pref: 匹配成功展示准备页面

src/pages/melee-battle.vue

@@ -29,53 +29,68 @@ const halfTimeTip = ref(false);
 const halfRest = ref(false);
 
 function recoverData(battleInfo, { force = false } = {}) {
-  if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
-  if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
-  players.value = battleInfo.teams[0].players;
-  start.value = battleInfo.status !== 0;
-  if (battleInfo.status === 0) {
-    const readyRemain = (Date.now() - battleInfo.createTime) / 1000;
-    console.log(`对局已进行${readyRemain}秒`);
-    if (readyRemain > 0 && readyRemain < 15) {
-      setTimeout(() => {
-        uni.$emit("update-timer", 15 - readyRemain - 0.2);
-      }, 200);
+  if (!battleInfo) return;
+  try {
+    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
+    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
+    
+    // 优先使用接口数据，否则使用缓存
+    if (battleInfo.teams?.[0]?.players) {
+      players.value = [...battleInfo.teams[0].players];
+    } else {
+      // 大乱斗可能存的是 players 列表
+      // 这里的缓存逻辑根据 AboutToStart 消息结构可能不同，假设也是 teams[0]
+      // 如果是从 match-page 过来的，match-page 只存了 teams[1] 和 [2] 给对抗模式
+      // 大乱斗的匹配逻辑可能不同，暂时保持原样，只做安全保护
+      players.value = []; 
     }
-    return;
-  }
-  tips.value =
-    (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
-  playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
-  const totals = {};
-  players.value.forEach((p) => {
-    const total = playersScores.value.reduce((acc, round) => {
-      const arr = round[p.id] || [];
-      return acc + arr.length;
-    }, 0);
-    totals[p.id] = total;
-  });
-  playersSorted.value = players.value.slice().sort((a, b) => {
-    return totals[b.id] - totals[a.id];
-  });
-  if (battleInfo.status === 3) {
-    halfTimeTip.value = true;
-    halfRest.value = true;
-    tips.value = "准备下半场";
-    // 剩余休息时间
-    // const remain = (Date.now() - battleInfo.timeoutTime) / 1000;
-    setTimeout(() => {
-      uni.$emit("update-remain", 0);
-    }, 200);
-    return;
-  }
-  if (force) {
-    const remain = (Date.now() - battleInfo.current.startTime) / 1000;
-    console.log(`当前轮已进行${remain}秒`);
-    if (remain > 0 && remain < 90) {
-      setTimeout(() => {
-        uni.$emit("update-remain", 90 - remain - 0.2);
-      }, 200);
+    
+    start.value = battleInfo.status !== 0;
+
+    if (battleInfo.status === 0) {
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      if (readyRemain > 0 && readyRemain < 15) {
+        setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
+      }
+      return;
     }
+
+    tips.value =
+      (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
+    playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
+    const totals = {};
+    players.value.forEach((p) => {
+      const total = playersScores.value.reduce((acc, round) => {
+        const arr = round[p.id] || [];
+        return acc + arr.length;
+      }, 0);
+      totals[p.id] = total;
+    });
+    playersSorted.value = players.value.slice().sort((a, b) => {
+      return totals[b.id] - totals[a.id];
+    });
+    if (battleInfo.status === 3) {
+      halfTimeTip.value = true;
+      halfRest.value = true;
+      tips.value = "准备下半场";
+      // 剩余休息时间
+      // const remain = (Date.now() - battleInfo.timeoutTime) / 1000;
+      setTimeout(() => {
+        uni.$emit("update-remain", 0);
+      }, 200);
+      return;
+    }
+    if (force) {
+      const remain = (Date.now() - (battleInfo.current?.startTime || Date.now())) / 1000;
+      console.log(`当前轮已进行${remain}秒`);
+      if (remain > 0 && remain < 90) {
+        setTimeout(() => {
+          uni.$emit("update-remain", 90 - remain - 0.2);
+        }, 200);
+      }
+    }
+  } catch (err) {
+    console.error("recoverData error:", err);
   }
 }
 
@@ -127,6 +142,7 @@ onBeforeUnmount(() => {
 onShow(async () => {
   if (battleId.value) {
     const result = await getBattleAPI(battleId.value);
+    if (!result) return;
     if (result.status === 2) {
       uni.showToast({
         title: "比赛已结束",