From 85f1f7e33d6c88f8cee63012cf397af114914500 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Fri, 25 Jul 2025 09:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BattleFooter.vue |  7 +++++++
 src/components/Container.vue    |  7 ++++++-
 src/components/CreateRoom.vue   |  6 ++++--
 src/components/Header.vue       |  4 ++--
 src/components/RoundEndTip.vue  |  3 +++
 src/pages/battle-room.vue       | 14 ++++++++------
 src/pages/melee-match.vue       | 20 +++++---------------
 src/pages/team-match.vue        | 15 +++++++++------
 src/websocket.js                |  8 ++++++++
 9 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/components/BattleFooter.vue b/src/components/BattleFooter.vue
index 94ab5f8..f92493b 100644
--- a/src/components/BattleFooter.vue
+++ b/src/components/BattleFooter.vue
@@ -40,6 +40,9 @@ defineProps({
             <text>环</text>
           </view>
         </view>
+        <block v-if="roundResults.length < 3">
+          <view v-for="i in 3 - roundResults.length" :key="i"> </view>
+        </block>
       </view>
       <view>
         <view v-for="(result, index) in roundResults" :key="index">
@@ -58,6 +61,9 @@ defineProps({
             <text>环</text>
           </view>
         </view>
+        <block v-if="roundResults.length < 3">
+          <view v-for="i in 3 - roundResults.length" :key="i"> </view>
+        </block>
       </view>
     </view>
   </view>
@@ -110,6 +116,7 @@ defineProps({
   background-color: #692735;
 }
 .players > view > view {
+  min-height: 28px;
   width: 85%;
   padding: 5px 20px;
   margin-bottom: 5px;
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 58f9add..10591b5 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, onUnmounted } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
@@ -47,6 +47,11 @@ onMounted(() => {
   const deviceInfo = uni.getDeviceInfo();
   isIos.value = deviceInfo.osName === "ios";
 });
+onUnmounted(() => {
+  // const pages = getCurrentPages();
+  // const currentPage = pages[pages.length - 1];
+  // uni.setStorageSync("last-route", currentPage.route);
+});
 onShow(() => {
   uni.$showHint = showGlobalHint;
   uni.$hideHint = hideGlobalHint;
diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue
index 2d12077..a53966e 100644
--- a/src/components/CreateRoom.vue
+++ b/src/components/CreateRoom.vue
@@ -110,7 +110,7 @@ const setClipboardData = () => {
   padding: 0 10px;
   display: flex;
   flex-wrap: wrap;
-  gap: 15px;
+  gap: 12px;
   justify-content: center;
   margin-bottom: 15px;
 }
@@ -119,7 +119,8 @@ const setClipboardData = () => {
   height: 55px;
   text-align: center;
   border-radius: 10px;
-  border: 1px solid #fff3;
+  border: 2rpx solid #fff3;
+  box-sizing: border-box;
   color: #fff;
   display: flex;
   flex-direction: column;
@@ -128,6 +129,7 @@ const setClipboardData = () => {
 }
 .battle-choosen {
   color: #fed847;
+  border: 4rpx solid #fff3;
   border-color: #fed847;
 }
 .battle-close {
diff --git a/src/components/Header.vue b/src/components/Header.vue
index ff4f355..9b4ab99 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -104,8 +104,8 @@ onUnmounted(() => {
   align-items: center;
 }
 .back-btn > image {
-  width: 22px;
-  height: 22px;
+  width: 18px;
+  height: 18px;
   margin-right: 10px;
 }
 .first-try-steps {
diff --git a/src/components/RoundEndTip.vue b/src/components/RoundEndTip.vue
index e875777..043fd21 100644
--- a/src/components/RoundEndTip.vue
+++ b/src/components/RoundEndTip.vue
@@ -73,6 +73,9 @@ onUnmounted(() => {
         }}</text>
         <text>环</text>
       </view>
+      <text v-if="bluePoint === 0 && redPoint === 0">
+        本场比赛无人射箭，已取消
+      </text>
       <text v-if="bluePoint === redPoint">
         红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
           redPoint
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index 5c8dd00..7471190 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -466,17 +466,19 @@ async function onReceiveMessage(messages = []) {
         tips.value = "准备下半场";
       }
       if (msg.constructor === MESSAGETYPES.MatchOver) {
-        uni.setStorageSync("last-battle", msg.endStatus);
         if (msg.endStatus.noSaved) {
-          uni.showToast({
-            title: "本场比赛无人射箭，已取消",
-            icon: "none",
-          });
+          // uni.showToast({
+          //   title: "本场比赛无人射箭，已取消",
+          //   icon: "none",
+          // });
+          currentBluePoint.value = 0;
+          currentRedPoint.value = 0;
           setTimeout(() => {
             uni.navigateBack();
           }, 1500);
         } else {
           isEnded.value = true;
+          uni.setStorageSync("last-battle", msg.endStatus);
           setTimeout(() => {
             uni.redirectTo({
               url: "/pages/battle-result",
@@ -537,7 +539,7 @@ onUnmounted(() => {
 const refreshTimer = ref(null);
 onShow(async () => {
   if (battleId.value) {
-    if (!isEnded.value && (await isGameEnded())) return;
+    if (!isEnded.value && (await isGameEnded(battleId.value))) return;
     getCurrentGameAPI();
     const refreshData = () => {
       const lastAwakeTime = uni.getStorageSync("last-awake-time");
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 3f26a99..09fbb0b 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -162,23 +162,13 @@ async function onReceiveMessage(messages = []) {
       tips.value = "准备下半场";
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
+      isEnded.value = true;
       uni.setStorageSync("last-battle", msg.endStatus);
-      if (msg.endStatus.noSaved) {
-        uni.showToast({
-          title: "本场比赛无人射箭，已取消",
-          icon: "none",
+      setTimeout(() => {
+        uni.redirectTo({
+          url: "/pages/battle-result",
         });
-        setTimeout(() => {
-          uni.navigateBack();
-        }, 1500);
-      } else {
-        isEnded.value = true;
-        setTimeout(() => {
-          uni.redirectTo({
-            url: "/pages/battle-result",
-          });
-        }, 1500);
-      }
+      }, 1500);
     }
     if (msg.constructor === MESSAGETYPES.BackToGame) {
       uni.$emit("update-header-loading", false);
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index dec8f30..c8822e2 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -233,6 +233,7 @@ async function onReceiveMessage(messages = []) {
       }
     }
     if (msg.constructor === MESSAGETYPES.FinalShoot) {
+      currentShooterId.value = 0;
       if (!isFinalShoot.value) {
         isFinalShoot.value = true;
         showRoundTip.value = true;
@@ -240,17 +241,19 @@ async function onReceiveMessage(messages = []) {
       }
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
-      uni.setStorageSync("last-battle", msg.endStatus);
       if (msg.endStatus.noSaved) {
-        uni.showToast({
-          title: "本场比赛无人射箭，已取消",
-          icon: "none",
-        });
+        // uni.showToast({
+        //   title: "本场比赛无人射箭，已取消",
+        //   icon: "none",
+        // });
+        currentBluePoint.value = 0;
+        currentRedPoint.value = 0;
         setTimeout(() => {
           uni.navigateBack();
         }, 1500);
       } else {
         isEnded.value = true;
+        uni.setStorageSync("last-battle", msg.endStatus);
         setTimeout(() => {
           uni.redirectTo({
             url: "/pages/battle-result",
@@ -289,7 +292,7 @@ onUnmounted(() => {
 const refreshTimer = ref(null);
 onShow(async () => {
   if (battleId.value) {
-    if (!isEnded.value && (await isGameEnded())) return;
+    if (!isEnded.value && (await isGameEnded(battleId.value))) return;
     getCurrentGameAPI();
     const refreshData = () => {
       const lastAwakeTime = uni.getStorageSync("last-awake-time");
diff --git a/src/websocket.js b/src/websocket.js
index d0b85b4..ef46d24 100644
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -37,6 +37,14 @@ function createWebSocket(token, onMessage) {
       ) {
         return;
       }
+      // const lastRoute = uni.getStorageSync("last-route");
+      // if (
+      //   lastRoute === "pages/battle-room" ||
+      //   lastRoute === "pages/team-match" ||
+      //   lastRoute === "pages/melee-match"
+      // ) {
+      //   return;
+      // }
       const { battleInfo } = msg;
       uni.setStorageSync("current-battle", battleInfo);
       console.log("----battleInfo", battleInfo);