update：优化比赛

src/components/BackToGame.vue

@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";
 
 import { getBattleAPI, getUserGameState } from "@/apis";
 import { debounce } from "@/util";
+import { returnToBattle } from "@/utils/matchReturn";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -67,11 +68,7 @@ const onClick = debounce(async () => {
     const result = await getBattleAPI();
     if (result && result.matchId) {
       await uni.$checkAudio();
-      if (result.mode <= 3) {
-        await navigateOnce(`/pages/team-battle/index?battleId=${result.matchId}`);
-      } else {
-        await navigateOnce(`/pages/melee-battle?battleId=${result.matchId}`);
-      }
+      await returnToBattle(result, navigateOnce);
       return;
     }
     if (game.value.roomID) {

src/components/Container.vue

@@ -7,6 +7,7 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
+import { returnToBattle } from "@/utils/matchReturn";
 import AudioManager from "@/audioManager";
 const props = defineProps({
   title: {
@@ -110,6 +111,15 @@ onShow(() => {
   showHint.value = false;
 });
 
+const navigateTo = (url) =>
+  new Promise((resolve, reject) => {
+    uni.navigateTo({
+      url,
+      success: resolve,
+      fail: reject,
+    });
+  });
+
 const backToGame = debounce(async () => {
   if (isLoading.value) return; // 防止重复点击
 
@@ -118,15 +128,7 @@ const backToGame = debounce(async () => {
     const result = await getBattleAPI();
     if (result && result.matchId) {
       await checkAudioProgress();
-      if (result.mode <= 3) {
-        uni.navigateTo({
-          url: `/pages/team-battle/index?battleId=${result.matchId}`,
-        });
-      } else {
-        uni.navigateTo({
-          url: `/pages/melee-battle?battleId=${result.matchId}`,
-        });
-      }
+      await returnToBattle(result, navigateTo);
     }
   } catch (error) {
     console.error("获取当前游戏失败:", error);