From fcb9a02c6819df5931484f65c8b80f9d03b812a5 Mon Sep 17 00:00:00 2001
From: wsy182 <2392948297@qq.com>
Date: Tue, 24 Mar 2026 09:36:58 +0800
Subject: [PATCH] ``` fix(backend): resolve merge conflicts and update API
 proxy configuration

- Remove leftover merge conflict markers from ChengduGamePage.vue
- Fix broken HTML structure by properly closing header and section tags
- Update proxy configuration to point to correct backend port (19000)
- Clean up import statements and remove conflicting code blocks
```
---
 src/views/ChengduGamePage.vue | 20 ++------------------
 vite.config.ts                |  4 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/views/ChengduGamePage.vue b/src/views/ChengduGamePage.vue
index 1e9acd0..bb46208 100644
--- a/src/views/ChengduGamePage.vue
+++ b/src/views/ChengduGamePage.vue
@@ -1,10 +1,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-<<<<<<< Updated upstream
-=======
 import deskImage from '../assets/images/desk/desk_01.png'
->>>>>>> Stashed changes
 import type { AuthSession } from '../api/authed-request'
 import { getUserInfo } from '../api/user'
 import {
@@ -746,8 +743,6 @@ onBeforeUnmount(() => {
         <button class="ghost-btn" type="button" :disabled="leaveRoomPending" @click="backHall">
           {{ leaveRoomPending ? '退出中...' : '返回大厅' }}
         </button>
-<<<<<<< Updated upstream
-=======
       </div>
 
       <div class="topbar-center">
@@ -755,13 +750,7 @@ onBeforeUnmount(() => {
           <p class="game-title">成都麻将实战桌</p>
           <p class="game-subtitle">{{ roomStatusText }} · {{ currentPhaseText }}</p>
         </div>
->>>>>>> Stashed changes
       </div>
-    </header>
-
-<<<<<<< Updated upstream
-    <section class="table-panel game-table-panel">
-=======
       <div class="topbar-right">
         <div class="status-chip net-chip">
           <span class="wifi-dot" :class="`is-${wsStatus}`"></span>
@@ -770,8 +759,9 @@ onBeforeUnmount(() => {
         <div class="status-chip clock-chip">{{ formattedClock }}</div>
         <button class="header-btn ghost-btn" type="button" @click="connectWs">重连</button>
       </div>
+    </header>
+
       <section class="table-panel game-table-panel">
->>>>>>> Stashed changes
       <div class="room-brief">
         <span class="room-brief-title">当前房间</span>
         <span class="room-brief-item">
@@ -799,11 +789,7 @@ onBeforeUnmount(() => {
           {{ startGamePending ? '开局请求中...' : '开始游戏' }}
         </button>
       </div>
-<<<<<<< Updated upstream
-      <div class="mahjong-table game-mahjong-table" :class="{ active: Boolean(roomId) }">
-=======
       </section>
-    </header>
 
     <section class="table-shell">
       <img class="table-desk" :src="deskImage" alt="" />
@@ -851,8 +837,6 @@ onBeforeUnmount(() => {
           <span class="wind east">东</span>
           <strong>{{ centerTimer }}</strong>
         </div>
-
->>>>>>> Stashed changes
         <div
           v-for="seat in seatViews"
           :key="seat.key"
diff --git a/vite.config.ts b/vite.config.ts
index 30c0c8e..ff9c332 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,11 +6,11 @@ export default defineConfig({
   server: {
     proxy: {
       '/api/v1': {
-        target: 'http://127.0.0.1:8080',
+        target: 'http://127.0.0.1:19000',
         changeOrigin: true,
       },
       '/api/v1/ws': {
-        target: 'ws://127.0.0.1:8080',
+        target: 'ws://127.0.0.1:19000',
         ws: true,
       }
     }