pref: 进度条变化

pref: 比赛结束
Merge remote-tracking branch 'origin/new-race-mode' into new-race-mode
2026-05-06 17:57:02 +08:00 · 2026-05-06 16:15:39 +08:00 · 2026-05-06 14:20:41 +08:00 · 2026-05-06 14:20:06 +08:00 · 2026-05-06 11:55:46 +08:00 · 2026-05-06 10:15:13 +08:00
17 changed files with 1002 additions and 2567 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,11 @@ pnpm-debug.log*
 lerna-debug.log*

 node_modules
+.history
+.github
+openspec
+CLAUDE.md
+dosc
 .DS_Store
 dist
 *.local
--- a/src/App.vue
+++ b/src/App.vue
@@ -52,7 +52,7 @@
 	}

 	function onDeviceShoot() {
-		audioManager.play("射箭声音")
+		// audioManager.play("射箭声音")
 	}

 	function onShootWsMsg(content) {
--- a/src/apis.js
+++ b/src/apis.js
@@ -1,470 +1,498 @@
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版

 try {
-  const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+    const accountInfo = uni.getAccountInfoSync();
+    const envVersion = accountInfo.miniProgram.envVersion;

-  switch (envVersion) {
-    case "develop": // 开发版
-      BASE_URL = "http://localhost:8000/api/shoot";
-      // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
-    case "trial": // 体验版
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
-    case "release": // 正式版
-      BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
-      break;
-    default:
-      // 保持默认值
-      break;
-  }
+    switch (envVersion) {
+        case "develop": // 开发版
+            BASE_URL = "http://localhost:8000/api/shoot";
+            // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            break;
+        case "trial": // 体验版
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            break;
+        case "release": // 正式版
+            BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
+            break;
+        default:
+            // 保持默认值
+            break;
+    }
 } catch (e) {
-  console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
 }

 function request(method, url, data = {}) {
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
-  const header = {};
-  if (token) header.Authorization = `Bearer ${token || ""}`;
-  return new Promise((resolve, reject) => {
-    uni.request({
-      url: `${BASE_URL}${url}`,
-      method,
-      header,
-      data,
-      timeout: 10000,
-      success: (res) => {
-        if (res.data) {
-          const { code, data, message } = res.data;
-          if (code === 0) resolve(data);
-          else if (message) {
-            if (message.indexOf("登录身份已失效") !== -1) {
-              uni.removeStorageSync(
-                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-              );
-              uni.$emit("update-user");
-            }
-            if (message === "ROOM_FULL") {
-              resolve({ full: true });
-              return;
-            }
-            if (message === "ERROR_ROOM_GAME_START") {
-              resolve({ started: true });
-              return;
-            }
-            if (url.indexOf("/user/room") !== -1 && method === "GET") {
-              resolve({});
-              return;
-            }
-            if (message === "ERROR_BATTLE_GAMING") {
-              resolve({});
-              return;
-            }
-            if (message === "BIND_DEVICE") {
-              resolve({ binded: true });
-              return;
-            }
-            if (message === "ERROR_ORDER_UNPAY") {
-              uni.showToast({
-                title: "当前有未支付订单",
-                icon: "none",
-              });
-              resolve({});
-              return;
-            }
-            if (message === "ROOM_EMPTY") {
-              return uni.showToast({
-                title: "房间已过期",
-                icon: "none",
-              });
-            }
-            uni.showToast({
-              title: message,
-              icon: "none",
-            });
-          }
-          reject("");
-        }
-      },
-      fail: (err) => {
-        handleRequestError(err, url);
-        reject(err);
-      },
+    const token = uni.getStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+    );
+    const header = {};
+    if (token) header.Authorization = `Bearer ${token || ""}`;
+    return new Promise((resolve, reject) => {
+        uni.request({
+            url: `${BASE_URL}${url}`,
+            method,
+            header,
+            data,
+            timeout: 10000,
+            success: (res) => {
+                if (res.data) {
+                    const {code, data, message} = res.data;
+                    if (code === 0) resolve(data);
+                    else if (message) {
+                        if (message.indexOf("登录身份已失效") !== -1) {
+                            uni.removeStorageSync(
+                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+                            );
+                            uni.$emit("update-user");
+                        }
+                        if (message === "ROOM_FULL") {
+                            resolve({full: true});
+                            return;
+                        }
+                        if (message === "ERROR_ROOM_GAME_START") {
+                            resolve({started: true});
+                            return;
+                        }
+                        if (url.indexOf("/user/room") !== -1 && method === "GET") {
+                            resolve({});
+                            return;
+                        }
+                        if (message === "ERROR_BATTLE_GAMING") {
+                            resolve({});
+                            return;
+                        }
+                        if (message === "BIND_DEVICE") {
+                            resolve({binded: true});
+                            return;
+                        }
+                        if (message === "ERROR_ORDER_UNPAY") {
+                            uni.showToast({
+                                title: "当前有未支付订单",
+                                icon: "none",
+                            });
+                            resolve({});
+                            return;
+                        }
+                        if (message === "ROOM_EMPTY") {
+                            return uni.showToast({
+                                title: "房间已过期",
+                                icon: "none",
+                            });
+                        }
+                        uni.showToast({
+                            title: message,
+                            icon: "none",
+                        });
+                    }
+                    reject("");
+                }
+            },
+            fail: (err) => {
+                handleRequestError(err, url);
+                reject(err);
+            },
+        });
    });
-  });
 }

 // 统一的错误处理函数
 function handleRequestError(err, url) {
-  console.log("请求失败:", { err, url });
+    console.log("请求失败:", {err, url});

-  // 根据错误类型显示不同提示
-  if (err.errMsg) {
-    if (err.errMsg.includes("timeout")) {
-      showCustomToast("请求超时，请稍后重试", "timeout");
-    } else if (err.errMsg.includes("fail")) {
-      // 检查网络状态
-      uni.getNetworkType({
-        success: (res) => {
-          if (res.networkType === "none") {
-            showCustomToast("网络连接已断开，请检查网络设置", "network");
-          } else {
-            showCustomToast("服务器连接失败，请稍后重试", "server");
-          }
-        },
-        fail: () => {
-          showCustomToast("网络异常，请检查网络连接", "unknown");
-        },
-      });
+    // 根据错误类型显示不同提示
+    if (err.errMsg) {
+        if (err.errMsg.includes("timeout")) {
+            showCustomToast("请求超时，请稍后重试", "timeout");
+        } else if (err.errMsg.includes("fail")) {
+            // 检查网络状态
+            uni.getNetworkType({
+                success: (res) => {
+                    if (res.networkType === "none") {
+                        showCustomToast("网络连接已断开，请检查网络设置", "network");
+                    } else {
+                        showCustomToast("服务器连接失败，请稍后重试", "server");
+                    }
+                },
+                fail: () => {
+                    showCustomToast("网络异常，请检查网络连接", "unknown");
+                },
+            });
+        } else {
+            showCustomToast("请求失败，请稍后重试", "general");
+        }
    } else {
-      showCustomToast("请求失败，请稍后重试", "general");
+        showCustomToast("网络异常，请稍后重试", "unknown");
    }
-  } else {
-    showCustomToast("网络异常，请稍后重试", "unknown");
-  }
 }

 // 自定义提示函数
 function showCustomToast(message, type) {
-  const config = {
-    title: message,
-    icon: "none",
-    duration: 3000,
-  };
+    const config = {
+        title: message,
+        icon: "none",
+        duration: 3000,
+    };

-  // 根据错误类型可以添加不同的处理逻辑
-  switch (type) {
-    case "timeout":
-      config.duration = 4000; // 超时提示显示更久
-      break;
-    case "network":
-      config.duration = 5000; // 网络问题提示显示更久
-      break;
-    default:
-      break;
-  }
+    // 根据错误类型可以添加不同的处理逻辑
+    switch (type) {
+        case "timeout":
+            config.duration = 4000; // 超时提示显示更久
+            break;
+        case "network":
+            config.duration = 5000; // 网络问题提示显示更久
+            break;
+        default:
+            break;
+    }

-  uni.showToast(config);
+    uni.showToast(config);
 }

 // 获取全局配置
 export const getAppConfig = () => {
-  return request("GET", "/index/appConfig");
+    return request("GET", "/index/appConfig");
 };

 export const getHomeData = (seasonId) => {
-  return request("GET", `/user/myHome?seasonId=${seasonId}`);
+    return request("GET", `/user/myHome?seasonId=${seasonId}`);
 };

 export const getProvinceData = () => {
-  return request("GET", "/index/provinces/list");
+    return request("GET", "/index/provinces/list");
 };

 export const loginAPI = async (phone, nickName, avatarData, code) => {
-  const result = await request("POST", "/index/code", {
-    appName: "shoot",
-    appId: "wxa8f5989dcd45cc23",
-    nickName,
-    avatarData,
-    code,
-    phone,
-  });
-  uni.setStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
-    result.token
-  );
-  return result;
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        nickName,
+        avatarData,
+        code,
+        phone,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const silentLoginAPI = async (code) => {
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const checkUserBindAPI = async (code) => {
+    return request("POST", "/index/checkBind", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
 };

 export const bindDeviceAPI = (device) => {
-  return request("POST", "/user/device/bindDevice", {
-    device,
-  });
+    return request("POST", "/user/device/bindDevice", {
+        device,
+    });
+};
+
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
 };

 export const unbindDeviceAPI = (deviceId) => {
-  return request("POST", "/user/device/unbindDevice", {
-    deviceId,
-  });
+    return request("POST", "/user/device/unbindDevice", {
+        deviceId,
+    });
 };

 export const getMyDevicesAPI = () => {
-  // "/user/device/getBinding?deviceId=9ZF9oVXs"
-  return request("GET", "/user/device/getBindings");
+    // "/user/device/getBinding?deviceId=9ZF9oVXs"
+    return request("GET", "/user/device/getBindings");
 };

 export const createPractiseAPI = (arrows, time, target) => {
-  return request("POST", "/user/practice/create", {
-    shootNumber: arrows,
-    shootTime: time,
-    targetType: target*20,
-  });
+    return request("POST", "/user/practice/create", {
+        shootNumber: arrows,
+        shootTime: time,
+        targetType: target * 20,
+    });
 };

 export const startPractiseAPI = () => {
-  return request("POST", "/user/practice/begin");
+    return request("POST", "/user/practice/begin");
 };

 export const endPractiseAPI = () => {
-  return request("POST", "/user/practice/stop");
+    return request("POST", "/user/practice/stop");
 };

 export const getPractiseAPI = async (id) => {
-  return request("GET", `/user/practice/get?id=${id}`);
+    return request("GET", `/user/practice/get?id=${id}`);
 };

 export const createRoomAPI = (gameType, teamSize, targetType) => {
-  return request("POST", "/user/createroom", {
-    gameType,
-    teamSize,
-    targetType,
-  });
+    return request("POST", "/user/createroom", {
+        gameType,
+        teamSize,
+        targetType,
+    });
 };

 export const getRoomAPI = (number) => {
-  return request("GET", `/user/room?number=${number}`);
+    return request("GET", `/user/room?number=${number}`);
 };

 export const joinRoomAPI = (number) => {
-  return request("POST", `/user/room/join`, { number });
+    return request("POST", `/user/room/join`, {number});
 };

 export const destroyRoomAPI = (roomNumber) => {
-  return request("POST", "/user/room/destroyRoom", {
-    roomNumber,
-  });
+    return request("POST", "/user/room/destroyRoom", {
+        roomNumber,
+    });
 };

 export const exitRoomAPI = (number, userId) => {
-  return request("POST", "/user/room/exitRoom", {
-    number,
-    userId,
-  });
+    return request("POST", "/user/room/exitRoom", {
+        number,
+        userId,
+    });
 };

 export const startRoomAPI = (number) => {
-  return request("POST", "/user/room/start", { number });
+    return request("POST", "/user/room/start", {number});
 };

 export const getPractiseResultListAPI = async (page = 1, page_size = 15) => {
-  const reuslt = await request(
-    "GET",
-    `/user/practice/list?page=${page}&page_size=${page_size}`
-  );
-  return reuslt.list;
+    const reuslt = await request(
+        "GET",
+        `/user/practice/list?page=${page}&page_size=${page_size}`
+    );
+    return reuslt.list;
 };

 export const matchGameAPI = (match, gameType, teamSize) => {
-  return request("POST", "/user/game/match", {
-    match,
-    gameType,
-    teamSize,
-    readyTime: 1.5,
-  });
+    return request("POST", "/user/game/match", {
+        match,
+        gameType,
+        teamSize,
+        readyTime: 15,
+        targetType: 20,
+    });
 };

 export const readyGameAPI = (battleId) => {
-  return request("POST", "/user/game/prepare", {
-    battleId,
-  });
+    return request("POST", "/user/game/prepare", {
+        battleId,
+    });
 };

 export const simulShootAPI = (device_id, x, y) => {
-  const data = {
-    device_id,
-  };
-  if (x !== undefined && y !== undefined) {
-    data.x = x;
-    data.y = y;
-  }
-  return request("POST", "/index/arrow", data);
+    const data = {
+        device_id,
+    };
+    if (x !== undefined && y !== undefined) {
+        data.x = x;
+        data.y = y;
+    }
+    return request("POST", "/index/arrow", data);
 };

 export const getBattleListAPI = async (page, battleType) => {
-  const result = await request("POST", "/user/battle/details/list", {
-    page,
-    pageSize: 10,
-    battleType,
-  });
-  return result.list;
+    const result = await request("POST", "/user/battle/details/list", {
+        page,
+        pageSize: 10,
+        battleType,
+    });
+    return result.list;
 };

 export const getRankListAPI = () => {
-  return request("GET", "/index/ranklist");
+    return request("GET", "/index/ranklist");
 };

 export const createOrderAPI = (vipId) => {
-  return request("POST", "/user/order/create", {
-    vipId,
-    quanity: 1,
-    tradeType: "mini",
-    payType: "wxpay",
-  });
+    return request("POST", "/user/order/create", {
+        vipId,
+        quanity: 1,
+        tradeType: "mini",
+        payType: "wxpay",
+    });
 };

 export const payOrderAPI = (id) => {
-  return request("POST", "/user/order/pay", {
-    id,
-    tradeType: "mini",
-    payType: "wxpay",
-  });
+    return request("POST", "/user/order/pay", {
+        id,
+        tradeType: "mini",
+        payType: "wxpay",
+    });
 };

 export const getOrderListAPI = async (page) => {
-  const reuslt = await request("GET", `/user/order/list?page=${page}`);
-  return reuslt.items || [];
+    const reuslt = await request("GET", `/user/order/list?page=${page}`);
+    return reuslt.items || [];
 };

 export const cancelOrderListAPI = async (id) => {
-  return request("POST", "/user/order/cancelOrder", { id });
+    return request("POST", "/user/order/cancelOrder", {id});
 };

 export const getUserGameState = () => {
-  return request("GET", "/user/state");
+    return request("GET", "/user/state");
 };

 export const getPointBookConfigAPI = async () => {
-  return request("GET", "/user/score/sheet/option");
+    return request("GET", "/user/score/sheet/option");
 };

 export const savePointBookAPI = async (
-  bowType,
-  distance,
-  targetType,
-  groups,
-  arrows,
-  data = []
-) => {
-  return request("POST", "/user/score/sheet/report", {
    bowType,
    distance,
    targetType,
    groups,
    arrows,
-    group_data: data.map((item) =>
-      item.map((i) => ({
-        ...i,
-        ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
-      }))
-    ),
-  });
+    data = []
+) => {
+    return request("POST", "/user/score/sheet/report", {
+        bowType,
+        distance,
+        targetType,
+        groups,
+        arrows,
+        group_data: data.map((item) =>
+            item.map((i) => ({
+                ...i,
+                ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+            }))
+        ),
+    });
 };

 export const getPointBookListAPI = async (
-  page = 1,
-  bowType,
-  distance,
-  targetType
+    page = 1,
+    bowType,
+    distance,
+    targetType
 ) => {
-  let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
-  if (bowType) url += `&bowType=${bowType}`;
-  if (distance) url += `&distance=${distance}`;
-  if (targetType) url += `&targetType=${targetType}`;
-  const result = await request("GET", url);
-  return result.list || [];
+    let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+    if (bowType) url += `&bowType=${bowType}`;
+    if (distance) url += `&distance=${distance}`;
+    if (targetType) url += `&targetType=${targetType}`;
+    const result = await request("GET", url);
+    return result.list || [];
 };

 export const getPointBookDetailAPI = async (id) => {
-  return request("GET", `/user/score/sheet/detail?id=${id}`);
+    return request("GET", `/user/score/sheet/detail?id=${id}`);
 };

 export const getPointBookDataAPI = async () => {
-  return request("GET", "/user/score/sheet/statistics");
+    return request("GET", "/user/score/sheet/statistics");
 };

 export const getPractiseDataAPI = async () => {
-  return request("GET", "/user/practice/statistics");
+    return request("GET", "/user/practice/statistics");
 };

 export const getBattleDataAPI = async () => {
-  return request("GET", "/user/fight/statistics");
+    return request("GET", "/user/fight/statistics");
 };

 export const chooseTeamAPI = async (number, group) => {
-  return request("POST", "/user/room/group", { number, group });
+    return request("POST", "/user/room/group", {number, group});
 };

 export const getVIPDescAPI = async () => {
-  return request("GET", "/index/memberVipDescribe");
+    return request("GET", "/index/memberVipDescribe");
 };

 export const getPointBookStatisticsAPI = async () => {
-  return request("GET", `/v2/user/score/sheet/statistics`);
+    return request("GET", `/v2/user/score/sheet/statistics`);
 };

 export const donateAPI = async (amount, name, phone, organizer, advice) => {
-  return request("POST", `/user/donate`, {
-    amount,
-    name,
-    phone,
-    organizer,
-    advice,
-  });
+    return request("POST", `/user/donate`, {
+        amount,
+        name,
+        phone,
+        organizer,
+        advice,
+    });
 };

 export const laserAimAPI = async () => {
-  return request("POST", "/user/device/laserAim");
+    return request("POST", "/user/device/laserAim");
 };

 export const laserCloseAPI = async () => {
-  return request("POST", "/user/device/closeAim");
+    return request("POST", "/user/device/closeAim");
 };

 export const getDeviceBatteryAPI = async () => {
-  return request("GET", "/user/device/battery");
+    return request("GET", "/user/device/battery");
 };

 export const addNoteAPI = async (id, remark) => {
-  return request("POST", "/user/score/sheet/remark", { id, remark });
+    return request("POST", "/user/score/sheet/remark", {id, remark});
 };

 export const removePointRecord = async (id) => {
-  return request("DELETE", `/user/score/sheet/delete?id=${id}`);
+    return request("DELETE", `/user/score/sheet/delete?id=${id}`);
 };

 export const getPhoneNumberAPI = (data) => {
-  return request("POST", "/index/getPhone", data);
+    return request("POST", "/index/getPhone", data);
 };

 export const getPointBookRankListAPI = (page = 1) => {
-  return request(
-    "GET",
-    `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
-  );
+    return request(
+        "GET",
+        `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
+    );
 };

 export const clickLikeAPI = (userId, ifLike) => {
-  return request("POST", "/user/score/sheet/week/shoot/rank/like", {
-    userId,
-    ifLike,
-  });
+    return request("POST", "/user/score/sheet/week/shoot/rank/like", {
+        userId,
+        ifLike,
+    });
 };

 export const getMyLikeList = (page = 1, pageSize = 10) => {
-  return request(
-    "GET",
-    `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
-  );
+    return request(
+        "GET",
+        `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
+    );
 };

 export const getReadyAPI = (roomId) => {
-  return request("POST", `/user/room/ready`, {
-    roomId,
-  });
+    return request("POST", `/user/room/ready`, {
+        roomId,
+    });
 };

 export const getBattleAPI = async (battleId) => {
-  return request("POST", "/user/match/info", {
-    id: battleId,
-  });
+    return request("POST", "/user/match/info", {
+        id: battleId,
+    });
 };

 export const kickPlayerAPI = (number, userId) => {
-  return request("POST", "/user/room/kicking", {
-    number,
-    userId,
-  });
+    return request("POST", "/user/room/kicking", {
+        number,
+        userId,
+    });
 };
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -5,7 +5,7 @@ import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
-import { laserAimAPI, getBattleAPI } from "@/apis";
+import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
 import AudioManager from "@/audioManager";
 const props = defineProps({
@@ -135,6 +135,10 @@ const goBack = () => {
  uni.navigateBack();
 };

+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
 const goCalibration = async () => {
  await laserAimAPI();
  uni.navigateTo({
@@ -202,7 +206,7 @@ const goCalibration = async () => {
          <button hover-class="none" @click="() => (showHint = false)">
            取消
          </button>
-          <button hover-class="none" @click="goBack">确认</button>
+          <button hover-class="none" @click="cancelMatching">确认</button>
        </view>
      </view>
      <view v-if="hintType === 4" class="tip-content">
--- a/src/components/HeaderProgress.vue
+++ b/src/components/HeaderProgress.vue
@@ -56,7 +56,7 @@ async function onReceiveMessage(message) {
    currentRoundEnded.value = true;
    audioManager.play("比赛开始");
  } else if (type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束");
+    audioManager.play("比赛结束", false);
  } else if (type === MESSAGETYPESV2.ShootResult) {
    if (melee.value && current.playerId !== user.value.id) return;
    if (current.playerId === user.value.id) currentShot.value++;
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -53,6 +53,7 @@ const currentRoundEnded = ref(false);
 const ended = ref(false);
 const halfTime = ref(false);
 const wait = ref(0);
+const transitionStyle = ref("all 1s linear");

 watch(
  () => props.tips,
@@ -81,7 +82,19 @@ watch(

 const resetTimer = (count) => {
  if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(count);
+  const newVal = Math.round(count);
+  
+  // 如果剩余时间增加（如重置），瞬间变化无动画
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+  
  if (remain.value > 0) {
    timer.value = setInterval(() => {
      if (remain.value === 0) {
@@ -188,6 +201,7 @@ onBeforeUnmount(() => {
          width: `${(remain / total) * 100}%`,
          backgroundColor: barColor,
          right: tips.includes('红队') ? 0 : 'unset',
+          transition: transitionStyle,
        }"
      />
      <text>剩余{{ remain }}秒</text>
@@ -242,7 +256,6 @@ onBeforeUnmount(() => {
  height: 15px;
  border-radius: 15px;
  z-index: -1;
-  transition: all 1s linear;
 }
 .container > view:last-child > text {
  font-size: 10px;
--- a/src/components/ShootProgress2.vue
+++ b/src/components/ShootProgress2.vue
@@ -20,12 +20,23 @@ const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
 const laoding = ref(false);
+const transitionStyle = ref("all 1s linear");

 const updateRemain = (value) => {
-  // if (Math.ceil(value) === remain.value || Math.floor(value) === remain.value)
-  //   return;
  if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(value);
+  const newVal = Math.round(value);
+  
+  // 如果剩余时间增加（如轮次切换重置），瞬间变化无动画；否则保持动画
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+  
  timer.value = setInterval(() => {
    laoding.value = remain.value === 0;
    if (remain.value > 0) remain.value--;
@@ -72,6 +83,7 @@ onBeforeUnmount(() => {
          width: `${(remain / total) * 100}%`,
          background: barColor,
          right: tips.includes('红队') ? 0 : 'unset',
+          transition: transitionStyle,
        }"
      />
      <text v-if="!laoding">剩余{{ remain }}秒</text>
@@ -106,7 +118,6 @@ onBeforeUnmount(() => {
 .container > view:last-child > view {
  height: 24rpx;
  border-radius: 15px;
-  transition: all 1s linear;
 }
 .container > view:last-child > text {
  font-size: 18rpx;
--- a/src/components/Signin.vue
+++ b/src/components/Signin.vue
@@ -86,18 +86,17 @@ const handleLogin = async () => {
      icon: "none",
    });
  }
+  await doLogin();
+};
+
+async function doLogin() {
  loading.value = true;
  try {
    const wxResult = await wxLogin();
    const fileManager = uni.getFileSystemManager();
    const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
    const base64Url = `data:image/png;base64,${avatarBase64}`;
-    const result = await loginAPI(
-      phone.value,
-      nickName.value,
-      base64Url,
-      wxResult.code
-    );
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
    const data = await getHomeData();
    if (data.user) updateUser(data.user);
    const devices = await getMyDevicesAPI();
@@ -139,6 +138,10 @@ const openPrivacyLink = () => {

 onShow(() => {
  loading.value = false;
+  agree.value = false;
+  phone.value = "";
+  avatarUrl.value = "";
+  nickName.value = "";
 });
 </script>

--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,68 +1,70 @@
 {
-  "name": "shoot-miniprograms",
-  "appid": "",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  "uniStatistics": {
-    "enable": false
-  },
-  "app-plus": {
-    "bounce": "none",
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    "name" : "shoot-miniprograms",
+    "appid" : "__UNI__B03E251",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "uniStatistics" : {
+        "enable" : false
    },
-    "modules": {},
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "ios": {},
-      "sdkConfigs": {}
+    "app-plus" : {
+        "bounce" : "none",
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {}
+        }
+    },
+    "h5" : {
+        "darkmode" : true,
+        "themeLocation" : "theme.json"
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxa8f5989dcd45cc23",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "uglifyFileName" : true,
+            "useCompilerModule" : true,
+            "useIsolateContext" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true,
+        "darkmode" : true,
+        "themeLocation" : "theme.json",
+        "permission" : {},
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
    }
-  },
-  "h5": {
-    "darkmode": true,
-    "themeLocation": "theme.json"
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wxa8f5989dcd45cc23",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "uglifyFileName": true,
-      "useCompilerModule": true,
-      "useIsolateContext": true
-    },
-    "lazyCodeLoading": "requiredComponents",
-    "usingComponents": true,
-    "darkmode": true,
-    "themeLocation": "theme.json",
-    "permission": {},
-    "requiredPrivateInfos": ["getLocation", "chooseLocation"]
-  }
 }
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,25 +1,26 @@
 <script setup>
-import { ref, onMounted } from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+import {onMounted, ref} from "vue";
+import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
-import AppBackground from "@/components/AppBackground.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";

 import {
+  checkUserBindAPI,
  getAppConfig,
-  getRankListAPI,
+  getDeviceBatteryAPI,
  getHomeData,
  getMyDevicesAPI,
-  getDeviceBatteryAPI,
+  getRankListAPI,
+  silentLoginAPI,
 } from "@/apis";
-import { topThreeColors } from "@/constants";
-import { canEenter } from "@/util";
+import {topThreeColors} from "@/constants";

 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
 const {
  updateConfig,
@@ -27,9 +28,10 @@ const {
  updateDevice,
  updateRank,
  getLvlName,
+  getLvlNameByScore,
  updateOnline,
 } = store;
-const { user, device, rankData, online, game } = storeToRefs(store);
+const {user, device, rankData, online, game} = storeToRefs(store);

 const showModal = ref(false);
 const showGuide = ref(false);
@@ -44,7 +46,7 @@ const toPage = async (path) => {
  //   await uni.$checkAudio();
  // }
  // }
-  uni.navigateTo({ url: path });
+  uni.navigateTo({url: path});
 };

 const toRankListPage = () => {
@@ -54,12 +56,36 @@ const toRankListPage = () => {
 };

 onShow(async () => {
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
+  const token = uni.getStorageSync(`${env}_token`);
+
+  if (!user.value.id && !token) {
+    try {
+      const wxResult = await uni.login({provider: "weixin"});
+      const bindResult = await checkUserBindAPI(wxResult.code);
+      if (bindResult.binded) {
+        const newResult = await uni.login({provider: "weixin"});
+        const silentResult = await silentLoginAPI(newResult.code);
+        if (silentResult.user) updateUser(silentResult.user);
+        const devices = await getMyDevicesAPI();
+        if (devices.bindings && devices.bindings.length) {
+          updateDevice(
+              devices.bindings[0].deviceId,
+              devices.bindings[0].deviceName
+          );
+          const data = await getDeviceBatteryAPI();
+          updateOnline(data.online);
+        }
+      } else {
+        showModal.value = true;
+      }
+    } catch (e) {
+      console.log("检查绑定状态失败", e);
+    }
+  }

  const promises = [getRankListAPI()];
-  if (token) {
+  if (token || user.value.id) {
    promises.push(getHomeData());
  }

@@ -87,8 +113,8 @@ onShow(async () => {
      const devices = await getMyDevicesAPI();
      if (devices.bindings && devices.bindings.length) {
        updateDevice(
-          devices.bindings[0].deviceId,
-          devices.bindings[0].deviceName
+            devices.bindings[0].deviceId,
+            devices.bindings[0].deviceName
        );
        const data = await getDeviceBatteryAPI();
        updateOnline(data.online);
@@ -108,7 +134,7 @@ onShareAppMessage(() => {
    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
    path: "/pages/index", // 用户点击分享卡片后跳转的页面路径
    imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
  };
 });
 onShareTimeline(() => {
@@ -116,7 +142,7 @@ onShareTimeline(() => {
    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享到朋友圈的标题
    query: "from=timeline", // 用户通过朋友圈点击后，在页面 onShow 的 options 中可以获取到的参数
    imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
  };
 });
 </script>
@@ -126,25 +152,25 @@ onShareTimeline(() => {
    <view class="container">
      <view class="top-theme">
        <image
-          src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
-          mode="widthFix"
+            src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
+            mode="widthFix"
        />
      </view>
-      <UserHeader showRank :onSignin="() => (showModal = true)" />
+      <UserHeader showRank :onSignin="() => (showModal = true)"/>
      <view :style="{ padding: '12px 10px' }">
        <view class="feature-grid">
          <view class="bow-card">
            <image
-              v-if="online"
-              src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
-              mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                v-if="online"
+                src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
            />
            <image
-              v-else
-              src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
-              mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                v-else
+                src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
            />
            <block v-if="user.id">
              <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -152,9 +178,9 @@ onShareTimeline(() => {
              <text v-else-if="online">设备在线</text>
            </block>
            <image
-              src="../static/first-try.png"
-              mode="widthFix"
-              @click="() => toPage('/pages/first-try')"
+                src="../static/first-try.png"
+                mode="widthFix"
+                @click="() => toPage('/pages/first-try')"
            />
            <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '47%' }">
              <text>新人必刷！</text>
@@ -163,49 +189,49 @@ onShareTimeline(() => {
          </view>
          <view class="play-card">
            <view @click="() => toPage('/pages/practise')">
-              <image src="../static/my-practise.png" mode="widthFix" />
+              <image src="../static/my-practise.png" mode="widthFix"/>
            </view>
            <view @click="() => toPage('/pages/friend-battle')">
-              <image src="../static/friend-battle.png" mode="widthFix" />
+              <image src="../static/friend-battle.png" mode="widthFix"/>
            </view>
          </view>
        </view>
        <view class="ranking-section">
          <image
-            src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
-            mode="widthFix"
+              src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
+              mode="widthFix"
          />
          <button
-            class="into-btn"
-            @click="() => toPage('/pages/ranking')"
-            hover-class="none"
+              class="into-btn"
+              @click="() => toPage('/pages/ranking')"
+              hover-class="none"
          ></button>
          <view class="ranking-players" @click="toRankListPage">
-            <img src="../static/juezhanbang.png" mode="widthFix" />
+            <img src="../static/juezhanbang.png" mode="widthFix"/>
            <view class="divide-line"></view>
            <view class="player-avatars">
              <view
-                v-for="i in 6"
-                :key="i"
-                class="player-avatar"
-                :style="{
+                  v-for="i in 6"
+                  :key="i"
+                  class="player-avatar"
+                  :style="{
                  zIndex: 8 - i,
                  borderColor: rankData.rank[i - 1]
                    ? topThreeColors[i - 1] || '#000'
                    : '#000',
                }"
              >
-                <image v-if="i === 1" src="../static/champ1.png" />
-                <image v-if="i === 2" src="../static/champ2.png" />
-                <image v-if="i === 3" src="../static/champ3.png" />
+                <image v-if="i === 1" src="../static/champ1.png"/>
+                <image v-if="i === 2" src="../static/champ2.png"/>
+                <image v-if="i === 3" src="../static/champ3.png"/>
                <view v-if="i > 3">{{ i }}</view>
                <image
-                  :src="
+                    :src="
                    rankData.rank[i - 1]
                      ? rankData.rank[i - 1].avatar
                      : '../static/user-icon-dark.png'
                  "
-                  mode="aspectFill"
+                    mode="aspectFill"
                />
              </view>
              <view class="more-players">
@@ -215,14 +241,15 @@ onShareTimeline(() => {
          </view>
          <view class="my-data">
            <view @click="() => toPage('/pages/my-growth')">
-              <image src="../static/my-growth.png" mode="widthFix" />
+              <image src="../static/my-growth.png" mode="widthFix"/>
            </view>
            <view @click="() => toPage('/pages/ranking')">
              <view>
                <text>段位</text>
                <text>{{
-                  user.rankLvl ? getLvlName(user.rankLvl) : "暂无"
-                }}</text>
+                    user.lvlName || "暂无"
+                  }}
+                </text>
              </view>
              <view>
                <text>赛季平均环数</text>
@@ -231,18 +258,19 @@ onShareTimeline(() => {
              <view>
                <text>赛季胜率</text>
                <text>{{
-                  user.avg_win
-                    ? Number((user.avg_win * 100).toFixed(2)) + "%"
-                    : "暂无"
-                }}</text>
+                    user.avg_win
+                        ? Number((user.avg_win * 100).toFixed(2)) + "%"
+                        : "暂无"
+                  }}
+                </text>
              </view>
            </view>
          </view>
        </view>
      </view>
-      <Signin :show="showModal" :onClose="() => (showModal = false)" />
+      <Signin :show="showModal" :onClose="() => (showModal = false)"/>
    </view>
-    <AppFooter />
+    <AppFooter/>
  </Container>
 </template>

@@ -363,6 +391,7 @@ onShareTimeline(() => {
  width: 32rpx;
  height: 32rpx;
 }
+
 .player-avatar > view:first-child {
  border-radius: 50%;
  background: #777777;
@@ -373,6 +402,7 @@ onShareTimeline(() => {
  height: 18px;
  color: #fff;
 }
+
 .player-avatar > image:last-child {
  width: 100%;
  height: 100%;
@@ -391,18 +421,22 @@ onShareTimeline(() => {
  margin-left: 2px;
  color: #fff;
 }
+
 .my-data {
  display: flex;
  margin-top: 20px;
  justify-content: space-between;
 }
+
 .my-data > view:first-child {
  width: 28%;
 }
+
 .my-data > view:first-child > image {
  width: 100%;
  transform: translateX(-8px);
 }
+
 .my-data > view:nth-child(2) {
  width: 68%;
  font-size: 12px;
@@ -410,9 +444,11 @@ onShareTimeline(() => {
  display: flex;
  justify-content: space-between;
 }
+
 .my-data > view:nth-child(2) > view:nth-child(2) {
  width: 38%;
 }
+
 .my-data > view:nth-child(2) > view {
  width: 28%;
  border-radius: 10px;
@@ -422,11 +458,13 @@ onShareTimeline(() => {
  align-items: center;
  justify-content: center;
 }
+
 .my-data > view:nth-child(2) > view > text:last-child {
  color: #fff;
  line-height: 25px;
  font-weight: 500;
 }
+
 .top-theme {
  position: absolute;
  display: flex;
@@ -436,6 +474,7 @@ onShareTimeline(() => {
  height: 60px;
  z-index: -1;
 }
+
 .top-theme > image {
  width: 300rpx;
  transform: translate(-4%, -14%);
--- a/src/pages/match-page.vue
+++ b/src/pages/match-page.vue
@@ -3,34 +3,38 @@ import { ref, onMounted, onBeforeUnmount } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Matching from "@/components/Matching.vue";
-import RoundEndTip from "@/components/RoundEndTip.vue";
-import TestDistance from "@/components/TestDistance.vue";
 import { matchGameAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";

 const gameType = ref(0);
 const teamSize = ref(0);
 const onComplete = ref(null);
-const matchSuccess = ref(false);

 async function stopMatch() {
  uni.$showHint(3);
 }

+async function cancelMatch() {
+  if (gameType.value && teamSize.value) {
+    await matchGameAPI(false, gameType.value, teamSize.value);
+  }
+  uni.navigateBack()
+}
+
 async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.MatchSuccess) {
-    matchSuccess.value = true;
-    onComplete.value = () => {
-      if (gameType.value == 1) {
-        uni.redirectTo({
-          url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
-        });
-      } else if (gameType.value == 2) {
-        uni.redirectTo({
-          url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
-        });
-      }
-    };
+    onComplete.value = () => {}
+  }
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
+    if (gameType.value == 1) {
+      uni.redirectTo({
+        url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
+      });
+    } else if (gameType.value == 2) {
+      uni.redirectTo({
+        url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
+      });
+    }
  }
 }

@@ -46,6 +50,7 @@ onMounted(() => {
    keepScreenOn: true,
  });
  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("cancelMatching", cancelMatch);
 });

 onBeforeUnmount(() => {
@@ -53,9 +58,7 @@ onBeforeUnmount(() => {
    keepScreenOn: false,
  });
  uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+  uni.$off("cancelMatching", cancelMatch);
 });

 onShow(async () => {
@@ -65,9 +68,7 @@ onShow(async () => {
 });

 onHide(() => {
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+
 });
 </script>

--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -28,54 +28,73 @@ const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);

+const navigateToResult = () => {
+  uni.redirectTo({ url: `/pages/battle-result?battleId=${battleId.value}` });
+};
+
 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 +146,7 @@ onBeforeUnmount(() => {
 onShow(async () => {
  if (battleId.value) {
    const result = await getBattleAPI(battleId.value);
+    if (!result) return;
    if (result.status === 2) {
      uni.showToast({
        title: "比赛已结束",
--- a/src/pages/my-device.vue
+++ b/src/pages/my-device.vue
@@ -8,7 +8,7 @@ import {
  bindDeviceAPI,
  getMyDevicesAPI,
  unbindDeviceAPI,
-  laserAimAPI,
+  laserAimAPI, bindDeviceAPIV2,
 } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -20,6 +20,7 @@ const { updateDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
+const token = ref(null);

 // 扫描二维码方法
 const handleScan = () => {
@@ -30,13 +31,14 @@ const handleScan = () => {
    scanType: ["qrCode"],
    success: async (res) => {
      try {
-        const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
-
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // const base64Decode = (str) => {
+        //   // 将 base64 转换为 utf8 字符串
+        //   const bytes = wx.base64ToArrayBuffer(str);
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        // };
+        //
+        // addDevice.value = JSON.parse(base64Decode(res.result));
+        token.value = res.result;
        confirmBindTip.value = true;
      } catch (err) {
        uni.showToast({
@@ -57,8 +59,8 @@ const handleScan = () => {
 };

 const confirmBind = async () => {
-  if (!justBind.value && addDevice.value.id) {
-    const result = await bindDeviceAPI(addDevice.value);
+  if (!justBind.value && token.value) {
+    const result = await bindDeviceAPIV2(token.value);
    confirmBindTip.value = false;
    if (result.binded) {
      return uni.showToast({
@@ -66,7 +68,7 @@ const confirmBind = async () => {
        icon: "none",
      });
    }
-    updateDevice(addDevice.value.id, addDevice.value.name);
+    updateDevice(result.deviceId, result.name);
    justBind.value = true;
    uni.showToast({
      title: "绑定成功",
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -110,7 +110,7 @@ onShow(async () => {
  const result = await getHomeData();
  rankData.value = result;
  handleSelect(selectedIndex.value);
-  seasonData.value = result.seasonList;
+  seasonData.value = result.seasonList || [];
  if (seasonData.value[0]) {
    seasonName.value = seasonData.value[0].seasonName;
  }
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -35,16 +35,32 @@ const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
+const matchStatus = ref(undefined);

 const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
  try {
    battleId.value = battleInfo.matchId;
-    blueTeam.value = battleInfo.teams[1].players || [];
-    redTeam.value = battleInfo.teams[2].players || [];
+    
+    // 优先使用接口返回的队伍数据，如果没有则尝试从缓存读取（应对匹配刚完成接口未就绪的情况）
+    const t1 = battleInfo.teams?.[1] || {};
+    const t2 = battleInfo.teams?.[2] || {};
+    
+    if (t1.players) blueTeam.value = [...t1.players];
+    else {
+      const cached = uni.getStorageSync("blue-team");
+      if (cached && cached.length) blueTeam.value = cached;
+    }
+
+    if (t2.players) redTeam.value = [...t2.players];
+    else {
+      const cached = uni.getStorageSync("red-team");
+      if (cached && cached.length) redTeam.value = cached;
+    }
+    
    start.value = battleInfo.status !== 0;
+
    if (battleInfo.status === 0) {
-      const readyRemain = (Date.now() - battleInfo.createTime) / 1000;
-      console.log(`对局已进行${readyRemain}秒`);
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
      if (readyRemain > 0 && readyRemain < 15) {
        setTimeout(() => {
          uni.$emit("update-timer", 15 - readyRemain - 0.2);
@@ -95,6 +111,15 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
  }
 };

+function onBattleEnd(){
+  showRoundTip.value = false
+  console.log("onBattleEnd ended...")
+  if (matchStatus.value === 2) {
+    uni.redirectTo({
+      url: `/pages/battle-result?battleId=${battleId.value}`,
+    });
+  }
+}
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -118,6 +143,7 @@ async function onReceiveMessage(msg) {
      }
    }
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    matchStatus.value = msg.status;
    if (msg.status === 4) {
      showRoundTip.value = true;
      currentBluePoint.value = 0;
@@ -125,13 +151,7 @@ async function onReceiveMessage(msg) {
      setTimeout(() => {
        uni.navigateBack();
      }, 2000);
-      return;
    }
-    setTimeout(() => {
-      uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.matchId,
-      });
-    }, 1000);
  }
 }

@@ -162,6 +182,7 @@ const refreshTimer = ref(null);
 onShow(async () => {
  if (battleId.value) {
    const result = await getBattleAPI(battleId.value);
+    if (!result) return;
    if (result.status === 2) {
      uni.showToast({
        title: "比赛已结束",
@@ -227,7 +248,7 @@ onShow(async () => {
          :roundData="
            roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
          "
-          :onAutoClose="() => (showRoundTip = false)"
+          :onAutoClose="onBattleEnd"
        />
      </ScreenHint>
    </view>
--- a/src/store.js
+++ b/src/store.js
@@ -22,6 +22,19 @@ const getLvlName = (rankLvl, rankList = []) => {
  return lvlName;
 };

+const getLvlNameByScore = (score, rankList = []) => {
+  if (!rankList) return;
+  let lvlName = "";
+  rankList.some((r, index) => {
+    if (r.upgrade_scores && r.upgrade_scores < score) {
+      lvlName = rankList[index].name;
+      return true;
+    }
+    return false;
+  });
+  return lvlName;
+};
+
 const getLvlImage = (rankLvl, rankList = []) => {
  if (!rankList) return;
  let lvlImage = "";
@@ -35,6 +48,19 @@ const getLvlImage = (rankLvl, rankList = []) => {
  return lvlImage;
 };

+const getLvlImageByScore = (score, rankList = []) => {
+  if (!rankList) return;
+  let lvlImage = "";
+  rankList.some((r, index) => {
+    if (r.upgrade_scores && r.upgrade_scores < score) {
+      lvlImage = rankList[index].icoin;
+      return true;
+    }
+    return false;
+  });
+  return lvlImage;
+};
+
 // 定义游戏相关的 store
 export default defineStore("store", {
  // 状态
@@ -65,6 +91,9 @@ export default defineStore("store", {

  // 方法
  actions: {
+    getLvlNameByScore(score) {
+      return getLvlNameByScore(score, this.config.randInfos);
+    },
    getLvlName(rankLvl) {
      return getLvlName(rankLvl, this.config.randInfos);
    },
@@ -79,14 +108,9 @@ export default defineStore("store", {
    },
    async updateUser(user = {}) {
      this.user = { ...defaultUser, ...user };
-      if (this.user.rankLvl !== undefined) {
-        this.user.lvlName = getLvlName(
-          this.user.rankLvl,
-          this.config.randInfos
-        );
-      }
-      this.user.lvlImage = getLvlImage(
-        this.user.rankLvl,
+      this.user.lvlName = getLvlNameByScore(this.user.scores, this.config.randInfos)
+      this.user.lvlImage = getLvlImageByScore(
+        this.user.scores,
        this.config.randInfos
      );
    },
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
linyimin	9a5d64cc9e	pref: 进度条变化	2026-05-06 17:57:02 +08:00
linyimin	1beb1009b3	pref: 比赛结束	2026-05-06 16:15:39 +08:00
linyimin	9cd32a7aa6	Merge remote-tracking branch 'origin/new-race-mode' into new-race-mode	2026-05-06 14:20:41 +08:00
linyimin	473e6df77b	pref: 匹配成功展示准备页面	2026-05-06 14:20:06 +08:00
chenlimao	088cd33b0a	fix：解决后端返回null数据报错问题	2026-05-06 11:55:46 +08:00
chenlimao	51fd4acd8b	fix：添加git忽略提交配置2	2026-05-06 10:15:13 +08:00
chenlimao	691e33a84e	fix：添加git忽略提交配置	2026-05-06 10:12:41 +08:00
chenlimao	e60d24d56c	fix：配置文件提交	2026-05-06 10:03:20 +08:00
linyimin	e1a9d97596	pref: 小程序添加静默登录	2026-04-28 10:31:54 +08:00
linyimin	f07facd98b	pref: 绑定设备、匹配pk	2026-04-28 08:59:16 +08:00