From 9a6ca0700e9bb5994ac01ef8e94d8102393c9d2f Mon Sep 17 00:00:00 2001
From: chenlimao <web_wei_328@163.com>
Date: Thu, 14 May 2026 14:23:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81+=E5=88=9B=E5=BB=BA=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E8=A1=A8=E5=8D=95=E9=BB=98=E8=AE=A4=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CreateRoom.vue | 11 +++++++++--
 src/pages/battle-room.vue     |  5 -----
 src/pages/friend-battle.vue   |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index e34d7d7..0b32a26 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -17,12 +17,19 @@ const props = defineProps({
   },
 });
 
-const battleMode = ref(1);
-const targetMode = ref(1);
+/** 对战模式：0=未选 1=1v1 2=乱斗 3=2v2 4=3v3 */
+const battleMode = ref(0);
+/** 靶纸尺寸：0=未选 1=20cm 2=40cm */
+const targetMode = ref(0);
 const loading = ref(false);
 const roomNumber = ref("");
 
 const createRoom = debounce(async () => {
+  // 校验必填项：对战模式与靶纸均必须选择
+  if (!battleMode.value || !targetMode.value) {
+    uni.showToast({ title: '请完善创建信息', icon: 'none' });
+    return;
+  }
   if (game.value.inBattle) {
     uni.$showHint(1);
     return;
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index 34c777d..03de5dd 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -10,7 +10,6 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import {
   getRoomAPI,
   exitRoomAPI,
-  startRoomAPI,
   chooseTeamAPI,
   getReadyAPI,
   kickPlayerAPI,
@@ -208,10 +207,6 @@ const chooseTeam = async (team) => {
   refreshMembers(result.members);
 };
 
-const exitRoom = async () => {
-  uni.navigateBack();
-};
-
 /** 待确认踢出的玩家信息 */
 const playerToKick = ref(null);
 /** 控制踢出确认弹窗的显示状态 */
diff --git a/src/pages/friend-battle.vue b/src/pages/friend-battle.vue
index 3741aba..698524a 100644
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -162,7 +162,8 @@ onLoad(async (options) => {
         <view v-if="warnning" class="warnning">
           {{ warnning }}
         </view>
-        <CreateRoom v-if="!warnning" :onConfirm="() => (showModal = false)" />
+        <!-- showModal 关闭时立即销毁组件，重开时重建，确保选项重置为 0 -->
+        <CreateRoom v-if="!warnning && showModal" :onConfirm="() => (showModal = false)" />
       </SModal>
       <Signin :show="showSignin" :onClose="onSignin" />
     </view>