update:优化样式

(cherry picked from commit a6becf67ff)

.gitignore

@@ -8,6 +8,11 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+.history
+.github
+openspec
+CLAUDE.md
+docs
 .DS_Store
 dist
 *.local

AGENTS.md

@@ -0,0 +1,270 @@
+# AI Agent 企业级行为策略（Ultimate Edition）
+
+## 核心目标
+
+AI 应：
+
+* 像高级工程师一样思考
+* 保持智能
+* 保持上下文理解能力
+* 保持组件联动能力
+* 同时避免无意义 token 消耗
+
+目标不是限制 AI。
+
+目标是：
+
+* 智能
+* 克制
+* 稳定
+* 高效
+
+---
+
+# AI 工作模式
+
+默认采用：
+
+Think First
+Explore Second
+Modify Last
+
+即：
+
+1. 先理解需求
+2. 再推理可能相关文件
+3. 再最小化读取
+4. 最后修改代码
+
+禁止：
+
+* 无脑全项目扫描
+* 不经思考直接 grep
+* 无限递归读取
+
+---
+
+# 智能按需扫描（核心规则）
+
+允许 AI 自动：
+
+* 分析当前任务
+* 分析 import
+* 分析组件依赖
+* 分析 store 依赖
+* 分析 api 依赖
+* 分析 types 依赖
+* 分析 utils 依赖
+
+允许：
+
+* 自动读取直接依赖文件
+* 自动修复 import
+* 自动修复类型引用
+* 自动分析运行链路
+
+但必须：
+
+* 最小化扫描范围
+* 最小化 token 消耗
+* 禁止无限递归探索
+
+---
+
+# 扫描深度限制
+
+默认最大依赖深度：
+
+2 层
+
+例如：
+
+index.vue
+-> ProductCard.vue
+-> product.ts
+
+允许读取：
+
+* ProductCard.vue
+* product.ts
+
+禁止继续无限扫描。
+
+如果任务复杂：
+
+必须先输出分析计划，
+等待确认后再扩大扫描范围。
+
+---
+
+# AI 自由发挥边界
+
+允许：
+
+* 合理重构
+* 合理组件化
+* 合理优化结构
+* 合理优化样式
+* 合理优化复用
+* 合理修复低级问题
+* 合理修复 import
+* 合理修复类型错误
+
+禁止：
+
+* 为了炫技重构项目
+* 无意义抽象
+* 过度设计
+* 无意义拆分
+* 无意义新增依赖
+* 自动升级依赖
+
+---
+
+# Token 经济策略
+
+Token 应优先用于：
+
+* 推理
+* 架构理解
+* 业务逻辑
+* UI 结构优化
+* 类型安全
+* 组件联动
+
+禁止浪费在：
+
+* 全项目 grep
+* 重复读取
+* 重复输出
+* 重复解释
+* 输出完整项目
+* 输出未修改代码
+
+---
+
+# 页面生成规则（Figma / uni-app）
+
+允许：
+
+* 自动组件化
+* 自动布局优化
+* 自动结构优化
+* 自动提取公共组件
+
+优先：
+
+* flex 布局
+* 可维护性
+* uni-app 最佳实践
+* 低嵌套结构
+* 高复用结构
+
+禁止：
+
+* div 套 div
+* 全 absolute 页面
+* 垃圾 HTML
+* 无意义嵌套
+* 内联 style 泛滥
+
+---
+
+# uni-app 规则
+
+必须：
+
+* 使用 view/text/image
+* px 转 rpx
+* 使用 script setup
+* scoped scss
+* 兼容：
+
+  * H5
+  * 微信小程序
+  * App
+
+---
+
+# 大任务策略
+
+复杂任务：
+
+必须：
+
+1. 先分析
+2. 先规划
+3. 先输出方案
+4. 等待确认
+
+再：
+
+5. 编码
+
+禁止直接进入大规模代码生成。
+
+---
+
+# 修改策略
+
+优先：
+
+* diff 修改
+* 小范围 patch
+* 保持现有架构
+* 保持现有组件体系
+* 保持现有 API 结构
+
+允许：
+
+* 小范围智能优化
+
+禁止：
+
+* 全项目重构
+* 无关文件修改
+
+---
+
+# 高级工程师行为模式
+
+AI 应像高级工程师：
+
+* 先思考
+* 再探索
+* 再修改
+
+而不是：
+
+* 无脑扫描器
+* Token 消耗机器
+* 低级代码生成器
+
+AI 应主动：
+
+* 控制扫描范围
+* 控制输出长度
+* 控制修改范围
+* 控制复杂度
+
+同时保持：
+
+* 智能
+* 联动能力
+* 架构理解能力
+
+---
+
+# 默认输出规则
+
+默认：
+
+* 仅输出修改部分
+* 不重复未修改代码
+* 少解释
+* 优先 patch
+* 优先 diff
+* 写好中文注释
+
+除非用户明确要求：
+否则不要输出完整项目。

doc.md

@@ -0,0 +1,116 @@
+# 微信小程序多人协作分支管理规范
+
+## 一、分支结构
+
+```
+main (主分支/生产环境)
+  └── test (测试分支)
+        └── feature/xxx (个人开发分支)
+```
+
+| 分支 | 用途 | 稳定性 |
+|------|------|--------|
+| main | 生产环境代码 | 最高，仅接受测试通过的代码合并 |
+| test | 测试环境，用于体验版发布 | 中，需验证后合并到 main |
+| feature/xxx | 个人开发分支 | 低，按需命名，如 `feature/user-center` |
+
+---
+
+## 二、开发流程
+
+### 1. 开始开发
+
+```bash
+# 确保本地 main 最新
+git checkout main
+git pull origin main
+
+# 从 main 创建自己的开发分支
+git checkout -b feature/your-name-work
+```
+
+### 2. 开发阶段
+
+- 在个人分支上开发功能
+- 频繁提交，保持原子性提交
+- 定期 `git pull origin main` 同步主线变更，避免合并冲突累积
+
+```bash
+git add .
+git commit -m "feat: 完成xxx功能"
+```
+
+### 3. 合并到 test 分支
+
+```bash
+# 切换到 test
+git checkout test
+git pull origin test
+
+# 合并个人分支
+git merge feature/your-name-work
+
+# 推送 test 分支
+git push origin test
+```
+
+### 4. 打包上传体验版
+
+```bash
+# 执行打包
+npm run build
+```
+
+打包完成后：
+
+1. 打开 **微信开发者工具**
+2. 导入项目，选择 `dist/build/mp-weixin` 目录
+3. 在开发者工具中点击 **上传**
+4. 登录 [微信公众平台](https://mp.weixin.qq.com)
+5. 进入 **管理->版本管理**
+6. 找到刚上传的版本，点击 **选为体验版**
+
+---
+
+## 三、合并到 main 分支
+
+当 test 分支验证通过后，将其合并到 main：
+
+```bash
+git checkout main
+git pull origin main
+
+git merge origin/test
+
+git push origin main
+```
+
+---
+
+## 四、冲突处理
+
+合并时如有冲突，在个人分支解决后再合并：
+
+```bash
+git checkout feature/your-name-work
+git merge main
+# 解决冲突后
+git add .
+git commit -m "merge: 解决与main的冲突"
+git push origin feature/your-name-work
+
+# 重新合并到 test
+git checkout test
+git merge feature/your-name-work
+git push origin test
+```
+
+---
+
+## 五、注意事项
+
+1. **禁止直接向 main 和 test 分支提交代码**，必须通过合并
+2. **每次合并前先拉取最新代码**，避免覆盖他人改动
+3. **体验版发布前确认代码已提交**，避免遗漏
+4. **开发分支命名建议**：`feature/姓名-功能名`，如 `feature/zhangsan-login`
+5. **删除已合并的开发分支**：`git branch -d feature/your-name-work`

package.json

@@ -25,6 +25,7 @@
     "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
     "@dcloudio/uni-ui": "^1.5.11",
     "pinia": "2.0.36",
+    "pinia-plugin-persistedstate": "3.2.1",
     "vue": "^3.4.21",
     "vue-i18n": "^9.1.9"
   },

src/App.vue

@@ -21,7 +21,8 @@
 	} = storeToRefs(store);
 	const {
 		updateUser,
-		updateOnline
+		updateOnline,
+		clearSessionState
 	} = store;
 
 	watch(
@@ -46,13 +47,24 @@
 		updateUser(value);
 	}
 
+	function onSessionKickedOut() {
+		const env = uni.getAccountInfoSync().miniProgram.envVersion;
+		uni.removeStorageSync(`${env}_token`);
+		clearSessionState();
+		uni.showModal({
+			title: "提示",
+			content: "账号已在其他设备登录",
+			showCancel: false,
+		});
+	}
+
 	async function emitUpdateOnline() {
 		const data = await getDeviceBatteryAPI();
 		updateOnline(data.online);
 	}
 
 	function onDeviceShoot() {
-		audioManager.play("射箭声音")
+		// audioManager.play("射箭声音")
 	}
 
 	function onShootWsMsg(content) {
@@ -65,6 +77,7 @@
 	onShow(() => {
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
+		uni.$on("session-kicked-out", onSessionKickedOut);
 		const token = uni.getStorageSync(
 			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 		);
@@ -77,6 +90,7 @@
 	onHide(() => {
 		uni.$off("update-user", emitUpdateUser);
 		uni.$off("update-online", emitUpdateOnline);
+		uni.$off("session-kicked-out", onSessionKickedOut);
 		websocket.closeWebSocket();
 	});
 </script>
@@ -289,4 +303,4 @@
 		font-style: normal;
 		font-display: swap;
 	}
-</style>
+</style>

src/apis.js

@@ -1,470 +1,570 @@
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
 
 try {
-  const accountInfo = uni.getAccountInfoSync();
+    const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+    const envVersion = accountInfo.miniProgram.envVersion;
 
-  switch (envVersion) {
+    switch (envVersion) {
-    case "develop": // 开发版
+        case "develop": // 开发版
-      BASE_URL = "http://localhost:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
-      // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    case "trial": // 体验版
+        case "trial": // 体验版
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    case "release": // 正式版
+        case "release": // 正式版
-      BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
+            BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
-      break;
+            break;
-    default:
+        default:
-      // 保持默认值
+            // 保持默认值
-      break;
+            break;
-  }
+    }
 } catch (e) {
-  console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
 }
 
 function request(method, url, data = {}) {
-  const token = uni.getStorageSync(
+    const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
+    );
-  const header = {};
+    const header = {};
-  if (token) header.Authorization = `Bearer ${token || ""}`;
+    if (token) header.Authorization = `Bearer ${token || ""}`;
-  return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
-    uni.request({
+        uni.request({
-      url: `${BASE_URL}${url}`,
+            url: `${BASE_URL}${url}`,
-      method,
+            method,
-      header,
+            header,
-      data,
+            data,
-      timeout: 10000,
+            timeout: 10000,
-      success: (res) => {
+            success: (res) => {
-        if (res.data) {
+                if (res.data) {
-          const { code, data, message } = res.data;
+                    const {code, data, message} = res.data;
-          if (code === 0) resolve(data);
+                    if (code === 0) resolve(data);
-          else if (message) {
+                    else if (message) {
-            if (message.indexOf("登录身份已失效") !== -1) {
+                        if (message.indexOf("登录身份已失效") !== -1) {
-              uni.removeStorageSync(
+                            console.log('1111111111111111111,token失效')
-                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+                            uni.removeStorageSync(
-              );
+                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-              uni.$emit("update-user");
+                            );
-            }
+                            uni.$emit("update-user");
-            if (message === "ROOM_FULL") {
+                            reject({ type: "AUTH_INVALID", message });
-              resolve({ full: true });
+                            return;
-              return;
+                        }
-            }
+                        if (message === "ROOM_FULL") {
-            if (message === "ERROR_ROOM_GAME_START") {
+                            resolve({full: true});
-              resolve({ started: true });
+                            return;
-              return;
+                        }
-            }
+                        if (message === "ERROR_ROOM_GAME_START") {
-            if (url.indexOf("/user/room") !== -1 && method === "GET") {
+                            resolve({started: true});
-              resolve({});
+                            return;
-              return;
+                        }
-            }
+                        if (url.indexOf("/user/room") !== -1 && method === "GET") {
-            if (message === "ERROR_BATTLE_GAMING") {
+                            resolve({});
-              resolve({});
+                            return;
-              return;
+                        }
-            }
+                        if (message === "ERROR_BATTLE_GAMING") {
-            if (message === "BIND_DEVICE") {
+                            resolve({});
-              resolve({ binded: true });
+                            return;
-              return;
+                        }
-            }
+                        if (message === "BIND_DEVICE") {
-            if (message === "ERROR_ORDER_UNPAY") {
+                            resolve({binded: true});
-              uni.showToast({
+                            return;
-                title: "当前有未支付订单",
+                        }
-                icon: "none",
+                        if (message === "ERROR_ORDER_UNPAY") {
-              });
+                            uni.showToast({
-              resolve({});
+                                title: "当前有未支付订单",
-              return;
+                                icon: "none",
-            }
+                            });
-            if (message === "ROOM_EMPTY") {
+                            resolve({});
-              return uni.showToast({
+                            return;
-                title: "房间已过期",
+                        }
-                icon: "none",
+                        if (message === "ROOM_EMPTY") {
-              });
+                            return uni.showToast({
-            }
+                                title: "房间已过期",
-            uni.showToast({
+                                icon: "none",
-              title: message,
+                            });
-              icon: "none",
+                        }
-            });
+                        uni.showToast({
-          }
+                            title: message,
-          reject("");
+                            icon: "none",
-        }
+                        });
-      },
+                    }
-      fail: (err) => {
+                    reject("");
-        handleRequestError(err, url);
+                }
-        reject(err);
+            },
-      },
+            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) {
-    if (err.errMsg.includes("timeout")) {
+        if (err.errMsg.includes("timeout")) {
-      showCustomToast("请求超时，请稍后重试", "timeout");
+            showCustomToast("请求超时，请稍后重试", "timeout");
-    } else if (err.errMsg.includes("fail")) {
+        } else if (err.errMsg.includes("fail")) {
-      // 检查网络状态
+            // 检查网络状态
-      uni.getNetworkType({
+            uni.getNetworkType({
-        success: (res) => {
+                success: (res) => {
-          if (res.networkType === "none") {
+                    if (res.networkType === "none") {
-            showCustomToast("网络连接已断开，请检查网络设置", "network");
+                        showCustomToast("网络连接已断开，请检查网络设置", "network");
-          } else {
+                    } else {
-            showCustomToast("服务器连接失败，请稍后重试", "server");
+                        showCustomToast("服务器连接失败，请稍后重试", "server");
-          }
+                    }
-        },
+                },
-        fail: () => {
+                fail: () => {
-          showCustomToast("网络异常，请检查网络连接", "unknown");
+                    showCustomToast("网络异常，请检查网络连接", "unknown");
-        },
+                },
-      });
+            });
+        } else {
+            showCustomToast("请求失败，请稍后重试", "general");
+        }
     } else {
-      showCustomToast("请求失败，请稍后重试", "general");
+        showCustomToast("网络异常，请稍后重试", "unknown");
     }
-  } else {
-    showCustomToast("网络异常，请稍后重试", "unknown");
-  }
 }
 
 // 自定义提示函数
 function showCustomToast(message, type) {
-  const config = {
+    const config = {
-    title: message,
+        title: message,
-    icon: "none",
+        icon: "none",
-    duration: 3000,
+        duration: 3000,
-  };
+    };
 
-  // 根据错误类型可以添加不同的处理逻辑
+    // 根据错误类型可以添加不同的处理逻辑
-  switch (type) {
+    switch (type) {
-    case "timeout":
+        case "timeout":
-      config.duration = 4000; // 超时提示显示更久
+            config.duration = 4000; // 超时提示显示更久
-      break;
+            break;
-    case "network":
+        case "network":
-      config.duration = 5000; // 网络问题提示显示更久
+            config.duration = 5000; // 网络问题提示显示更久
-      break;
+            break;
-    default:
+        default:
-      break;
+            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", {
+    const result = await request("POST", "/index/code", {
-    appName: "shoot",
+        appName: "shoot",
-    appId: "wxa8f5989dcd45cc23",
+        appId: "wxa8f5989dcd45cc23",
-    nickName,
+        nickName,
-    avatarData,
+        avatarData,
-    code,
+        code,
-    phone,
+        phone,
-  });
+    });
-  uni.setStorageSync(
+    uni.setStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
-    result.token
+        result.token
-  );
+    );
-  return result;
+    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", {
+    return request("POST", "/user/device/bindDevice", {
-    device,
+        device,
-  });
+    });
+};
+
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
 };
 
 export const unbindDeviceAPI = (deviceId) => {
-  return request("POST", "/user/device/unbindDevice", {
+    return request("POST", "/user/device/unbindDevice", {
-    deviceId,
+        deviceId,
-  });
+    });
 };
 
 export const getMyDevicesAPI = () => {
-  // "/user/device/getBinding?deviceId=9ZF9oVXs"
+    // "/user/device/getBinding?deviceId=9ZF9oVXs"
-  return request("GET", "/user/device/getBindings");
+    return request("GET", "/user/device/getBindings");
 };
 
 export const createPractiseAPI = (arrows, time, target) => {
-  return request("POST", "/user/practice/create", {
+    return request("POST", "/user/practice/create", {
-    shootNumber: arrows,
+        shootNumber: arrows,
-    shootTime: time,
+        shootTime: time,
-    targetType: target*20,
+        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", {
+    return request("POST", "/user/createroom", {
-    gameType,
+        gameType,
-    teamSize,
+        teamSize,
-    targetType,
+        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", {
+    return request("POST", "/user/room/destroyRoom", {
-    roomNumber,
+        roomNumber,
-  });
+    });
 };
 
 export const exitRoomAPI = (number, userId) => {
-  return request("POST", "/user/room/exitRoom", {
+    return request("POST", "/user/room/exitRoom", {
-    number,
+        number,
-    userId,
+        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(
+    const reuslt = await request(
-    "GET",
+        "GET",
-    `/user/practice/list?page=${page}&page_size=${page_size}`
+        `/user/practice/list?page=${page}&page_size=${page_size}`
-  );
+    );
-  return reuslt.list;
+    return reuslt.list;
 };
 
 export const matchGameAPI = (match, gameType, teamSize) => {
-  return request("POST", "/user/game/match", {
+    return request("POST", "/user/game/match", {
-    match,
+        match,
-    gameType,
+        gameType,
-    teamSize,
+        teamSize,
-    readyTime: 1.5,
+        readyTime: 15,
-  });
+        targetType: 20,
+    });
 };
 
 export const readyGameAPI = (battleId) => {
-  return request("POST", "/user/game/prepare", {
+    return request("POST", "/user/game/prepare", {
-    battleId,
+        battleId,
-  });
+    });
 };
 
 export const simulShootAPI = (device_id, x, y) => {
-  const data = {
+    const data = {
-    device_id,
+        device_id,
-  };
+    };
-  if (x !== undefined && y !== undefined) {
+    if (x !== undefined && y !== undefined) {
-    data.x = x;
+        data.x = x;
-    data.y = y;
+        data.y = y;
-  }
+    }
-  return request("POST", "/index/arrow", data);
+    return request("POST", "/index/arrow", data);
 };
 
 export const getBattleListAPI = async (page, battleType) => {
-  const result = await request("POST", "/user/battle/details/list", {
+    const result = await request("POST", "/user/battle/details/list", {
-    page,
+        page,
-    pageSize: 10,
+        pageSize: 10,
-    battleType,
+        battleType,
-  });
+    });
-  return result.list;
+    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", {
+    return request("POST", "/user/order/create", {
-    vipId,
+        vipId,
-    quanity: 1,
+        quanity: 1,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const payOrderAPI = (id) => {
-  return request("POST", "/user/order/pay", {
+    return request("POST", "/user/order/pay", {
-    id,
+        id,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const getOrderListAPI = async (page) => {
-  const reuslt = await request("GET", `/user/order/list?page=${page}`);
+    const reuslt = await request("GET", `/user/order/list?page=${page}`);
-  return reuslt.items || [];
+    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) =>
+    data = []
-      item.map((i) => ({
+) => {
-        ...i,
+    return request("POST", "/user/score/sheet/report", {
-        ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+        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,
+    page = 1,
-  bowType,
+    bowType,
-  distance,
+    distance,
-  targetType
+    targetType
 ) => {
-  let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+    let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
-  if (bowType) url += `&bowType=${bowType}`;
+    if (bowType) url += `&bowType=${bowType}`;
-  if (distance) url += `&distance=${distance}`;
+    if (distance) url += `&distance=${distance}`;
-  if (targetType) url += `&targetType=${targetType}`;
+    if (targetType) url += `&targetType=${targetType}`;
-  const result = await request("GET", url);
+    const result = await request("GET", url);
-  return result.list || [];
+    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 getPersonalTrainingAPI = async () => {
+    return request("GET", "/personal/training");
+};
+
+export const getTrainingDifficultyListAPI = async (type) => {
+    const query = type ? `?type=${encodeURIComponent(type)}` : "";
+    return request("GET", `/training/difficulty/list${query}`);
 };
 
 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`, {
+    return request("POST", `/user/donate`, {
-    amount,
+        amount,
-    name,
+        name,
-    phone,
+        phone,
-    organizer,
+        organizer,
-    advice,
+        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(
+    return request(
-    "GET",
+        "GET",
-    `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
+        `/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", {
+    return request("POST", "/user/score/sheet/week/shoot/rank/like", {
-    userId,
+        userId,
-    ifLike,
+        ifLike,
-  });
+    });
 };
 
 export const getMyLikeList = (page = 1, pageSize = 10) => {
-  return request(
+    return request(
-    "GET",
+        "GET",
-    `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
+        `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
-  );
+    );
 };
 
 export const getReadyAPI = (roomId) => {
-  return request("POST", `/user/room/ready`, {
+    return request("POST", `/user/room/ready`, {
-    roomId,
+        roomId,
-  });
+    });
 };
 
 export const getBattleAPI = async (battleId) => {
-  return request("POST", "/user/match/info", {
+    return request("POST", "/user/match/info", {
-    id: battleId,
+        id: battleId,
-  });
+    });
 };
 
 export const kickPlayerAPI = (number, userId) => {
-  return request("POST", "/user/room/kicking", {
+    return request("POST", "/user/room/kicking", {
-    number,
+        number,
-    userId,
+        userId,
-  });
+    });
+};
+
+// 获取赛季列表
+export const getSeasonList = () => {
+    return request("GET", "/index/season/list");
+};
+
+// 获取赛季统计
+export const getSeasonStats = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/season/stats", data);
+};
+
+//获取积分榜
+export const getScoreRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/score/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取10环排行榜
+export const getTenRingRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/tenRing/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取MVP排行榜
+export const getMvpRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/mvp/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取我的积分排名
+export const getMyScoreRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myScoreRank", data);
+};
+
+// 获取我的MVP排名
+export const getMyMvpRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myMvpRank", data);
+};
+
+// 获取我的10环排名
+export const getMyTenRingRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myTenRingRank", data);
 };

src/audioManager.js

@@ -1,4 +1,11 @@
+export const AUDIO_INTERRUPTION_BEGIN_EVENT = "audio-interruption-begin";
+export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end";
+
 export const audioFils = {
+  tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
+  点击按钮: "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%82%B9%E5%87%BB%E6%8C%89%E9%92%AE.mp3",
+  "20CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/20CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
+  "40CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/40CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
   // 激光已校准:
   //   "https://static.shelingxingqiu.com/attachment/2025-10-29/ddupaur1vdkyhzaqdc.mp3",
   胜利: "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuo9yjp0kt5msvmvd.mp3",
@@ -36,7 +43,7 @@ export const audioFils = {
   请开始射击:
     "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3",
   射击无效:
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutya55ufiiw8oo55.mp3",
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3",
   未上靶:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
   "1环":
@@ -93,7 +100,7 @@ function debugLog(...args) {
   const envVersion = accountInfo.miniProgram.envVersion;
 
   // 只在体验版打印日志，正式版(release)和开发版(develop)不打印
-  if (envVersion === "trial") {
+  if (envVersion === "trial" || envVersion === "develop") {
     console.log(...args);
   }
 }
@@ -123,6 +130,7 @@ class AudioManager {
     // 防重复播放保护
     this.lastPlayKey = null;
     this.lastPlayAt = 0;
+    this.isInterrupted = false;
 
     // 静音开关
     this.isMuted = false;
@@ -137,10 +145,41 @@ class AudioManager {
     this.localFileCache = uni.getStorageSync("audio_local_files") || {};
     // 启动时自动清理过期的缓存文件（URL 已不在 audioFils 中的文件）
     this.cleanObsoleteCache();
+    this.bindAudioInterruptionEvents();
 
     this.initAudios();
   }
 
+  bindAudioInterruptionEvents() {
+    if (this._audioInterruptionBound) return;
+    this._audioInterruptionBound = true;
+
+    const begin = () => {
+      if (this.isInterrupted) return;
+      this.isInterrupted = true;
+      this.stopAll();
+      this.isSequenceRunning = false;
+      this.sequenceQueue = [];
+      this.sequenceIndex = 0;
+      this.pendingPlayKey = null;
+      uni.$emit(AUDIO_INTERRUPTION_BEGIN_EVENT);
+    };
+
+    const end = () => {
+      if (!this.isInterrupted) return;
+      this.isInterrupted = false;
+      uni.$emit(AUDIO_INTERRUPTION_END_EVENT);
+      void this.reloadAll();
+    };
+
+    if (typeof uni?.onAudioInterruptionBegin === "function") {
+      uni.onAudioInterruptionBegin(begin);
+    }
+    if (typeof uni?.onAudioInterruptionEnd === "function") {
+      uni.onAudioInterruptionEnd(end);
+    }
+  }
+
   // 清理不再使用的缓存文件
   cleanObsoleteCache() {
     const activeUrls = new Set(Object.values(audioFils));
@@ -362,6 +401,7 @@ class AudioManager {
         }
         this.allowPlayMap.set(key, false);
         this.onAudioEnded(key);
+        uni.$emit('audioEnded', key);
       });
 
       audio.onStop(() => {
@@ -456,6 +496,10 @@ class AudioManager {
 
   // 播放指定音频或音频数组（数组则按顺序连续播放）
   play(input, interrupt = true) {
+    if (this.isInterrupted) {
+      debugLog("音频处理中断状态，忽略播放请求");
+      return;
+    }
     // 统一规范化为队列
     let queue = [];
     if (Array.isArray(input)) {
@@ -509,6 +553,10 @@ class AudioManager {
 
   // 内部方法：播放单个 key
   _playSingle(key, forceStopAll = false) {
+    if (this.isInterrupted) {
+      debugLog(`音频处理中断状态，跳过播放: ${key}`);
+      return;
+    }
     // 200ms 内的同 key 重复播放直接忽略，避免“比比赛开始”这类重复首音
     const now = Date.now();
     if (this.lastPlayKey === key && now - this.lastPlayAt < 250) {
@@ -552,7 +600,13 @@ class AudioManager {
       // 显式授权播放并立即播放
       this.allowPlayMap.set(key, true);
 
-      audio.play();
+      try {
+        audio.play();
+      } catch (err) {
+        this.allowPlayMap.set(key, false);
+        debugLog(`音频 ${key} 播放调用失败`, err?.errMsg || err);
+        return;
+      }
       this.currentPlayingKey = key;
       this.lastPlayKey = key;
       this.lastPlayAt = Date.now();

src/components/AppBackground.vue

@@ -18,31 +18,31 @@ const props = defineProps({
     <image
       class="bg-image"
       v-if="type === 0"
-      src="../static/app-bg.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 1"
-      src="../static/app-bg2.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg2.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 2"
-      src="../static/app-bg3.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg3.png"
       :style="{ height: capsuleHeight + 50 + 'px' }"
     />
     <image
       class="bg-image"
       v-if="type === 3"
-      src="../static/app-bg4.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg4.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 4"
-      src="../static/app-bg5.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
       mode="widthFix"
     />
     <image
@@ -50,6 +50,36 @@ const props = defineProps({
       v-if="type === 5"
       src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
       mode="widthFix"
+    />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
+  <image
+      class="bg-image"
+      v-if="type === 7"
+      src="@/static/app-bg6.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 8"
+      src="@/static/app-bg7.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 9"
+      src="@/static/app-bg8.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 10"
+      src="@/static/app-bg9.png"
+      mode="widthFix"
     />
     <view class="bg-overlay" v-if="type === 0"></view>
   </view>
@@ -67,7 +97,7 @@ const props = defineProps({
 
 .bg-image {
   width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }
 
 .bg-overlay {

src/components/AppFooter.vue

@@ -31,7 +31,7 @@ function handleTabClick(index) {
       v-for="(tab, index) in tabs"
       :key="index"
       class="tab-item"
-      @click="handleTabClick(index)"
+      @click="$clickSound(() => handleTabClick(index))"
       :style="{
         width: index === 1 ? '36%' : '20%',
       }"

src/components/Avatar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -26,12 +26,33 @@ const props = defineProps({
     type: Number,
     default: 45,
   },
+  sizeUnit: {
+    type: String,
+    default: "px",
+  },
+  imageMode: {
+    type: String,
+    default: "widthFix",
+  },
   borderColor: {
     type: String,
     default: "",
   },
 });
 const avatarFrame = ref("");
+const sizeValue = computed(() => `${Number(props.size)}${props.sizeUnit}`);
+const frameSizeValue = computed(() => `${Number(props.size) + 10}${props.sizeUnit}`);
+const avatarImageStyle = computed(() => ({
+  width: sizeValue.value,
+  height: sizeValue.value,
+  minHeight: sizeValue.value,
+  borderColor: props.borderColor || "#fff",
+}));
+const avatarFrameStyle = computed(() => ({
+  width: frameSizeValue.value,
+  height: frameSizeValue.value,
+}));
+
 watch(
   () => [config.value, props.rankLvl],
   () => {
@@ -51,10 +72,7 @@ watch(
       v-if="avatarFrame"
       :src="avatarFrame"
       mode="widthFix"
-      :style="{
+      :style="avatarFrameStyle"
-        width: Number(size) + 10 + 'px',
-        height: Number(size) + 10 + 'px',
-      }"
       class="avatar-frame"
     />
     <image
@@ -78,13 +96,8 @@ watch(
     <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
     <image
       :src="src || '../static/user-icon.png'"
-      mode="widthFix"
+      :mode="imageMode"
-      :style="{
+      :style="avatarImageStyle"
-        width: size + 'px',
-        height: size + 'px',
-        minHeight: size + 'px',
-        borderColor: borderColor || '#fff',
-      }"
       class="avatar-image"
     />
   </view>

src/components/BackToGame.vue

@@ -19,8 +19,12 @@ const props = defineProps({
 });
 const loading = ref(false);
 
+/** 统一获取当前环境 token，用于守卫：无有效 token 时不发起接口请求 */
+const getToken = () =>
+  uni.getStorageSync(`${uni.getAccountInfoSync().miniProgram.envVersion}_token`);
+
 onShow(async () => {
-  if (user.value.id) {
+  if (user.value.id && getToken()) {
     setTimeout(async () => {
       const state = await getUserGameState();
       updateGame(state.gaming, state.roomId);
@@ -33,7 +37,8 @@ watch(
   async (value) => {
     if (!value.id) {
       updateGame(false, "");
-    } else {
+    } else if (getToken()) {
+      // 有有效 token 时才查询在局状态，避免 token 失效时反复发起无效请求
       const state = await getUserGameState();
       updateGame(state.gaming, state.roomId);
     }
@@ -49,7 +54,7 @@ const onClick = debounce(async () => {
       await uni.$checkAudio();
       if (result.mode <= 3) {
         uni.navigateTo({
-          url: `/pages/team-battle?battleId=${result.matchId}`,
+          url: `/pages/team-battle/index?battleId=${result.matchId}`,
         });
       } else {
         uni.navigateTo({

src/components/BattleHeader.vue

@@ -80,28 +80,35 @@ defineProps({
         />
       </view>
     </view>
-    <view
+    <!-- 大乱斗玩家列表：scroll-view 作为横向滚动容器 -->
+    <!-- 小程序中 scroll-view 不支持直接 display:flex，需内部 wrapper view 承载 flex 布局 -->
+    <!-- 仅当玩家 >5 人（内容溢出宽度）时才阻止冒泡，防止与外层 swiper 切换 tab 的手势冲突 -->
+    <scroll-view
       v-if="players.length"
       class="players-melee"
+      scroll-x
+      @touchmove="(e) => players.length > 5 && e.stopPropagation()"
       :style="{ paddingTop: showHeader ? '15px' : '0' }"
     >
-      <view
+      <view class="players-melee-inner">
-        v-for="(player, index) in players"
+        <view
-        :key="index"
+          v-for="(player, index) in players"
-        :style="{
+          :key="index"
-          backgroundColor: meleeAvatarColors[index],
+          :style="{
-          width: `${Math.max(100 / players.length, 18)}vw`,
+            backgroundColor: meleeAvatarColors[index],
-        }"
+            width: `${Math.max(100 / players.length, 18)}vw`,
-      >
+          }"
-        <Avatar
+        >
-          :src="player.avatar"
+          <Avatar
-          :rankLvl="showRank ? undefined : player.rankLvl"
+            :src="player.avatar"
-          :size="40"
+            :rankLvl="showRank ? undefined : player.rankLvl"
-          :rank="showRank ? index + 1 : 0"
+            :size="40"
-        />
+            :rank="showRank ? index + 1 : 0"
-        <text class="player-name">{{ player.name }}</text>
+          />
+          <text class="player-name">{{ player.name }}</text>
+        </view>
       </view>
-    </view>
+    </scroll-view>
   </view>
 </template>
 
@@ -144,17 +151,21 @@ defineProps({
   justify-content: center;
 }
 .players-melee {
-  display: flex;
   height: 80px;
   width: 100%;
-  overflow-x: auto;
 }
 .players-melee::-webkit-scrollbar {
   width: 0;
   height: 0;
   color: transparent;
 }
-.players-melee > view {
+/* 小程序 scroll-view 不支持直接 flex，通过内层 wrapper 承载横向排列 */
+.players-melee-inner {
+  display: flex;
+  height: 100%;
+  flex-wrap: nowrap;
+}
+.players-melee-inner > view {
   display: flex;
   flex-direction: column;
   align-items: center;

src/components/BowTarget.vue

@@ -34,6 +34,18 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  targetRadius: {
+    type: Number,
+    default: 20,
+  },
+  hitRadiusPx: {
+    type: Number,
+    default: 2,
+  },
+  zoomHitRadiusPx: {
+    type: Number,
+    default: 5,
+  },
 });
 
 const pMode = ref(true);
@@ -45,6 +57,8 @@ const timer = ref(null);
 const dirTimer = ref(null);
 const angle = ref(null);
 const circleColor = ref("");
+const ROUND_TIP_OFFSET_Y = -32;
+const EXPERIENCE_TIP_OFFSET_Y = -68;
 
 watch(
   () => props.scores,
@@ -80,13 +94,92 @@ watch(
   }
 );
 
-function calcRealX(num, offset = 3.4) {
+const safeTargetRadius = computed(() => {
-  const len = 20.4 + num;
+  const radius = Number(props.targetRadius);
-  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
+  return Number.isFinite(radius) && radius > 0 ? radius : 20;
+});
+
+const currentHitRadiusPx = computed(() => {
+  const radius = Number(
+    pMode.value ? props.zoomHitRadiusPx : props.hitRadiusPx
+  );
+  return Number.isFinite(radius) && radius >= 0 ? radius : 0;
+});
+
+function getShotPoint(shot, fallbackCenter = false) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  if (Number.isFinite(x) && Number.isFinite(y)) return { x, y };
+  return fallbackCenter ? { x: 0, y: 0 } : null;
 }
-function calcRealY(num, offset = 3.4) {
+
-  const len = num < 0 ? Math.abs(num) + 20.4 : 20.4 - num;
+function getPointDirection(point) {
-  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
+  if (!point) return null;
+  const distance = Math.sqrt(point.x * point.x + point.y * point.y);
+  if (distance === 0) return null;
+
+  return {
+    x: point.x / distance,
+    y: point.y / distance,
+  };
+}
+
+function formatPxOffset(value) {
+  if (!value) return "";
+  const operator = value > 0 ? "+" : "-";
+  return ` ${operator} ${Math.abs(value)}px`;
+}
+
+function formatTargetPosition(percent, offset) {
+  const pxOffset = formatPxOffset(offset);
+  return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
+}
+
+function getTargetPositionStyle(point, offsetPx = 0, extraOffset = {}) {
+  if (!point) return { display: "none" };
+
+  const radius = safeTargetRadius.value;
+  const diameter = radius * 2;
+  const direction = getPointDirection(point);
+  const xOffset = (direction ? direction.x * offsetPx : 0) + (extraOffset.x || 0);
+  const yOffset = (direction ? -direction.y * offsetPx : 0) + (extraOffset.y || 0);
+  const leftPercent = ((point.x + radius) / diameter) * 100;
+  const topPercent = ((radius - point.y) / diameter) * 100;
+
+  return {
+    left: formatTargetPosition(leftPercent, xOffset),
+    top: formatTargetPosition(topPercent, yOffset),
+    transform: "translate(-50%, -50%)",
+  };
+}
+
+function getHitStyle(shot) {
+  const radius = currentHitRadiusPx.value;
+  const point = getShotPoint(shot);
+
+  return {
+    ...getTargetPositionStyle(point, radius),
+    width: `${radius * 2}px`,
+    height: `${radius * 2}px`,
+  };
+}
+
+function getRoundTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: ROUND_TIP_OFFSET_Y }
+  );
+}
+
+function getExperienceTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: EXPERIENCE_TIP_OFFSET_Y }
+  );
 }
 const simulShoot = async () => {
   if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
@@ -169,20 +262,14 @@ onBeforeUnmount(() => {
       <view
         v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
         class="e-value fade-in-out"
-        :style="{
+        :style="getExperienceTipStyle(latestOne)"
-          left: calcRealX(latestOne.ring ? latestOne.x : 0, 20),
-          top: calcRealY(latestOne.ring ? latestOne.y : 0, 40),
-        }"
       >
         经验 +1
       </view>
       <view
         v-if="latestOne"
         class="round-tip fade-in-out"
-        :style="{
+        :style="getRoundTipStyle(latestOne)"
-          left: calcRealX(latestOne.ring ? latestOne.x : 0, 28),
-          top: calcRealY(latestOne.ring ? latestOne.y : 0, 28),
-        }"
         >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
         }}<text v-if="latestOne.ring">环</text>
       </view>
@@ -193,20 +280,14 @@ onBeforeUnmount(() => {
           user.id === bluelatestOne.playerId
         "
         class="e-value fade-in-out"
-        :style="{
+        :style="getExperienceTipStyle(bluelatestOne)"
-          left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 20),
-          top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 40),
-        }"
       >
         经验 +1
       </view>
       <view
         v-if="bluelatestOne"
         class="round-tip fade-in-out"
-        :style="{
+        :style="getRoundTipStyle(bluelatestOne)"
-          left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 28),
-          top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 28),
-        }"
         >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
         }}<text v-if="bluelatestOne.ring">环</text></view
       >
@@ -217,8 +298,7 @@ onBeforeUnmount(() => {
             index === scores.length - 1 && latestOne ? 'pump-in' : ''
           }`"
           :style="{
-            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
+            ...getHitStyle(bow),
-            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
             backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
           }"
           ><text v-if="pMode">{{ index + 1 }}</text></view
@@ -231,8 +311,7 @@ onBeforeUnmount(() => {
             index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
           }`"
           :style="{
-            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
+            ...getHitStyle(bow),
-            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
             backgroundColor: '#1840FF',
           }"
         >
@@ -292,6 +371,31 @@ onBeforeUnmount(() => {
   font-size: 24px;
   margin-left: 5px;
 }
+@keyframes target-tip-fade-in-out {
+  0% {
+    transform: translate(-50%, -50%) translateY(20px);
+    opacity: 0;
+  }
+
+  30% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  80% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate(-50%, -50%);
+    opacity: 0;
+  }
+}
+.round-tip.fade-in-out,
+.e-value.fade-in-out {
+  animation: target-tip-fade-in-out 1.2s ease forwards;
+}
 .target > image:last-child {
   width: 100%;
   height: 100%;
@@ -302,21 +406,11 @@ onBeforeUnmount(() => {
   z-index: 1;
   color: #fff;
   transition: all 0.3s ease;
-}
+  box-sizing: border-box;
-.s-point {
-  width: 4px;
-  height: 4px;
-  min-width: 4px;
-  min-height: 4px;
 }
 .b-point {
-  width: 10px;
-  height: 10px;
-  min-width: 10px;
-  min-height: 10px;
   border: 1px solid #fff;
   z-index: 1;
-  box-sizing: border-box;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -332,6 +426,19 @@ onBeforeUnmount(() => {
   transform: translate(-50%, -50%);*/
   margin-top: 2rpx;
 }
+@keyframes target-pump-in {
+  from {
+    transform: translate(-50%, -50%) scale(2);
+  }
+
+  to {
+    transform: translate(-50%, -50%) scale(1);
+  }
+}
+.hit.pump-in {
+  animation: target-pump-in 0.3s ease-out forwards;
+  transform-origin: center center;
+}
 .header {
   width: 100%;
   display: flex;

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({
@@ -41,6 +41,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  headerClass: {
+    type: String,
+    default: "",
+  },
   showBottom: {
     type: Boolean,
     default: true,
@@ -116,7 +120,7 @@ const backToGame = debounce(async () => {
       await checkAudioProgress();
       if (result.mode <= 3) {
         uni.navigateTo({
-          url: `/pages/team-battle?battleId=${result.matchId}`,
+          url: `/pages/team-battle/index?battleId=${result.matchId}`,
         });
       } else {
         uni.navigateTo({
@@ -135,6 +139,10 @@ const goBack = () => {
   uni.navigateBack();
 };
 
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
 const goCalibration = async () => {
   await laserAimAPI();
   uni.navigateTo({
@@ -148,6 +156,7 @@ const goCalibration = async () => {
     <AppBackground :type="bgType" :bgColor="bgColor" />
     <Header
       v-if="!isHome"
+      :class="headerClass"
       :title="title"
       :onBack="onBack"
       :whiteBackArrow="whiteBackArrow"
@@ -202,7 +211,7 @@ const goCalibration = async () => {
           <button hover-class="none" @click="() => (showHint = false)">
             取消
           </button>
-          <button hover-class="none" @click="goBack">确认</button>
+          <button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
         </view>
       </view>
       <view v-if="hintType === 4" class="tip-content">

src/components/CreateRoom.vue

@@ -17,12 +17,19 @@ const props = defineProps({
   },
 });
 
-const battleMode = ref(1);
+/** 对战模式：0=未选 1=1v1 2=乱斗 3=2v2 4=3v3 */
-const targetMode = ref(1);
+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;
@@ -105,7 +112,7 @@ const createRoom = debounce(async () => {
         <text>40厘米全环靶</text>
       </view>
     </view>
-    <SButton :onClick="createRoom">创建房间</SButton>
+    <SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton>
   </view>
 </template>
 

src/components/GuideTwo.vue

@@ -0,0 +1,55 @@
+<script setup>
+defineProps({
+  noBg: {
+    type: Boolean,
+    default: false,
+  }
+});
+</script>
+
+<template>
+  <view class="container">
+    <image class="shooter2" src="https://static.shelingxingqiu.com/shootmini/static/shooter2.png" mode="widthFix" />
+    <view class="bg-box">
+      <image
+        class="bg"
+        v-if="!noBg"
+        src="https://static.shelingxingqiu.com/shootmini/static/long-bubble-border.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  padding: 0 26rpx 0 28rpx;
+  margin-bottom: 14rpx;
+  width: clac(100% - 54rpx);
+}
+.container .shooter2 {
+  display: block;
+  width: 133rpx;
+  height: 144rpx;
+}
+.container .bg-box {
+  color: #fff;
+  font-size: 28rpx;
+  position: relative;
+  flex: 1;
+  height: 128rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.container .bg-box .bg {
+  position: absolute;
+  left: 0;
+  right: 0;
+  width: 100%;
+}
+</style>

src/components/Header.vue

@@ -6,7 +6,7 @@ import Avatar from "@/components/Avatar.vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, game } = storeToRefs(store);
 
 const currentPage = computed(() => {
   const pages = getCurrentPages();
@@ -57,8 +57,10 @@ const signin = () => {
 
 const loading = ref(false);
 const pointBook = ref(null);
-const showProgress = ref(false);
 const heat = ref(0);
+/** 房间号按钮动态定位样式（position: fixed，根据胶囊真实位置计算，脱离 flex 流避免挤压标题） */
+const battleRoomBtnStyle = ref({});
+
 const updateLoading = (value) => {
   loading.value = value;
 };
@@ -79,8 +81,22 @@ onMounted(() => {
       pointBook.value = uni.getStorageSync("last-point-book");
     }
   }
-  if (currentPage.route === "pages/team-battle") {
+  // 仅在对战房间页获取胶囊位置，按钮用 fixed 定位精确贴靠胶囊左侧（脱离 flex 流，不挤压标题）
-    showProgress.value = true;
+  if (currentPage.route === "pages/battle-room") {
+    try {
+      const menuButtonRect = uni.getMenuButtonBoundingClientRect();
+      const { windowWidth } = uni.getSystemInfoSync();
+      battleRoomBtnStyle.value = {
+        // 按钮右边缘距视口右侧 = 屏幕宽 - 胶囊左边缘 + 4px 安全间隙
+        right: (windowWidth - menuButtonRect.left + 4) + "px",
+        // 垂直位置与胶囊顶部对齐
+        top: menuButtonRect.top + "px",
+        // 高度与胶囊一致，视觉融合
+        height: menuButtonRect.height + "px",
+      };
+    } catch (e) {
+      // 获取失败时使用 CSS 兜底定位（28vw + 4px 作为 right，8px 作为 top）
+    }
   }
   uni.$on("update-hot", updateHot);
 });
@@ -126,8 +142,8 @@ onBeforeUnmount(() => {
       </view>
       <block
         v-if="
-          '-凹造型-感知距离-小试牛刀'.indexOf(title) === -1 ||
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) === -1 ||
-          '-凹造型-感知距离-小试牛刀'.indexOf(title) === 10
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11
         "
       >
         <text>{{ title }}</text>
@@ -135,12 +151,12 @@ onBeforeUnmount(() => {
       <block
         v-if="
           title &&
-          '-凹造型-感知距离-小试牛刀'.indexOf(title) !== -1 &&
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) !== -1 &&
-          '-凹造型-感知距离-小试牛刀'.indexOf(title) !== 10
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) !== 11
         "
       >
         <view class="first-try-steps">
-          <text :class="title === '-凹造型' ? 'current-step' : ''">凹造型</text>
+          <text :class="title === '-箭前准备' ? 'current-step' : ''">箭前准备</text>
           <text>-</text>
           <text :class="title === '-感知距离' ? 'current-step' : ''"
             >感知距离</text
@@ -169,9 +185,26 @@ onBeforeUnmount(() => {
         }}</text
       >
     </view>
-    <view v-if="showProgress" class="battle-progress">
+    <view
+      v-if="
+        currentPage === 'pages/team-battle' ||
+        currentPage === 'pages/team-battle/index'
+      "
+      class="battle-progress"
+    >
       <HeaderProgress />
     </view>
+    <!-- 对战房间：整个胶囊为分享按钮，房号从 Store 读取；fixed 定位紧靠系统胶囊左侧 -->
+    <button
+      v-if="currentPage === 'pages/battle-room' && game.roomNumber"
+      open-type="share"
+      hover-class="none"
+      class="battle-room-number"
+      :style="battleRoomBtnStyle"
+    >
+      <text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
+      <image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
+    </button>
   </view>
 </template>
 
@@ -259,4 +292,37 @@ onBeforeUnmount(() => {
   margin: 0 20rpx;
   max-width: 300rpx;
 }
+/* 对战房间：整个胶囊作为分享按钮，fixed 定位脱离 flex 流，紧贴系统胶囊左侧 */
+.battle-room-number {
+  position: fixed;
+  /* 兜底定位（JS 获取胶囊位置失败时生效）：约 28vw 对应胶囊区域左边缘 */
+  right: calc(28vw + 4px);
+  top: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 240rpx;
+  height: 64rpx;
+  background: rgba(0, 0, 0, 0.15);
+  border-radius: 96rpx;
+  border: 1rpx solid #5b5758;
+  padding: 0;
+}
+/* 重置 button 默认边框 */
+.battle-room-number::after {
+  border: none;
+}
+.battle-room-number__text {
+  width: 156rpx;
+  height: 28rpx;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #ffffff;
+  text-align: center;
+  line-height: 28rpx;
+}
+.battle-room-number__icon {
+  width: 25rpx;
+  height: 26rpx;
+}
 </style>

src/components/HeaderProgress.vue

@@ -19,12 +19,17 @@ const ended = ref(false);
 const halfTime = ref(false);
 const currentShot = ref(0);
 const totalShot = ref(0);
+/** 标记组件是否已完成挂载，防止 immediate watcher 在挂载前用旧 store 值触发意外播音 */
+const isMounted = ref(false);
 
 watch(
   () => tips.value,
   (newVal) => {
+    // 挂载完成前不播音（避免 immediate store watcher 用旧值触发多余播报）
+    if (!isMounted.value) return;
+    // 空字符串或含"重回"的 tips 均不播音
+    if (!newVal || newVal.includes("重回")) return;
     let key = [];
-    if (newVal.includes("重回")) return;
     if (currentRoundEnded.value) {
       // 播放当前轮次语音
       key.push(`第${["一", "二", "三", "四", "五"][currentRound.value]}轮`);
@@ -33,8 +38,8 @@ watch(
       newVal.includes("你")
         ? "轮到你了"
         : newVal.includes("红队")
-        ? "请红方射箭"
+          ? "请红方射箭"
-        : "请蓝方射箭"
+          : "请蓝方射箭"
     );
     audioManager.play(key, false);
     currentRoundEnded.value = false;
@@ -52,14 +57,20 @@ async function onReceiveMessage(message) {
   const { type, mode, current, shootData } = message;
   if (type === MESSAGETYPESV2.BattleStart) {
     melee.value = Boolean(mode > 3);
-    totalShot.value = mode === 1 ? 3 : 2;
+    // 优先使用后端返回的 shootNumber，降级则根据 mode 推算
+    totalShot.value = message.shootNumber ?? (mode === 1 ? 3 : 2);
     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++;
+    // 从 indexMap 按当前用户 id 取已射箭数，由后端维护准确值，不在前端自增。
+    // 注意：后端在 ShootResult 中会将 playerId 重置为 0（无当前射手），
+    // 因此不能依赖 playerId === user.id 判断，改为直接读取 indexMap[user.id]。
+    // indexMap[user.id] 只在本人射箭后才增加，队友射箭时该值不变，逻辑等价且更准确。
+    const myShot = current.indexMap?.[user.value.id];
+    if (myShot !== undefined) currentShot.value = myShot;
     if (message.shootData) {
       let key = [];
       key.push(
@@ -92,22 +103,36 @@ const onUpdateTips = (newVal) => {
   tips.value = newVal;
 };
 
-const onUpdateTotalShot = (newVal) => {
+// 监听 Pinia store 中 totalShot 变化，用于比赛恢复时同步箭数（替代 uni.$emit 避免时序问题）
-  currentShot.value = newVal.currentShot;
+// 使用 immediate: true 确保组件创建时立即读取 store 当前值（解决重入时 totalShot 值不变 watch 不触发的问题）
-  totalShot.value = newVal.totalShot;
+watch(() => store.game.totalShot, (newVal) => {
-};
+  if (newVal > 0) {
+    totalShot.value = newVal;
+    currentShot.value = store.game.currentShot;
+  }
+}, { immediate: true });
+
+// 监听 Pinia store 中 tips 变化，用于比赛恢复时同步提示文案（替代 uni.$emit 避免时序问题）
+// 使用 immediate: true 确保组件创建时立即读取 store 当前值（解决 onShow 早于 onMounted 导致 uni.$emit 事件丢失的问题）
+// 注意：使用 != null 而非 if(newVal)，确保空字符串 "" 也能触发清空（避免重新开赛时旧文案残留）
+watch(() => store.game.tips, (newVal) => {
+  if (newVal != null) {
+    tips.value = newVal;
+  }
+}, { immediate: true });
 
 onMounted(() => {
-  uni.$on("update-shot", onUpdateTotalShot);
+  isMounted.value = true;
   uni.$on("update-tips", onUpdateTips);
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("play-sound", playSound);
 });
 
 onBeforeUnmount(() => {
-  uni.$off("update-shot", onUpdateTotalShot);
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("play-sound", playSound);
+  // 补充取消 update-tips 监听，防止页面重建时监听器叠加
+  uni.$off("update-tips", onUpdateTips);
   if (timer.value) clearInterval(timer.value);
 });
 </script>
@@ -117,10 +142,7 @@ onBeforeUnmount(() => {
     <text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
     <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
     <button v-if="!!tips" hover-class="none" @click="updateSound">
-      <image
+      <image :src="`../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
-        :src="`../static/sound${sound ? '' : '-off'}-yellow.png`"
-        mode="widthFix"
-      />
     </button>
   </view>
 </template>
@@ -134,11 +156,13 @@ onBeforeUnmount(() => {
   justify-content: center;
   font-weight: 500;
 }
-.container > button:last-child {
+
+.container>button:last-child {
   width: 36px;
   height: 36px;
 }
-.container > button:last-child > image {
+
+.container>button:last-child>image {
   width: 36px;
   min-height: 36px;
 }

src/components/Matching.vue

@@ -123,7 +123,7 @@ onBeforeUnmount(() => {
         </text>
       </view>
     </view>
-    <button hover-class="none" @click="stopMatch">取消匹配</button>
+    <button hover-class="none" @click="$clickSound(stopMatch)">取消匹配</button>
   </view>
 </template>
 

src/components/PlayerScore.vue

@@ -43,7 +43,7 @@ const rowCount = new Array(6).fill(0);
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
           <text>{{
-            scores[1] && scores[1][index] ? `${scores[0][index].ring}环` : "-"
+            scores[1] && scores[1][index] ? `${scores[1][index].ring}环` : "-"
           }}</text>
         </view>
       </view>

src/components/PlayerSeats.vue

@@ -14,6 +14,11 @@ const props = defineProps({
     type: Function,
     default: () => {},
   },
+  /** 当前用户是否为房主；仅房主可见踢人按钮 */
+  isOwner: {
+    type: Boolean,
+    default: false,
+  },
 });
 const seats = new Array(props.total).fill(1);
 </script>
@@ -45,8 +50,9 @@ const seats = new Array(props.total).fill(1);
         mode="widthFix"
         class="player-bg"
       /> -->
+      <!-- 仅房主（isOwner=true）且非空座位时展示踢人按钮 -->
       <button
-        v-if="index > 0 && players[index]"
+        v-if="index > 0 && players[index] && isOwner"
         hover-class="none"
         class="remove-player"
         @click="() => removePlayer(players[index])"

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) {
@@ -126,7 +139,7 @@ async function onReceiveMessage(msg) {
     halfTime.value = false;
     audioManager.play("比赛开始");
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束");
+    audioManager.play("比赛结束", false);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     let arrow = {};
     if (msg.details && Array.isArray(msg.details)) {
@@ -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;

src/components/ShootProgress2.vue

@@ -1,6 +1,7 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import {ref, watch, onMounted, onBeforeUnmount} from "vue";
-import { RoundGoldImages } from "@/constants";
+import {RoundGoldImages} from "@/constants";
+
 const props = defineProps({
   tips: {
     type: String,
@@ -19,34 +20,87 @@ const props = defineProps({
 const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
-const laoding = ref(false);
+const loading = ref(false);
+const transitionStyle = ref("all 1s linear");
+const currentTeam = ref(null);
 
 const updateRemain = (value) => {
-  // if (Math.ceil(value) === remain.value || Math.floor(value) === remain.value)
+  if (value.stop) {
-  //   return;
+    if (timer.value) clearInterval(timer.value);
+    return
+  }
+  // zeroThenReset：ToSomeoneShoot 到达时，若进度条仍在倒计时则先瞬间清零（约 150ms 停留）再显示下一玩家满值
+  // 若进度条已到 0（loading 状态），直接切换满值
+  if (value.zeroThenReset) {
+    if (timer.value) clearInterval(timer.value);
+    const wasNonZero = remain.value > 0;
+    // 更新下一玩家颜色和方向（在清零和满值时均生效）
+    currentTeam.value = value.team;
+    if (value.team === 'red') barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+    if (value.team === 'blue') barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+    transitionStyle.value = "none";
+    if (wasNonZero) {
+      // 瞬间清零，停留约 150ms 后切换为满值
+      remain.value = 0;
+      loading.value = true;
+      setTimeout(() => {
+        remain.value = value.value;
+        loading.value = false;
+        setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+      }, 150);
+    } else {
+      // 已在底部，直接切换满值
+      remain.value = value.value;
+      loading.value = false;
+      setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+    }
+    return;
+  }
+  loading.value = false;
+  currentTeam.value = value.team
+  if (value.team === 'red')
+    barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+  if (value.team === 'blue')
+    barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+  if (value.reset) {
+    // 重置前先清除旧计时器，防止超时未射箭时旧 interval 残留，导致进度条震荡
+    if (timer.value) clearInterval(timer.value);
+    // 重置时瞬间跳满格，禁用 CSS 过渡避免从旧值「涨到满」的动画
+    transitionStyle.value = "none";
+    remain.value = value.value;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+    return;
+  }
+  const newVal = Math.round(value.value);
+  // 如果剩余时间增加（如轮次切换重置），瞬间变化无动画；否则保持动画
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+
+  // 启动前先清除旧计时器，防止多次 {stop:false} 事件叠加多个 interval
   if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(value);
   timer.value = setInterval(() => {
-    laoding.value = remain.value === 0;
+    loading.value = remain.value === 0;
     if (remain.value > 0) remain.value--;
   }, 1000);
 };
 
 watch(
-  () => props.tips,
+    () => props.tips,
-  (newVal) => {
+    (newVal) => {
-    if (newVal.includes("红队"))
+
-      barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+    },
-    if (newVal.includes("蓝队"))
+    {
-      barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+      immediate: true,
-    if (newVal.includes("重回")) return;
-    if (newVal.includes("红队") || newVal.includes("蓝队")) {
-      updateRemain(props.total);
     }
-  },
-  {
-    immediate: true,
-  }
 );
 
 onMounted(() => {
@@ -61,20 +115,21 @@ onBeforeUnmount(() => {
 
 <template>
   <view class="container">
-    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix" />
+    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
     <view
-      :style="{
+        :style="{
-        justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start',
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
       }"
     >
       <view
-        :style="{
+          :style="{
           width: `${(remain / total) * 100}%`,
           background: barColor,
-          right: tips.includes('红队') ? 0 : 'unset',
+          right: currentTeam==='red' ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
-      <text v-if="!laoding">剩余{{ remain }}秒</text>
+      <text v-if="!loading">剩余{{ remain }}秒</text>
       <text v-else>···</text>
     </view>
   </view>
@@ -87,11 +142,13 @@ onBeforeUnmount(() => {
   flex-direction: column;
   align-items: center;
 }
+
 .container > image {
   width: 380rpx;
   height: 80rpx;
   transform: translateY(18rpx);
 }
+
 .container > view:last-child {
   width: 100%;
   text-align: center;
@@ -103,11 +160,12 @@ onBeforeUnmount(() => {
   display: flex;
   align-items: center;
 }
+
 .container > view:last-child > view {
   height: 24rpx;
   border-radius: 15px;
-  transition: all 1s linear;
 }
+
 .container > view:last-child > text {
   font-size: 18rpx;
   color: #fff;

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(
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
-      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>
 

src/components/Swiper.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from "vue";
+import { ref, watch } from "vue";
 
 const props = defineProps({
   interval: {
@@ -14,13 +14,24 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  current: {
+    type: Number,
+    default: 0,
+  },
   onChange: {
     type: Function,
     default: (index) => {},
   },
 });
 
-const currentIndex = ref(0);
+const currentIndex = ref(props.current);
+
+watch(
+  () => props.current,
+  (index) => {
+    currentIndex.value = index;
+  }
+);
 
 const handleChange = (e) => {
   currentIndex.value = e.detail.current;
@@ -75,7 +86,7 @@ const handleChange = (e) => {
 
 .dots {
   position: absolute;
-  bottom: 5%;
+  bottom: 2%;
   left: 50%;
   transform: translateX(-50%);
   display: flex;

src/components/TargetCanvas.vue

@@ -0,0 +1,535 @@
+<script setup>
+import { computed, getCurrentInstance, nextTick, onMounted, ref, watch } from "vue";
+
+const defaultCanvasSize = 300;
+const defaultRingCount = 10;
+
+const props = defineProps({
+  // canvas 唯一标识；不传时组件内部自动生成，避免多个靶面 canvas-id 冲突。
+  canvasId: {
+    type: String,
+    default: "",
+  },
+  // 业务坐标半径，例如 20 表示命中点坐标范围为 -20 到 20。
+  // 当前组件主要用它参与重绘判断，外层命中点定位也应使用同一半径。
+  coordinateRadius: {
+    type: Number,
+    default: 20,
+  },
+  // 是否显示靶心十字辅助线。
+  showCrosshair: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示象限文字。
+  showQuadrantLabels: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示环数文字。
+  showRingLabels: {
+    type: Boolean,
+    default: true,
+  },
+  // 象限文字配置，key 为 1/2/3/4。
+  quadrantLabels: {
+    type: Object,
+    default: () => ({
+      1: "1",
+      2: "2",
+      3: "3",
+      4: "4",
+    }),
+  },
+  // 高亮区域数组。
+  // quadrant: 1/2/3/4，表示第几个象限。
+  // rings: "all" 或环数数组，例如 [7, 8, 9, 10]。
+  // scope: "box" 表示整象限矩形，"sector" 表示环形扇区。
+  // style: 可覆盖高亮填充色、描边色、线宽比例。
+  highlightAreas: {
+    type: Array,
+    default: () => [],
+  },
+  // 只绘制透明高亮层，不绘制完整靶纸；用于叠加在靶纸图片上。
+  highlightOnly: {
+    type: Boolean,
+    default: false,
+  },
+  // 外部指定 canvas 绘制尺寸；用于让高亮层跟随靶图真实显示区域。
+  canvasWidth: {
+    type: Number,
+    default: 0,
+  },
+  canvasHeight: {
+    type: Number,
+    default: 0,
+  },
+  // 靶纸样式覆盖配置，例如环数、环色、环线颜色、环数字体等。
+  targetStyleConfig: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 十字辅助线样式覆盖配置。
+  crosshairStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 象限文字样式覆盖配置。
+  quadrantLabelStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const instance = getCurrentInstance();
+const localCanvasId = `target-canvas-${Math.random().toString(36).slice(2, 10)}`;
+const currentCanvasId = computed(() => props.canvasId || localCanvasId);
+const lastDrawKey = ref("");
+const canvasSize = ref({
+  width: defaultCanvasSize,
+  height: defaultCanvasSize,
+});
+
+// 完整靶纸默认样式，调用方可以通过 targetStyleConfig 局部覆盖。
+const defaultTargetStyleConfig = {
+  ringCount: defaultRingCount,
+  ringColors: {
+    1: "#f8f8f3",
+    2: "#f8f8f3",
+    3: "#595959",
+    4: "#595959",
+    5: "#24aee0",
+    6: "#24aee0",
+    7: "#ff1f35",
+    8: "#ff1f35",
+    9: "#f7d34a",
+    10: "#f7d34a",
+  },
+  ringLineColor: "rgba(150, 150, 150, 0.55)",
+  ringLineWidthRatio: 0.0022,
+  centerDotColor: "#ffffff",
+  centerDotRadiusRatio: 0.0048,
+  ringLabelFontRatio: 0.032,
+  ringLabelDarkColor: "#111111",
+  ringLabelLightColor: "#ffffff",
+};
+
+// 十字辅助线默认样式。
+const defaultCrosshairStyle = {
+  color: "rgba(20, 20, 20, 0.38)",
+  lineWidthRatio: 0.0025,
+};
+
+// 象限文字默认样式。
+const defaultQuadrantLabelStyle = {
+  color: "#ffffff",
+  fontSizeRatio: 0.045,
+  offsetRatio: 0.78,
+};
+
+// 高亮区域默认样式。
+const defaultHighlightStyle = {
+  color: "rgba(254, 216, 71, 0.34)",
+  strokeColor: "rgba(254, 216, 71, 0.82)",
+  lineWidthRatio: 0.003,
+};
+
+// 合并默认靶纸样式和外部传入样式，ringColors 单独深合并。
+const mergeTargetStyleConfig = () => ({
+  ...defaultTargetStyleConfig,
+  ...props.targetStyleConfig,
+  ringColors: {
+    ...defaultTargetStyleConfig.ringColors,
+    ...(props.targetStyleConfig?.ringColors || {}),
+  },
+});
+
+// 统一把外部传入值转成有效数字，非法值使用 fallback。
+const getNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+// 获取指定环数的填充色，兼容数字 key 和字符串 key。
+const getRingColor = (ring, config) => {
+  return config.ringColors?.[ring] || config.ringColors?.[String(ring)] || "#ffffff";
+};
+
+// 规范化高亮环数配置；"all" 表示全部环，数组或单值会过滤非法环数。
+const normalizeRings = (rings, ringCount) => {
+  if (rings === "all") {
+    return "all";
+  }
+
+  const rawRings = Array.isArray(rings) ? rings : [rings];
+  return rawRings
+    .map((ring) => Number(ring))
+    .filter((ring) => Number.isInteger(ring) && ring >= 1 && ring <= ringCount);
+};
+
+// 获取象限对应的扇形弧度范围。
+const getQuadrantAngles = (quadrant) => {
+  const angleMap = {
+    1: [Math.PI, Math.PI * 1.5],
+    2: [Math.PI * 1.5, Math.PI * 2],
+    3: [Math.PI * 0.5, Math.PI],
+    4: [0, Math.PI * 0.5],
+  };
+
+  return angleMap[Number(quadrant)] || null;
+};
+
+// 获取象限对应的矩形区域，用于整象限高亮。
+const getQuadrantBox = (quadrant, centerX, centerY, radius) => {
+  const boxMap = {
+    1: [centerX - radius, centerY - radius, radius, radius],
+    2: [centerX, centerY - radius, radius, radius],
+    3: [centerX - radius, centerY, radius, radius],
+    4: [centerX, centerY, radius, radius],
+  };
+
+  return boxMap[Number(quadrant)] || null;
+};
+
+// 绘制实心圆，靶纸环区和中心点都会用到。
+const drawCircle = (ctx, centerX, centerY, radius, fillColor) => {
+  ctx.beginPath();
+  ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
+  ctx.setFillStyle(fillColor);
+  ctx.fill();
+};
+
+// 绘制环形扇区，用于按象限高亮指定环数。
+const drawAnnularSector = (
+  ctx,
+  centerX,
+  centerY,
+  innerRadius,
+  outerRadius,
+  startAngle,
+  endAngle,
+  fillColor,
+  strokeColor = "",
+  lineWidth = 0
+) => {
+  ctx.beginPath();
+  ctx.arc(centerX, centerY, outerRadius, startAngle, endAngle);
+
+  if (innerRadius > 0) {
+    ctx.arc(centerX, centerY, innerRadius, endAngle, startAngle, true);
+  } else {
+    ctx.lineTo(centerX, centerY);
+  }
+
+  ctx.closePath();
+  ctx.setFillStyle(fillColor);
+  ctx.fill();
+
+  if (strokeColor && lineWidth > 0) {
+    ctx.setStrokeStyle(strokeColor);
+    ctx.setLineWidth(lineWidth);
+    ctx.stroke();
+  }
+};
+
+// 从外到内绘制完整靶纸色环。
+const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
+  for (let ring = 1; ring <= config.ringCount; ring += 1) {
+    const radius = targetRadius * ((config.ringCount + 1 - ring) / config.ringCount);
+    drawCircle(ctx, centerX, centerY, radius, getRingColor(ring, config));
+  }
+};
+
+// 绘制所有高亮区域，支持整象限矩形高亮和指定环数扇区高亮。
+const drawHighlights = (ctx, centerX, centerY, targetRadius, config) => {
+  props.highlightAreas.forEach((area = {}) => {
+    const angles = getQuadrantAngles(area.quadrant);
+
+    if (!angles) {
+      return;
+    }
+
+    const highlightStyle = {
+      ...defaultHighlightStyle,
+      ...(area.style || {}),
+    };
+    const highlightLineWidth = Math.max(1, targetRadius * highlightStyle.lineWidthRatio);
+    const rings = normalizeRings(area.rings || "all", config.ringCount);
+    const scope = area.scope || (rings === "all" ? "box" : "sector");
+
+    // 整象限默认画成矩形高亮，便于对应 1/2/3/4 号框训练提示。
+    if (rings === "all" && scope === "box") {
+      const box = getQuadrantBox(area.quadrant, centerX, centerY, targetRadius);
+      if (!box) return;
+      ctx.beginPath();
+      ctx.rect(...box);
+      ctx.setFillStyle(highlightStyle.color);
+      ctx.fill();
+      ctx.setStrokeStyle(highlightStyle.strokeColor);
+      ctx.setLineWidth(highlightLineWidth);
+      ctx.stroke();
+      return;
+    }
+
+    const targetRings = rings === "all"
+      ? Array.from({ length: config.ringCount }, (_, index) => index + 1)
+      : rings;
+
+    targetRings.forEach((ring) => {
+      const innerRadius = targetRadius * ((config.ringCount - ring) / config.ringCount);
+      const outerRadius = targetRadius * ((config.ringCount + 1 - ring) / config.ringCount);
+      drawAnnularSector(
+        ctx,
+        centerX,
+        centerY,
+        innerRadius,
+        outerRadius,
+        angles[0],
+        angles[1],
+        highlightStyle.color,
+        highlightStyle.strokeColor,
+        highlightLineWidth
+      );
+    });
+  });
+};
+
+// 绘制各环之间的分割线。
+const drawRingLines = (ctx, centerX, centerY, targetRadius, config) => {
+  const lineWidth = Math.max(1, targetRadius * config.ringLineWidthRatio);
+
+  ctx.setStrokeStyle(config.ringLineColor);
+  ctx.setLineWidth(lineWidth);
+
+  for (let index = 1; index <= config.ringCount; index += 1) {
+    const radius = targetRadius * (index / config.ringCount);
+    ctx.beginPath();
+    ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
+    ctx.stroke();
+  }
+};
+
+// 绘制靶心十字辅助线。
+const drawCrosshair = (ctx, centerX, centerY, targetRadius) => {
+  if (!props.showCrosshair) {
+    return;
+  }
+
+  const style = {
+    ...defaultCrosshairStyle,
+    ...props.crosshairStyle,
+  };
+
+  ctx.beginPath();
+  ctx.moveTo(centerX - targetRadius, centerY);
+  ctx.lineTo(centerX + targetRadius, centerY);
+  ctx.moveTo(centerX, centerY - targetRadius);
+  ctx.lineTo(centerX, centerY + targetRadius);
+  ctx.setStrokeStyle(style.color);
+  ctx.setLineWidth(Math.max(1, targetRadius * style.lineWidthRatio));
+  ctx.stroke();
+};
+
+// 绘制环数文字。
+const drawRingLabels = (ctx, centerX, centerY, targetRadius, config) => {
+  if (!props.showRingLabels) {
+    return;
+  }
+
+  const ringWidth = targetRadius / config.ringCount;
+  const fontSize = Math.max(10, targetRadius * config.ringLabelFontRatio);
+
+  ctx.setFontSize(fontSize);
+  ctx.setTextAlign("center");
+  ctx.setTextBaseline("middle");
+
+  for (let ring = config.ringCount; ring >= 1; ring -= 1) {
+    const y = centerY + (config.ringCount - ring + 0.45) * ringWidth;
+    const color = ring <= 2 ? config.ringLabelDarkColor : config.ringLabelLightColor;
+    ctx.setFillStyle(color);
+    ctx.fillText(String(ring), centerX, y);
+  }
+};
+
+// 绘制象限文字。
+const drawQuadrantLabels = (ctx, centerX, centerY, targetRadius) => {
+  if (!props.showQuadrantLabels) {
+    return;
+  }
+
+  const style = {
+    ...defaultQuadrantLabelStyle,
+    ...props.quadrantLabelStyle,
+  };
+  const offset = targetRadius * style.offsetRatio;
+  const positions = {
+    1: [centerX - offset, centerY - offset],
+    2: [centerX + offset, centerY - offset],
+    3: [centerX - offset, centerY + offset],
+    4: [centerX + offset, centerY + offset],
+  };
+
+  ctx.setFontSize(Math.max(12, targetRadius * style.fontSizeRatio));
+  ctx.setTextAlign("center");
+  ctx.setTextBaseline("middle");
+  ctx.setFillStyle(style.color);
+
+  Object.entries(positions).forEach(([key, position]) => {
+    const label = props.quadrantLabels?.[key] || props.quadrantLabels?.[Number(key)];
+    if (label === undefined || label === null || label === "") return;
+    ctx.fillText(String(label), position[0], position[1]);
+  });
+};
+
+// 生成高亮区域的绘制 key，只保留真正影响画面的字段。
+const getHighlightDrawKeyAreas = () => {
+  return props.highlightAreas.map((area = {}) => ({
+    quadrant: area.quadrant,
+    rings: area.rings,
+    scope: area.scope,
+    style: area.style,
+  }));
+};
+
+// 生成本次绘制状态的唯一 key，用于避免相同内容重复 draw。
+const getDrawKey = (width, height) => {
+  return JSON.stringify({
+    width,
+    height,
+    coordinateRadius: props.coordinateRadius,
+    showCrosshair: props.showCrosshair,
+    showQuadrantLabels: props.showQuadrantLabels,
+    showRingLabels: props.showRingLabels,
+    highlightAreas: getHighlightDrawKeyAreas(),
+    targetStyleConfig: props.targetStyleConfig,
+    crosshairStyle: props.crosshairStyle,
+    quadrantLabelStyle: props.quadrantLabelStyle,
+    highlightOnly: props.highlightOnly,
+  });
+};
+
+// 主绘制入口：根据 highlightOnly 决定画完整靶纸，还是只画透明高亮层。
+const drawTarget = () => {
+  const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1);
+  const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1);
+  const drawKey = getDrawKey(width, height);
+
+  if (drawKey === lastDrawKey.value) {
+    return;
+  }
+
+  const size = Math.min(width, height);
+  const centerX = width / 2;
+  const centerY = height / 2;
+  const targetRadius = size / 2;
+  const config = mergeTargetStyleConfig();
+  const ctx = uni.createCanvasContext(currentCanvasId.value, instance?.proxy);
+
+  ctx.clearRect(0, 0, width, height);
+
+  if (!props.highlightOnly) {
+    drawTargetRings(ctx, centerX, centerY, targetRadius, config);
+  }
+
+  drawHighlights(ctx, centerX, centerY, targetRadius, config);
+
+  if (!props.highlightOnly) {
+    drawRingLines(ctx, centerX, centerY, targetRadius, config);
+    drawCircle(
+      ctx,
+      centerX,
+      centerY,
+      Math.max(1, targetRadius * config.centerDotRadiusRatio),
+      config.centerDotColor
+    );
+    drawCrosshair(ctx, centerX, centerY, targetRadius);
+    drawRingLabels(ctx, centerX, centerY, targetRadius, config);
+    drawQuadrantLabels(ctx, centerX, centerY, targetRadius);
+  }
+
+  ctx.draw();
+  lastDrawKey.value = drawKey;
+};
+
+const setCanvasSizeAndDraw = async (width, height) => {
+  canvasSize.value = {
+    width: width > 0 ? width : defaultCanvasSize,
+    height: height > 0 ? height : width || defaultCanvasSize,
+  };
+
+  await nextTick();
+  drawTarget();
+};
+
+// 读取 canvas 实际渲染尺寸后再绘制，保证小程序真机尺寸和坐标一致。
+const measureAndDraw = () => {
+  const propWidth = Math.round(getNumber(props.canvasWidth, 0));
+  const propHeight = Math.round(getNumber(props.canvasHeight, 0));
+
+  if (propWidth > 0 && propHeight > 0) {
+    setCanvasSizeAndDraw(propWidth, propHeight);
+    return;
+  }
+
+  const query = uni.createSelectorQuery().in(instance?.proxy);
+
+  query
+    .select(`#${currentCanvasId.value}`)
+    .boundingClientRect(async (rect) => {
+      const width = Math.round(getNumber(rect?.width, defaultCanvasSize));
+      const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize));
+
+      await setCanvasSizeAndDraw(width, height);
+    })
+    .exec();
+};
+
+// 等待 Vue 完成 DOM 更新后重新测量和绘制。
+const scheduleDraw = async () => {
+  await nextTick();
+  measureAndDraw();
+};
+
+watch(
+  () => [
+    props.coordinateRadius,
+    props.showCrosshair,
+    props.showQuadrantLabels,
+    props.showRingLabels,
+    props.highlightAreas,
+    props.highlightOnly,
+    props.canvasWidth,
+    props.canvasHeight,
+    props.quadrantLabels,
+    props.targetStyleConfig,
+    props.crosshairStyle,
+    props.quadrantLabelStyle,
+  ],
+  scheduleDraw,
+  {
+    deep: true,
+  }
+);
+
+onMounted(() => {
+  setTimeout(measureAndDraw, 30);
+});
+</script>
+
+<template>
+  <canvas
+    :id="currentCanvasId"
+    class="target-canvas"
+    :canvas-id="currentCanvasId"
+    :width="canvasSize.width"
+    :height="canvasSize.height"
+  />
+</template>
+
+<style scoped>
+.target-canvas {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+</style>

src/components/TeamAvatars.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, computed } from "vue";
+import { ref, watch } from "vue";
 const props = defineProps({
   isRed: {
     type: Boolean,
@@ -10,7 +10,7 @@ const props = defineProps({
     default: () => [],
   },
   currentShooterId: {
-    type: Number,
+    type: [Number, String],
     default: "",
   },
 });
@@ -30,31 +30,35 @@ const getPos = (id) => {
   return sort * 40;
 };
 
-onMounted(() => {
+const syncPlayers = () => {
-  props.team.forEach((p, index) => {
+  const nextPlayers = {};
-    players.value[p.id] = { sort: index, ...p };
+  const shooterId = props.currentShooterId;
+  const shooterIndex = props.team.findIndex(
+    (p) => String(p?.id) === String(shooterId)
+  );
+  const nextTeam = [...props.team];
+
+  currentTeam.value = !!shooterId && shooterIndex >= 0;
+  firstName.value = "";
+
+  if (currentTeam.value) {
+    const target = nextTeam.splice(shooterIndex, 1)[0];
+    if (target) {
+      nextTeam.unshift(target);
+      firstName.value = target.name || "";
+    }
+  }
+
+  nextTeam.forEach((p, index) => {
+    if (p?.id) nextPlayers[p.id] = { sort: index, ...p };
   });
-});
+  players.value = nextPlayers;
+};
 
 watch(
-  () => props.currentShooterId,
+  [() => props.team, () => props.currentShooterId],
-  (newVal) => {
+  syncPlayers,
-    if (!newVal) return;
+  { immediate: true, deep: true }
-    const index = props.team.findIndex((p) => p.id === newVal);
-    currentTeam.value = index >= 0;
-    if (index >= 0) {
-      const newPlayers = [...props.team];
-      const target = newPlayers.splice(index, 1)[0];
-      if (target) {
-        newPlayers.unshift(target);
-        firstName.value = target.name;
-        newPlayers.forEach((p, index) => {
-          players.value[p.id] = { sort: index, ...p };
-        });
-      }
-    }
-  },
-  { immediate: true }
 );
 </script>
 
@@ -70,7 +74,7 @@ watch(
     />
     <view
       v-for="(item, index) in team"
-      :key="index"
+      :key="item.id || index"
       class="player"
       :style="{
         width: (isFirst(item.id) ? 80 : 60) + 'rpx',

src/main.js

@@ -1,11 +1,26 @@
 import { createSSRApp } from 'vue'
 import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 import App from './App.vue'
+import audioManager from './audioManager'
 
 export function createApp() {
   const app = createSSRApp(App)
   const pinia = createPinia()
+  pinia.use(piniaPluginPersistedstate)
   app.use(pinia)
+
+  /**
+   * 全局点击音效工具函数，用于在任意按钮/元素点击时自动播放音效。
+   * 用法：@click="$clickSound(handler)" 或 @click="$clickSound(() => doSomething())"
+   * @param {Function} handler - 原始点击回调函数（可选，点击时直接调用）
+   * @param {string} [soundKey='点击按钮'] - audioManager 中的音效 key
+   */
+  app.config.globalProperties.$clickSound = (handler, soundKey = '点击按钮') => {
+    audioManager.play(soundKey);
+    if (typeof handler === 'function') handler();
+  };
+
   return {
     app
   }

src/manifest.json

@@ -1,68 +1,70 @@
 {
-  "name": "shoot-miniprograms",
+    "name" : "shoot-miniprograms",
-  "appid": "",
+    "appid" : "__UNI__B03E251",
-  "description": "",
+    "description" : "",
-  "versionName": "1.0.0",
+    "versionName" : "1.0.0",
-  "versionCode": "100",
+    "versionCode" : "100",
-  "transformPx": false,
+    "transformPx" : false,
-  "uniStatistics": {
+    "uniStatistics" : {
-    "enable": false
+        "enable" : false
-  },
-  "app-plus": {
-    "bounce": "none",
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
     },
-    "modules": {},
+    "app-plus" : {
-    "distribute": {
+        "bounce" : "none",
-      "android": {
+        "usingComponents" : true,
-        "permissions": [
+        "nvueStyleCompiler" : "uni-app",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+        "compilerVersion" : 3,
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+        "splashscreen" : {
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+            "alwaysShowBeforeRender" : true,
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+            "waiting" : true,
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+            "autoclose" : true,
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+            "delay" : 0
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+        },
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+        "modules" : {},
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+        "distribute" : {
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+            "android" : {
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                "permissions" : [
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<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\"/>",
-      "ios": {},
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-      "sdkConfigs": {}
+                    "<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"]
-  }
 }

src/mock/index.js

@@ -0,0 +1,104 @@
+// 首页一周打卡展示数据，直接对应顶部 7 个日期卡片。
+export const trainingHomeWeekSchedule = [
+  {
+    key: "mon",
+    label: "周一",
+    status: "done",
+    icon: "../../static/training-home/done.png",
+  },
+  {
+    key: "tue",
+    label: "周二",
+    status: "done",
+    icon: "../../static/training-home/done.png",
+  },
+  {
+    key: "wed",
+    label: "周三",
+    status: "missed",
+    icon: "../../static/training-home/missed.png",
+  },
+  {
+    key: "thu",
+    label: "周四",
+    status: "missed",
+    icon: "../../static/training-home/missed.png",
+  },
+  {
+    key: "fri",
+    label: "周五",
+    status: "done",
+    icon: "../../static/training-home/done.png",
+  },
+  {
+    key: "sat",
+    label: "周六",
+    status: "done",
+    icon: "../../static/training-home/done.png",
+  },
+  {
+    key: "sun",
+    label: "周日",
+    status: "missed",
+    icon: "../../static/training-home/missed.png",
+  },
+];
+
+// 首页统计卡数据，按设计稿从左到右展示。
+export const trainingHomeStats = [
+  { key: "days", value: "12", unit: "天", label: "共训练" },
+  { key: "shots", value: "112", unit: "支", label: "累计射箭" },
+  { key: "hitRate", value: "30", unit: "%", label: "命中率" },
+  { key: "endurance", value: "6", unit: "支/分钟", label: "耐力射击" },
+  { key: "calories", value: "31W", unit: "卡路里", label: "共消耗" },
+];
+
+// 雷达图区文案与数值配置。
+export const trainingHomeRadar = {
+  labels: ["基础", "精准", "力量", "节奏", "耐力"],
+  values: [5.5, 6.3, 10, 4.5, 6],
+  maxValue: 10,
+  surpassValue: '80%'
+};
+
+// 首页主推荐训练卡数据。
+export const trainingHomeFeatured = {
+  title: "基础训练",
+  progressText: "当前进度 LV7 >",
+};
+
+// 首页四个训练入口卡片数据。
+export const trainingHomeModes = [
+  {
+    key: "endurance",
+    title: "耐力训练",
+    progressText: "当前进度 LV5 >",
+    icon: "../../static/training-home/img_3.png",
+    recommended: true,
+    disabled: false,
+  },
+  {
+    key: "precision",
+    title: "精准训练",
+    progressText: "当前进度 LV3 >",
+    icon: "../../static/training-home/img_4.png",
+    recommended: false,
+    disabled: false,
+  },
+  {
+    key: "rhythm",
+    title: "节奏训练",
+    progressText: "当前进度 LV6 >",
+    icon: "../../static/training-home/img_5.png",
+    recommended: false,
+    disabled: false,
+  },
+  {
+    key: "power",
+    title: "力量训练",
+    progressText: "Coming!  LV10",
+    icon: "../../static/training-home/img_6.png",
+    recommended: false,
+    disabled: true,
+  },
+];

src/mock/trainingDifficulty.js

@@ -0,0 +1,113 @@
+// 难度页当前用于保存“开始训练前上下文”的本地存储 key。
+export const trainingDifficultyStorageKey = "training-selection";
+
+// 当前是页面联调用的模拟数据：
+// 1. 总难度 20 级
+// 2. 已解锁到 Lv3
+// 3. 前三关展示不同完成进度
+const totalDifficultyLevel = 20;
+const mockedUnlockedDifficultyId = "lv3";
+const mockedDifficultyProgressMap = {
+  lv1: 100,
+  lv2: 90,
+  lv3: 70,
+};
+
+const modeList = [
+  {
+    key: "endurance",
+    title: "耐力训练",
+  },
+  {
+    key: "precision",
+    title: "精准训练",
+  },
+  {
+    key: "rhythm",
+    title: "节奏训练",
+  },
+  {
+    key: "basic",
+    title: "基础训练",
+  },
+  {
+    key: "power",
+    title: "力量训练",
+  },
+  {
+    key: "focus",
+    title: "专注训练",
+  },
+];
+
+const createDifficultyId = (level) => `lv${level}`;
+
+const createDifficultyLabel = (level) => `Lv${level}`;
+
+// 根据等级生成模拟文案，方便一次性扩展到更多关卡。
+const createDifficultySummary = (level) => {
+  return [
+    `箭靶划分为${Math.min(1 + Math.floor((level - 1) / 5), 4)}个区域`,
+    `需${4 + level}次命中目标`,
+    `${100 + Math.floor((level - 1) / 2) * 10}秒内完成所有射击`,
+    "需使用20CM全环靶",
+  ];
+};
+
+// 难度页的节点位置已经在页面内统一计算，
+// 这里保留最核心的 id / label 即可，不再维护无效的 left / top / style 字段。
+const createDifficultyNode = (level) => {
+  return {
+    id: createDifficultyId(level),
+    label: createDifficultyLabel(level),
+  };
+};
+
+const createDifficultyDetail = (level) => {
+  const id = createDifficultyId(level);
+  const label = createDifficultyLabel(level);
+
+  return {
+    id,
+    label,
+    title: `${label}难度`,
+    summary: createDifficultySummary(level),
+    startText: "开始",
+    targetPaperType: "20CM全环靶",
+  };
+};
+
+// 所有训练模式当前共用同一套难度定义。
+const sharedDifficultyNodes = Array.from(
+  { length: totalDifficultyLevel },
+  (_, index) => createDifficultyNode(index + 1)
+);
+
+const sharedDifficultyDetails = Object.fromEntries(
+  Array.from({ length: totalDifficultyLevel }, (_, index) => {
+    const detail = createDifficultyDetail(index + 1);
+    return [detail.id, detail];
+  })
+);
+
+const createModeConfig = ({ key, title, reward = null }) => {
+  return {
+    key,
+    title,
+    nodes: sharedDifficultyNodes,
+    details: sharedDifficultyDetails,
+    activeDifficultyId: mockedUnlockedDifficultyId,
+    progressMap: mockedDifficultyProgressMap,
+    reward,
+  };
+};
+
+// 难度页数据源入口：
+// 页面通过 getTrainingDifficultyModeConfig(modeKey) 获取当前模式完整配置。
+export const trainingDifficultyModeMap = Object.fromEntries(
+  modeList.map((mode) => [mode.key, createModeConfig(mode)])
+);
+
+export const getTrainingDifficultyModeConfig = (modeKey) => {
+  return trainingDifficultyModeMap[modeKey] || trainingDifficultyModeMap.precision;
+};

src/pages.json

@@ -31,7 +31,7 @@
       }
     },
     {
-      "path": "pages/team-battle"
+      "path": "pages/team-battle/index"
     },
     {
       "path": "pages/melee-battle"
@@ -39,6 +39,9 @@
     {
       "path": "pages/battle-result"
     },
+    {
+      "path": "pages/friend-battle-result"
+    },
     {
       "path": "pages/point-book-edit"
     },
@@ -116,6 +119,15 @@
     },
     {
       "path": "pages/mine-bow-data"
+    },
+    {
+      "path": "pages/training/difficulty"
+    },
+    {
+      "path": "pages/training/index"
+    },
+    {
+      "path": "pages/training/practise-one"
     }
   ],
   "globalStyle": {

src/pages/battle-result.vue

@@ -117,7 +117,7 @@ const checkBowData = () => {
             }deg)`,
           }"
         >
-          <view v-if="data.mvp && data.mvp[0].totalRings">
+          <view v-if="data.mvp && data.mvp.totalRings">
             <image src="../static/title-mvp.png" mode="widthFix" />
             <text
               >斩获<text
@@ -127,7 +127,7 @@ const checkBowData = () => {
                   margin: '0 3px',
                   fontWeight: '600',
                 }"
-                >{{ data.mvp[0].totalRings }}</text
+                >{{ data.mvp.totalRings }}</text
               >环</text
             >
           </view>

src/pages/battle-room.vue

@@ -3,14 +3,13 @@ import { ref, onMounted, computed, onBeforeUnmount } from "vue";
 import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import PlayerSeats from "@/components/PlayerSeats.vue";
-import Guide from "@/components/Guide.vue";
+import GuideTwo from "@/components/GuideTwo.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
+import ScreenHint from "@/components/ScreenHint.vue";
 import {
   getRoomAPI,
-  destroyRoomAPI,
   exitRoomAPI,
-  startRoomAPI,
   chooseTeamAPI,
   getReadyAPI,
   kickPlayerAPI,
@@ -18,6 +17,7 @@ import {
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+import audioManager from "@/audioManager";
 const store = useStore();
 const { user } = storeToRefs(store);
 
@@ -29,16 +29,54 @@ const players = ref([]);
 const blueTeam = ref([]);
 const redTeam = ref([]);
 
+/**
+ * 根据对战类型和房间人数动态生成页面标题
+ * battleType=1: 组队对战；count 2/4/6 分别对应 1v1/2v2/3v3
+ * battleType=2: 多人乱斗
+ */
+const battleTitle = computed(() => {
+  if (!room.value.battleType) return "好友约战";
+  if (room.value.battleType === 2) return "多人乱斗";
+  const half = room.value.count / 2;
+  return `${half}v${half}对抗赛`;
+});
+
+/** 靶纸尺寸（cm），由 URL 参数或 API 返回的 targetType 字段填充 */
+const targetSize = ref(0);
+
+/**
+ * 根据 targetSize 动态生成靶纸尺寸文本，如"40cm"
+ * 数据未就绪时显示 "--"；数据来源：创建者取 URL 参数 target，加入者取 API 返回的 targetType
+ */
+const targetSizeLabel = computed(() =>
+  targetSize.value ? `${targetSize.value}cm` : '--'
+);
+
 const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
 const goBattle = ref(false);
+/** 从结算页返回时为 true，跳过进场靶纸语音 */
+const skipTargetAudio = ref(false);
 
+/**
+ * 从服务端刷新当前房间数据，更新成员列表、准备状态等信息
+ * 仅在 roomNumber 有效且房间未开始时执行
+ */
 async function refreshRoomData() {
   if (!roomNumber.value) return;
   const result = await getRoomAPI(roomNumber.value);
   if (result.started) return;
   room.value = result;
+  // 加入者通过 API 返回的 targetType 字段同步靶纸尺寸，并持久化到本地缓存
+  if (result.targetType) {
+    targetSize.value = result.targetType;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, result.targetType);
+  } else if (targetSize.value === 0) {
+    // API 无该字段时，从本地缓存兜底（如"返回房间"场景）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
   owner.value = {};
   opponent.value = {};
   const members = result.members || [];
@@ -98,10 +136,6 @@ async function refreshRoomData() {
   // timer.value = setTimeout(refreshRoomData, 2000);
 }
 
-const startGame = async () => {
-  const result = await startRoomAPI(room.value.number);
-};
-
 const getReady = async () => {
   await getReadyAPI(roomNumber.value);
 };
@@ -161,7 +195,7 @@ async function onReceiveMessage(message) {
       uni.setStorageSync("blue-team", message.teams[1].players || []);
       uni.setStorageSync("red-team", message.teams[2].players || []);
       uni.redirectTo({
-        url: "/pages/team-battle?battleId=" + message.matchId,
+        url: "/pages/team-battle/index?battleId=" + message.matchId,
       });
     } else {
       uni.redirectTo({
@@ -176,16 +210,32 @@ const chooseTeam = async (team) => {
   refreshMembers(result.members);
 };
 
-const destroyRoom = async () => {
+/** 待确认踢出的玩家信息 */
-  if (roomNumber.value) await destroyRoomAPI(roomNumber.value);
+const playerToKick = ref(null);
+/** 控制踢出确认弹窗的显示状态 */
+const showKickConfirm = ref(false);
+
+/**
+ * 点击踢出按钮，弹出二次确认弹窗
+ * @param {object} player - 被踢的玩家信息
+ */
+const removePlayer = (player) => {
+  playerToKick.value = player;
+  showKickConfirm.value = true;
 };
 
-const exitRoom = async () => {
+/** 确认踢出：调用 API 并关闭弹窗 */
-  uni.navigateBack();
+const confirmKick = async () => {
+  if (!playerToKick.value) return;
+  await kickPlayerAPI(roomNumber.value, playerToKick.value.id);
+  showKickConfirm.value = false;
+  playerToKick.value = null;
 };
 
-const removePlayer = async (player) => {
+/** 取消踢出：关闭弹窗 */
-  await kickPlayerAPI(roomNumber.value, player.id);
+const cancelKick = () => {
+  showKickConfirm.value = false;
+  playerToKick.value = null;
 };
 
 const canClick = computed(() => {
@@ -200,28 +250,93 @@ const canClick = computed(() => {
   return true;
 });
 
+/**
+ * 根据对战类型和人数动态生成分享文案
+ * 1v1 / 默认 → "星球论箭，来一决高下敢否?"
+ * 2v2 → "2v2对抗赛，是兄弟来助我一把!"
+ * 3v3 → "3v3对抗赛，来了马上发车!"
+ * 乱斗 → "热血乱斗赛，敢来争锋?"
+ */
+const shareTitle = computed(() => {
+  const { battleType, count } = room.value;
+  if (battleType === 2) return '热血乱斗赛，敢来争锋?';
+  if (battleType === 1 && count === 4) return '2v2对抗赛，是兄弟来助我一把!';
+  if (battleType === 1 && count === 6) return '3v3对抗赛，来了马上发车!';
+  return '星球论箭，来一决高下敢否?';
+});
+
+/**
+ * 根据对战类型和靶纸尺寸动态返回分享封面图路径，共 4 张图：
+ *   contest_share_20.png — 约战/对抗赛 + 20cm 靶
+ *   contest_share_40.png — 约战/对抗赛 + 40cm 靶
+ *   melee_share_20.png   — 多人乱斗 + 20cm 靶
+ *   melee_share_40.png   — 多人乱斗 + 40cm 靶
+ *
+ * 当 targetSize 未知时默认取 20cm 图。
+ */
+const shareImage = computed(() => {
+  const type = room.value.battleType === 2 ? 'melee' : 'contest';
+  const size = targetSize.value === 40 ? '40' : '20';
+  return `https://static.shelingxingqiu.com/shootmini/static/share/${type}_share_${size}.png`;
+});
+
 onShareAppMessage(() => {
   return {
-    title: "邀请您进入房间对战",
+    title: shareTitle.value,
     path: "/pages/friend-battle?roomID=" + roomNumber.value,
-    imageUrl: "",
+    imageUrl: shareImage.value,
   };
 });
 
+/**
+ * onShow 生命周期：页面显示时刷新房间数据
+ * 注：uni-app 中 onShow 可能早于 onLoad 执行，此时 roomNumber 尚未赋值，
+ * refreshRoomData 会提前 return。
+ */
 onShow(() => {
   goBattle.value = false;
   refreshRoomData();
 });
 
+/**
+ * 页面加载时解析路由参数，初始化房间号
+ * - 存入本地 ref（供页面内部逻辑使用）
+ * - 同步到 Pinia Store（供 Header 组件展示房号胶囊）
+ */
 onLoad(async (options) => {
-  if (options.roomNumber) roomNumber.value = options.roomNumber;
+  // 从结算页跳回时携带 fromResult=1，标记跳过进场语音
+  if (options.fromResult) skipTargetAudio.value = true;
+  if (options.roomNumber) {
+    roomNumber.value = options.roomNumber;
+    store.updateRoomNumber(options.roomNumber);
+  }
+  // 创建者通过 URL 参数 target（1→20cm，2→40cm）初始化靶纸尺寸，并持久化到本地缓存
+  if (options.target) {
+    targetSize.value = parseInt(options.target) * 20;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, targetSize.value);
+  } else if (roomNumber.value) {
+    // "返回房间"等无 target 参数的场景：从本地缓存恢复（待 refreshRoomData 进一步覆盖）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
 });
 
+/**
+ * 组件挂载后：保持屏幕常亮、注册 WebSocket 消息监听
+ * 房间号已通过 onLoad 同步到 Store，Header 从 Store 直接读取，无需额外通知
+ */
 onMounted(() => {
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  // 页面加载完成 1 秒后根据靶纸尺寸播报对应语音；从结算页返回时跳过
+  setTimeout(() => {
+    if (!skipTargetAudio.value) {
+      const key = targetSize.value === 40 ? '40CM全环靶' : '20CM全环靶';
+      audioManager.play(key);
+    }
+  }, 1000);
 });
 
 onBeforeUnmount(() => {
@@ -236,59 +351,36 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <Container :title="`好友约战 - ${roomNumber}`">
+  <Container :title="battleTitle">
     <view class="standby-phase">
-      <Guide>
+      <GuideTwo>
         <view class="battle-guide">
           <view class="guide-tips">
-            <text>弓箭手们，人都到齐了吗?</text>
+            <text class="guide-tips__target">请使用{{ targetSizeLabel }}全环靶</text>
-            <text v-if="room.battleType === 1">{{
+            <text class="guide-tips__warn">如果实际靶纸与选择靶纸不同，将导致射箭无效</text>
-              `${room.count / 2}v${room.count / 2}比赛即将开始!`
-            }}</text>
-            <text v-if="room.battleType === 2">大乱斗即将开始! </text>
           </view>
-          <button hover-class="none" open-type="share">邀请</button>
         </view>
-      </Guide>
+      </GuideTwo>
       <view v-if="room.battleType === 1 && room.count === 2" class="team-mode">
-        <image
+        <image src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png" mode="widthFix" />
-          src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png"
-          mode="widthFix"
-        />
         <view>
-          <view
+          <view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }">
-            v-if="owner.id"
-            class="player"
-            :style="{ transform: 'translateY(-60px)' }"
-          >
             <Avatar :src="owner.avatar" :size="60" />
             <text>管理员</text>
             <text>{{ owner.name }}</text>
           </view>
-          <view
+          <view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
-            v-else
-            class="no-player"
-            :style="{ transform: 'translateY(-60px)' }"
-          >
             <image src="../static/question-mark.png" mode="widthFix" />
           </view>
           <image src="../static/versus.png" mode="widthFix" />
-          <view
+          <view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }">
-            v-if="opponent.id"
-            class="player"
-            :style="{ transform: 'translateY(60px)' }"
-          >
             <Avatar :src="opponent.avatar" :size="60" />
             <text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }">
               已准备
             </text>
             <text>{{ opponent.name }}</text>
-            <button
+            <button v-if="owner.id === user.id" hover-class="none" class="remove-player"
-              v-if="owner.id === user.id"
+              @click="() => removePlayer(opponent)">
-              hover-class="none"
-              class="remove-player"
-              @click="() => removePlayer(opponent)"
-            >
               <image src="../static/close-white.png" mode="widthFix" />
             </button>
           </view>
@@ -299,31 +391,16 @@ onBeforeUnmount(() => {
       </view>
       <block v-if="room.battleType === 1 && room.count >= 4">
         <view class="all-players">
-          <image
+          <image src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" mode="widthFix" />
-            src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png"
+          <image v-if="room.count === 4" src="../static/title-2v2.png" mode="widthFix" />
-            mode="widthFix"
+          <image v-if="room.count === 6" src="../static/title-3v3.png" mode="widthFix" />
-          />
-          <image
-            v-if="room.count === 4"
-            src="../static/title-2v2.png"
-            mode="widthFix"
-          />
-          <image
-            v-if="room.count === 6"
-            src="../static/title-3v3.png"
-            mode="widthFix"
-          />
           <view>
             <view v-for="(item, index) in players" :key="index">
               <Avatar v-if="item.id" :src="item.avatar" :size="36" />
               <text v-if="owner.id === item.id">管理员</text>
-              <button
+              <!-- 仅房主可见踢人按钮，且不能踢自己 -->
-                v-if="owner.id !== item.id && item.id"
+              <button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player"
-                hover-class="none"
+                @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
-                class="remove-player"
-                @click="() => removePlayer(item)"
-                :style="{ top: '-10rpx', right: '-10rpx' }"
-              >
                 <image src="../static/close-white.png" mode="widthFix" />
               </button>
             </view>
@@ -331,16 +408,8 @@ onBeforeUnmount(() => {
         </view>
         <view class="choose-side">
           <view>
-            <view
+            <view v-for="(item, index) in redTeam" :key="index" class="choose-side-left-item">
-              v-for="(item, index) in redTeam"
+              <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
-              :key="index"
-              class="choose-side-left-item"
-            >
-              <button
-                hover-class="none"
-                v-if="item.id === user.id"
-                @click="chooseTeam(0)"
-              >
                 <image src="../static/close-grey.png" mode="widthFix" />
               </button>
               <text class="truncate">{{ item.name || "我要加入" }}</text>
@@ -354,11 +423,7 @@ onBeforeUnmount(() => {
             </view>
           </view>
           <view>
-            <view
+            <view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item">
-              v-for="(item, index) in blueTeam"
-              :key="index"
-              class="choose-side-right-item"
-            >
               <view v-if="item.id">
                 <Avatar :src="item.avatar" :size="36" />
                 <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
@@ -367,37 +432,44 @@ onBeforeUnmount(() => {
                 <image src="../static/add-grey.png" mode="widthFix" />
               </button>
               <text class="truncate">{{ item.name || "我要加入" }}</text>
-              <button
+              <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
-                hover-class="none"
-                v-if="item.id === user.id"
-                @click="chooseTeam(0)"
-              >
                 <image src="../static/close-grey.png" mode="widthFix" />
               </button>
             </view>
           </view>
         </view>
       </block>
-      <PlayerSeats
+      <!-- isOwner：当前用户是房主时才展示踢人按钮 -->
-        v-if="room.battleType === 2"
+      <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
-        :total="room.count || 10"
+        :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
-        :players="players"
-        :removePlayer="removePlayer"
-      />
       <view>
-        <SButton :disabled="!canClick" :onClick="getReady">
+        <SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)">
           {{
             allReady.value
               ? "即将进入对局..."
               : owner.id === user.id
-              ? "开始对局"
+                ? "开始对局"
-              : "我准备好了"
+                : "我准备好了"
           }}
         </SButton>
         <text class="tips">所有人准备好后由房主点击开始</text>
       </view>
     </view>
   </Container>
+  <!-- 踢出玩家二次确认弹窗（不传 onClose，屏蔽 X 关闭按钮） -->
+  <ScreenHint :show="showKickConfirm">
+    <view class="kick-confirm">
+      <!-- 弹窗标题，玩家名字高亮显示 -->
+      <text class="kick-confirm__title">
+        是否把「<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>」移出房间？
+      </text>
+      <!-- 按钮区：确认在左，取消在右 -->
+      <view class="kick-confirm__btns">
+        <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--confirm" @click="confirmKick">确定</button>
+        <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">取消</button>
+      </view>
+    </view>
+  </ScreenHint>
 </template>
 
 <style scoped>
@@ -406,6 +478,7 @@ onBeforeUnmount(() => {
   height: calc(100% - 40px);
   overflow-x: hidden;
 }
+
 .tips {
   color: #fff9;
   width: 100%;
@@ -414,6 +487,7 @@ onBeforeUnmount(() => {
   margin-top: 10px;
   font-size: 12px;
 }
+
 .player-unknow {
   width: 40px;
   height: 40px;
@@ -425,25 +499,30 @@ onBeforeUnmount(() => {
   justify-content: center;
   background-color: #69686866;
 }
-.player-unknow > image {
+
+.player-unknow>image {
   width: 40%;
 }
+
 .team-mode {
   width: calc(100vw - 30px);
   height: 125vw;
-  margin: 15px;
+  margin: 0 15px 15px 15px;
 }
-.team-mode > image:first-child {
+
+.team-mode>image:first-child {
   position: absolute;
   width: calc(100vw - 30px);
   z-index: -1;
 }
-.team-mode > view {
+
+.team-mode>view {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 95%;
 }
+
 .player {
   width: 70px;
   display: flex;
@@ -455,14 +534,16 @@ onBeforeUnmount(() => {
   font-size: 14px;
   position: relative;
 }
-.player > image {
+
+.player>image {
   width: 70px;
   height: 70px;
   border-radius: 50%;
   background-color: #ccc;
   margin-bottom: 5px;
 }
-.player > text:nth-child(2) {
+
+.player>text:nth-child(2) {
   color: #000;
   background-color: #fed847;
   font-size: 16rpx;
@@ -472,21 +553,85 @@ onBeforeUnmount(() => {
   margin-top: -16rpx;
   position: relative;
 }
-.player > text:nth-child(3) {
+
+.player>text:nth-child(3) {
   margin-top: 6rpx;
 }
-.player > text {
+
+.player>text {
   max-width: 100px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   text-align: center;
 }
+
 .player .ready {
   background-color: #2c261fb3 !important;
   border: 1rpx solid #a3793f66 !important;
   color: #fed847 !important;
 }
+
+/* 踢出确认弹窗内容 */
+.kick-confirm {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20rpx 30rpx;
+  color: #fff;
+}
+.kick-confirm__title {
+  font-size: 30rpx;
+  font-weight: 500;
+  text-align: center;
+  line-height: 1.5;
+  /* 标题与按钮区间距 */
+  margin-bottom: 58rpx;
+}
+.kick-confirm__btns {
+  display: flex;
+  /* 两个按钮间距 */
+  gap: 16rpx;
+}
+/* 按钮公共基础样式：固定宽高与圆角 */
+.kick-confirm__btn {
+  font-size: 28rpx;
+  width: 232rpx;
+  height: 70rpx;
+  border-radius: 44rpx;
+  line-height: 70rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+/* 取消按钮：白色半透明背景（用 rgba 避免 opacity 平铺到文字） */
+.kick-confirm__btn--cancel {
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  color: #FFFFFF;
+  font-weight: 500;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 44rpx;
+}
+.kick-confirm__btn--cancel::after {
+  border: none;
+}
+/* 确认按钮：黄色实心背景 */
+.kick-confirm__btn--confirm {
+  background: #FED847;
+  border: none;
+  color: #000000;
+  font-weight: 500;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 44rpx;
+}
+.kick-confirm__btn--confirm::after {
+  border: none;
+}
+
 .remove-player {
   width: 40rpx;
   height: 40rpx;
@@ -499,13 +644,16 @@ onBeforeUnmount(() => {
   top: 0;
   right: 0;
 }
-.remove-player > image {
+
+.remove-player>image {
   width: 90%;
   height: 90%;
 }
-.team-mode > view > image:nth-child(2) {
+
+.team-mode>view>image:nth-child(2) {
   width: 120px;
 }
+
 .no-player {
   width: 70px;
   height: 70px;
@@ -516,10 +664,12 @@ onBeforeUnmount(() => {
   align-items: center;
   transform: translateY(60px);
 }
-.no-player > image {
+
+.no-player>image {
   width: 20px;
   margin-right: 2px;
 }
+
 .btns {
   height: 100%;
   display: flex;
@@ -527,12 +677,14 @@ onBeforeUnmount(() => {
   align-items: center;
   justify-content: center;
 }
+
 .battle-guide {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.battle-guide > button:last-child {
+
+.battle-guide>button:last-child {
   color: #fed847;
   border: 1px solid #fed847;
   margin-right: 10px;
@@ -541,6 +693,7 @@ onBeforeUnmount(() => {
   position: relative;
   font-size: 28rpx;
 }
+
 .all-players {
   position: relative;
   display: flex;
@@ -548,68 +701,73 @@ onBeforeUnmount(() => {
   align-items: center;
   height: 83vw;
 }
-.all-players > image:first-child {
+
+.all-players>image:first-child {
   position: absolute;
   width: 100%;
 }
-.all-players > image:nth-child(2) {
+
+.all-players>image:nth-child(2) {
   width: 25vw;
   position: relative;
 }
-.all-players > view {
+
+.all-players>view {
   position: relative;
   width: 42vw;
   height: 42vw;
   margin-top: 7vw;
 }
-.all-players > view > view {
+
+.all-players>view>view {
   position: absolute;
   left: 50%;
   top: 50%;
 }
+
 /* 4个头像 - 正方形排列 */
-.all-players > view > view:nth-child(1):nth-last-child(4) {
+.all-players>view>view:nth-child(1):nth-last-child(4) {
-  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw)
+  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw) rotate(30deg);
-    rotate(30deg);
 }
-.all-players > view > view:nth-child(2):nth-last-child(3) {
+
-  transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw)
+.all-players>view>view:nth-child(2):nth-last-child(3) {
-    rotate(120deg);
+  transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw) rotate(120deg);
 }
-.all-players > view > view:nth-child(3):nth-last-child(2) {
+
-  transform: translate(-50%, -50%) rotate(-210deg) translateY(-21.5vw)
+.all-players>view>view:nth-child(3):nth-last-child(2) {
-    rotate(210deg);
+  transform: translate(-50%, -50%) rotate(-210deg) translateY(-21.5vw) rotate(210deg);
 }
-.all-players > view > view:nth-child(4):nth-last-child(1) {
+
-  transform: translate(-50%, -50%) rotate(-300deg) translateY(-21.5vw)
+.all-players>view>view:nth-child(4):nth-last-child(1) {
-    rotate(300deg);
+  transform: translate(-50%, -50%) rotate(-300deg) translateY(-21.5vw) rotate(300deg);
 }
+
 /* 6个头像 - 六边形排列 */
-.all-players > view > view:nth-child(1):nth-last-child(6) {
+.all-players>view>view:nth-child(1):nth-last-child(6) {
-  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw)
+  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw) rotate(30deg);
-    rotate(30deg);
 }
-.all-players > view > view:nth-child(2):nth-last-child(5) {
+
-  transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw)
+.all-players>view>view:nth-child(2):nth-last-child(5) {
-    rotate(90deg);
+  transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw) rotate(90deg);
 }
-.all-players > view > view:nth-child(3):nth-last-child(4) {
+
-  transform: translate(-50%, -50%) rotate(-150deg) translateY(-21vw)
+.all-players>view>view:nth-child(3):nth-last-child(4) {
-    rotate(150deg);
+  transform: translate(-50%, -50%) rotate(-150deg) translateY(-21vw) rotate(150deg);
 }
-.all-players > view > view:nth-child(4):nth-last-child(3) {
+
-  transform: translate(-50%, -50%) rotate(-210deg) translateY(-21vw)
+.all-players>view>view:nth-child(4):nth-last-child(3) {
-    rotate(210deg);
+  transform: translate(-50%, -50%) rotate(-210deg) translateY(-21vw) rotate(210deg);
 }
-.all-players > view > view:nth-child(5):nth-last-child(2) {
+
-  transform: translate(-50%, -50%) rotate(-270deg) translateY(-21vw)
+.all-players>view>view:nth-child(5):nth-last-child(2) {
-    rotate(270deg);
+  transform: translate(-50%, -50%) rotate(-270deg) translateY(-21vw) rotate(270deg);
 }
-.all-players > view > view:nth-child(6):nth-last-child(1) {
+
-  transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw)
+.all-players>view>view:nth-child(6):nth-last-child(1) {
-    rotate(330deg);
+  transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw) rotate(330deg);
 }
-.all-players > view > view > text {
+
+.all-players>view>view>text {
   position: absolute;
   background-color: #fed847;
   font-size: 8px;
@@ -621,18 +779,23 @@ onBeforeUnmount(() => {
   text-align: center;
   color: #333;
 }
+
 .choose-side {
   display: flex;
 }
-.choose-side > view {
+
+.choose-side>view {
   width: 50%;
 }
-.choose-side > view:first-child > view {
+
+.choose-side>view:first-child>view {
   background: linear-gradient(270deg, #6a1212 0%, rgba(74, 0, 0, 0) 100%);
 }
-.choose-side > view:last-child > view {
+
+.choose-side>view:last-child>view {
   background: linear-gradient(270deg, rgba(13, 0, 74, 0) 0%, #172a86 100%);
 }
+
 .choose-side-left-item,
 .choose-side-right-item {
   display: flex;
@@ -644,33 +807,39 @@ onBeforeUnmount(() => {
   margin: 10px 5px;
   position: relative;
 }
+
 .choose-side-left-item {
   justify-content: flex-end;
 }
-.choose-side-left-item > text,
+
-.choose-side-right-item > text {
+.choose-side-left-item>text,
+.choose-side-right-item>text {
   margin: 10px;
   max-width: 100px;
   font-size: 14px;
 }
-.choose-side-left-item > button:first-child,
+
-.choose-side-right-item > button:last-child {
+.choose-side-left-item>button:first-child,
+.choose-side-right-item>button:last-child {
   position: absolute;
   top: 0;
 }
-.choose-side-left-item > button:first-child > image,
+
-.choose-side-right-item > button:last-child > image {
+.choose-side-left-item>button:first-child>image,
+.choose-side-right-item>button:last-child>image {
   width: 28px;
 }
-.choose-side-left-item > button:first-child {
+
+.choose-side-left-item>button:first-child {
   left: 0;
 }
 
-.choose-side-right-item > button:last-child {
+.choose-side-right-item>button:last-child {
   right: 0;
 }
-.choose-side-left-item > button:last-child,
+
-.choose-side-right-item > button:first-child {
+.choose-side-left-item>button:last-child,
+.choose-side-right-item>button:first-child {
   background-color: #fff;
   border-radius: 50%;
   width: 38px;
@@ -680,18 +849,21 @@ onBeforeUnmount(() => {
   align-items: center;
   margin-bottom: 14rpx;
 }
-.choose-side-left-item > button:last-child > image,
+
-.choose-side-right-item > button:first-child > image {
+.choose-side-left-item>button:last-child>image,
+.choose-side-right-item>button:first-child>image {
   width: 18px;
 }
-.choose-side-left-item > view,
+
-.choose-side-right-item > view {
+.choose-side-left-item>view,
+.choose-side-right-item>view {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.choose-side-left-item > view > text,
+
-.choose-side-right-item > view > text {
+.choose-side-left-item>view>text,
+.choose-side-right-item>view>text {
   font-size: 16rpx;
   border-radius: 20rpx;
   line-height: 26rpx;
@@ -702,4 +874,23 @@ onBeforeUnmount(() => {
   border: 1rpx solid #a3793f66;
   color: #fed847;
 }
+
+.guide-tips__target {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: rgba(255, 217, 71, 0.8);
+}
+
+.guide-tips__warn {
+  font-weight: 400;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-top: 6rpx;
+}
+
+.guide-tips {
+  display: flex;
+  flex-direction: column;
+  padding-left: 20rpx;
+}
 </style>

src/pages/device-intro.vue

@@ -33,7 +33,7 @@ const onScrollView = (e) => {
     >
       <image
         :style="{ opacity: addBg ? 1 : 0 }"
-        src="../static/app-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
         mode="widthFix"
       />
       <navigator open-type="navigateBack">

src/pages/first-try.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { computed, ref, onMounted, onBeforeUnmount } from "vue";
 import Guide from "@/components/Guide.vue";
 import SButton from "@/components/SButton.vue";
 import Swiper from "@/components/Swiper.vue";
@@ -18,6 +18,8 @@ import {
   startPractiseAPI,
   endPractiseAPI,
   getPractiseAPI,
+  laserAimAPI,
+  laserCloseAPI,
 } from "@/apis";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
@@ -32,6 +34,7 @@ const total = 12;
 const stepButtonTexts = [
   "开始",
   "进入下一个任务",
+  "我已校准",
   "进入下一个任务",
   "我准备好了，开始",
   "",
@@ -43,8 +46,11 @@ const practiseResult = ref({});
 const btnDisabled = ref(false);
 const practiseId = ref("");
 const showGuide = ref(false);
+const laserActive = ref(false);
+const guideSwiperIndex = ref(0);
 
 const guideImages = [
+  "https://static.shelingxingqiu.com/shootmini/static/target.png",
   "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wwdpgwt9e6du.png",
   "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wvv9sw4zioqk.png",
   "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0ww3khaycallu.png",
@@ -54,10 +60,45 @@ const guideImages = [
   "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wwr6hfjhyfn5.png",
 ];
 
+const calibrationGuides = [
+  {
+    title: "箭头面向靶子",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5wscg7hrfo.png",
+  },
+  {
+    title: "摆出拉弓姿势",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5b7ljrhx3o.png",
+  },
+  {
+    title: "调整瞄准器",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-29/dduexjgrcxf9wjaiv4.png",
+  },
+];
+
 const onSwiperIndexChange = (index) => {
-  if (index + 1 === guideImages.length) {
+  guideSwiperIndex.value = index;
-    showGuide.value = true;
+  showGuide.value = index + 1 === guideImages.length;
-  }
+};
+
+const isGuideLastImage = computed(
+  () => guideSwiperIndex.value + 1 === guideImages.length
+);
+
+const currentStepButtonText = computed(() => {
+  if (step.value === 1 && isGuideLastImage.value) return "去校准智能弓";
+  return stepButtonTexts[step.value];
+});
+
+const openCalibrationLaser = async () => {
+  if (laserActive.value) return;
+  await laserAimAPI();
+  laserActive.value = true;
+};
+
+const closeCalibrationLaser = async () => {
+  if (!laserActive.value) return;
+  await laserCloseAPI();
+  laserActive.value = false;
 };
 
 const createPractise = async (arrows) => {
@@ -75,7 +116,7 @@ async function onReceiveMessage(msg) {
     scores.value = msg.details;
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(onOver, 1500);
-  } else if (msg.type === MESSAGETYPESV2.TestDistance) {
+  } else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) {
     if (msg.shootData.distance / 100 >= 5) {
       audioManager.play("距离合格");
       btnDisabled.value = false;
@@ -110,12 +151,13 @@ onMounted(() => {
   uni.$on("share-image", onClickShare);
 });
 
-onBeforeUnmount(() => {
+onBeforeUnmount(async () => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
+  await closeCalibrationLaser();
   audioManager.stopAll();
   endPractiseAPI();
 });
@@ -123,28 +165,39 @@ onBeforeUnmount(() => {
 const nextStep = async () => {
   if (step.value === 0) {
     step.value = 1;
-    title.value = "-凹造型";
+    title.value = "-箭前准备";
   } else if (step.value === 1) {
+    if (!isGuideLastImage.value) {
+      guideSwiperIndex.value += 1;
+      showGuide.value = guideSwiperIndex.value + 1 === guideImages.length;
+      return;
+    }
+    showGuide.value = false;
+    step.value = 2;
+    // title.value = "-校准智能弓";
+    await openCalibrationLaser();
+  } else if (step.value === 2) {
+    await closeCalibrationLaser();
     showGuide.value = false;
     btnDisabled.value = true;
-    step.value = 2;
+    step.value = 3;
     title.value = "-感知距离";
     const result = await createPractiseAPI(total, 120);
     if (result) practiseId.value = result.id;
-  } else if (step.value === 2) {
-    showGuide.value = false;
-    step.value = 3;
-    title.value = "-小试牛刀";
   } else if (step.value === 3) {
+    showGuide.value = false;
+    step.value = 4;
+    title.value = "-小试牛刀";
+  } else if (step.value === 4) {
     title.value = "小试牛刀";
     await startPractiseAPI();
     scores.value = [];
-    step.value = 4;
+    step.value = 5;
     start.value = true;
     setTimeout(() => {
       uni.$emit("play-sound", "请开始射击");
     }, 300);
-  } else if (step.value === 5) {
+  } else if (step.value === 6) {
     uni.navigateBack({
       delta: 1,
     });
@@ -159,13 +212,13 @@ const onClose = async () => {
     setTimeout(() => {
       practiseResult.value = {};
       showGuide.value = false;
-      step.value = 5;
+      step.value = 6;
     }, 500);
   } else {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    step.value = 3;
+    step.value = 4;
     const result = await createPractiseAPI(total, 120);
     if (result) practiseId.value = result.id;
   }
@@ -173,14 +226,14 @@ const onClose = async () => {
 </script>
 
 <template>
-  <Container :bgType="1" :title="title" :showBottom="step !== 4">
+  <Container :bgType="1" :title="title" :showBottom="step !== 5">
     <view class="container">
       <Guide
-        v-if="step !== 4"
+        v-if="step !== 5"
         :type="
-          step === 2
+          step === 3
             ? 2
-            : step === 5 || (step === 0 && user.nickName.length > 6)
+            : step === 6 || (step === 0 && user.nickName.length > 6)
             ? 1
             : 0
         "
@@ -196,25 +249,28 @@ const onClose = async () => {
           ，这是新人必刷小任务，0基础小白也能快速掌握弓箭技巧和游戏规则哦~：）
         </text>
         <text v-if="step === 1" :style="{ fontSize: '28rpx' }"
-          >这是我们人帅技高的高教练。首先，请按教练示范，尝试自己去做这些动作和手势吧。</text
+          >这位就是人帅技高的高教练！接下来请跟随教练指引，做好射箭前期准备。</text
+        >
+        <text v-if="step === 2" :style="{ fontSize: '28rpx' }"
+          >请按下方步骤完成智能弓校准，让瞄准器和靶子保持对齐。</text
         >
         <view
           class="guide-tips"
           :style="{ marginTop: '8rpx' }"
-          v-if="step === 2"
+          v-if="step === 3"
         >
           <text>你知道5米射程有多远吗？</text>
           <text>
             在我们的排位赛中，射程小于5米的成绩无效、哦！建议平时练习距离至少5米。现在，来边射箭边调整你的站位点吧！
           </text>
         </view>
-        <view class="guide-tips" v-if="step === 3">
+        <view class="guide-tips" v-if="step === 4">
           <text>一切准备就绪</text>
           <text :style="{ fontSize: '28rpx' }"
             >试着完成一个真正的弓箭手任务吧！</text
           >
         </view>
-        <view class="guide-tips" v-if="step === 5">
+        <view class="guide-tips" v-if="step === 6">
           <text>新手试炼场通关啦，优秀！</text>
           <text :style="{ fontSize: '28rpx' }"
             >反曲弓运动基本知识和射灵世界系统规则你已Get，是不是挺容易呀：）</text
@@ -231,35 +287,53 @@ const onClose = async () => {
         src="https://static.shelingxingqiu.com/attachment/2025-11-17/deas80ef1sf9td0leq.png"
         class="try-tip"
         mode="widthFix"
-        v-if="step === 3"
+        v-if="step === 4"
       />
       <image
         src="https://static.shelingxingqiu.com/attachment/2025-07-01/db0ehpz9lav58g5drl.png"
         class="try-tip"
         mode="widthFix"
-        v-if="step === 5"
+        v-if="step === 6"
       />
       <view style="height: 570px" v-if="step === 1">
-        <Swiper :onChange="onSwiperIndexChange" :data="guideImages" />
+        <Swiper
+          :current="guideSwiperIndex"
+          :onChange="onSwiperIndexChange"
+          :data="guideImages"
+        />
       </view>
-      <ShootProgress v-if="step === 4" tips="请开始连续射箭" :start="start" />
+      <view class="calibration-container" v-if="step === 2">
-      <TestDistance v-if="step === 2" :guide="false" />
+        <view
+          v-for="(guide, index) in calibrationGuides"
+          :key="guide.title"
+          class="calibration-guide"
+        >
+          <view>
+            <text>{{ index + 1 }}</text>
+            <text>{{ guide.title }}</text>
+          </view>
+          <image :src="guide.src" mode="widthFix" />
+        </view>
+        <text>请完成以上步骤校准智能弓</text>
+      </view>
+      <ShootProgress v-if="step === 5" tips="请开始连续射箭" :start="start" />
+      <TestDistance v-if="step === 3" :guide="false" />
       <view
         class="user-row"
-        v-if="step === 4"
+        v-if="step === 5"
-        :style="{ marginBottom: step === 2 ? '40px' : '0' }"
+        :style="{ marginBottom: '0' }"
       >
         <Avatar :src="user.avatar" :size="35" />
         <BowPower />
       </view>
       <BowTarget
-        v-if="step === 4"
+        v-if="step === 5"
-        :currentRound="step === 4 ? scores.length : 0"
+        :currentRound="step === 5 ? scores.length : 0"
-        :totalRound="step === 4 ? total : 0"
+        :totalRound="step === 5 ? total : 0"
         :scores="scores"
       />
       <ScorePanel
-        v-if="step === 4"
+        v-if="step === 5"
         :total="total"
         :rowCount="6"
         :arrows="scores"
@@ -287,7 +361,7 @@ const onClose = async () => {
             step === 1 ? "学会了，我摆得比教练还帅" : "我找到合适的点位了"
           }}</text>
         </BubbleTip>
-        {{ stepButtonTexts[step] }}
+        {{ currentStepButtonText }}
       </SButton>
     </template>
   </Container>
@@ -301,4 +375,43 @@ const onClose = async () => {
   width: calc(100% - 20px);
   margin: 0 10px;
 }
+.calibration-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.calibration-guide {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 26rpx;
+  color: #ffffff;
+  margin-bottom: 15rpx;
+}
+.calibration-guide > view {
+  width: 100%;
+  margin: 25rpx 0;
+  display: flex;
+  align-items: center;
+}
+.calibration-guide > view > text:first-child {
+  font-size: 24rpx;
+  background: #e89024;
+  border-radius: 50%;
+  width: 32rpx;
+  height: 32rpx;
+  line-height: 32rpx;
+  display: block;
+  text-align: center;
+  margin-right: 15rpx;
+}
+.calibration-guide > image {
+  width: 630rpx;
+  height: 250rpx;
+}
+.calibration-container > text {
+  font-size: 24rpx;
+  color: #fff9;
+  margin: 30rpx;
+}
 </style>

src/pages/friend-battle.vue

@@ -2,7 +2,7 @@
 import { ref } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
-import Guide from "@/components/Guide.vue";
+import GuideTwo from "@/components/GuideTwo.vue";
 import SButton from "@/components/SButton.vue";
 import SModal from "@/components/SModal.vue";
 import Signin from "@/components/Signin.vue";
@@ -72,6 +72,13 @@ const onSignin = () => {
   if (roomID.value && user.value.id) enterRoom(roomID.value);
   showSignin.value = false;
 };
+
+/** 跳转到我的战绩页面，默认展示「好友约战」tab */
+const goMyRecord = () => {
+  uni.navigateTo({
+    url: '/pages/my-growth?tab=1',
+  });
+};
 onShow(async () => {
   if (user.value.id) {
     const result = await getBattleDataAPI();
@@ -90,16 +97,17 @@ onLoad(async (options) => {
 <template>
   <Container title="好友约战" :showBackToGame="true">
     <view :style="{ width: '100%', height: '100%' }">
-      <Guide>
+      <GuideTwo>
         <view class="guide-tips">
-          <text>约上朋友开几局，欢乐多，不寂寞</text>
+          <text class="guide-tips__main">约上朋友开几局，欢乐多，不寂寞</text>
-          <text>一起练升级更快，早日加入全国排位赛！</text>
+          <text class="guide-tips__sub">一起练升级更快，早日加入全国排位赛！</text>
         </view>
-      </Guide>
+      </GuideTwo>
       <view class="my-data">
         <view>
           <Avatar :rankLvl="user.rankLvl" :src="user.avatar" :size="30" />
           <text class="truncate">{{ user.nickName }}</text>
+          <text class="my-record-btn" @click="goMyRecord">我的战绩</text>
         </view>
         <view>
           <view>
@@ -119,16 +127,9 @@ onLoad(async (options) => {
           <view>
             <view class="stars">
               <block v-for="i in 5" :key="i">
-                <image
+                <image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" mode="widthFix" />
-                  v-if="data.totalWinningRate >= i * 0.2"
+                <image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="../static/star-half.png"
-                  src="../static/star-full.png"
+                  mode="widthFix" />
-                  mode="widthFix"
-                />
-                <image
-                  v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1"
-                  src="../static/star-half.png"
-                  mode="widthFix"
-                />
                 <image v-else src="../static/star-empty.png" mode="widthFix" />
               </block>
             </view>
@@ -139,19 +140,12 @@ onLoad(async (options) => {
       <view class="founded-room">
         <image src="../static/founded-room.png" mode="widthFix" />
         <view>
-          <input
+          <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
-            placeholder="输入房间号"
+          <view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
-            v-model="roomNumber"
-            placeholder-style="color: #ccc"
-          />
-          <view @click="enterRoom(roomNumber)">进入房间</view>
         </view>
       </view>
       <view class="create-room">
-        <image
+        <image src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png" mode="widthFix" />
-          src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png"
-          mode="widthFix"
-        />
         <image src="../static/room-notfound-title.png" mode="widthFix" />
         <view>
           <image :src="user.avatar" mode="widthFix" />
@@ -161,20 +155,17 @@ onLoad(async (options) => {
           </view>
         </view>
         <view>
-          <SButton width="80%" :rounded="30" :onClick="onCreateRoom">
+          <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
             创建约战房
           </SButton>
         </view>
       </view>
-      <SModal
+      <SModal :show="showModal" :onClose="() => (showModal = false)" height="716rpx">
-        :show="showModal"
-        :onClose="() => (showModal = false)"
-        height="716rpx"
-      >
         <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>
@@ -182,6 +173,24 @@ onLoad(async (options) => {
 </template>
 
 <style scoped>
+.guide-tips {
+  display: flex;
+  flex-direction: column;
+  padding-left: 112rpx;
+  width: 100%;
+}
+.guide-tips__main {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: rgba(255, 217, 71, 0.8);
+}
+.guide-tips__sub {
+  font-weight: 400;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-top: 6rpx;
+}
+
 .founded-room {
   display: flex;
   flex-direction: column;
@@ -192,10 +201,12 @@ onLoad(async (options) => {
   border-radius: 10px;
   padding: 15px;
 }
-.founded-room > image {
+
+.founded-room>image {
   width: 16vw;
 }
-.founded-room > view {
+
+.founded-room>view {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -205,14 +216,16 @@ onLoad(async (options) => {
   width: 100%;
   overflow: hidden;
 }
-.founded-room > view > input {
+
+.founded-room>view>input {
   width: 70%;
   text-align: center;
   font-size: 14px;
   height: 40px;
   color: #000;
 }
-.founded-room > view > view {
+
+.founded-room>view>view {
   background-color: #fed847;
   width: 30%;
   line-height: 40px;
@@ -223,38 +236,45 @@ onLoad(async (options) => {
   color: #000;
   text-align: center;
 }
+
 .create-room {
   position: relative;
   margin: 15px;
   height: 50vw;
 }
-.create-room > image:first-of-type {
+
+.create-room>image:first-of-type {
   position: absolute;
   width: 100%;
 }
-.create-room > image:nth-of-type(2) {
+
+.create-room>image:nth-of-type(2) {
   padding: 15px;
   width: 25vw;
   position: relative;
 }
-.create-room > view:nth-child(3) {
+
+.create-room>view:nth-child(3) {
   margin: 12vw auto;
   position: relative;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.create-room > view > image:first-child {
+
+.create-room>view>image:first-child {
   width: 19vw;
   transform: translateY(-60%);
   border-radius: 50%;
   position: relative;
 }
-.create-room > view > image:nth-child(2) {
+
+.create-room>view>image:nth-child(2) {
   width: 37vw;
   position: relative;
 }
-.create-room > view > view:nth-child(3) {
+
+.create-room>view>view:nth-child(3) {
   position: relative;
   width: 19vw;
   height: 19vw;
@@ -265,10 +285,12 @@ onLoad(async (options) => {
   align-items: center;
   transform: translateY(60%);
 }
-.create-room > view > view:nth-child(3) > image {
+
+.create-room>view>view:nth-child(3)>image {
   width: 20px;
   margin-right: 2px;
 }
+
 .warnning {
   width: 100%;
   height: 100%;
@@ -277,6 +299,7 @@ onLoad(async (options) => {
   align-items: center;
   color: #fff9;
 }
+
 .my-data {
   width: calc(100% - 30px);
   margin: 15px;
@@ -286,12 +309,14 @@ onLoad(async (options) => {
   overflow: hidden;
   background-color: #54431d33;
 }
-.my-data > view {
+
+.my-data>view {
   width: 100%;
   display: flex;
   color: #fff9;
 }
-.my-data > view:first-child {
+
+.my-data>view:first-child {
   width: calc(100% - 30px);
   align-items: flex-end;
   padding-bottom: 15px;
@@ -299,16 +324,29 @@ onLoad(async (options) => {
   margin: 15px;
   margin-bottom: 0;
 }
-.my-data > view:first-child > text {
+
+.my-data>view:first-child>.my-record-btn {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #76D4FF;
+  text-align: center;
+  font-style: normal;
+  width: auto;
+  margin-left: auto;
+}
+
+.my-data>view:first-child>text {
   color: #fff;
   font-size: 17px;
   margin-left: 10px;
   width: 120px;
 }
-.my-data > view:last-child {
+
+.my-data>view:last-child {
   margin-bottom: 15px;
 }
-.my-data > view:last-child > view {
+
+.my-data>view:last-child>view {
   width: 33%;
   margin-top: 15px;
   display: flex;
@@ -316,25 +354,30 @@ onLoad(async (options) => {
   align-items: center;
   font-size: 12px;
 }
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
   margin-bottom: 5px;
 }
-.my-data > view:last-child > view > view > text:first-child {
+
+.my-data>view:last-child>view>view>text:first-child {
   color: #fff;
   font-size: 20px;
   margin-right: 5px;
   transform: translateY(4px);
 }
-.my-data > view:last-child > view:nth-child(2) {
+
+.my-data>view:last-child>view:nth-child(2) {
   border-left: 1px solid #48494e;
   border-right: 1px solid #48494e;
 }
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
   display: flex;
   align-items: flex-end;
   height: 20px;
 }
-.stars > image {
+
+.stars>image {
   width: 4vw;
   height: 4vw;
   margin: 0 1px;

src/pages/index.vue

@@ -1,38 +1,48 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import {onMounted, ref} from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+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,
+  getScoreRankList,
+  silentLoginAPI,
 } from "@/apis";
-import { topThreeColors } from "@/constants";
+import {topThreeColors} from "@/constants";
-import { canEenter } from "@/util";
 
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
 const {
   updateConfig,
   updateUser,
   updateDevice,
-  updateRank,
   getLvlName,
+  getLvlNameByScore,
   updateOnline,
 } = store;
-const { user, device, rankData, online, game } = storeToRefs(store);
+const {user, device, online, game} = storeToRefs(store);
 
 const showModal = ref(false);
 const showGuide = ref(false);
+const scoreRankList = ref([]);
+
+// 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
+const getScoreRankData = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};
 
 const toPage = async (path) => {
   if (!user.value.id) {
@@ -44,7 +54,7 @@ const toPage = async (path) => {
   //   await uni.$checkAudio();
   // }
   // }
-  uni.navigateTo({ url: path });
+  uni.navigateTo({url: path});
 };
 
 const toRankListPage = () => {
@@ -54,19 +64,44 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  const token = uni.getStorageSync(
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+  const token = uni.getStorageSync(`${env}_token`);
-  );
 
-  const promises = [getRankListAPI()];
+  if (!user.value.id && !token) {
-  if (token) {
+    // showModal.value = true;
+    // 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 = [getScoreRankList(undefined, 1, 10)];
+  if (token || user.value.id) {
     promises.push(getHomeData());
   }
 
   const [rankList, homeData] = await Promise.all(promises);
 
-  console.log("排行数据", rankList);
+  console.log("积分榜数据", rankList);
-  updateRank(rankList);
+  scoreRankList.value = getScoreRankData(rankList).slice(0, 10);
 
   if (homeData) {
     console.log("首页数据：", homeData);
@@ -87,8 +122,8 @@ onShow(async () => {
       const devices = await getMyDevicesAPI();
       if (devices.bindings && devices.bindings.length) {
         updateDevice(
-          devices.bindings[0].deviceId,
+            devices.bindings[0].deviceId,
-          devices.bindings[0].deviceName
+            devices.bindings[0].deviceName
         );
         const data = await getDeviceBatteryAPI();
         updateOnline(data.online);
@@ -108,7 +143,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 +151,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>
@@ -125,26 +160,26 @@ onShareTimeline(() => {
   <Container :isHome="true" :showBackToGame="true">
     <view class="container">
       <view class="top-theme">
-        <image
+        <!-- <image
-          src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
+            src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
-          mode="widthFix"
+            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"
+                v-if="online"
-              src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
+                src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                @click="() => toPage('/pages/my-device')"
             />
             <image
-              v-else
+                v-else
-              src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
+                src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/my-device')"
+                @click="$clickSound(() => toPage('/pages/my-device'))"
             />
             <block v-if="user.id">
               <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -152,9 +187,9 @@ onShareTimeline(() => {
               <text v-else-if="online">设备在线</text>
             </block>
             <image
-              src="../static/first-try.png"
+                src="../static/first-try.png"
-              mode="widthFix"
+                mode="widthFix"
-              @click="() => toPage('/pages/first-try')"
+                @click="() => toPage('/pages/first-try')"
             />
             <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '47%' }">
               <text>新人必刷！</text>
@@ -162,67 +197,69 @@ onShareTimeline(() => {
             </BubbleTip>
           </view>
           <view class="play-card">
-            <view @click="() => toPage('/pages/practise')">
+            <!-- toPage('/pages/practise') -->
-              <image src="../static/my-practise.png" mode="widthFix" />
+            <view @click="() => toPage('/pages/training/index')">
+              <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
-            <view @click="() => toPage('/pages/friend-battle')">
+            <view @click="$clickSound(() => 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"
+              src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
-            mode="widthFix"
+              mode="widthFix"
           />
           <button
-            class="into-btn"
+              class="into-btn"
-            @click="() => toPage('/pages/ranking')"
+              @click="$clickSound(() => toPage('/pages/ranking'))"
-            hover-class="none"
+              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"
+                  v-for="i in 6"
-                :key="i"
+                  :key="i"
-                class="player-avatar"
+                  class="player-avatar"
-                :style="{
+                  :style="{
                   zIndex: 8 - i,
-                  borderColor: rankData.rank[i - 1]
+                  borderColor: scoreRankList[i - 1]
                     ? topThreeColors[i - 1] || '#000'
                     : '#000',
                 }"
               >
-                <image v-if="i === 1" src="../static/champ1.png" />
+                <image v-if="i === 1" src="../static/champ1.png"/>
-                <image v-if="i === 2" src="../static/champ2.png" />
+                <image v-if="i === 2" src="../static/champ2.png"/>
-                <image v-if="i === 3" src="../static/champ3.png" />
+                <image v-if="i === 3" src="../static/champ3.png"/>
                 <view v-if="i > 3">{{ i }}</view>
                 <image
-                  :src="
+                    :src="
-                    rankData.rank[i - 1]
+                    scoreRankList[i - 1]
-                      ? rankData.rank[i - 1].avatar
+                      ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
                       : '../static/user-icon-dark.png'
                   "
-                  mode="aspectFill"
+                    mode="aspectFill"
                 />
               </view>
               <view class="more-players">
-                <text>{{ rankData.rank.length }}</text>
+                <text>{{ scoreRankList.length }}</text>
               </view>
             </view>
           </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) : "暂无"
+                    user.lvlName || "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
               <view>
                 <text>赛季平均环数</text>
@@ -231,18 +268,19 @@ onShareTimeline(() => {
               <view>
                 <text>赛季胜率</text>
                 <text>{{
-                  user.avg_win
+                    user.avg_win
-                    ? Number((user.avg_win * 100).toFixed(2)) + "%"
+                        ? Number((user.avg_win * 100).toFixed(2)) + "%"
-                    : "暂无"
+                        : "暂无"
-                }}</text>
+                  }}
+                </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 +401,7 @@ onShareTimeline(() => {
   width: 32rpx;
   height: 32rpx;
 }
+
 .player-avatar > view:first-child {
   border-radius: 50%;
   background: #777777;
@@ -373,6 +412,7 @@ onShareTimeline(() => {
   height: 18px;
   color: #fff;
 }
+
 .player-avatar > image:last-child {
   width: 100%;
   height: 100%;
@@ -391,18 +431,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 +454,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,20 +468,23 @@ 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;
+  display: none;
   align-items: center;
   justify-content: center;
   width: 100%;
   height: 60px;
   z-index: -1;
 }
+
 .top-theme > image {
   width: 300rpx;
   transform: translate(-4%, -14%);

src/pages/match-detail.vue

@@ -20,25 +20,47 @@ onLoad(async (options) => {
   const result = await getBattleAPI(battleId.value);
   data.value = result;
   if (result.mode > 3) {
-    players.value = result.resultList.map((item, index) => {
+    const plist = result.teams[0] ? result.teams[0].players : [];
-      const plist = result.teams[0] ? result.teams[0].players : [];
+    // 以 id 为 key 建立 teams 玩家快速查找表
-      const p = plist.find((p) => p.id === item.userId);
+    const teamPlayerMap = {};
+    plist.forEach((p) => { teamPlayerMap[p.id] = p; });
+
+    // 处理有成绩的玩家（resultList 顺序即排名顺序）
+    const rankedPlayers = (result.resultList || []).map((item, index) => {
+      const playerId = item.userId || item.id;
+      const p = teamPlayerMap[playerId] || item;
       const arrows = new Array(12);
-      result.rounds.forEach((r, index) => {
+      result.rounds.forEach((r, rIndex) => {
-        if (r.shoots[item.userId]) {
+        if (r.shoots[playerId]) {
-          r.shoots[item.userId].forEach((s, index2) => {
+          r.shoots[playerId].forEach((s, sIndex) => {
-            arrows[index2 + index * 6] = s;
+            arrows[sIndex + rIndex * 6] = s;
           });
         }
       });
       return {
         ...item,
+        id: playerId,
         rank: index + 1,
-        name: p.name,
+        name: (p && p.name) || item.name,
-        avatar: p.avatar || "",
+        avatar: (p && p.avatar) || item.avatar || "",
         arrows,
       };
     });
+
+    // 追加未出现在 resultList 中的玩家（未射箭），rank=0 隐藏角标
+    const rankedIds = new Set(rankedPlayers.map((p) => p.id));
+    const unrankedPlayers = plist
+      .filter((p) => !rankedIds.has(p.id))
+      .map((p) => ({
+        id: p.id,
+        name: p.name,
+        avatar: p.avatar || "",
+        arrows: [],
+        totalScore: 0,
+        rank: 0,
+      }));
+
+    players.value = [...rankedPlayers, ...unrankedPlayers];
   }
 });
 
@@ -59,13 +81,14 @@ const checkBowData = (selected) => {
   <Container title="详情">
     <view class="container">
       <BattleHeader
+        v-if="data.mode <= 3"
         :winner="data.winTeam"
         :blueTeam="data.teams[1] ? data.teams[1].players : []"
         :redTeam="data.teams[2] ? data.teams[2].players : []"
         :players="players"
       />
       <view
-        v-if="data.mode >= 3"
+        v-if="data.mode > 3"
         class="score-header"
         :style="{ border: 'none', padding: '5px 15px' }"
       >
@@ -76,14 +99,14 @@ const checkBowData = (selected) => {
         </view>
       </view>
       <PlayerScore2
-        v-if="data.mode >= 3"
+        v-if="data.mode > 3"
         v-for="(player, index) in players"
         :key="index"
         :name="player.name"
         :avatar="player.avatar"
         :arrows="player.arrows"
         :totalScore="player.totalScore"
-        :rank="index + 1"
+        :rank="player.rank"
       />
       <view
         v-if="data.mode <= 3"

src/pages/match-page.vue

@@ -3,34 +3,110 @@ 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 { matchGameAPI, getBattleAPI } from "@/apis";
-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);
+
+/** 匹配超时计时器，用于检测 WS 消息丢失或真正超时 */
+const matchTimeoutTimer = ref(null);
+
+/** 匹配超时阈值（ms），后端设置 15s 匹配，前端预留 5s 冗余 */
+const MATCH_TIMEOUT_MS = 20 * 1000;
+
+/** 清除超时计时器 */
+const clearMatchTimeout = () => {
+  if (matchTimeoutTimer.value) {
+    clearTimeout(matchTimeoutTimer.value);
+    matchTimeoutTimer.value = null;
+  }
+};
+
+/**
+ * 超时处理：查询后端是否已分配对局
+ * - 有对局 → WS 消息丢失场景，自动跳入
+ * - 无对局 → 真正超时，提示用户并返回大厅
+ */
+const handleMatchTimeout = async () => {
+  try {
+    const battle = await getBattleAPI();
+    if (battle && battle.matchId) {
+      uni.showToast({ title: "匹配成功，正在进入...", icon: "none" });
+      if (battle.mode <= 3) {
+        uni.redirectTo({ url: `/pages/team-battle/index?battleId=${battle.matchId}` });
+      } else {
+        uni.redirectTo({ url: `/pages/melee-battle?battleId=${battle.matchId}` });
+      }
+    } else {
+      uni.showToast({ title: "匹配超时，请重试", icon: "none" });
+      try {
+        if (gameType.value && teamSize.value) {
+          await matchGameAPI(false, gameType.value, teamSize.value);
+        }
+      } catch (_) { /* 取消失败忽略 */ }
+      uni.navigateBack();
+    }
+  } catch (e) {
+    uni.showToast({ title: "匹配超时，请重试", icon: "none" });
+    uni.navigateBack();
+  }
+};
 
 async function stopMatch() {
   uni.$showHint(3);
 }
 
+/**
+ * 取消匹配，带容错处理：
+ * - 取消成功 → 返回大厅
+ * - 取消失败（后端已分配对局但 WS 未到达）→ 查询并跳入当前对局
+ */
+async function cancelMatch() {
+  clearMatchTimeout();
+  try {
+    if (gameType.value && teamSize.value) {
+      await matchGameAPI(false, gameType.value, teamSize.value);
+    }
+    uni.navigateBack();
+  } catch (e) {
+    // 取消匹配接口失败，尝试查询是否已被分配对局
+    try {
+      const battle = await getBattleAPI();
+      if (battle && battle.matchId) {
+        if (battle.mode <= 3) {
+          uni.redirectTo({ url: `/pages/team-battle/index?battleId=${battle.matchId}` });
+        } else {
+          uni.redirectTo({ url: `/pages/melee-battle?battleId=${battle.matchId}` });
+        }
+      } else {
+        uni.navigateBack();
+      }
+    } catch (_) {
+      uni.navigateBack();
+    }
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (msg.type === MESSAGETYPESV2.MatchSuccess) {
-    matchSuccess.value = true;
+    onComplete.value = () => {}
-    onComplete.value = () => {
+  }
-      if (gameType.value == 1) {
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
-        uni.redirectTo({
+    // 收到开始消息，清除超时计时器
-          url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
+    clearMatchTimeout();
-        });
+    // 使用后端下发的 mode 字段判断跳转目标，与好友约战（battle-room.vue）保持一致
-      } else if (gameType.value == 2) {
+    // mode <= 3 为团队对抗，mode > 3 为大乱斗，覆盖全部 gameType（1~5），不再遗漏
-        uni.redirectTo({
+    if (msg.mode <= 3) {
-          url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
+      uni.redirectTo({
-        });
+        url: `/pages/team-battle/index?battleId=${msg.id}`,
-      }
+      });
-    };
+    } else {
+      uni.redirectTo({
+        url: `/pages/melee-battle?battleId=${msg.id}`,
+      });
+    }
   }
 }
 
@@ -46,28 +122,29 @@ onMounted(() => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("cancelMatching", cancelMatch);
 });
 
 onBeforeUnmount(() => {
+  clearMatchTimeout();
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
+  uni.$off("cancelMatching", cancelMatch);
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 
 onShow(async () => {
   if (gameType.value && teamSize.value) {
     matchGameAPI(true, gameType.value, teamSize.value);
+    // 启动超时计时器，防止 WS 消息丢失或长时间无对手导致用户卡死
+    clearMatchTimeout();
+    matchTimeoutTimer.value = setTimeout(handleMatchTimeout, MATCH_TIMEOUT_MS);
   }
 });
 
 onHide(() => {
-  if (gameType.value && teamSize.value && !matchSuccess.value) {
+
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 </script>
 

src/pages/melee-battle.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch, nextTick } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -10,16 +10,19 @@ import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import TestDistance from "@/components/TestDistance.vue";
+import SModal from "@/components/SModal.vue";
 import audioManager from "@/audioManager";
 import { getBattleAPI, laserCloseAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, online } = storeToRefs(store);
 const title = ref("");
 const start = ref(null);
 const battleId = ref("");
+/** 对战模式：1=好友约战 2=排位赛，用于结算页跳转判断 */
+const way = ref(0);
 const currentRound = ref(1);
 const tips = ref("即将开始...");
 const players = ref([]);
@@ -27,55 +30,85 @@ const playersSorted = ref([]);
 const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);
+/** 控制设备离线提示弹窗的显示状态 */
+const showOfflineModal = ref(false);
+/** 记录每位玩家当前半场连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});
+
+/**
+ * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
+ */
+watch(online, (newVal, oldVal) => {
+  if (!newVal && oldVal && start.value === true) {
+    showOfflineModal.value = true;
+  }
+});
 
 function recoverData(battleInfo, { force = false } = {}) {
-  if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
+  if (!battleInfo) return;
-  if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
+  try {
-  players.value = battleInfo.teams[0].players;
+    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
-  start.value = battleInfo.status !== 0;
+    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
-  if (battleInfo.status === 0) {
+    // 保存 way 供结算跳转时使用
-    const readyRemain = (Date.now() - battleInfo.createTime) / 1000;
+    way.value = battleInfo.way ?? 0;
-    console.log(`对局已进行${readyRemain}秒`);
+    
-    if (readyRemain > 0 && readyRemain < 15) {
+    // 优先使用接口数据，否则使用缓存
-      setTimeout(() => {
+    if (battleInfo.teams?.[0]?.players) {
-        uni.$emit("update-timer", 15 - readyRemain - 0.2);
+      players.value = [...battleInfo.teams[0].players];
-      }, 200);
+    } else {
+      // 大乱斗可能存的是 players 列表
+      // 这里的缓存逻辑根据 AboutToStart 消息结构可能不同，假设也是 teams[0]
+      // 如果是从 match-page 过来的，match-page 只存了 teams[1] 和 [2] 给对抗模式
+      // 大乱斗的匹配逻辑可能不同，暂时保持原样，只做安全保护
+      players.value = []; 
     }
-    return;
+    
-  }
+    start.value = battleInfo.status !== 0;
-  tips.value =
+
-    (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
+    if (battleInfo.status === 0) {
-  playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
-  const totals = {};
+      if (readyRemain > 0 && readyRemain < 15) {
-  players.value.forEach((p) => {
+        setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
-    const total = playersScores.value.reduce((acc, round) => {
+      }
-      const arr = round[p.id] || [];
+      return;
-      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);
     }
+
+    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);
   }
 }
 
@@ -89,6 +122,28 @@ onLoad(async (options) => {
   // });
 });
 
+/**
+ * 检测指定玩家连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number|string} playerId - 本次射手的 ID（大乱斗中 ShootResult 保留 playerId）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(playerId, isXRing) {
+  if (!playerId) return;
+  const id = parseInt(playerId);
+  if (isXRing) {
+    xRingStreaks.value[id] = (xRingStreaks.value[id] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[id] >= 3) {
+      xRingStreaks.value[id] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[id] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -96,15 +151,37 @@ async function onReceiveMessage(msg) {
     halfRest.value = false;
     recoverData(msg);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    // 更新前快照各玩家本轮已射箭数，用于事后识别本次射手
+    const curRound = playersScores.value[playersScores.value.length - 1] || {};
+    const prevCounts = {};
+    for (const pid of Object.keys(curRound)) {
+      prevCounts[pid] = (curRound[pid] || []).length;
+    }
     recoverData(msg);
+    // 对比更新后数据找出箭数增加的玩家（即本次射手），并读取其最新箭的 ring 数据
+    const newRound = playersScores.value[playersScores.value.length - 1] || {};
+    let shooterId = null;
+    let isXRing = false;
+    for (const pid of Object.keys(newRound)) {
+      const newLen = (newRound[pid] || []).length;
+      if (newLen > (prevCounts[pid] || 0)) {
+        shooterId = parseInt(pid);
+        const shot = newRound[pid][newLen - 1];
+        isXRing = !!(shot?.ringX && shot?.ring);
+        break;
+      }
+    }
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    checkAndPlayTententen(shooterId, isXRing);
   } else if (msg.type === MESSAGETYPESV2.HalfRest) {
     halfTimeTip.value = true;
     halfRest.value = true;
     tips.value = "准备下半场";
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(() => {
+      // 全部跳转到新结算页
       uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.matchId,
+        url: "/pages/friend-battle-result?battleId=" + msg.matchId,
       });
     }, 1000);
   }
@@ -127,6 +204,7 @@ onBeforeUnmount(() => {
 onShow(async () => {
   if (battleId.value) {
     const result = await getBattleAPI(battleId.value);
+    if (!result) return;
     if (result.status === 2) {
       uni.showToast({
         title: "比赛已结束",
@@ -180,13 +258,25 @@ onShow(async () => {
       <ScreenHint
         :show="halfTimeTip"
         mode="small"
-        :onClose="() => (halfTimeTip = false)"
       >
         <view class="half-time-tip">
           <text>上半场结束，休息一下吧:）</text>
           <text>20秒后开始下半场</text>
         </view>
       </ScreenHint>
+      <!-- 设备离线提示弹窗 -->
+      <SModal
+        :show="showOfflineModal"
+        :noBg="true"
+        height="360rpx"
+        :onClose="() => (showOfflineModal = false)"
+      >
+        <view class="offline-modal">
+          <text class="offline-title">设备已离线</text>
+          <text class="offline-desc">检测到设备已断开连接，请检查设备后继续比赛</text>
+          <SButton @click="showOfflineModal = false">我知道了</SButton>
+        </view>
+      </SModal>
     </view>
   </Container>
 </template>
@@ -196,4 +286,25 @@ onShow(async () => {
   width: 100%;
   height: 100%;
 }
+
+.offline-modal {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 60rpx 40rpx 40rpx;
+  gap: 24rpx;
+}
+
+.offline-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #FED847;
+}
+
+.offline-desc {
+  font-size: 28rpx;
+  color: #CCCCCC;
+  text-align: center;
+  line-height: 1.6;
+}
 </style>

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) => {
+        // const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
+        //   // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
+        //   const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
+        // };
-
+        //
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // 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) {
+  if (!justBind.value && token.value) {
-    const result = await bindDeviceAPI(addDevice.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: "绑定成功",
@@ -128,7 +130,7 @@ onShow(() => {
 <template>
   <Container title="弓箭绑定">
     <view v-if="!device.deviceId" class="scan-code">
-      <button hover-class="none" @click="handleScan">
+      <button hover-class="none" @click="$clickSound(handleScan)">
         <image src="../static/scan.png" mode="widthFix" />
       </button>
       <button hover-class="none" @click="showTip = true">
@@ -210,33 +212,35 @@ onShow(() => {
           <text>{{ user.nickName }}</text>
         </view>
       </view>
-      <block v-if="calibration">
+      <!-- <block v-if="calibration"> -->
-        <SButton :onClick="toFristTryPage" width="60vw" :rounded="40"
-          >进入新手试炼</SButton
-        >
-        <view :style="{ marginTop: '15px' }">
-          <SButton
-            :onClick="backToHome"
-            backgroundColor="#fff3"
-            color="#fff"
-            width="60vw"
-            :rounded="40"
-            >返回首页</SButton
-          >
-        </view>
-      </block>
-      <block v-else>
         <view>
           <text>恭喜，你的弓箭和账号已成功绑定！</text>
           <text :style="{ color: '#fed847' }">已赠送6个月射灵世界会员</text>
         </view>
-        <SButton :onClick="goCalibration" width="60vw" :rounded="40">
+        <!-- <SButton :onClick="goCalibration" width="60vw" :rounded="40">
           开启智能弓进行校准
         </SButton>
         <text :style="{ marginTop: '20rpx', fontSize: '24rpx', color: '#fff9' }"
           >校准时弓箭激光将开启，请勿直视激光</text
-        >
+        > -->
-      </block>
+
+        <view>
+          <SButton
+          :onClick="backToHome"
+          backgroundColor="#fff3"
+          color="#fff"
+          width="60vw"
+          :rounded="40"
+          >返回首页</SButton
+          >
+        </view>
+        <view :style="{ marginTop: '15px' }">
+          <SButton :onClick="toFristTryPage" width="60vw" :rounded="40">进入新手试炼</SButton>
+        </view>
+      <!-- </block> -->
+      <!-- <block v-else>
+        
+      </block> -->
     </view>
     <view v-if="device.deviceId && !justBind" class="has-device">
       <view class="device-binded">
@@ -267,7 +271,7 @@ onShow(() => {
         </view>
       </view>
       <view :style="{ marginTop: '240rpx' }">
-        <SButton :onClick="unbindDevice" width="80vw" :rounded="40"
+        <SButton :onClick="() => $clickSound(unbindDevice)" width="80vw" :rounded="40"
           >解绑</SButton
         >
       </view>
@@ -392,7 +396,7 @@ onShow(() => {
   width: 140rpx;
   height: 140rpx;
   margin-bottom: 5px;
-  border-radius: 10px;
+  border-radius: 12px;
 }
 .device-binded > view > text {
   width: 120px;

src/pages/my-growth.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { onMounted } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowData from "@/components/BowData.vue";
@@ -54,8 +55,26 @@ const onPractiseLoading = async (page) => {
 };
 const getName = (battle) => {
   if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
-  return battle.mode + "人大乱斗";
+  // 排位赛大乱斗：mode 数字与实际人数不一致，使用固定映射
+  if (battle.way === 2) {
+    if (battle.mode === 4) return "5人大乱斗";
+    if (battle.mode === 5) return "10人大乱斗";
+  }
+  // 好友约战大乱斗：从 teams[0].players 取实际参与人数动态展示
+  const count = battle.teams?.[0]?.players?.length;
+  return count ? `${count}人大乱斗` : "大乱斗";
 };
+
+/**
+ * 支持通过 URL 参数指定初始 tab
+ * @example /pages/my-growth?tab=1 跳转到「好友约战」tab
+ */
+onLoad((options) => {
+  if (options && options.tab !== undefined) {
+    const tabIndex = parseInt(options.tab, 10);
+    if (!isNaN(tabIndex)) selectedIndex.value = tabIndex;
+  }
+});
 </script>
 
 <template>
@@ -96,7 +115,7 @@ const getName = (battle) => {
                 :blueTeam="item.teams[1] ? item.teams[1].players : []"
                 :redTeam="item.teams[2] ? item.teams[2].players : []"
                 :winner="item.winTeam"
-                :showRank="item.teams[0]"
+                :showRank="!!item.teams[0]"
                 :showHeader="false"
               />
             </view>
@@ -119,7 +138,7 @@ const getName = (battle) => {
                 :blueTeam="item.teams[1] ? item.teams[1].players : []"
                 :redTeam="item.teams[2] ? item.teams[2].players : []"
                 :winner="item.winTeam"
-                :showRank="item.teams[0]"
+                :showRank="!!item.teams[0]"
                 :showHeader="false"
               />
             </view>

src/pages/point-book-create.vue

@@ -114,7 +114,7 @@ onMounted(async () => {
       />
     </view>
     <template #bottom>
-      <SButton :rounded="50" :onClick="toEditPage">下一步</SButton>
+      <SButton :rounded="50" :onClick="() => $clickSound(toEditPage)">下一步</SButton>
     </template>
   </Container>
 </template>

src/pages/point-book-detail-share.vue

@@ -107,7 +107,7 @@ const targetTypeName = computed(() => {
 <template>
   <view class="container" :style="{ paddingTop: paddingTop + 'px' }">
     <image
-      src="../static/app-bg5.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
       class="bg-image"
       mode="aspectFill"
       :style="{ height: paddingTop + 60 + 'px' }"

src/pages/point-book-edit.vue

@@ -198,7 +198,7 @@ onLoad((options) => {
       </ScreenHint2>
     </view>
     <template #bottom>
-      <SButton :rounded="50" :onClick="onSubmit">
+      <SButton :rounded="50" :onClick="() => $clickSound(onSubmit)">
         {{ currentGroup === groups ? "保存并查看分析" : "下一组" }}
       </SButton>
     </template>

src/pages/point-book.vue

@@ -329,10 +329,10 @@ onShareTimeline(() => {
             </view>
           </view>
           <view>
-            <button hover-class="none" @click="toRecordPage" class="image-btn">
+            <button hover-class="none" @click="$clickSound(toRecordPage)" class="image-btn">
               <image src="../static/record-btn.png" mode="widthFix" />
             </button>
-            <button hover-class="none" @click="startScoring" class="image-btn">
+            <button hover-class="none" @click="$clickSound(startScoring)" class="image-btn">
               <image src="../static/start-scoring.png" mode="widthFix" />
             </button>
           </view>

src/pages/practise-one.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 12;
+/** 当前练习中连续 X 环计数，用于触发 tententen 音效 */
+const xRingStreak = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -46,6 +48,7 @@ onLoad((options) => {
 const onReady = async () => {
   await startPractiseAPI();
   scores.value = [];
+  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
   start.value = true;
   audioManager.play("练习开始");
 };
@@ -55,11 +58,35 @@ const onOver = async () => {
   start.value = false;
 };
 
+/**
+ * 检测连续 X 环是否达到 3 箭，达到则播放 tententen 音效
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(isXRing) {
+  if (isXRing) {
+    xRingStreak.value += 1;
+    // 连续 3 箭均为 X 环，在环数播报入队后追加 tententen，避免播放顺序颠倒
+    if (xRingStreak.value >= 3) {
+      xRingStreak.value = 0;
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置连续计数
+    xRingStreak.value = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (msg.type === MESSAGETYPESV2.ShootResult) {
+    const prevLen = scores.value.length;
     scores.value = msg.details;
+    // 有新箭时取最后一箭判断是否 X 环并检测连续计数
+    if (scores.value.length > prevLen) {
+      const latestArrow = scores.value[scores.value.length - 1];
+      checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
+    }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    setTimeout(onOver, 1500);
+    // setTimeout(onOver, 1500);
   }
 }
 
@@ -74,6 +101,7 @@ async function onComplete() {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
+    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
     const result = await createPractiseAPI(total, 120);
     if (result) practiseId.value = result.id;
   }
@@ -84,6 +112,12 @@ const onClickShare = debounce(async () => {
   await wxShare("shareCanvas");
 });
 
+function onAudioEnded(s) {
+  if (s.indexOf("比赛结束") >= 0) {
+    onOver()
+  }
+}
+
 onMounted(async () => {
   // audioManager.play("第一轮");
   uni.setKeepScreenOn({
@@ -91,6 +125,7 @@ onMounted(async () => {
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
+  uni.$on("audioEnded", onAudioEnded);
   const result = await createPractiseAPI(total, 120, targetType.value);
   if (result) practiseId.value = result.id;
 });
@@ -101,6 +136,7 @@ onBeforeUnmount(() => {
   });
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
   audioManager.stopAll();
   endPractiseAPI();
 });

src/pages/practise-two.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 36;
+/** 当前练习中连续 X 环计数，用于触发 tententen 音效 */
+const xRingStreak = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -45,6 +47,7 @@ onLoad((options) => {
 const onReady = async () => {
   await startPractiseAPI();
   scores.value = [];
+  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
   start.value = true;
   audioManager.play("练习开始");
 };
@@ -54,9 +57,33 @@ const onOver = async () => {
   start.value = false;
 };
 
+/**
+ * 检测连续 X 环是否达到 3 箭，达到则播放 tententen 音效
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(isXRing) {
+  if (isXRing) {
+    xRingStreak.value += 1;
+    // 连续 3 箭均为 X 环，在环数播报入队后追加 tententen，避免播放顺序颠倒
+    if (xRingStreak.value >= 3) {
+      xRingStreak.value = 0;
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置连续计数
+    xRingStreak.value = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (msg.type === MESSAGETYPESV2.ShootResult) {
+    const prevLen = scores.value.length;
     scores.value = msg.details;
+    // 有新箭时取最后一箭判断是否 X 环并检测连续计数
+    if (scores.value.length > prevLen) {
+      const latestArrow = scores.value[scores.value.length - 1];
+      checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
+    }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(onOver, 1500);
   }
@@ -89,7 +116,8 @@ async function onComplete() {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    const result = await createPractiseAPI(total, 360);
+    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
+    const result = await createPractiseAPI(total, 3600);
     if (result) practiseId.value = result.id;
   }
 }
@@ -105,7 +133,7 @@ onMounted(async () => {
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 360, targetType.value);
+  const result = await createPractiseAPI(total, 3600, targetType.value);
   if (result) practiseId.value = result.id;
 });
 
@@ -132,7 +160,7 @@ onBeforeUnmount(() => {
         <ShootProgress
           :tips="`请连续射${total}支箭`"
           :start="start"
-          :total="360"
+          :total="3600"
           :onStop="onOver"
         />
         <view class="user-row">

src/pages/rank-list.vue

@@ -1,58 +1,333 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { computed, nextTick, onMounted, ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
+import {
+  getMvpRankList,
+  getMyMvpRank,
+  getMyScoreRank,
+  getMyTenRingRank,
+  getScoreRankList,
+  getTenRingRankList,
+} from "@/apis";
 import { capsuleHeight } from "@/util";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+
+const PAGE_SIZE = 10;
+
 const store = useStore();
-const { user, rankData } = storeToRefs(store);
+const { user } = storeToRefs(store);
 const { getLvlName } = store;
 
-const selectedIndex = ref(0);
+const createRankState = () => ({
-const currentList = ref([]);
+  list: [],
-const myData = ref({});
+  page: 0,
-const addBg = ref(false);
+  pageSize: PAGE_SIZE,
-
+  loading: false,
-onMounted(async () => {
+  noMore: false,
-  handleSelect(0);
+  loaded: false,
+  scrollTop: 0,
+  myData: null,
+  myDataLoaded: false,
 });
 
-const handleSelect = (index) => {
+const rankTabs = [
-  selectedIndex.value = index;
+  {
-  myData.value = {};
+    key: "score",
-  currentList.value = [];
+    title: "积分榜",
-  if (index === 0) {
+    subTitle: "排位赛积分",
-    currentList.value = rankData.value.rank;
+    listApi: getScoreRankList,
-  } else if (index === 1) {
+    myApi: getMyScoreRank,
-    currentList.value = rankData.value.mvpRank;
+  },
-  } else if (index === 2) {
+  {
-    currentList.value = rankData.value.ringRank;
+    key: "mvp",
+    title: "MVP榜",
+    subTitle: "MVP次数",
+    listApi: getMvpRankList,
+    myApi: getMyMvpRank,
+  },
+  {
+    key: "tenRing",
+    title: "十环榜",
+    subTitle: "十环次数",
+    listApi: getTenRingRankList,
+    myApi: getMyTenRingRank,
+  },
+];
+
+// 解析 ranking 页面传入的榜单参数，进入页面时默认选中对应 tab。
+const getTabIndexByRouteParam = (tab) => {
+  if (tab === "mvp") return 1;
+  if (tab === "tenRing") return 2;
+  return 0;
+};
+
+const rankStates = ref({
+  score: createRankState(),
+  mvp: createRankState(),
+  tenRing: createRankState(),
+});
+
+const selectedIndex = ref(0);
+const initialTabIndex = ref(0);
+const pageMounted = ref(false);
+const initializedFromRoute = ref(false);
+const addBg = ref(false);
+const currentScrollTop = ref(0);
+const restoreScrollTop = ref(0);
+const tabSwitchAnimating = ref(false);
+const suppressScrollSync = ref(false);
+const suppressLoadMore = ref(false);
+const stickyTabsTop = capsuleHeight + 50;
+const stickyTabsActive = ref(false);
+const tabsStickyThreshold = ref(0);
+const tabsStickyReady = ref(false);
+const tabsHeight = ref(0);
+
+const getTabConfig = (index = selectedIndex.value) => rankTabs[index];
+const getTabKey = (index = selectedIndex.value) => getTabConfig(index).key;
+
+// 统一提取榜单接口返回的列表数据，兼容数组和对象两种返回格式。
+const getRankListFromResponse = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};
+
+// 为当前登录用户构造默认的个人榜单信息，避免接口未返回时底部区域缺数据。
+const buildDefaultMyData = () => ({
+  rank: null,
+  userId: user.value.id,
+  name: user.value.nickName,
+  avatar: user.value.avatar,
+  totalScore: 0,
+  mvpCount: 0,
+  tenRings: 0,
+  totalGames: 0,
+  totalCount: 0,
+  rankName: user.value.lvlName,
+  rankLvl: user.value.rankLvl,
+});
+
+const currentTabKey = computed(() => getTabKey(selectedIndex.value));
+const currentState = computed(() => rankStates.value[currentTabKey.value]);
+const currentList = computed(() => currentState.value.list);
+const currentSubTitle = computed(() => getTabConfig(selectedIndex.value).subTitle);
+const currentMyData = computed(() => {
+  if (!user.value.id) return null;
+  return currentState.value.myData || buildDefaultMyData();
+});
+
+// 统一格式化段位和场次文案，兼容不同接口的字段命名。
+const formatLevelText = (item = {}) => {
+  const levelName = item.rankName || getLvlName(item.rankLvl) || "暂无段位";
+  const totalGames = item.totalGames ?? item.TotalGames ?? 0;
+  return `${levelName}，${totalGames}场`;
+};
+
+// 统一读取榜单项的排名字段，没有后端 rank 时回退到前端序号。
+const getDisplayRank = (item = {}, index = 0) => {
+  return item.rank ?? index + 1;
+};
+
+// 底部个人排名在未上榜时展示占位符，而不是空白。
+const getDisplayMyRank = (item = {}) => {
+  return item.rank ?? "-";
+};
+
+const getScoreValue = (item = {}) => item.totalScore ?? 0;
+const getMvpValue = (item = {}) => item.mvpCount ?? item.totalScore ?? 0;
+const getTenRingValue = (item = {}) =>
+  item.tenRings ?? item.TenRings ?? item.totalScore ?? 0;
+
+// 根据当前选中的榜单类型，读取对应的展示值。
+const getRankValue = (item = {}, index = selectedIndex.value) => {
+  if (index === 0) return getScoreValue(item);
+  if (index === 1) return getMvpValue(item);
+  return getTenRingValue(item);
+};
+
+const getRankUnit = (index = selectedIndex.value) => {
+  if (index === 0) return "分";
+  return "次";
+};
+
+// 统一设置页面当前的视觉滚动状态，避免吸顶和顶部背景不同步。
+const syncScrollVisualState = (scrollTop = 0) => {
+  currentScrollTop.value = scrollTop;
+  addBg.value = scrollTop > 100;
+  if (!tabsStickyReady.value) {
+    stickyTabsActive.value = false;
+    return;
   }
-  if (user.value.id) {
+  stickyTabsActive.value = scrollTop >= tabsStickyThreshold.value;
-    currentList.value.some((item) => {
+};
-      if (item.userId === user.value.id) {
+
-        myData.value = item;
+// 只保留一条滚动恢复链路：从当前滚动位置平滑滚到目标位置，避免多套控制同时生效造成闪烁。
-        return true;
+const applyScrollPosition = async (
-      }
+  fromScrollTop = currentScrollTop.value,
-      return false;
+  toScrollTop = 0,
-    });
+  withAnimation = false
-    if (!myData.value.userId) {
+) => {
-      myData.value = {
+  tabSwitchAnimating.value = withAnimation;
-        userId: user.value.id,
+  restoreScrollTop.value = fromScrollTop;
-        TotalGames: 0,
+  await nextTick();
-        totalScore: 0,
+  restoreScrollTop.value = toScrollTop;
-        mvpCount: 0,
+  syncScrollVisualState(toScrollTop);
-        TenRings: 0,
+};
-      };
+
+// 请求指定榜单的某一页数据，只有当前榜单会追加分页，不影响其他榜单的浏览状态。
+const loadRankPage = async (tabKey, { reset = false } = {}) => {
+  const state = rankStates.value[tabKey];
+  const config = rankTabs.find((item) => item.key === tabKey);
+  if (!config || state.loading) return;
+  if (!reset && state.noMore) return;
+
+  const nextPage = reset ? 1 : state.page + 1;
+  state.loading = true;
+  if (reset) state.noMore = false;
+
+  try {
+    const result = await config.listApi(undefined, nextPage, PAGE_SIZE);
+    const list = getRankListFromResponse(result);
+    state.list = reset ? list : state.list.concat(list);
+    state.page = nextPage;
+    state.loaded = true;
+    state.noMore = list.length < PAGE_SIZE;
+  } catch (error) {
+    if (reset) {
+      state.list = [];
+      state.page = 0;
+      state.loaded = false;
+      state.noMore = false;
     }
+    uni.showToast({
+      title: "排行榜加载失败",
+      icon: "none",
+    });
+    console.error("load rank page error", error);
+  } finally {
+    state.loading = false;
   }
 };
 
-const onScrollView = (e) => {
+// 每个榜单独立请求一次个人排名信息，切回该榜单时直接复用，避免打断浏览上下文。
-  addBg.value = e.detail.scrollTop > 100;
+const loadMyRankData = async (tabKey) => {
+  if (!user.value.id) return;
+
+  const state = rankStates.value[tabKey];
+  const config = rankTabs.find((item) => item.key === tabKey);
+  if (!config || state.myDataLoaded) return;
+
+  try {
+    const result = await config.myApi();
+    state.myData = {
+      ...buildDefaultMyData(),
+      ...(result || {}),
+    };
+  } catch (error) {
+    state.myData = buildDefaultMyData();
+    console.error("load my rank data error", error);
+  } finally {
+    state.myDataLoaded = true;
+  }
 };
 
-const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
+// 首次进入或切换到未加载过的榜单时，初始化它的分页数据和个人横条数据。
+const ensureTabReady = async (index = selectedIndex.value) => {
+  const tabKey = getTabKey(index);
+  const state = rankStates.value[tabKey];
+
+  if (!state.loaded) {
+    await loadRankPage(tabKey, { reset: true });
+  }
+
+  if (user.value.id && !state.myDataLoaded) {
+    await loadMyRankData(tabKey);
+  }
+
+  await nextTick();
+  return state.scrollTop || 0;
+};
+
+onLoad((options = {}) => {
+  initialTabIndex.value = getTabIndexByRouteParam(options.tab);
+  selectedIndex.value = initialTabIndex.value;
+  if (pageMounted.value && !initializedFromRoute.value) {
+    initializePage();
+  }
+});
+
+// 页面初始化同时兼容 onLoad 和 onMounted 的先后顺序，确保首屏一定落到路由指定的榜单。
+const initializePage = async () => {
+  if (initializedFromRoute.value) return;
+  initializedFromRoute.value = true;
+  const nextScrollTop = await ensureTabReady(selectedIndex.value);
+  await applyScrollPosition(0, nextScrollTop, false);
+  setTimeout(() => {
+    measureTabsMetrics();
+  }, 0);
+};
+
+onMounted(async () => {
+  pageMounted.value = true;
+  await initializePage();
+});
+
+// 切换榜单时保留原榜单的列表和滚动位置，切回来后继续从之前的位置浏览。
+const handleSelect = async (index) => {
+  if (index === selectedIndex.value) return;
+
+  const previousTabKey = currentTabKey.value;
+  rankStates.value[previousTabKey].scrollTop = currentScrollTop.value;
+  const previousScrollTop = currentScrollTop.value;
+
+  suppressScrollSync.value = true;
+  suppressLoadMore.value = true;
+  selectedIndex.value = index;
+  const nextScrollTop = await ensureTabReady(index);
+  await applyScrollPosition(previousScrollTop, nextScrollTop, false);
+  setTimeout(() => {
+    tabSwitchAnimating.value = false;
+    suppressScrollSync.value = false;
+    suppressLoadMore.value = false;
+  }, 220);
+};
+
+// 触底后只加载当前榜单的下一页数据，其他榜单的数据和页码保持不变。
+const loadMore = async () => {
+  if (suppressLoadMore.value) return;
+  await loadRankPage(currentTabKey.value);
+};
+
+// 实时记录当前榜单的滚动位置，切换回来时恢复到上一次浏览位置。
+const onScrollView = (e) => {
+  const scrollTop = e.detail.scrollTop || 0;
+  if (suppressScrollSync.value) return;
+  syncScrollVisualState(scrollTop);
+  rankStates.value[currentTabKey.value].scrollTop = scrollTop;
+};
+
+// 计算 tab 在滚动内容中的真实位置和高度，作为吸顶切换的唯一依据。
+const measureTabsMetrics = () => {
+  const query = uni.createSelectorQuery();
+  query
+    .select("#rank-list-content-start")
+    .boundingClientRect()
+    .select(".rank-tabs-anchor")
+    .boundingClientRect()
+    .exec((res = []) => {
+      const [startRect, rect] = res;
+      if (!startRect || !rect) return;
+      const tabOffset = rect.top - startRect.top;
+      tabsStickyThreshold.value = Math.max(0, tabOffset - 92);
+      tabsHeight.value = rect.height || 0;
+      tabsStickyReady.value = true;
+      syncScrollVisualState(currentScrollTop.value);
+    });
+};
 </script>
 
 <template>
@@ -65,7 +340,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
     >
       <image
         :style="{ opacity: addBg ? 1 : 0 }"
-        src="../static/app-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
         mode="widthFix"
       />
       <navigator open-type="navigateBack">
@@ -75,18 +350,32 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
     </view>
     <scroll-view
       scroll-y
+      :scroll-with-animation="tabSwitchAnimating"
+      :scroll-top="restoreScrollTop"
       @scroll="onScrollView"
-      :style="{ height: myData.userId ? '90vh' : '100vh' }"
+      @scrolltolower="loadMore"
+      :style="{ height: user.id ? '90vh' : '100vh' }"
     >
+      <view id="rank-list-content-start" class="content-start-anchor"></view>
       <image
         src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9b3wcrwnlnghiq.png"
         mode="widthFix"
         class="header-bg"
+        @load="measureTabsMetrics"
       />
-      <view class="rank-tabs">
+      <view
+        v-if="stickyTabsActive"
+        class="rank-tabs-placeholder"
+        :style="{ height: `${tabsHeight}px` }"
+      />
+      <view
+        class="rank-tabs rank-tabs-anchor"
+        :class="{ 'rank-tabs-anchor-fixed': stickyTabsActive }"
+        :style="stickyTabsActive ? { top: `${stickyTabsTop}px` } : {}"
+      >
         <view
-          v-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']"
+          v-for="(rankType, index) in rankTabs"
-          :key="index"
+          :key="rankType.key"
           :style="{
             fontSize: index === selectedIndex ? '16px' : '14px',
             color: index === selectedIndex ? '#000' : '#fff',
@@ -94,18 +383,18 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
           }"
           @tap="handleSelect(index)"
         >
-          {{ rankType }}
+          {{ rankType.title }}
         </view>
       </view>
       <view class="rank-list">
         <view class="rank-list-header">
           <text>排名</text>
           <text>用户ID</text>
-          <text>{{ subTitles[selectedIndex] }}</text>
+          <text>{{ currentSubTitle }}</text>
         </view>
         <view
           v-for="(item, index) in currentList"
-          :key="index"
+          :key="`${currentTabKey}-${index}-${item.userId || item.name}`"
           class="rank-list-item"
           :style="{
             backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent',
@@ -147,65 +436,60 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
             src="../static/champ3.png"
             mode="widthFix"
           />
-          <view v-if="index > 2" class="view-crown">{{ index + 1 }}</view>
+          <view v-if="index > 2" class="view-crown">
+            {{ getDisplayRank(item, index) }}
+          </view>
           <Avatar :src="item.avatar" />
           <view class="rank-item-content">
             <text class="truncate">{{ item.name }}</text>
-            <text>{{ getLvlName(item.rankLvl) }}，{{ item.TotalGames }}场</text>
+            <text>{{ formatLevelText(item) }}</text>
           </view>
-          <text class="rank-item-integral" v-if="selectedIndex === 0">
+          <text class="rank-item-integral">
             <text
               :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.totalScore }} </text
+            >
-            >分
+              {{ getRankValue(item) }}
-          </text>
+            </text>
-          <text class="rank-item-integral" v-if="selectedIndex === 1">
+            {{ getRankUnit() }}
-            <text
-              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.mvpCount }} </text
-            >次
-          </text>
-          <text class="rank-item-integral" v-if="selectedIndex === 2">
-            <text
-              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.TenRings }} </text
-            >次
           </text>
         </view>
-        <view v-if="!currentList.length" class="no-data">
+        <view
-          <text>筹备中...</text>
+          v-if="currentState.loading && !currentList.length"
+          class="no-data"
+        >
+          <text>加载中...</text>
+        </view>
+        <view
+          v-else-if="!currentState.loading && !currentList.length"
+          class="no-data"
+        >
+          <text>暂无数据</text>
+        </view>
+        <view v-else class="list-tip">
+          <text v-if="currentState.loading">加载中...</text>
+          <text v-else-if="currentState.noMore">没有更多了</text>
         </view>
       </view>
     </scroll-view>
-    <view class="my-rank-data" v-if="myData.userId">
+    <view class="my-rank-data" v-if="currentMyData">
       <image
         src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png"
         mode="widthFix"
       />
-      <text>{{ myData.rank }}</text>
+      <text>{{ getDisplayMyRank(currentMyData) }}</text>
-      <Avatar :src="user.avatar" />
+      <Avatar :src="currentMyData.avatar || user.avatar" />
       <view class="rank-item-content">
-        <text class="truncate">{{ user.nickName }}</text>
+        <text class="truncate">{{ currentMyData.name || user.nickName }}</text>
-        <text>{{ user.lvlName }}，{{ myData.TotalGames }}场</text>
+        <text>{{ formatLevelText(currentMyData) }}</text>
       </view>
-      <text class="rank-item-integral" v-if="selectedIndex === 0">
+      <text class="rank-item-integral">
         <text
           :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.totalScore || 0 }}</text
+        >
-        >分</text
+          {{ getRankValue(currentMyData) }}
-      >
+        </text>
-      <text class="rank-item-integral" v-if="selectedIndex === 1">
+        {{ getRankUnit() }}
-        <text
+      </text>
-          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.mvpCount || 0 }}</text
-        >次</text
-      >
-      <text class="rank-item-integral" v-if="selectedIndex === 2">
-        <text
-          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.TenRings || 0 }}</text
-        >次</text
-      >
     </view>
   </view>
 </template>
@@ -214,9 +498,16 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
 .container {
   width: 100%;
 }
+
+.content-start-anchor {
+  width: 100%;
+  height: 0;
+}
+
 .header-bg {
   width: 100%;
 }
+
 .header {
   width: 100%;
   height: 50px;
@@ -227,6 +518,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   z-index: 10;
   overflow: hidden;
 }
+
 .header-back {
   width: 22px;
   height: 22px;
@@ -234,6 +526,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   margin-top: 5px;
   position: relative;
 }
+
 .header > image:first-child {
   width: 100vw;
   height: 100vh;
@@ -242,25 +535,40 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   left: 0;
   transition: all 0.5s ease;
 }
+
 .header > text {
   color: #fff;
   font-weight: bold;
   transition: all 0.5s ease;
   position: relative;
 }
+
 .rank-tabs {
   width: calc(100% - 20px);
   display: flex;
   justify-content: space-around;
-  padding: 0 10px;
+  padding: 20rpx 10px;
-  margin-top: -15px;
 }
+
 .rank-tabs > view {
   width: 25%;
   padding: 10px;
   text-align: center;
   border-radius: 20px;
 }
+
+.rank-tabs-placeholder {
+  width: 100%;
+}
+
+.rank-tabs-anchor-fixed {
+  position: fixed;
+  left: 0;
+  z-index: 11;
+  background: #000000;
+  backdrop-filter: blur(8px);
+}
+
 .rank-list {
   display: flex;
   flex-direction: column;
@@ -268,11 +576,12 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   width: calc(100% - 20px);
   color: #fff9;
   font-size: 12px;
-  margin: 10px;
+  margin: 0 10px 10px 10px;
   border: 1px solid rgb(255 217 71 / 0.2);
   border-radius: 10px;
   background-color: #313131;
 }
+
 .rank-list > view {
   display: flex;
   align-items: center;
@@ -281,20 +590,25 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   overflow: hidden;
   position: relative;
 }
+
 .rank-list-header {
   width: calc(100% - 20px) !important;
   padding: 10px;
 }
+
 .rank-list-header > text:nth-child(2) {
   width: 14%;
 }
+
 .rank-list-header > text:last-child {
   width: 30%;
   text-align: right;
 }
+
 .rank-list-item {
   padding: 10px 0;
 }
+
 .player-bg {
   position: absolute;
   width: 100%;
@@ -302,12 +616,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   top: 0;
   left: 0;
 }
+
 .player-crown {
   position: relative;
   width: 27px;
   height: 27px;
   margin: 0 15px;
 }
+
 .view-crown {
   width: 27px;
   height: 27px;
@@ -319,6 +635,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   background-color: #676767;
   position: relative;
 }
+
 .rank-item-content {
   display: flex;
   flex-direction: column;
@@ -328,17 +645,20 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   position: relative;
   padding-left: 10px;
 }
+
 .rank-item-content > text:first-child {
   color: #fff;
   font-size: 14px;
   margin-bottom: 3px;
   width: 120px;
 }
+
 .rank-list-item > text:last-child {
   margin-right: 10px;
   width: 56px;
   text-align: right;
 }
+
 .my-rank-data {
   width: calc(100% - 30px);
   padding: 15px;
@@ -352,12 +672,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   overflow: hidden;
   border-radius: 10px;
 }
+
 .my-rank-data > image:first-child {
   position: absolute;
   width: 100%;
   left: 0;
   top: -5px;
 }
+
 .my-rank-data > text:nth-child(2) {
   background-color: #c1a434;
   position: relative;
@@ -369,20 +691,24 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   min-width: 15px;
   text-align: center;
 }
+
 .my-rank-data > text:last-child {
   position: relative;
   margin-right: 10px;
   width: 65px;
   text-align: right;
 }
+
 .my-rank-data > .rank-item-content > text:first-child {
   color: #fed847;
 }
+
 .my-rank-data > .rank-item-integral {
   color: #fff9;
   font-size: 12px;
   margin-right: 0 !important;
 }
+
 .no-data {
   width: 100%;
   height: 400px;
@@ -392,4 +718,11 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
   color: #fff9;
   font-size: 14px;
 }
+
+.list-tip {
+  justify-content: center !important;
+  color: #fff9;
+  font-size: 12px;
+  min-height: 60rpx;
+}
 </style>

src/pages/team-battle.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
+import {ref, onMounted, onBeforeUnmount, nextTick, watch} from "vue";
-import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import {onLoad, onShow, onHide} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -11,17 +11,21 @@ import RoundEndTip from "@/components/RoundEndTip.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import TeamAvatars from "@/components/TeamAvatars.vue";
 import ShootProgress2 from "@/components/ShootProgress2.vue";
-import { laserCloseAPI, getBattleAPI } from "@/apis";
+import SModal from "@/components/SModal.vue";
-import { MESSAGETYPESV2 } from "@/constants";
+import {laserCloseAPI, getBattleAPI} from "@/apis";
+import {MESSAGETYPESV2} from "@/constants";
 import audioManager from "@/audioManager";
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { user } = storeToRefs(store);
+const {user, online} = storeToRefs(store);
 const start = ref(null);
 const tips = ref("");
 const battleId = ref("");
 const currentRound = ref(0);
+/** 专用于 RoundEndTip 展示的轮次，与进度条的 currentRound 解耦，避免 ToSomeoneShoot 提前更新 currentRound 导致 Tip 显示错误轮次 */
+const roundTipRound = ref(0);
 const goldenRound = ref(0);
 const currentRedPoint = ref(0);
 const currentBluePoint = ref(0);
@@ -35,16 +39,54 @@ const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
+const matchStatus = ref(undefined);
+const updateRemainSecond = ref(0);
+/** 当前对局每人射击时间（秒），从后端 shootTime 字段动态读取，默认 15 */
+const shootTimeTotal = ref(15);
+/** 对战来源类型（1=好友约战，2=匹配对战），用于结算页分流 */
+const battleWay = ref(0);
+/** 上一次处理的 ToSomeoneShoot 关键字段，用于去重过滤重复消息 */
+const lastToSomeoneShootKey = ref("");
+/** 控制设备离线提示弹窗的显示状态 */
+const showOfflineModal = ref(false);
+/** 记录每位玩家当前轮连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});
 
-const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
+/**
+ * 监听设备在线状态，比赛进行中设备离线时弹窗提示用户
+ */
+watch(online, (newVal, oldVal) => {
+  if (!newVal && oldVal && start.value === true) {
+    showOfflineModal.value = true;
+  }
+});
+
+const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
   try {
     battleId.value = battleInfo.matchId;
-    blueTeam.value = battleInfo.teams[1].players || [];
+    // 存储对战来源，供结算跳转分流使用
-    redTeam.value = battleInfo.teams[2].players || [];
+    if (battleInfo.way !== undefined) battleWay.value = battleInfo.way;
+
+    // 优先使用接口返回的队伍数据，如果没有则尝试从缓存读取（应对匹配刚完成接口未就绪的情况）
+    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;
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
-      console.log(`对局已进行${readyRemain}秒`);
       if (readyRemain > 0 && readyRemain < 15) {
         setTimeout(() => {
           uni.$emit("update-timer", 15 - readyRemain - 0.2);
@@ -53,30 +95,73 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
       return;
     }
     if (!arrowOnly) {
+      // 在 ToSomeoneShoot 时同步更新当前轮次，使进度条轮次图片及时切换
+      currentRound.value = battleInfo.current.round || 1;
       currentShooterId.value = battleInfo.current.playerId;
       const redPlayer = battleInfo.teams[2].players.find(
-        (item) => item.id === battleInfo.current.playerId
+          (item) => item.id === battleInfo.current.playerId
       );
       let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
       if (force) nextTips += "重回";
       if (
-        battleInfo.current.playerId === user.value.id &&
+          battleInfo.current.playerId === user.value.id
-        redTeam.value.length > 1
       ) {
         nextTips += "你";
       }
+      // 同队连续出手时 tips 值不变，HeaderProgress watch 不触发音频
+      // 需在赋值前比较旧值，手动播放音频确保始终触发 onAudioEnded 启动计时器
+      // 注意：使用 interrupt=false 避免打断上一支箭的环数播报音频
+      if (tips.value === nextTips && !nextTips.includes("重回")) {
+        const audioKey = redPlayer ? "请红方射箭" : "请蓝方射箭";
+        audioManager.play(audioKey, false);
+      }
       tips.value = nextTips;
-      uni.$emit("update-tips", nextTips);
+      // 同步写入 Pinia store，供 HeaderProgress 通过 immediate watch 在 onMounted 时立即读取
+      // 规避 WeChat 小程序 onShow 在组件 onMounted 之前触发导致 uni.$emit 事件丢失的时序问题
+      store.updateTips(nextTips);
+      // force 模式下改为在 nextTick 内发送 update-tips，规避 WeChat 小程序
+      // onShow 与 onMounted 时序问题导致 HeaderProgress 监听器尚未注册的边界情况
+      if (!force) {
+        uni.$emit("update-tips", nextTips);
+      }
+      // redPlayer 已在上方 find() 确认：不为 null 则当前射手在红队
+      const targetTeam = redPlayer ? 'red' : 'blue';
+      // 从后端消息读取本局射击时间，动态设置进度条满值与倒计时秒数（降级兜底 15s）
+      shootTimeTotal.value = battleInfo.shootTime ?? 15;
       if (force) {
-        const remain = (Date.now() - battleInfo.current.startTime) / 1000;
+        // force 模式下 start.value 刚由 null 变 true，Vue 异步调度渲染，
-        console.log(`当前轮已进行${remain}秒`);
+        // ShootProgress2（v-if="start"）尚未挂载，update-remain 事件会被丢弃。
-        if (remain > 0 && remain < 15) {
+        // 同时 HeaderProgress 对含"重回"的 tips 拦截音频，倒计时无法依赖
-          setTimeout(() => {
+        // onAudioEnded 驱动，需在 nextTick 后直接启动。
-            uni.$emit("update-remain", 15 - remain - 0.2);
+
-          }, 200);
+        // playerId=0 表示后端处于过渡状态（上一位射手已完成、下一位尚未分配）
+        // 此时 startTime/targetTeam 均不可靠，停止进度条并等待 WS ToSomeoneShoot 驱动
+        if (!battleInfo.current.playerId) {
+          nextTick(() => {
+            uni.$emit("update-tips", nextTips);
+            uni.$emit("update-remain", {stop: true});
+          });
+          return;
         }
+
+        const elapsed = (Date.now() - battleInfo.current.startTime) / 1000;
+        if (elapsed > 0 && elapsed < shootTimeTotal.value) {
+          updateRemainSecond.value = shootTimeTotal.value - elapsed - 0.2;
+        }
+        const actualRemain = updateRemainSecond.value;
+        nextTick(() => {
+          // 在 nextTick 内统一发送，确保 ShootProgress2 和 HeaderProgress 均已挂载
+          uni.$emit("update-tips", nextTips);
+          uni.$emit("update-remain", {reset: true, value: shootTimeTotal.value, team: targetTeam});
+          // 重置动画完成后，直接启动倒计时（无需依赖音频结束回调）
+          setTimeout(() => {
+            uni.$emit("update-remain", {stop: false, value: actualRemain, team: targetTeam});
+          }, 100);
+        });
       } else {
-        uni.$emit("update-remain", battleInfo.readyTime);
+        // ToSomeoneShoot 到达时：若进度条仍在倒计时则瞬间清零再切换满值，确保视觉连贯
+        uni.$emit("update-remain", {zeroThenReset: true, value: shootTimeTotal.value, team: targetTeam});
+        updateRemainSecond.value = shootTimeTotal.value;
       }
     } else {
       currentRound.value = battleInfo.current.round || 1;
@@ -95,29 +180,105 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
   }
 };
 
+function onAudioEnded(s) {
+  // "请红方射箭"/"请蓝方射箭"：队友或对手轮次；"轮到你了"：用户本人轮次（HeaderProgress特殊分支）
+  // 三者音频结束后均需启动倒计时进度条
+  if (s.indexOf('请红方射箭') >= 0 || s.indexOf('请蓝方射箭') >= 0 || s.indexOf('轮到你了') >= 0) {
+    let team;
+    if (s.indexOf('请红方射箭') >= 0) team = 'red';
+    else if (s.indexOf('请蓝方射箭') >= 0) team = 'blue';
+    else team = tips.value.includes('红队') ? 'red' : 'blue'; // 轮到你了：从当前tips判断用户所在队伍
+    uni.$emit("update-remain", {stop: false, value: updateRemainSecond.value, team: team});
+  }
+  if (s.indexOf("比赛结束") >= 0) {
+    console.log("比赛结束");
+    onBattleEnd()
+  }
+}
+
+function onBattleEnd() {
+  if (matchStatus.value === 2) {
+    // 全部跳转到新结算页
+    uni.redirectTo({
+      url: `/pages/friend-battle-result?battleId=${battleId.value}`,
+    });
+  }
+}
+
+/**
+ * @param {object} msg - NewRound 消息
+ * @param {number} prevRound - 在 NewRound 消息到达时即时捕获的旧轮次，用于 Tip 展示，避免异步延迟内 currentRound 已被更新
+ */
+function onNewRound(msg, prevRound) {
+  showRoundTip.value = true;
+  isFinalShoot.value = msg.current.goldRound;
+  // 新轮次开始时立即清空靶纸箭迹，避免残留上一轮落点至新轮次第一箭到来
+  scores.value = [];
+  blueScores.value = [];
+  // 决金轮箭数不确定（平局后可能再加一箭），清零 totalShot 隐藏箭数显示
+  if (msg.current.goldRound) {
+    store.updateShotInfo(0, 0);
+  }
+  // 用传入的 prevRound（捕获时刻的旧轮次）展示结算 Tip，与进度条 currentRound 解耦
+  roundTipRound.value = prevRound;
+  const latestRound = msg.rounds[prevRound - 1];
+  if (latestRound) {
+    if (isFinalShoot.value) {
+      currentBluePoint.value = msg.teams[1].score;
+      currentRedPoint.value = msg.teams[2].score;
+    } else {
+      currentBluePoint.value = latestRound.scores[1].score;
+      currentRedPoint.value = latestRound.scores[2].score;
+    }
+  }
+}
+
+/**
+ * 检测指定射手连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number} shooterId - 本次射手的 ID（取自 currentShooterId.value）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(shooterId, isXRing) {
+  if (!shooterId) return;
+  if (isXRing) {
+    xRingStreaks.value[shooterId] = (xRingStreaks.value[shooterId] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[shooterId] >= 3) {
+      xRingStreaks.value[shooterId] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[shooterId] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
     start.value = true;
   } else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) {
+    // 去重防护：如果 playerId + round 与上一次处理完全相同，则忽略重复推送的消息
+    // （防止 onBeforeUnmount 未及时 off 和页面重创建导致同一事件被处理多次）
+    const key = `${msg?.current?.playerId}-${msg?.current?.round}`;
+    if (key === lastToSomeoneShootKey.value) return;
+    lastToSomeoneShootKey.value = key;
     recoverData(msg);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     showRoundTip.value = false;
-    recoverData(msg, { arrowOnly: true });
+    recoverData(msg, {arrowOnly: true});
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    // currentShooterId 在 ToSomeoneShoot 时写入，ShootResult 不会覆盖，可靠识别本次射手
+    checkAndPlayTententen(currentShooterId.value, !!(msg.shootData?.ringX && msg.shootData?.ring));
   } else if (msg.type === MESSAGETYPESV2.NewRound) {
-    showRoundTip.value = true;
+    // 在进入延迟前先捕获当前轮次，供 onNewRound 使用，防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
-    isFinalShoot.value = msg.current.goldRound;
+    const prevRound = currentRound.value;
-    const latestRound = msg.rounds[currentRound.value - 1];
+    setTimeout(() => {
-    if (latestRound) {
+      onNewRound(msg, prevRound)
-      if (isFinalShoot.value) {
+    }, 800)
-        currentBluePoint.value = msg.teams[1].score;
-        currentRedPoint.value = msg.teams[2].score;
-      } else {
-        currentBluePoint.value = latestRound.scores[1].score;
-        currentRedPoint.value = latestRound.scores[2].score;
-      }
-    }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    matchStatus.value = msg.status;
     if (msg.status === 4) {
       showRoundTip.value = true;
       currentBluePoint.value = 0;
@@ -125,18 +286,15 @@ async function onReceiveMessage(msg) {
       setTimeout(() => {
         uni.navigateBack();
       }, 2000);
-      return;
     }
-    setTimeout(() => {
-      uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.matchId,
-      });
-    }, 1000);
   }
 }
 
 onLoad(async (options) => {
   if (options.battleId) battleId.value = options.battleId;
+  // 重置箭数和提示文案，防止因 Pinia 保留上一场比赛的旧值而错误展示
+  store.updateShotInfo(0, 0);
+  store.updateTips("");
   // uni.enableAlertBeforeUnload({
   //   message: "离开比赛可能导致比赛失败，是否继续？",
   //   success: (res) => {
@@ -149,29 +307,45 @@ onMounted(async () => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("audioEnded", onAudioEnded);
   await laserCloseAPI();
 });
 onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
+  // 注销所有第三方事件盓听，防止页面重创建时监听叠加导致消息重复处理
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("audioEnded", onAudioEnded);
   audioManager.stopAll();
 });
 const refreshTimer = ref(null);
 onShow(async () => {
   if (battleId.value) {
+    // 延迟 300ms 等待网络恢复，避免小程序从后台切回时网络尚未就绪导致请求失败报错
+    await new Promise(resolve => setTimeout(resolve, 300));
     const result = await getBattleAPI(battleId.value);
+    if (!result) return;
     if (result.status === 2) {
-      uni.showToast({
+      // 比赛已结束（如切后台再回来）：跳新结算页
-        title: "比赛已结束",
+      uni.redirectTo({
-        icon: "none",
+        url: `/pages/friend-battle-result?battleId=${result.matchId}`,
-      });
-      uni.navigateBack({
-        delta: 2,
       });
     } else {
-      recoverData(result, { force: true });
+      if (result.status !== 0) {
+        // 比赛进行中，从后端恢复箭数（测距阶段不展示）
+        // 决金轮不展示箭数；其余轮次从 indexMap 按用户 id 取已射箭数
+        if (result.shootNumber && !result.current?.goldRound) {
+          store.updateShotInfo(result.current?.indexMap?.[user.value.id] ?? 0, result.shootNumber);
+        }
+      } else {
+        // 测距阶段重置箭数和提示文案，防止 ImmediateWatcher 读取 Pinia 保留的旧值
+        store.updateShotInfo(0, 0);
+        // 同步清空 Pinia tips 与本地 tips，避免重新开赛时 HeaderProgress 展示上一场旧文案
+        store.updateTips("");
+        tips.value = "";
+      }
+      recoverData(result, {force: true});
     }
   }
 });
@@ -180,56 +354,71 @@ onShow(async () => {
 <template>
   <Container :bgType="start ? 3 : 1">
     <view class="container">
+      <!-- winner=0 表示对局尚未开始，不显示胜者徽章 -->
       <BattleHeader
-        v-if="start === false"
+          v-if="start === false"
-        :redTeam="redTeam"
+          :redTeam="redTeam"
-        :blueTeam="blueTeam"
+          :blueTeam="blueTeam"
+          :winner="0"
       />
-      <TestDistance v-if="start === false" :guide="false" :isBattle="true" />
+      <TestDistance v-if="start === false" :guide="false" :isBattle="true"/>
       <view v-if="start" class="players-row">
         <TeamAvatars
-          :team="blueTeam"
+            :team="blueTeam"
-          :isRed="false"
+            :isRed="false"
-          :currentShooterId="currentShooterId"
+            :currentShooterId="currentShooterId"
         />
         <ShootProgress2
-          :tips="tips"
+            :tips="tips"
-          :currentRound="
+            :total="shootTimeTotal"
+            :currentRound="
             goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound
           "
         />
-        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId" />
+        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId"/>
       </view>
       <BowTarget
-        v-if="start"
+          v-if="start"
-        mode="team"
+          mode="team"
-        :scores="scores"
+          :scores="scores"
-        :blueScores="blueScores"
+          :blueScores="blueScores"
       />
       <BattleFooter
-        v-if="start"
+          v-if="start"
-        :roundResults="roundResults"
+          :roundResults="roundResults"
-        :redPoints="redPoints"
+          :redPoints="redPoints"
-        :bluePoints="bluePoints"
+          :bluePoints="bluePoints"
-        :goldenRound="goldenRound"
+          :goldenRound="goldenRound"
       />
       <ScreenHint
-        :show="showRoundTip"
+          :show="showRoundTip"
-        :onClose="() => (showRoundTip = false)"
+          :mode="isFinalShoot ? 'tall' : 'normal'"
-        :mode="isFinalShoot ? 'tall' : 'normal'"
       >
         <RoundEndTip
-          v-if="showRoundTip"
+            v-if="showRoundTip"
-          :isFinal="isFinalShoot"
+            :isFinal="isFinalShoot"
-          :round="currentRound"
+            :round="roundTipRound"
-          :bluePoint="currentBluePoint"
+            :bluePoint="currentBluePoint"
-          :redPoint="currentRedPoint"
+            :redPoint="currentRedPoint"
-          :roundData="
+            :roundData="
-            roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
+            roundResults[roundTipRound - 1] ? roundResults[roundTipRound - 1] : []
           "
-          :onAutoClose="() => (showRoundTip = false)"
+            :onAutoClose="()=>{ showRoundTip = false}"
         />
       </ScreenHint>
+      <!-- 设备离线提示弹窗 -->
+      <SModal
+          :show="showOfflineModal"
+          :noBg="true"
+          height="360rpx"
+          :onClose="() => (showOfflineModal = false)"
+      >
+        <view class="offline-modal">
+          <text class="offline-title">设备已离线</text>
+          <text class="offline-desc">检测到设备已断开连接，请检查设备后继续比赛</text>
+          <SButton @click="showOfflineModal = false">我知道了</SButton>
+        </view>
+      </SModal>
     </view>
   </Container>
 </template>
@@ -239,6 +428,7 @@ onShow(async () => {
   width: 100%;
   height: 100%;
 }
+
 .players-row {
   display: flex;
   align-items: center;
@@ -246,4 +436,25 @@ onShow(async () => {
   margin-top: -2%;
   margin-bottom: 6%;
 }
+
+.offline-modal {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 60rpx 40rpx 40rpx;
+  gap: 24rpx;
+}
+
+.offline-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #FED847;
+}
+
+.offline-desc {
+  font-size: 28rpx;
+  color: #CCCCCC;
+  text-align: center;
+  line-height: 1.6;
+}
 </style>

src/pages/team-battle/components/AppBackground.vue

@@ -0,0 +1,91 @@
+<script setup>
+import { capsuleHeight } from "@/util";
+
+const props = defineProps({
+  type: {
+    type: Number,
+    default: 0,
+  },
+  bgColor: {
+    type: String,
+    default: "#050b19",
+  },
+});
+</script>
+
+<template>
+  <view class="background" :style="{ backgroundColor: bgColor }">
+    <image
+      class="bg-image"
+      v-if="type === 0"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 1"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg2.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 2"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg3.png"
+      :style="{ height: capsuleHeight + 50 + 'px' }"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 3"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg4.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 4"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 5"
+      src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
+      mode="widthFix"
+    />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
+    <view class="bg-overlay" v-if="type === 0"></view>
+  </view>
+</template>
+
+<style scoped>
+.background {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: -1;
+}
+
+.bg-image {
+  width: 100%;
+  /* height: 100%; */
+}
+
+.bg-overlay {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  background: linear-gradient(
+    to bottom,
+    rgba(26, 26, 26, 0.2),
+    rgba(0, 0, 0, 0.2)
+  );
+}
+</style>

src/pages/team-battle/components/Avatar.vue

@@ -0,0 +1,123 @@
+<script setup>
+import { ref, onMounted, watch } from "vue";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { getLvlImage } = store;
+const { config } = storeToRefs(store);
+const props = defineProps({
+  src: {
+    type: String,
+    default: "",
+  },
+  rankLvl: {
+    type: Number,
+    default: undefined,
+  },
+  onClick: {
+    type: Function,
+    default: () => {},
+  },
+  rank: {
+    type: Number,
+    default: 0,
+  },
+  size: {
+    type: Number,
+    default: 45,
+  },
+  borderColor: {
+    type: String,
+    default: "",
+  },
+});
+const avatarFrame = ref("");
+watch(
+  () => [config.value, props.rankLvl],
+  () => {
+    if (props.rankLvl !== undefined) {
+      avatarFrame.value = getLvlImage(props.rankLvl);
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+</script>
+
+<template>
+  <view class="avatar" @click="onClick">
+    <image
+      v-if="avatarFrame"
+      :src="avatarFrame"
+      mode="widthFix"
+      :style="{
+        width: Number(size) + 10 + 'px',
+        height: Number(size) + 10 + 'px',
+      }"
+      class="avatar-frame"
+    />
+    <image
+      v-if="rank === 1"
+      src="../../../static/champ1.png"
+      mode="widthFix"
+      class="avatar-rank"
+    />
+    <image
+      v-if="rank === 2"
+      src="../../../static/champ2.png"
+      mode="widthFix"
+      class="avatar-rank"
+    />
+    <image
+      v-if="rank === 3"
+      src="../../../static/champ3.png"
+      mode="widthFix"
+      class="avatar-rank"
+    />
+    <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
+    <image
+      :src="src || '../../../static/user-icon.png'"
+      mode="widthFix"
+      :style="{
+        width: size + 'px',
+        height: size + 'px',
+        minHeight: size + 'px',
+        borderColor: borderColor || '#fff',
+      }"
+      class="avatar-image"
+    />
+  </view>
+</template>
+
+<style scoped>
+.avatar {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.avatar-frame {
+  position: absolute;
+}
+.avatar-rank,
+.rank-view {
+  position: absolute;
+  width: 20px;
+  height: 15px;
+  top: -6px;
+  right: -4px;
+}
+.rank-view {
+  background-color: #6d6d6d;
+  text-align: center;
+  line-height: 15px;
+  font-size: 12px;
+  border-top-left-radius: 50%;
+  border-bottom-right-radius: 50%;
+}
+.avatar-image {
+  border-radius: 50%;
+  border: 1px solid #fff;
+}
+</style>

src/pages/team-battle/components/BackToGame.vue

@@ -0,0 +1,138 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+
+import { getBattleAPI, getUserGameState } from "@/apis";
+import { debounce } from "@/util";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, game } = storeToRefs(store);
+const { updateGame } = store;
+
+const props = defineProps({
+  signin: {
+    type: Function,
+    default: () => {},
+  },
+});
+const loading = ref(false);
+
+/** 统一获取当前环境 token，用于守卫：无有效 token 时不发起接口请求 */
+const getToken = () =>
+  uni.getStorageSync(`${uni.getAccountInfoSync().miniProgram.envVersion}_token`);
+
+onShow(async () => {
+  if (user.value.id && getToken()) {
+    setTimeout(async () => {
+      const state = await getUserGameState();
+      updateGame(state.gaming, state.roomId);
+    }, 1000);
+  }
+});
+
+watch(
+  () => user.value,
+  async (value) => {
+    if (!value.id) {
+      updateGame(false, "");
+    } else if (getToken()) {
+      // 有有效 token 时才查询在局状态，避免 token 失效时反复发起无效请求
+      const state = await getUserGameState();
+      updateGame(state.gaming, state.roomId);
+    }
+  }
+);
+
+const onClick = debounce(async () => {
+  if (loading.value) return;
+  try {
+    loading.value = true;
+    const result = await getBattleAPI();
+    if (result && result.matchId) {
+      await uni.$checkAudio();
+      if (result.mode <= 3) {
+        uni.navigateTo({
+          url: `/pages/team-battle/index?battleId=${result.matchId}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/melee-battle?battleId=${result.matchId}`,
+        });
+      }
+      return;
+    }
+    if (game.value.roomID) {
+      uni.navigateTo({
+        url: "/pages/battle-room?roomNumber=" + game.value.roomID,
+      });
+    } else {
+      updateGame(false, "");
+    }
+  } finally {
+    loading.value = false;
+  }
+});
+const gameOver = () => {
+  updateGame(false, "");
+};
+onMounted(() => {
+  uni.$on("game-over", gameOver);
+});
+onBeforeUnmount(() => {
+  uni.$off("game-over", gameOver);
+});
+</script>
+
+<template>
+  <view
+    v-if="game.inBattle || game.roomID"
+    class="back-to-game"
+    @click="onClick"
+  >
+    <image src="../../../static/back-to-game-bg.png" mode="widthFix" />
+    <block v-if="game.inBattle">
+      <image src="../../../static/pk-icon.png" mode="widthFix" />
+      <text>返回进行中的对局</text>
+    </block>
+    <block v-else-if="game.roomID">
+      <text>返回房间</text>
+    </block>
+    <image src="../../../static/back.png" mode="widthFix" />
+  </view>
+</template>
+
+<style scoped>
+.back-to-game {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  width: 56vw;
+  left: calc(50% - 28vw);
+  top: 12%;
+  z-index: 999;
+}
+.back-to-game > image:first-child {
+  position: absolute;
+  width: 100%;
+  height: 100rpx;
+}
+.back-to-game > image:nth-child(2) {
+  position: relative;
+  width: 60px;
+  height: 60px;
+}
+.back-to-game > text {
+  position: relative;
+  font-size: 14px;
+}
+.back-to-game > image:last-child {
+  position: relative;
+  width: 15px;
+  margin-left: 5px;
+  transform: rotate(180deg);
+}
+</style>

src/pages/team-battle/components/BattleFooter.vue

@@ -0,0 +1,203 @@
+=
+<script setup>
+import { computed } from "vue";
+import BowPower from "./BowPower.vue";
+import { RoundImages } from "@/constants";
+const props = defineProps({
+  roundResults: {
+    type: Array,
+    default: () => [],
+  },
+  bluePoints: {
+    type: Number,
+    default: 0,
+  },
+  redPoints: {
+    type: Number,
+    default: 0,
+  },
+  goldenRound: {
+    type: Number,
+    default: 0,
+  },
+});
+
+const normalRounds = computed(() => {
+  const count = props.roundResults.findIndex((item) => !!item.ifGold);
+  return count > 0 ? count : props.roundResults.length;
+});
+</script>
+
+<template>
+  <view class="container">
+    <view class="guide-row">
+      <image src="../../../static/shooter.png" mode="widthFix" />
+      <view
+        :style="{
+          marginBottom: '10px',
+          transform: 'scale(0.8) translateX(10px)',
+        }"
+      >
+        <BowPower />
+      </view>
+    </view>
+    <view>
+      <image src="../../../static/battle-header-melee.png" mode="widthFix" />
+      <text>蓝队({{ bluePoints }})</text>
+      <text>红队({{ redPoints }})</text>
+    </view>
+    <view class="players">
+      <view>
+        <view v-for="(result, index) in roundResults" :key="index">
+          <block v-if="index + 1 > normalRounds">
+            <image
+              :src="RoundImages[`gold${index + 1 - normalRounds}`]"
+              mode="widthFix"
+            />
+          </block>
+          <block v-else>
+            <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          </block>
+          <view>
+            <text>{{
+              result.shoots[1] && result.shoots[1].length
+                ? result.shoots[1]
+                    .map((item) => item.ring)
+                    .reduce((last, next) => last + next, 0)
+                : ""
+            }}</text>
+            <text>环</text>
+          </view>
+        </view>
+        <block v-if="roundResults.length < 3">
+          <view v-for="i in 3 - roundResults.length" :key="i">
+            <image
+              :src="RoundImages[`round${i + roundResults.length}`]"
+              mode="widthFix"
+            />
+            <view>
+              <text></text>
+              <text>环</text>
+            </view>
+          </view>
+        </block>
+      </view>
+      <view>
+        <view v-for="(result, index) in roundResults" :key="index">
+          <block v-if="index + 1 > normalRounds">
+            <image
+              :src="RoundImages[`gold${index + 1 - normalRounds}`]"
+              mode="widthFix"
+            />
+          </block>
+          <block v-else>
+            <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          </block>
+          <view>
+            <text>{{
+              result.shoots[2] && result.shoots[2].length
+                ? result.shoots[2]
+                    .map((item) => item.ring)
+                    .reduce((last, next) => last + next, 0)
+                : ""
+            }}</text>
+            <text>环</text>
+          </view>
+        </view>
+        <block v-if="roundResults.length < 3">
+          <view v-for="i in 3 - roundResults.length" :key="i">
+            <image
+              :src="RoundImages[`round${i + roundResults.length}`]"
+              mode="widthFix"
+            />
+            <view>
+              <text></text>
+              <text>环</text>
+            </view>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100%;
+  overflow: hidden;
+  margin-top: -100rpx;
+}
+.container > view:nth-child(2) {
+  position: relative;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 13px;
+}
+.container > view:nth-child(2) > image:first-child {
+  position: absolute;
+  width: 100%;
+  top: -6px;
+}
+.container > view:nth-child(2) > text {
+  z-index: 1;
+  margin-top: 2px;
+  color: #8a323e;
+  font-weight: 500;
+}
+.container > view:nth-child(2) > text:nth-child(2) {
+  color: #004ac1;
+}
+.players {
+  display: flex;
+}
+.players > view {
+  width: 50%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  padding-top: 5px;
+}
+.players > view:first-child > view {
+  background: linear-gradient(270deg, #172a86 0%, #0000 100%);
+}
+.players > view:last-child > view {
+  background: linear-gradient(270deg, #0000 0%, #6a1212 100%);
+}
+.players > view > view {
+  min-height: 52rpx;
+  width: calc(100% - 40px);
+  padding: 2px 20px;
+  margin-bottom: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.players > view > view > image:first-child {
+  width: 135rpx;
+  height: 20px;
+}
+.players > view > view > view:last-child {
+  font-size: 10px;
+}
+.players > view > view > view:last-child > text:first-child {
+  font-size: 16px;
+  color: #fed847;
+  margin-right: 5px;
+  font-weight: 500;
+}
+.guide-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  padding: 0 5vw;
+  margin-bottom: -4px;
+  z-index: 2;
+  position: relative;
+}
+.guide-row > image {
+  width: 140rpx;
+}
+</style>

src/pages/team-battle/components/BattleHeader.vue

@@ -0,0 +1,200 @@
+<script setup>
+import Avatar from "./Avatar.vue";
+import { meleeAvatarColors } from "@/constants";
+defineProps({
+  players: {
+    type: Array,
+    default: () => [],
+  },
+  blueTeam: {
+    type: Array,
+    default: () => [],
+  },
+  redTeam: {
+    type: Array,
+    default: () => [],
+  },
+  showRank: {
+    type: Boolean,
+    default: false,
+  },
+  winner: {
+    type: Number,
+    default: 2,
+  },
+  showHeader: {
+    type: Boolean,
+    default: true,
+  },
+});
+</script>
+
+<template>
+  <view class="container" :style="{ paddingTop: showHeader ? '5px' : '0' }">
+    <image
+      v-if="showHeader"
+      :src="`../../../static/battle-header${players.length ? '-melee' : ''}.png`"
+      mode="widthFix"
+    />
+    <view
+      v-if="!players.length && blueTeam.length && redTeam.length"
+      class="players"
+      :style="{ paddingTop: showHeader ? '15px' : '0' }"
+    >
+      <view>
+        <view
+          v-for="(player, index) in blueTeam"
+          :key="index"
+          :style="{
+            margin: blueTeam.length === 2 ? '0 -5px' : '0 6px',
+            width: `${100 / blueTeam.length - blueTeam.length * 3}%`,
+          }"
+        >
+          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" :size="40" />
+          <text class="player-name">{{ player.name }}</text>
+        </view>
+        <image
+          v-if="winner === 1"
+          src="../../../static/winner-badge.png"
+          mode="widthFix"
+          class="left-winner-badge"
+        />
+      </view>
+      <view>
+        <view
+          v-for="(player, index) in redTeam"
+          :key="index"
+          :style="{
+            margin: redTeam.length === 2 ? '0 -5px' : '0 6px',
+            width: `${100 / redTeam.length - redTeam.length * 3}%`,
+          }"
+        >
+          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" :size="40" />
+          <text class="player-name">{{ player.name }}</text>
+        </view>
+        <image
+          v-if="winner === 2"
+          src="../../../static/winner-badge.png"
+          mode="widthFix"
+          class="right-winner-badge"
+        />
+      </view>
+    </view>
+    <!-- 大乱斗玩家列表：scroll-view 作为横向滚动容器 -->
+    <!-- 小程序中 scroll-view 不支持直接 display:flex，需内部 wrapper view 承载 flex 布局 -->
+    <!-- 仅当玩家 >5 人（内容溢出宽度）时才阻止冒泡，防止与外层 swiper 切换 tab 的手势冲突 -->
+    <scroll-view
+      v-if="players.length"
+      class="players-melee"
+      scroll-x
+      @touchmove="(e) => players.length > 5 && e.stopPropagation()"
+      :style="{ paddingTop: showHeader ? '15px' : '0' }"
+    >
+      <view class="players-melee-inner">
+        <view
+          v-for="(player, index) in players"
+          :key="index"
+          :style="{
+            backgroundColor: meleeAvatarColors[index],
+            width: `${Math.max(100 / players.length, 18)}vw`,
+          }"
+        >
+          <Avatar
+            :src="player.avatar"
+            :rankLvl="showRank ? undefined : player.rankLvl"
+            :size="40"
+            :rank="showRank ? index + 1 : 0"
+          />
+          <text class="player-name">{{ player.name }}</text>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100%;
+  position: relative;
+  margin-bottom: 10px;
+}
+.container > image:first-child {
+  position: absolute;
+  width: 100%;
+  top: -5px;
+  z-index: 1;
+}
+.players {
+  display: flex;
+}
+.players > view {
+  width: 50%;
+  height: 75px;
+  color: #fff9;
+  font-size: 12px;
+  overflow: hidden;
+  position: relative;
+  padding-top: 5px;
+  display: flex;
+  justify-content: center;
+}
+.players > view:first-child {
+  background-color: #364469;
+}
+.players > view:last-child {
+  background-color: #692735;
+}
+.players > view > view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.players-melee {
+  height: 80px;
+  width: 100%;
+}
+.players-melee::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+/* 小程序 scroll-view 不支持直接 flex，通过内层 wrapper 承载横向排列 */
+.players-melee-inner {
+  display: flex;
+  height: 100%;
+  flex-wrap: nowrap;
+}
+.players-melee-inner > view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: #fff9;
+  font-size: 12px;
+  padding-top: 7px;
+  flex: 0 0 auto;
+}
+.player-name {
+  margin-top: 3px;
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+}
+.left-winner-badge {
+  position: absolute;
+  width: 50px;
+  top: -12%;
+  left: -5%;
+  transform: rotate(-12deg);
+}
+.right-winner-badge {
+  position: absolute;
+  width: 50px;
+  top: -12%;
+  right: -5%;
+  transform: rotate(36deg);
+}
+</style>

src/pages/team-battle/components/BowPower.vue

@@ -0,0 +1,40 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import { getDeviceBatteryAPI } from "@/apis";
+
+const power = ref(0);
+const timer = ref(null);
+
+onMounted(async () => {
+  const data = await getDeviceBatteryAPI();
+  power.value = data.battery;
+  timer.value = setInterval(async () => {
+    const data = await getDeviceBatteryAPI();
+    power.value = data.battery;
+  }, 1000 * 10);
+});
+
+onBeforeUnmount(() => {
+  clearInterval(timer.value);
+});
+</script>
+
+<template>
+  <view class="container">
+    <image src="../../../static/b-power.png" mode="widthFix" />
+    <view>电量{{ power || 1 }}%</view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  color: #ffffffa8;
+  font-size: 13px;
+}
+.container > image {
+  width: 20px;
+  margin-right: 5px;
+}
+</style>

src/pages/team-battle/components/BowTarget.vue

@@ -0,0 +1,558 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
+import PointSwitcher from "./PointSwitcher.vue";
+
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
+import { simulShootAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+
+const props = defineProps({
+  currentRound: {
+    type: Number,
+    default: 0,
+  },
+  totalRound: {
+    type: Number,
+    default: 0,
+  },
+  scores: {
+    type: Array,
+    default: () => [],
+  },
+  blueScores: {
+    type: Array,
+    default: () => [],
+  },
+  latestShotFlash: {
+    type: Object,
+    default: null,
+  },
+  mode: {
+    type: String,
+    default: "solo", // solo 单排，team 双排
+  },
+  stop: {
+    type: Boolean,
+    default: false,
+  },
+  targetRadius: {
+    type: Number,
+    default: 20,
+  },
+  hitRadiusPx: {
+    type: Number,
+    default: 2,
+  },
+  zoomHitRadiusPx: {
+    type: Number,
+    default: 5,
+  },
+});
+
+const pMode = ref(true);
+const latestOne = ref(null);
+const bluelatestOne = ref(null);
+const timer = ref(null);
+const dirTimer = ref(null);
+const angle = ref(null);
+const circleColor = ref("");
+const ROUND_TIP_OFFSET_Y = -32;
+const EXPERIENCE_TIP_OFFSET_Y = -68;
+
+function showShotFlash(flash) {
+  const shootData = flash?.shootData;
+  if (!shootData) return;
+  if (timer.value) clearTimeout(timer.value);
+
+  if (flash.team === "red") {
+    latestOne.value = shootData;
+    timer.value = setTimeout(() => {
+      latestOne.value = null;
+    }, 1000);
+    return;
+  }
+
+  bluelatestOne.value = shootData;
+  timer.value = setTimeout(() => {
+    bluelatestOne.value = null;
+  }, 1000);
+}
+
+watch(
+  () => props.latestShotFlash,
+  (newVal) => {
+    showShotFlash(newVal);
+  },
+  { immediate: true }
+);
+
+const safeTargetRadius = computed(() => {
+  const radius = Number(props.targetRadius);
+  return Number.isFinite(radius) && radius > 0 ? radius : 20;
+});
+
+const currentHitRadiusPx = computed(() => {
+  const radius = Number(
+    pMode.value ? props.zoomHitRadiusPx : props.hitRadiusPx
+  );
+  return Number.isFinite(radius) && radius >= 0 ? radius : 0;
+});
+
+function getShotPoint(shot, fallbackCenter = false) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  if (Number.isFinite(x) && Number.isFinite(y)) return { x, y };
+  return fallbackCenter ? { x: 0, y: 0 } : null;
+}
+
+function getPointDirection(point) {
+  if (!point) return null;
+  const distance = Math.sqrt(point.x * point.x + point.y * point.y);
+  if (distance === 0) return null;
+
+  return {
+    x: point.x / distance,
+    y: point.y / distance,
+  };
+}
+
+function formatPxOffset(value) {
+  if (!value) return "";
+  const operator = value > 0 ? "+" : "-";
+  return ` ${operator} ${Math.abs(value)}px`;
+}
+
+function formatTargetPosition(percent, offset) {
+  const pxOffset = formatPxOffset(offset);
+  return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
+}
+
+function getTargetPositionStyle(point, offsetPx = 0, extraOffset = {}) {
+  if (!point) return { display: "none" };
+
+  const radius = safeTargetRadius.value;
+  const diameter = radius * 2;
+  const direction = getPointDirection(point);
+  const xOffset = (direction ? direction.x * offsetPx : 0) + (extraOffset.x || 0);
+  const yOffset = (direction ? -direction.y * offsetPx : 0) + (extraOffset.y || 0);
+  const leftPercent = ((point.x + radius) / diameter) * 100;
+  const topPercent = ((radius - point.y) / diameter) * 100;
+
+  return {
+    left: formatTargetPosition(leftPercent, xOffset),
+    top: formatTargetPosition(topPercent, yOffset),
+    transform: "translate(-50%, -50%)",
+  };
+}
+
+function getHitStyle(shot) {
+  const radius = currentHitRadiusPx.value;
+  const point = getShotPoint(shot);
+
+  return {
+    ...getTargetPositionStyle(point, radius),
+    width: `${radius * 2}px`,
+    height: `${radius * 2}px`,
+  };
+}
+
+function getRoundTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: ROUND_TIP_OFFSET_Y }
+  );
+}
+
+function getExperienceTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: EXPERIENCE_TIP_OFFSET_Y }
+  );
+}
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+const simulShoot2 = async () => {
+  if (device.value.deviceId) {
+    const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
+    await simulShootAPI(device.value.deviceId, r1, r1);
+  }
+};
+
+const env = computed(() => {
+  const accountInfo = uni.getAccountInfoSync();
+  return accountInfo.miniProgram.envVersion;
+});
+
+const arrowStyle = computed(() => {
+  return {
+    transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
+      360 - angle.value
+    }deg) translateY(105%)`,
+  };
+});
+
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) return;
+  if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
+    if (
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
+    ) {
+      angle.value = null;
+      setTimeout(() => {
+        if (props.scores[0]) {
+          circleColor.value =
+            message.shootData.playerId === props.scores[0].playerId
+              ? "#ff4444"
+              : "#1840FF";
+        }
+        angle.value = message.shootData.angle;
+      }, 200);
+    }
+  }
+}
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+});
+
+onBeforeUnmount(() => {
+  if (timer.value) {
+    clearTimeout(timer.value);
+    timer.value = null;
+  }
+  if (dirTimer.value) {
+    clearTimeout(dirTimer.value);
+    dirTimer.value = null;
+  }
+  uni.$off("socket-inbox", onReceiveMessage);
+});
+</script>
+
+<template>
+  <view class="container">
+    <view class="header" v-if="totalRound > 0">
+      <text v-if="totalRound > 0" class="round-count">{{
+        (currentRound > totalRound ? totalRound : currentRound) +
+        "/" +
+        totalRound
+      }}</text>
+    </view>
+    <view class="target">
+      <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
+        <view :style="{ background: circleColor }">
+          <image src="../../../static/dot-circle.png" mode="widthFix" />
+        </view>
+      </view>
+      <view v-if="stop" class="stop-sign">中场休息</view>
+      <view
+        v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(latestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="latestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(latestOne)"
+        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
+        }}<text v-if="latestOne.ring">环</text>
+      </view>
+      <view
+        v-if="
+          bluelatestOne &&
+          bluelatestOne.ring &&
+          user.id === bluelatestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(bluelatestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="bluelatestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(bluelatestOne)"
+        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
+        }}<text v-if="bluelatestOne.ring">环</text></view
+      >
+      <block v-for="(bow, index) in scores" :key="index">
+        <view
+          v-if="bow.ring > 0"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === scores.length - 1 && latestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
+          }"
+          ><text v-if="pMode">{{ index + 1 }}</text></view
+        >
+      </block>
+      <block v-for="(bow, index) in blueScores" :key="index">
+        <view
+          v-if="bow.ring > 0"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: '#1840FF',
+          }"
+        >
+          <text v-if="pMode">{{ index + 1 }}</text>
+        </view>
+      </block>
+      <image src="../../../static/bow-target.png" mode="widthFix" />
+    </view>
+    <view class="footer">
+      <PointSwitcher
+        :onChange="(val) => (pMode = val)"
+        :style="{ zIndex: 999 }"
+      />
+    </view>
+    <view class="simul" v-if="env !== 'release'">
+      <button @click="simulShoot">模拟</button>
+      <button @click="simulShoot2">射箭</button>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: calc(100vw - 30px);
+  height: calc(100vw - 30px);
+  padding: 0px 15px;
+  position: relative;
+}
+.target {
+  position: relative;
+  margin: 10px;
+  width: calc(100% - 20px);
+  height: calc(100% - 20px);
+  z-index: -1;
+}
+.e-value {
+  position: absolute;
+  background-color: #0006;
+  color: #fff;
+  font-size: 12px;
+  padding: 4px 7px;
+  border-radius: 5px;
+  z-index: 2;
+  width: 50px;
+  text-align: center;
+}
+.round-tip {
+  position: absolute;
+  color: #fff;
+  font-size: 30px;
+  font-weight: bold;
+  z-index: 2;
+  width: 100px;
+  text-align: center;
+}
+.round-tip > text {
+  font-size: 24px;
+  margin-left: 5px;
+}
+@keyframes target-tip-fade-in-out {
+  0% {
+    transform: translate(-50%, -50%) translateY(20px);
+    opacity: 0;
+  }
+
+  30% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  80% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate(-50%, -50%);
+    opacity: 0;
+  }
+}
+.round-tip.fade-in-out,
+.e-value.fade-in-out {
+  animation: target-tip-fade-in-out 1.2s ease forwards;
+}
+.target > image:last-child {
+  width: 100%;
+  height: 100%;
+}
+.hit {
+  position: absolute;
+  border-radius: 50%;
+  z-index: 1;
+  color: #fff;
+  transition: all 0.3s ease;
+  box-sizing: border-box;
+}
+.b-point {
+  border: 1px solid #fff;
+  z-index: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.b-point > text {
+  font-size: 16rpx;
+  color: #fff;
+  font-family: "DINCondensed";
+  /* text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);*/
+  margin-top: 2rpx;
+}
+@keyframes target-pump-in {
+  from {
+    transform: translate(-50%, -50%) scale(2);
+  }
+
+  to {
+    transform: translate(-50%, -50%) scale(1);
+  }
+}
+.hit.pump-in {
+  animation: target-pump-in 0.3s ease-out forwards;
+  transform-origin: center center;
+}
+.header {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: -40px;
+}
+.header > image:first-child {
+  width: 40px;
+  height: 40px;
+}
+.round-count {
+  font-size: 20px;
+  color: #fed847;
+  top: 75px;
+  font-weight: bold;
+}
+.footer {
+  width: calc(100% - 20px);
+  padding: 0 10px;
+  display: flex;
+  margin-top: -40px;
+  justify-content: flex-end;
+}
+.footer > image {
+  width: 40px;
+  min-height: 40px;
+  max-height: 40px;
+  border-radius: 50%;
+  border: 1px solid #fff;
+}
+.simul {
+  position: absolute;
+  top: 0;
+  right: 20px;
+  margin-left: 20px;
+  z-index: 999;
+}
+.simul > button {
+  color: #fff;
+}
+.stop-sign {
+  position: absolute;
+  font-size: 44px;
+  color: #fff9;
+  text-align: center;
+  width: 200px;
+  height: 60px;
+  left: calc(50% - 100px);
+  top: calc(50% - 30px);
+  z-index: 99;
+  font-weight: bold;
+}
+.arrow-dir {
+  position: absolute;
+  width: 100%;
+  height: 52%;
+  left: 50%;
+  bottom: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.arrow-dir > view {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+}
+.arrow-dir > view > image {
+  width: 100rpx;
+  height: 100rpx;
+  transform: translate(-30%, -30%);
+}
+@keyframes spring-in {
+  0% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  15% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  30% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  45% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  60% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  75% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
+@keyframes disappear {
+  0% {
+    opacity: 1;
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.arrow-dir > view {
+  animation: disappear 3s ease forwards;
+}
+.arrow-dir > view > image {
+  animation: spring-in 3s ease forwards;
+  width: 100%;
+}
+</style>

src/pages/team-battle/components/Container.vue

@@ -0,0 +1,353 @@
+<script setup>
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import AppBackground from "./AppBackground.vue";
+import Header from "./Header.vue";
+import ScreenHint from "./ScreenHint.vue";
+import BackToGame from "./BackToGame.vue";
+import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
+import { capsuleHeight, debounce } from "@/util";
+import AudioManager from "@/audioManager";
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  bgType: {
+    type: Number,
+    default: 0,
+  },
+  onBack: {
+    type: Function,
+    default: null,
+  },
+  scroll: {
+    type: Boolean,
+    default: true,
+  },
+  isHome: {
+    type: Boolean,
+    default: false,
+  },
+  showBackToGame: {
+    type: Boolean,
+    default: false,
+  },
+  bgColor: {
+    type: String,
+    default: "#050b19",
+  },
+  whiteBackArrow: {
+    type: Boolean,
+    default: true,
+  },
+  showBottom: {
+    type: Boolean,
+    default: true,
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  loadingText: {
+    type: String,
+    default: "",
+  },
+});
+const isIOS = uni.getDeviceInfo().osName === "ios";
+const showHint = ref(false);
+const hintType = ref(0);
+const isLoading = ref(false);
+const audioInitProgress = ref(1);
+const audioProgress = ref(0);
+const audioTimer = ref(null);
+
+const showGlobalHint = (type) => {
+  hintType.value = type;
+  showHint.value = true;
+};
+
+const hideGlobalHint = () => {
+  showHint.value = false;
+};
+
+const restart = () => {
+  uni.restartMiniProgram({
+    path: "/pages/index",
+  });
+};
+
+const checkAudioProgress = async () => {
+  return new Promise((resolve, reject) => {
+    try {
+      audioInitProgress.value = AudioManager.getLoadProgress();
+      if (audioInitProgress.value === 1) return resolve();
+      audioTimer.value = setInterval(() => {
+        audioProgress.value = AudioManager.getLoadProgress();
+        if (audioProgress.value === 1) {
+          setTimeout(() => {
+            audioInitProgress.value = 1;
+          }, 200);
+          clearInterval(audioTimer.value);
+          resolve();
+        }
+      }, 200);
+    } catch (err) {
+      reject(err);
+    }
+  });
+};
+
+const audioFinalProgress = computed(() => {
+  const left = 1 - audioInitProgress.value;
+  if (left <= 0) return 0;
+  return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
+});
+
+const loadingProgress = computed(() => {
+  if (props.loading && audioInitProgress.value >= 1) return 1;
+  return audioFinalProgress.value;
+});
+
+onBeforeUnmount(() => {
+  if (audioTimer.value) clearInterval(audioTimer.value);
+});
+
+onShow(() => {
+  uni.$showHint = showGlobalHint;
+  uni.$hideHint = hideGlobalHint;
+  uni.$checkAudio = checkAudioProgress;
+  showHint.value = false;
+});
+
+const backToGame = debounce(async () => {
+  if (isLoading.value) return; // 防止重复点击
+
+  try {
+    isLoading.value = true;
+    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}`,
+        });
+      }
+    }
+  } catch (error) {
+    console.error("获取当前游戏失败:", error);
+  } finally {
+    isLoading.value = false;
+  }
+});
+
+const goBack = () => {
+  uni.navigateBack();
+};
+
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
+const goCalibration = async () => {
+  await laserAimAPI();
+  uni.navigateTo({
+    url: "/pages/calibration",
+  });
+};
+</script>
+
+<template>
+  <view :style="{ paddingTop: capsuleHeight + 'px' }">
+    <AppBackground :type="bgType" :bgColor="bgColor" />
+    <Header
+      v-if="!isHome"
+      :title="title"
+      :onBack="onBack"
+      :whiteBackArrow="whiteBackArrow"
+    />
+    <BackToGame v-if="showBackToGame" />
+    <scroll-view
+      :scroll-y="scroll"
+      :enhanced="true"
+      :bounces="false"
+      :show-scrollbar="false"
+      :style="{
+        height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${
+          $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
+        })`,
+      }"
+    >
+      <slot></slot>
+    </scroll-view>
+    <view
+      class="bottom-part"
+      v-if="$slots.bottom && showBottom"
+      :style="{ height: isIOS ? '65px' : '55px', paddingTop: '10px' }"
+    >
+      <slot name="bottom"></slot>
+    </view>
+    <ScreenHint :show="showHint">
+      <view v-if="hintType === 1" class="tip-content">
+        <text>完成进行中的对局才能开启新的。</text>
+        <text>您有正在进行中的对局，是否进入?</text>
+        <view>
+          <button hover-class="none" @click="() => (showHint = false)">
+            不进入
+          </button>
+          <button hover-class="none" @click="backToGame" :disabled="isLoading">
+            {{ isLoading ? "加载中..." : "进入" }}
+          </button>
+        </view>
+      </view>
+      <view v-if="hintType === 2" class="tip-content">
+        <text>离开比赛可能会导致比赛失败，</text>
+        <text>确认离开吗？</text>
+        <view>
+          <button hover-class="none" @click="goBack">离开比赛</button>
+          <button hover-class="none" @click="() => (showHint = false)">
+            继续比赛
+          </button>
+        </view>
+      </view>
+      <view v-if="hintType === 3" class="tip-content">
+        <text>今天不玩了吗？</text>
+        <view>
+          <button hover-class="none" @click="() => (showHint = false)">
+            取消
+          </button>
+          <button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
+        </view>
+      </view>
+      <view v-if="hintType === 4" class="tip-content">
+        <text>完成智能弓校准，即可解锁全部功能</text>
+        <view>
+          <button hover-class="none" @click="() => (showHint = false)">
+            取消
+          </button>
+          <button hover-class="none" @click="goCalibration">去校准</button>
+        </view>
+      </view>
+    </ScreenHint>
+    <view v-if="loading || audioInitProgress < 1" class="audio-progress">
+      <image
+        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
+        mode="widthFix"
+      />
+      <view>
+        <view :style="{ width: `${loadingProgress * 100}%` }">
+          <!-- <image
+            src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
+            mode="widthFix"
+          /> -->
+        </view>
+      </view>
+      <view>
+        <text>{{ loading ? loadingText || "加载中..." : "若加载时间过长，请" }}</text>
+        <button v-if="!loading" hover-class="none" @click="restart">点击这里重启</button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.tip-content {
+  flex-direction: column;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  width: 100%;
+  font-size: 14px;
+}
+.tip-content > text {
+  text-align: center;
+}
+.tip-content > view {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  margin-top: 50rpx;
+  width: 100%;
+}
+.tip-content > view > button {
+  padding: 12px;
+  border-radius: 20px;
+  background-color: #fff6;
+  color: #fff;
+  width: 45%;
+  font-size: 16px;
+}
+.tip-content > view > button:last-child {
+  background-color: #fed847;
+  color: #000;
+}
+
+.tip-content > view > button:disabled {
+  background-color: #ccc;
+  color: #666;
+  opacity: 0.6;
+}
+.audio-progress {
+  z-index: 999;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: rgb(0 0 0 / 0.8);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.audio-progress > image:nth-child(1) {
+  width: 140rpx;
+  height: 150rpx;
+  margin-bottom: 20rpx;
+}
+.audio-progress > view:nth-child(2) {
+  width: 380rpx;
+  height: 6rpx;
+  background: #595959;
+  border-radius: 4rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.audio-progress > view:nth-child(2) > view {
+  background: #ffe431;
+  min-height: 6rpx;
+  border-radius: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  transition: width 0.5s ease;
+}
+.audio-progress > view:nth-child(2) > view > image {
+  width: 46rpx;
+  height: 26rpx;
+}
+.audio-progress > view:nth-child(3) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.audio-progress > view:nth-child(3) > text {
+  font-size: 22rpx;
+  color: #a2a2a2;
+  text-align: center;
+  line-height: 32rpx;
+}
+.audio-progress > view:nth-child(3) > button {
+  font-size: 22rpx;
+  color: #ffe431;
+  line-height: 32rpx;
+  padding: 20rpx 0;
+}
+</style>

src/pages/team-battle/components/Guide.vue

@@ -0,0 +1,60 @@
+<script setup>
+defineProps({
+  noBg: {
+    type: Boolean,
+    default: false,
+  },
+  type: {
+    type: Number,
+    default: 0,
+  },
+});
+const bubbleTypes = [
+  "../../../static/long-bubble.png",
+  "../../../static/long-bubble-middle.png",
+  "../../../static/long-bubble-tall.png",
+];
+</script>
+
+<template>
+  <view class="container">
+    <image src="../../../static/shooter.png" mode="widthFix" />
+    <view>
+      <image
+        v-if="!noBg"
+        :src="bubbleTypes[type]"
+        :style="{ top: type === 2 ? '-6%' : '-13%' }"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+  width: clac(100% - 30px);
+}
+.container > image {
+  width: 20%;
+}
+.container > view {
+  position: relative;
+  width: 80%;
+  min-height: 55px;
+  display: flex;
+  flex-direction: column;
+}
+.container > view > image {
+  position: absolute;
+  left: -7%;
+  width: 108%;
+}
+.container > view {
+  color: #fff;
+  font-size: 28rpx;
+}
+</style>

src/pages/team-battle/components/Header.vue

@@ -0,0 +1,328 @@
+<script setup>
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import HeaderProgress from "./HeaderProgress.vue";
+import Avatar from "./Avatar.vue";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, game } = storeToRefs(store);
+
+const currentPage = computed(() => {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1].route;
+});
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  onBack: {
+    type: Function,
+    default: null,
+  },
+  whiteBackArrow: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+const onClick = () => {
+  if (props.onBack) {
+    props.onBack();
+  } else {
+    const pages = getCurrentPages();
+    if (pages.length > 1) {
+      uni.navigateBack();
+    } else {
+      uni.redirectTo({
+        url: "/pages/index",
+      });
+    }
+  }
+};
+
+const toUserPage = () => {
+  uni.navigateTo({
+    url: "/pages/user",
+  });
+};
+
+const signin = () => {
+  if (!user.value.id) {
+    uni.$emit("point-book-signin");
+  }
+};
+
+const loading = ref(false);
+const pointBook = ref(null);
+const heat = ref(0);
+/** 房间号按钮动态定位样式（position: fixed，根据胶囊真实位置计算，脱离 flex 流避免挤压标题） */
+const battleRoomBtnStyle = ref({});
+
+const updateLoading = (value) => {
+  loading.value = value;
+};
+
+const updateHot = (value) => {
+  heat.value = value;
+};
+
+onMounted(() => {
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  if (
+    currentPage.route === "pages/point-book-edit" ||
+    currentPage.route === "pages/point-book-detail"
+  ) {
+    pointBook.value = uni.getStorageSync("point-book");
+    if (!pointBook.value) {
+      pointBook.value = uni.getStorageSync("last-point-book");
+    }
+  }
+  // 仅在对战房间页获取胶囊位置，按钮用 fixed 定位精确贴靠胶囊左侧（脱离 flex 流，不挤压标题）
+  if (currentPage.route === "pages/battle-room") {
+    try {
+      const menuButtonRect = uni.getMenuButtonBoundingClientRect();
+      const { windowWidth } = uni.getSystemInfoSync();
+      battleRoomBtnStyle.value = {
+        // 按钮右边缘距视口右侧 = 屏幕宽 - 胶囊左边缘 + 4px 安全间隙
+        right: (windowWidth - menuButtonRect.left + 4) + "px",
+        // 垂直位置与胶囊顶部对齐
+        top: menuButtonRect.top + "px",
+        // 高度与胶囊一致，视觉融合
+        height: menuButtonRect.height + "px",
+      };
+    } catch (e) {
+      // 获取失败时使用 CSS 兜底定位（28vw + 4px 作为 right，8px 作为 top）
+    }
+  }
+  uni.$on("update-hot", updateHot);
+});
+onBeforeUnmount(() => {
+  uni.$off("update-hot", updateHot);
+});
+</script>
+
+<template>
+  <view class="container">
+    <view class="back-btn" @click="onClick">
+      <image v-if="whiteBackArrow" src="../../../static/back.png" mode="widthFix" />
+      <image
+        v-if="!whiteBackArrow"
+        src="../../../static/back-black.png"
+        mode="widthFix"
+      />
+    </view>
+    <view :style="{ color: whiteBackArrow ? '#fff' : '#000' }">
+      <view
+        v-if="currentPage === 'pages/point-book'"
+        class="user-header"
+        @click="signin"
+      >
+        <block v-if="user.id">
+          <Avatar
+            :src="user.avatar"
+            :onClick="toUserPage"
+            :size="40"
+            borderColor="#333"
+          />
+          <text class="truncate">{{ user.nickName }}</text>
+          <image
+            v-if="heat"
+            :src="`../../../static/hot${heat}.png`"
+            mode="widthFix"
+          />
+        </block>
+        <block v-else>
+          <image src="../../../static/user-icon.png" mode="widthFix" />
+          <text>新来的弓箭手你好呀~</text>
+        </block>
+      </view>
+      <block
+        v-if="
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) === -1 ||
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) === 11
+        "
+      >
+        <text>{{ title }}</text>
+      </block>
+      <block
+        v-if="
+          title &&
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) !== -1 &&
+          '-箭前准备-感知距离-小试牛刀'.indexOf(title) !== 11
+        "
+      >
+        <view class="first-try-steps">
+          <text :class="title === '-箭前准备' ? 'current-step' : ''">箭前准备</text>
+          <text>-</text>
+          <text :class="title === '-感知距离' ? 'current-step' : ''"
+            >感知距离</text
+          >
+          <text>-</text>
+          <text :class="title === '-小试牛刀' ? 'current-step' : ''"
+            >小试牛刀</text
+          >
+        </view>
+      </block>
+    </view>
+    <view v-if="pointBook" class="point-book-info">
+      <text>{{ pointBook.bowType.name }}</text>
+      <text>{{ pointBook.distance }} 米</text>
+      <text
+        >{{
+          pointBook.bowtargetType.name.substring(
+            0,
+            pointBook.bowtargetType.name.length - 3
+          )
+        }}
+        {{
+          pointBook.bowtargetType.name.substring(
+            pointBook.bowtargetType.name.length - 3
+          )
+        }}</text
+      >
+    </view>
+    <view
+      v-if="
+        currentPage === 'pages/team-battle' ||
+        currentPage === 'pages/team-battle/index'
+      "
+      class="battle-progress"
+    >
+      <HeaderProgress />
+    </view>
+    <!-- 对战房间：整个胶囊为分享按钮，房号从 Store 读取；fixed 定位紧靠系统胶囊左侧 -->
+    <button
+      v-if="currentPage === 'pages/battle-room' && game.roomNumber"
+      open-type="share"
+      hover-class="none"
+      class="battle-room-number"
+      :style="battleRoomBtnStyle"
+    >
+      <text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
+      <image src="../../../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
+    </button>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  width: 72vw;
+  height: 50px;
+  /* margin-top: var(--status-bar-height); */
+  padding-left: 15px;
+}
+.container > view:nth-child(2) {
+  font-size: 16px;
+  font-weight: bold;
+}
+.back-btn {
+  display: flex;
+  align-items: center;
+}
+.back-btn > image {
+  width: 22px;
+  height: 22px;
+  margin-right: 10px;
+}
+.first-try-steps {
+  display: flex;
+  align-items: center;
+  color: #fff6;
+  font-size: 14px;
+}
+.first-try-steps > text {
+  transition: all 0.3s ease;
+}
+.first-try-steps > text:nth-child(2),
+.first-try-steps > text:nth-child(4) {
+  margin: 0 5px;
+}
+.current-step {
+  font-size: 16px;
+  color: #fff;
+}
+.point-book-info {
+  color: #333;
+  position: fixed;
+  width: 60%;
+  left: 20%;
+  display: flex;
+  justify-content: center;
+}
+.point-book-info > text {
+  border-radius: 6px;
+  background-color: #fff;
+  font-size: 10px;
+  padding: 5px 10px;
+  margin: 3px;
+}
+.battle-progress {
+  position: fixed;
+  width: 60%;
+  left: 20%;
+  display: flex;
+  justify-content: center;
+}
+.user-header {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.user-header > image:first-child {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  border: 2rpx solid #333;
+}
+.user-header > image:last-child {
+  width: 36rpx;
+  height: 36rpx;
+}
+.user-header > text:nth-child(2) {
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #333333;
+  margin: 0 20rpx;
+  max-width: 300rpx;
+}
+/* 对战房间：整个胶囊作为分享按钮，fixed 定位脱离 flex 流，紧贴系统胶囊左侧 */
+.battle-room-number {
+  position: fixed;
+  /* 兜底定位（JS 获取胶囊位置失败时生效）：约 28vw 对应胶囊区域左边缘 */
+  right: calc(28vw + 4px);
+  top: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 240rpx;
+  height: 64rpx;
+  background: rgba(0, 0, 0, 0.15);
+  border-radius: 96rpx;
+  border: 1rpx solid #5b5758;
+  padding: 0;
+}
+/* 重置 button 默认边框 */
+.battle-room-number::after {
+  border: none;
+}
+.battle-room-number__text {
+  width: 156rpx;
+  height: 28rpx;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #ffffff;
+  text-align: center;
+  line-height: 28rpx;
+}
+.battle-room-number__icon {
+  width: 25rpx;
+  height: 26rpx;
+}
+</style>

src/pages/team-battle/components/HeaderProgress.vue

@@ -0,0 +1,83 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import audioManager from "@/audioManager";
+import useStore from "@/store";
+
+const store = useStore();
+
+// 私有 HeaderProgress 只负责展示提示/箭数和静音开关。
+// 报靶、轮到谁射箭、比赛结束等语音统一由 team-battle 页面队列播放，避免重复播报。
+const tips = ref("");
+const sound = ref(true);
+const currentShot = ref(0);
+const totalShot = ref(0);
+
+const updateSound = () => {
+  sound.value = !sound.value;
+  audioManager.setMuted(!sound.value);
+};
+
+const onUpdateTips = (newVal) => {
+  // 兼容页面通过 uni.$emit("update-tips") 触发的即时刷新。
+  tips.value = newVal;
+};
+
+// 监听 Pinia store 中 totalShot 变化，用于比赛恢复时同步箭数（替代 uni.$emit 避免时序问题）
+// 使用 immediate: true 确保组件创建时立即读取 store 当前值（解决重入时 totalShot 值不变 watch 不触发的问题）
+watch(
+  () => [store.game.currentShot, store.game.totalShot],
+  ([newCurrentShot, newTotalShot]) => {
+    currentShot.value = newCurrentShot || 0;
+    totalShot.value = newTotalShot || 0;
+  },
+  { immediate: true }
+);
+
+// 监听 Pinia store 中 tips 变化，用于比赛恢复时同步提示文案（替代 uni.$emit 避免时序问题）
+// 使用 immediate: true 确保组件创建时立即读取 store 当前值（解决 onShow 早于 onMounted 导致 uni.$emit 事件丢失的问题）
+// 注意：使用 != null 而非 if(newVal)，确保空字符串 "" 也能触发清空（避免重新开赛时旧文案残留）
+watch(() => store.game.tips, (newVal) => {
+  if (newVal != null) {
+    tips.value = newVal;
+  }
+}, { immediate: true });
+
+onMounted(() => {
+  uni.$on("update-tips", onUpdateTips);
+});
+
+onBeforeUnmount(() => {
+  uni.$off("update-tips", onUpdateTips);
+});
+</script>
+
+<template>
+  <view class="container">
+    <text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
+    <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
+    <button v-if="!!tips" hover-class="none" @click="updateSound">
+      <image :src="`../../../static/sound${sound ? '' : '-off'}-yellow.png`" mode="widthFix" />
+    </button>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 50vw;
+  color: #fed847;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: 500;
+}
+
+.container>button:last-child {
+  width: 36px;
+  height: 36px;
+}
+
+.container>button:last-child>image {
+  width: 36px;
+  min-height: 36px;
+}
+</style>

src/pages/team-battle/components/IconButton.vue

@@ -0,0 +1,39 @@
+<script setup>
+const props = defineProps({
+  name: {
+    type: String,
+    default: "",
+  },
+  src: {
+    type: String,
+    default: "",
+  },
+  onClick: {
+    type: Function,
+    default: () => {},
+  },
+  width: {
+    type: Number,
+    default: 22,
+  },
+});
+</script>
+<template>
+  <view class="container" @click="onClick">
+    <image :src="src" mode="widthFix" :style="{ width: width + 'px' }" />
+    <text>{{ name }}</text>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.container > text {
+  color: #666666;
+  font-size: 12px;
+  margin-top: 5px;
+}
+</style>

src/pages/team-battle/components/PointSwitcher.vue

@@ -0,0 +1,71 @@
+<script setup>
+import { ref } from "vue";
+
+const props = defineProps({
+  onChange: {
+    type: Function,
+    default: () => {},
+  },
+});
+
+const mode = ref(true);
+
+const onClick = () => {
+  mode.value = !mode.value;
+  props.onChange(mode.value);
+};
+</script>
+
+<template>
+  <view
+    class="point-switcher"
+    :style="{ borderColor: mode ? '#D8D8D8' : '#53EF56' }"
+  >
+    <view
+      @click="onClick"
+      :style="{ transform: 'translateX(' + (mode ? '-58' : '4') + 'rpx)' }"
+    >
+      <text>放大</text>
+      <view :style="{ background: mode ? '#D8D8D8' : '#53EF56' }"></view>
+      <text>真实</text>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.point-switcher {
+  width: 100rpx;
+  height: 40rpx;
+  border-radius: 22rpx;
+  border: 2rpx solid;
+  display: flex;
+  overflow: hidden;
+}
+.point-switcher > view {
+  position: relative;
+  display: flex;
+  align-items: center;
+  line-height: 40rpx;
+  color: #ffffff;
+  font-weight: 500;
+  font-size: 20rpx;
+  word-break: keep-all;
+  padding: 0 12rpx;
+  transition: all 0.3s ease;
+  transform: translateX(-58rpx);
+}
+.point-switcher > view > text:first-child {
+  color: #53ef56;
+}
+.point-switcher > view > view {
+  width: 36rpx;
+  height: 36rpx;
+  flex: 0 0 auto;
+  border-radius: 50%;
+  margin: 0 10rpx;
+  transition: all 0.3s ease;
+}
+.point-switcher > view > text:last-child {
+  color: #d8d8d8;
+}
+</style>

src/pages/team-battle/components/RoundEndTip.vue

@@ -0,0 +1,172 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+const props = defineProps({
+  isFinal: {
+    type: Boolean,
+    default: false,
+  },
+  round: {
+    type: Number,
+    default: 0,
+  },
+  bluePoint: {
+    type: Number,
+    default: 0,
+  },
+  redPoint: {
+    type: Number,
+    default: 0,
+  },
+  roundData: {
+    type: Object,
+    default: () => ({}),
+  },
+  onAutoClose: {
+    type: Function,
+    default: () => {},
+  },
+});
+const count = ref(props.isFinal ? 10 : 3);
+const tiemr = ref(null);
+function startCount() {
+  if (tiemr.value) clearInterval(tiemr.value);
+  tiemr.value = setInterval(() => {
+    if (count.value === 0) {
+      clearInterval(tiemr.value);
+      props.onAutoClose();
+    } else count.value -= 1;
+  }, 1000);
+}
+onMounted(() => {
+  startCount();
+});
+onBeforeUnmount(() => {
+  if (tiemr.value) clearInterval(tiemr.value);
+});
+</script>
+
+<template>
+  <view class="round-end-tip">
+    <text>第{{ round }}轮射箭结束</text>
+    <block v-if="!isFinal">
+      <view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0">
+        <text>本轮蓝队</text>
+        <text>{{
+          (roundData.shoots[1] || []).reduce(
+            (last, next) => last + next.ring,
+            0
+          )
+        }}</text>
+        <text>环，红队</text>
+        <text>{{
+          (roundData.shoots[2] || []).reduce(
+            (last, next) => last + next.ring,
+            0
+          )
+        }}</text>
+        <text>环</text>
+      </view>
+      <text
+        v-if="bluePoint === 0 && redPoint === 0"
+        :style="{ marginTop: '20px' }"
+      >
+        连续3个来回双方均无人射箭，比赛取消。
+      </text>
+      <text v-if="bluePoint !== 0 && bluePoint === redPoint">
+        红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
+          redPoint
+        }}</text
+        >分
+      </text>
+      <text v-if="bluePoint > redPoint">
+        蓝队获胜，得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
+          bluePoint
+        }}</text
+        >分
+      </text>
+      <text v-if="bluePoint < redPoint">
+        红队获胜，得<text :style="{ color: '#fed847', margin: '0 5px' }">{{
+          redPoint
+        }}</text
+        >分
+      </text>
+    </block>
+    <block v-if="isFinal">
+      <view class="point-view2">
+        <text>蓝队</text>
+        <text>{{ bluePoint }}</text>
+        <text>分，红队</text>
+        <text>{{ redPoint }}</text>
+        <text>分</text>
+      </view>
+      <text>同分僵局！最后一箭定江山</text>
+      <view class="final-shoot">
+        <text>{{ count }}</text>
+        <text>秒后蓝红双方</text>
+        <text>决金箭</text>
+        <text>一箭决胜负</text>
+      </view>
+    </block>
+  </view>
+</template>
+
+<style scoped>
+.round-end-tip {
+  width: 100%;
+  color: #fff9;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 32rpx;
+}
+.round-end-tip > text:first-child {
+  font-size: 36rpx;
+  color: #fff;
+}
+.point-view1 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 3px;
+}
+.point-view1 > text:nth-child(2),
+.point-view1 > text:nth-child(4) {
+  color: #fed847;
+  margin: 0 5px;
+}
+.point-view2 {
+  margin: 12px 0;
+  font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+}
+.point-view2 > text:nth-child(2),
+.point-view2 > text:nth-child(4) {
+  color: #fed847;
+  width: 30px;
+  text-align: center;
+  font-size: 30px;
+}
+.final-shoot {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 10px;
+  font-size: 28rpx;
+  word-break: keep-all;
+}
+.final-shoot > text:nth-child(1) {
+  width: 20px;
+  text-align: right;
+}
+.final-shoot > text:nth-child(1),
+.final-shoot > text:nth-child(3) {
+  font-size: 32rpx;
+  color: #fed847;
+  margin-left: 10px;
+  margin-right: 5px;
+}
+</style>

src/pages/team-battle/components/SButton.vue

@@ -0,0 +1,96 @@
+<script setup>
+import { ref } from "vue";
+import { debounce } from "@/util";
+const props = defineProps({
+  width: {
+    type: String,
+    default: "calc(100vw - 20px)",
+  },
+  rounded: {
+    type: Number,
+    default: 10,
+  },
+  onClick: {
+    type: Function,
+    default: async () => {},
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  backgroundColor: {
+    type: String,
+    default: "#fed847",
+  },
+  color: {
+    type: String,
+    default: "#000",
+  },
+  disabledColor:{
+    type: String,
+    default: "#757575",
+  }
+});
+
+const loading = ref(false);
+const timer = ref(null);
+
+const onBtnClick = debounce(async () => {
+  if (props.disabled || loading.value) return;
+
+  let loadingTimer = null;
+  loadingTimer = setTimeout(() => {
+    loading.value = true;
+  }, 300);
+
+  try {
+    await props.onClick();
+  } finally {
+    clearTimeout(loadingTimer);
+    loading.value = false;
+  }
+});
+</script>
+
+<template>
+  <button
+    class="sbtn"
+    hover-class="none"
+    :style="{
+      width: width,
+      borderRadius: rounded + 'px',
+      backgroundColor: disabled ? disabledColor : backgroundColor,
+      color,
+    }"
+    open-type="getUserInfo"
+    @click="onBtnClick"
+  >
+    <block v-if="!loading">
+      <slot />
+    </block>
+    <block v-else>
+      <image src="../../../static/btn-loading.png" mode="widthFix" class="loading" />
+    </block>
+  </button>
+</template>
+
+<style scoped>
+.sbtn {
+  margin: 0 auto;
+  height: 44px;
+  line-height: 44px;
+  font-weight: bold;
+  font-size: 15px;
+  display: flex;
+  text-align: center;
+  justify-content: center;
+  align-items: center;
+  overflow: initial;
+}
+.loading {
+  width: 25px;
+  height: 25px;
+  background-blend-mode: darken;
+  animation: rotate 1s linear infinite;
+}
+</style>

src/pages/team-battle/components/SModal.vue

@@ -0,0 +1,108 @@
+<script setup>
+import { ref, watch } from "vue";
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  height: {
+    type: String,
+    default: "650rpx",
+  },
+  onClose: {
+    type: Function,
+    default: () => {},
+  },
+  noBg: {
+    type: Boolean,
+    default: false,
+  },
+});
+const showContainer = ref(false);
+const showContent = ref(false);
+watch(
+  () => props.show,
+  (newValue) => {
+    if (newValue) {
+      showContainer.value = true;
+      setTimeout(() => {
+        showContent.value = true;
+      }, 100);
+    } else {
+      showContent.value = false;
+      setTimeout(() => {
+        showContainer.value = false;
+      }, 100);
+    }
+  },
+  {}
+);
+</script>
+
+<template>
+  <view
+    class="container"
+    v-if="showContainer"
+    :style="{ opacity: show ? 1 : 0 }"
+    @click="onClose"
+  >
+    <view
+      class="modal-content"
+      :style="{
+        transform: `translateY(${showContent ? '0%' : '100%'})`,
+        height,
+      }"
+      @click.stop=""
+    >
+      <image
+        v-if="!noBg"
+        src="https://static.shelingxingqiu.com/attachment/2025-12-04/dep11770wzxg6o2alo.png"
+        mode="widthFix"
+      />
+      <view class="close-btn" @click="onClose" v-if="!noBg">
+        <image src="../../../static/close-yellow.png" mode="widthFix" />
+      </view>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: #00000099;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  align-items: center;
+  opacity: 0;
+  transition: all 0.3s ease;
+  z-index: 999;
+}
+.modal-content {
+  width: 100%;
+  transform: translateY(100%);
+  transition: all 0.3s ease;
+  position: relative;
+  background-color: #372E1D;
+}
+.modal-content > image:first-child {
+  width: 100%;
+  position: absolute;
+  z-index: -1;
+}
+.close-btn {
+  display: flex;
+  justify-content: flex-end;
+  position: absolute;
+  right: 0;
+}
+.close-btn > image {
+  width: 40px;
+  height: 40px;
+}
+</style>

src/pages/team-battle/components/ScreenHint.vue

@@ -0,0 +1,89 @@
+<script setup>
+import IconButton from "./IconButton.vue";
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: null,
+  },
+  mode: {
+    type: String,
+    default: "normal",
+  },
+});
+const getContentHeight = () => {
+  if (props.mode === "tall") return "50vw";
+  if (props.mode === "square") return "74vw";
+  return "36vw";
+};
+</script>
+
+<template>
+  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
+    <view class="scale-in" :style="{ height: getContentHeight() }">
+      <image
+        v-if="mode === 'normal'"
+        src="../../../static/screen-hint-bg.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'tall'"
+        src="../../../static/coach-comment.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'square'"
+        src="../../../static/prompt-bg-square.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'small'"
+        src="../../../static/finish-frame.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+    <IconButton
+      v-if="!!onClose"
+      src="../../../static/close-gold-outline.png"
+      :width="30"
+      :onClick="onClose"
+    />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.8);
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+.container > view:first-child {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  width: 70vw;
+  color: #fff;
+  margin-bottom: 15px;
+}
+.container > view:first-child > image {
+  position: absolute;
+  width: 80vw;
+  left: -7%;
+  bottom: -18vw;
+  z-index: -1;
+  transform: translateY(-75px);
+}
+</style>

src/pages/team-battle/components/ShootProgress2.vue

@@ -0,0 +1,215 @@
+<script setup>
+import {ref, watch, onMounted, onBeforeUnmount} from "vue";
+import {RoundGoldImages} from "@/constants";
+
+const props = defineProps({
+  tips: {
+    type: String,
+    default: "",
+  },
+  total: {
+    type: Number,
+    default: 12,
+  },
+  currentRound: {
+    type: String,
+    default: "round1",
+  },
+});
+
+const barColor = ref("");
+const remain = ref(12);
+const timer = ref(null);
+const loading = ref(true);
+const transitionStyle = ref("all 1s linear");
+const currentTeam = ref(null);
+const MIN_TICK_MS = 1;
+const ZERO_EVENT = "team-battle-progress-zero";
+const COUNTDOWN_READY_EVENT = "team-battle-countdown-ready";
+
+const clearCountdownTimer = () => {
+  if (timer.value) {
+    clearInterval(timer.value);
+    timer.value = null;
+  }
+};
+
+const setTransitionByTick = (tickMs) => {
+  transitionStyle.value = `all ${Math.max(MIN_TICK_MS, Math.round(tickMs || 1000))}ms linear`;
+};
+
+const emitProgressZero = () => {
+  uni.$emit(ZERO_EVENT);
+};
+
+const emitCountdownReady = () => {
+  uni.$emit(COUNTDOWN_READY_EVENT);
+};
+
+const updateRemain = (value) => {
+  if (value.stop) {
+    clearCountdownTimer();
+    return;
+  }
+  // zeroThenReset：ToSomeoneShoot 到达时，若进度条仍在倒计时则先瞬间清零（约 150ms 停留）再显示下一玩家满值
+  // 若进度条已到 0（loading 状态），直接切换满值
+  if (value.zeroThenReset) {
+    clearCountdownTimer();
+    const wasNonZero = remain.value > 0;
+    // 更新下一玩家颜色和方向（在清零和满值时均生效）
+    currentTeam.value = value.team;
+    if (value.team === 'red') barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+    if (value.team === 'blue') barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+    transitionStyle.value = "none";
+    if (wasNonZero) {
+      // 瞬间清零，停留约 150ms 后切换为满值
+      remain.value = 0;
+      loading.value = true;
+      setTimeout(() => {
+        remain.value = value.value;
+        loading.value = false;
+        setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+      }, 150);
+    } else {
+      // 已在底部，直接切换满值
+      remain.value = value.value;
+      loading.value = false;
+      setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+    }
+    return;
+  }
+  loading.value = false;
+  currentTeam.value = value.team
+  if (value.team === 'red')
+    barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+  if (value.team === 'blue')
+    barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+  const nextVal = Math.max(0, Math.round(Number(value.value) || 0));
+  const nextTickMs = Math.max(MIN_TICK_MS, Math.round(Number(value.tickMs) || 1000));
+  if (value.reset) {
+    // 重置前先清除旧计时器，防止超时未射箭时旧 interval 残留，导致进度条震荡
+    clearCountdownTimer();
+    // 重置时瞬间跳满格，禁用 CSS 过渡避免从旧值「涨到满」的动画
+    transitionStyle.value = "none";
+    remain.value = nextVal;
+    loading.value = nextVal <= 0;
+    setTimeout(() => {
+      setTransitionByTick(nextTickMs);
+    }, 50);
+    return;
+  }
+  // 如果剩余时间增加（如轮次切换重置），瞬间变化无动画；否则保持动画
+  if (nextVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = nextVal;
+    setTimeout(() => {
+      setTransitionByTick(nextTickMs);
+    }, 50);
+  } else {
+    remain.value = nextVal;
+    setTransitionByTick(nextTickMs);
+  }
+
+  // 启动前先清除旧计时器，防止多次 {stop:false} 事件叠加多个 interval
+  clearCountdownTimer();
+  if (nextVal <= 0) {
+    loading.value = true;
+    emitProgressZero();
+    return;
+  }
+  timer.value = setInterval(() => {
+    if (remain.value > 0) remain.value--;
+    if (remain.value <= 0) {
+      remain.value = 0;
+      loading.value = true;
+      clearCountdownTimer();
+      emitProgressZero();
+      return;
+    }
+    loading.value = false;
+  }, nextTickMs);
+  emitCountdownReady();
+};
+
+watch(
+    () => props.tips,
+    (newVal) => {
+
+    },
+    {
+      immediate: true,
+    }
+);
+
+onMounted(() => {
+  uni.$on("update-remain", updateRemain);
+});
+
+onBeforeUnmount(() => {
+  uni.$off("update-remain", updateRemain);
+  clearCountdownTimer();
+});
+</script>
+
+<template>
+  <view class="container">
+    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
+    <view
+        :style="{
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
+      }"
+    >
+      <view
+          :style="{
+          width: `${(remain / total) * 100}%`,
+          background: barColor,
+          right: currentTeam==='red' ? 0 : 'unset',
+          transition: transitionStyle,
+        }"
+      />
+      <text v-if="!loading">剩余{{ remain }}秒</text>
+      <text v-else>···</text>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 50vw;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.container > image {
+  width: 380rpx;
+  height: 80rpx;
+  transform: translateY(18rpx);
+}
+
+.container > view:last-child {
+  width: 100%;
+  text-align: center;
+  background-color: #444444;
+  border-radius: 20px;
+  height: 24rpx;
+  position: relative;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+.container > view:last-child > view {
+  height: 24rpx;
+  border-radius: 15px;
+}
+
+.container > view:last-child > text {
+  font-size: 18rpx;
+  color: #fff;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+</style>

src/pages/team-battle/components/TeamAvatars.vue

@@ -0,0 +1,150 @@
+<script setup>
+import { ref, watch } from "vue";
+const props = defineProps({
+  isRed: {
+    type: Boolean,
+    default: true,
+  },
+  team: {
+    type: Array,
+    default: () => [],
+  },
+  currentShooterId: {
+    type: [Number, String],
+    default: "",
+  },
+});
+const players = ref({});
+const currentTeam = ref(false);
+const firstName = ref("");
+
+// 抽出判断：当前队伍且该玩家排序为 0（队伍首位）
+const isFirst = (id) =>
+  currentTeam.value && ((players.value[id] || {}).sort || 0) === 0;
+
+const getPos = (id) => {
+  const sort = (players.value[id] || {}).sort || 0;
+  if (currentTeam.value) {
+    return 30 * (sort + Math.ceil(sort / 2));
+  }
+  return sort * 40;
+};
+
+const syncPlayers = () => {
+  const nextPlayers = {};
+  const shooterId = props.currentShooterId;
+  const shooterIndex = props.team.findIndex(
+    (p) => String(p?.id) === String(shooterId)
+  );
+  const nextTeam = [...props.team];
+
+  currentTeam.value = !!shooterId && shooterIndex >= 0;
+  firstName.value = "";
+
+  if (currentTeam.value) {
+    const target = nextTeam.splice(shooterIndex, 1)[0];
+    if (target) {
+      nextTeam.unshift(target);
+      firstName.value = target.name || "";
+    }
+  }
+
+  nextTeam.forEach((p, index) => {
+    if (p?.id) nextPlayers[p.id] = { sort: index, ...p };
+  });
+  players.value = nextPlayers;
+};
+
+watch(
+  [() => props.team, () => props.currentShooterId],
+  syncPlayers,
+  { immediate: true, deep: true }
+);
+</script>
+
+<template>
+  <view class="container">
+    <image
+      :src="isRed ? '../../../static/flag-red.png' : '../../../static/flag-blue.png'"
+      class="flag"
+      :style="{
+        [isRed ? 'left' : 'right']: '10rpx',
+        top: currentTeam ? '-36rpx' : '-24rpx',
+      }"
+    />
+    <view
+      v-for="(item, index) in team"
+      :key="item.id || index"
+      class="player"
+      :style="{
+        width: (isFirst(item.id) ? 80 : 60) + 'rpx',
+        height: (isFirst(item.id) ? 80 : 60) + 'rpx',
+        zIndex: team.length - ((players[item.id] || {}).sort || 0),
+        border: isFirst(item.id) ? '3.5rpx solid' : '2rpx solid',
+        borderColor: isRed ? '#ff6060' : '#5fadff',
+        top: isFirst(item.id) ? '0rpx' : '12rpx',
+        [isRed ? 'left' : 'right']: getPos(item.id) + 'rpx',
+      }"
+    >
+      <image :src="item.avatar || '../../../static/user-icon.png'" mode="widthFix" />
+      <text
+        v-if="isFirst(item.id)"
+        :style="{ backgroundColor: isRed ? '#ff6060' : '#5fadff' }"
+        >{{ isRed ? "红队" : "蓝队" }}</text
+      >
+    </view>
+    <text
+      v-if="currentTeam"
+      class="truncate"
+      :style="{
+        color: isRed ? '#ff6060' : '#5fadff',
+        [isRed ? 'left' : 'right']: '-4rpx',
+      }"
+      >{{ firstName }}</text
+    >
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  position: relative;
+  width: 20vw;
+  height: 10rpx;
+  margin: 0 20rpx;
+}
+.container > text {
+  position: absolute;
+  font-size: 20rpx;
+  text-align: center;
+  width: 80rpx;
+  bottom: -100rpx;
+}
+.player {
+  transition: all 0.3s ease;
+  position: absolute;
+  border-radius: 50%;
+  overflow: hidden;
+  box-sizing: border-box;
+}
+.player > image {
+  width: 100%;
+  min-height: 100%;
+}
+.player > text {
+  position: absolute;
+  font-size: 15rpx;
+  text-align: center;
+  width: 76rpx;
+  left: 0;
+  bottom: 0;
+  color: #fff;
+}
+.flag {
+  position: absolute;
+  width: 45rpx;
+  height: 45rpx;
+  transition: all 0.3s ease;
+}
+</style>

src/pages/team-battle/components/TestDistance.vue

@@ -0,0 +1,193 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import Guide from "./Guide.vue";
+import BowPower from "./BowPower.vue";
+import Avatar from "./Avatar.vue";
+import audioManager from "@/audioManager";
+import { simulShootAPI } from "@/apis";
+import { MESSAGETYPESV2 } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+const props = defineProps({
+  guide: {
+    type: Boolean,
+    default: true,
+  },
+  isBattle: {
+    type: Boolean,
+    default: false,
+  },
+  count: {
+    type: Number,
+    default: 15,
+  },
+});
+const arrow = ref({});
+const distance = ref(0);
+const showsimul = ref(false);
+const count = ref(props.count);
+const timer = ref(null);
+
+const updateTimer = (value) => {
+  count.value = Math.round(value);
+};
+onMounted(() => {
+  audioManager.play("请射箭测试距离");
+  if (props.isBattle) {
+    timer.value = setInterval(() => {
+      count.value -= 1;
+      if (count.value < 0) clearInterval(timer.value);
+    }, 1000);
+  }
+  uni.$on("update-timer", updateTimer);
+});
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
+  uni.$off("update-timer", updateTimer);
+});
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.TestDistance) {
+    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
+    if (distance.value >= 5) audioManager.play("距离合格");
+    else audioManager.play("距离不足");
+  }
+}
+
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  const accountInfo = uni.getAccountInfoSync();
+  const envVersion = accountInfo.miniProgram.envVersion;
+  if (envVersion !== "release") showsimul.value = true;
+});
+
+onBeforeUnmount(() => {
+  uni.$off("socket-inbox", onReceiveMessage);
+});
+</script>
+
+<template>
+  <view class="container">
+    <Guide v-show="guide">
+      <view class="guide-tips">
+        <text>请确保站距达到5米</text>
+        <text>低于5米的射箭无效</text>
+      </view>
+    </Guide>
+    <view class="test-area">
+      <image
+        class="text-bg"
+        src="https://static.shelingxingqiu.com/attachment/2025-07-05/db3skuq1n9rj4fmld4.png"
+        mode="widthFix"
+      />
+      <button
+        class="simul"
+        @click="simulShoot"
+        hover-class="none"
+        v-if="showsimul"
+      >
+        模拟射箭
+      </button>
+      <view class="warnning-text">
+        <block v-if="distance > 0">
+          <text>当前距离{{ distance }}米</text>
+          <text v-if="distance >= 5">已达到距离要求</text>
+          <text v-else>请调整站位</text>
+        </block>
+        <block v-else>
+          <text>请射箭，测试站距</text>
+        </block>
+      </view>
+      <view class="user-row">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower />
+      </view>
+    </view>
+    <view v-if="isBattle" class="ready-timer">
+      <image src="../../../static/test-tip.png" mode="widthFix" />
+      <view v-if="count >= 0">
+        <text>具体正式比赛还有</text>
+        <text>{{ count }}</text>
+        <text>秒</text>
+      </view>
+      <view v-else> 进入中... </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  max-height: 70vh;
+}
+.ready-timer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  transform: translateY(-10vw);
+}
+.ready-timer > image:first-child {
+  width: 40%;
+}
+.ready-timer > view {
+  width: 80%;
+  height: 45px;
+  background-color: #545454;
+  border-radius: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transform: translateY(-8vw);
+  color: #bebebe;
+  font-size: 15px;
+}
+.ready-timer > view > text:nth-child(2) {
+  color: #fed847;
+  font-size: 20px;
+  width: 22px;
+  text-align: center;
+}
+.test-area {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: 112vw;
+  position: relative;
+}
+.test-area > view:last-child {
+  padding: 15px;
+  width: calc(100% - 30px);
+}
+.text-bg {
+  width: 100%;
+  position: absolute;
+  top: -14.4%;
+  left: 0;
+}
+.warnning-text {
+  color: #fed847;
+  font-size: 27px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 40%;
+}
+.warnning-text > text {
+  width: 70vw;
+  text-align: center;
+}
+.simul {
+  position: absolute;
+  color: #fff;
+  right: 10px;
+}
+</style>

src/pages/training/components/BowData.vue

@@ -0,0 +1,116 @@
+<script setup>
+import AppBackground from "@/components/AppBackground.vue";
+import Avatar from "@/components/Avatar.vue";
+import BowTarget from "./BowTarget.vue";
+import ScorePanel from "./ScorePanel.vue";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: () => {},
+  },
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+});
+</script>
+
+<template>
+  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
+    <AppBackground :type="10" />
+    <view class="header">
+      <view>
+        <Avatar :src="user.avatar" :rankLvl="user.rankLvl" :size="45" />
+        <view>
+          <text>{{ user.nickName }}</text>
+          <text>{{ user.lvlName }}</text>
+        </view>
+      </view>
+      <view @click="onClose">
+        <image src="/static/close-white.png" mode="widthFix" />
+      </view>
+    </view>
+    <view :style="{ width: '100%', marginBottom: '20px' }">
+      <BowTarget :scores="arrows" />
+    </view>
+    <view class="desc">
+      <text>{{ arrows.length }}</text>
+      <text>支箭，共</text>
+      <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
+      <text>环</text>
+    </view>
+    <ScorePanel
+      :completeEffect="false"
+      :rowCount="total === 12 ? 6 : 9"
+      :total="total"
+      :arrows="arrows"
+      :margin="total === 12 ? 4 : 1"
+      :fontSize="total === 12 ? 25 : 22"
+    />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: #232323;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 10;
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: calc(100% - 20px);
+  padding: 10px;
+}
+.header > view:first-child {
+  display: flex;
+  align-items: center;
+  margin-left: 10px;
+}
+.header > view:first-child > view:last-child {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-left: 10px;
+  color: #fff;
+}
+.header > view:first-child > view:last-child > text:last-child {
+  font-size: 10px;
+  background-color: #5f51ff;
+  padding: 2px 5px;
+  border-radius: 10px;
+  margin-top: 5px;
+}
+.header > view:last-child > image {
+  width: 40px;
+}
+.desc {
+  color: #fff;
+  margin-bottom: 40px;
+}
+.desc > text:nth-child(2),
+.desc > text:nth-child(4) {
+  color: #fed847;
+}
+</style>

src/pages/training/components/BowTarget.vue

@@ -0,0 +1,665 @@
+<script setup>
+import {
+  computed,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  watch,
+} from "vue";
+import PointSwitcher from "@/components/PointSwitcher.vue";
+import TargetCanvas from "@/components/TargetCanvas.vue";
+
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
+import { simulShootAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+
+const props = defineProps({
+  currentRound: {
+    type: Number,
+    default: 0,
+  },
+  totalRound: {
+    type: Number,
+    default: 0,
+  },
+  scores: {
+    type: Array,
+    default: () => [],
+  },
+  blueScores: {
+    type: Array,
+    default: () => [],
+  },
+  mode: {
+    type: String,
+    default: "solo", // solo 单排，team 双排
+  },
+  stop: {
+    type: Boolean,
+    default: false,
+  },
+  coordinateRadius: {
+    type: Number,
+    default: 20,
+  },
+  hitRadiusPx: {
+    type: Number,
+    default: 2,
+  },
+  zoomHitRadiusPx: {
+    type: Number,
+    default: 5,
+  },
+  showCrosshair: {
+    type: Boolean,
+    default: false,
+  },
+  showQuadrantLabels: {
+    type: Boolean,
+    default: false,
+  },
+  quadrantLabels: {
+    type: Object,
+    default: () => ({
+      1: "1",
+      2: "2",
+      3: "3",
+      4: "4",
+    }),
+  },
+  highlightAreas: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const pMode = ref(true);
+const latestOne = ref(null);
+const bluelatestOne = ref(null);
+const prevScores = ref([]);
+const prevBlueScores = ref([]);
+const timer = ref(null);
+const dirTimer = ref(null);
+const angle = ref(null);
+const circleColor = ref("");
+const ROUND_TIP_OFFSET_Y = -32;
+const EXPERIENCE_TIP_OFFSET_Y = -68;
+
+const getNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const safeTargetRadius = computed(() => {
+  return Math.max(getNumber(props.coordinateRadius, 20), 1);
+});
+
+const currentHitRadiusPx = computed(() => {
+  const radius = Number(
+    pMode.value ? props.zoomHitRadiusPx : props.hitRadiusPx
+  );
+  return Number.isFinite(radius) && radius >= 0 ? radius : 0;
+});
+
+function getShotPoint(shot, fallbackCenter = false) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  if (Number.isFinite(x) && Number.isFinite(y)) return { x, y };
+  return fallbackCenter ? { x: 0, y: 0 } : null;
+}
+
+function getPointDirection(point) {
+  if (!point) return null;
+  const distance = Math.sqrt(point.x * point.x + point.y * point.y);
+  if (distance === 0) return null;
+
+  return {
+    x: point.x / distance,
+    y: point.y / distance,
+  };
+}
+
+function formatPxOffset(value) {
+  if (!value) return "";
+  const operator = value > 0 ? "+" : "-";
+  return ` ${operator} ${Math.abs(value)}px`;
+}
+
+function formatTargetPosition(percent, offset) {
+  const pxOffset = formatPxOffset(offset);
+  return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
+}
+
+function getTargetPositionStyle(point, offsetPx = 0, extraOffset = {}) {
+  if (!point) return { display: "none" };
+
+  const radius = safeTargetRadius.value;
+  const diameter = radius * 2;
+  const direction = getPointDirection(point);
+  const xOffset = (direction ? direction.x * offsetPx : 0) + (extraOffset.x || 0);
+  const yOffset = (direction ? -direction.y * offsetPx : 0) + (extraOffset.y || 0);
+  const leftPercent = ((point.x + radius) / diameter) * 100;
+  const topPercent = ((radius - point.y) / diameter) * 100;
+
+  return {
+    left: formatTargetPosition(leftPercent, xOffset),
+    top: formatTargetPosition(topPercent, yOffset),
+    transform: "translate(-50%, -50%)",
+  };
+}
+
+function getHitStyle(shot) {
+  const radius = currentHitRadiusPx.value;
+  const point = getShotPoint(shot);
+
+  return {
+    ...getTargetPositionStyle(point, radius),
+    width: `${radius * 2}px`,
+    height: `${radius * 2}px`,
+  };
+}
+
+function getRoundTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: ROUND_TIP_OFFSET_Y }
+  );
+}
+
+function getExperienceTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: EXPERIENCE_TIP_OFFSET_Y }
+  );
+}
+
+watch(
+  () => props.scores,
+  (newVal) => {
+    if (newVal.length - prevScores.value.length === 1) {
+      latestOne.value = newVal[newVal.length - 1];
+      if (timer.value) clearTimeout(timer.value);
+      timer.value = setTimeout(() => {
+        latestOne.value = null;
+      }, 1000);
+    }
+    prevScores.value = [...newVal];
+  },
+  {
+    deep: true,
+  }
+);
+
+watch(
+  () => props.blueScores,
+  (newVal) => {
+    if (newVal.length - prevBlueScores.value.length === 1) {
+      bluelatestOne.value = newVal[newVal.length - 1];
+      if (timer.value) clearTimeout(timer.value);
+      timer.value = setTimeout(() => {
+        bluelatestOne.value = null;
+      }, 1000);
+    }
+    prevBlueScores.value = [...newVal];
+  },
+  {
+    deep: true,
+  }
+);
+
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+const simulShoot2 = async () => {
+  if (device.value.deviceId) {
+    const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
+    await simulShootAPI(device.value.deviceId, r1, r1);
+  }
+};
+
+const env = computed(() => {
+  const accountInfo = uni.getAccountInfoSync();
+  return accountInfo.miniProgram.envVersion;
+});
+
+const arrowStyle = computed(() => {
+  return {
+    transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
+      360 - angle.value
+    }deg) translateY(105%)`,
+  };
+});
+
+const currentArrowIndex = computed(() => {
+  return props.scores.length + props.blueScores.length + 1;
+});
+
+const getHighlightArrowIndex = (area = {}) => {
+  const arrowIndex = Number(area.arrowIndex ?? area.arrowNo ?? area.arrow);
+  return Number.isInteger(arrowIndex) && arrowIndex > 0 ? arrowIndex : null;
+};
+
+const currentHighlightAreas = computed(() => {
+  if (!Array.isArray(props.highlightAreas) || props.highlightAreas.length === 0) {
+    return [];
+  }
+
+  const hasExplicitArrowIndex = props.highlightAreas.some((area = {}) => {
+    return getHighlightArrowIndex(area) !== null;
+  });
+
+  const matchedAreas = props.highlightAreas.filter((area = {}) => {
+    return getHighlightArrowIndex(area) === currentArrowIndex.value;
+  });
+
+  if (hasExplicitArrowIndex) {
+    return matchedAreas;
+  }
+
+  if (props.highlightAreas.length === 1) {
+    return props.highlightAreas.slice(0, 1);
+  }
+
+  const currentArea = props.highlightAreas[currentArrowIndex.value - 1];
+  return currentArea ? [currentArea] : [];
+});
+
+const showHighlightCanvas = computed(() => {
+  return props.totalRound > 0 && currentHighlightAreas.value.length > 0;
+});
+
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) return;
+  if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
+    if (
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
+    ) {
+      angle.value = null;
+      setTimeout(() => {
+        if (props.scores[0]) {
+          circleColor.value =
+            message.shootData.playerId === props.scores[0].playerId
+              ? "#ff4444"
+              : "#1840FF";
+        }
+        angle.value = message.shootData.angle;
+      }, 200);
+    }
+  }
+}
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+});
+
+onBeforeUnmount(() => {
+  if (timer.value) {
+    clearTimeout(timer.value);
+    timer.value = null;
+  }
+  if (dirTimer.value) {
+    clearTimeout(dirTimer.value);
+    dirTimer.value = null;
+  }
+  uni.$off("socket-inbox", onReceiveMessage);
+});
+</script>
+
+<template>
+  <view class="container">
+    <!-- <view class="header" v-if="totalRound > 0">
+      <text v-if="totalRound > 0" class="round-count">{{
+        (currentRound > totalRound ? totalRound : currentRound) +
+        "/" +
+        totalRound
+      }}</text>
+    </view> -->
+    <view class="target">
+      <image
+        class="target-image"
+        src="../../../static/bow-target.png"
+        mode="aspectFit"
+      />
+      <TargetCanvas
+        v-if="showHighlightCanvas"
+        class="target-highlight-layer"
+        :coordinateRadius="coordinateRadius"
+        :showCrosshair="false"
+        :showQuadrantLabels="false"
+        :showRingLabels="false"
+        :highlightOnly="true"
+        :highlightAreas="currentHighlightAreas"
+      />
+      <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
+        <view :style="{ background: circleColor }">
+          <image src="../../../static/dot-circle.png" mode="widthFix" />
+        </view>
+      </view>
+      <view v-if="stop" class="stop-sign">中场休息</view>
+      <view
+        v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(latestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="latestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(latestOne)"
+        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
+        }}<text v-if="latestOne.ring">环</text>
+      </view>
+      <view
+        v-if="
+          bluelatestOne &&
+          bluelatestOne.ring &&
+          user.id === bluelatestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(bluelatestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="bluelatestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(bluelatestOne)"
+        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
+        }}<text v-if="bluelatestOne.ring">环</text></view
+      >
+      <block v-for="(bow, index) in scores" :key="index">
+        <view
+          v-if="bow.ring > 0"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === scores.length - 1 && latestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
+          }"
+          ><text v-if="pMode">{{ index + 1 }}</text></view
+        >
+      </block>
+      <block v-for="(bow, index) in blueScores" :key="index">
+        <view
+          v-if="bow.ring > 0"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: '#1840FF',
+          }"
+        >
+          <text v-if="pMode">{{ index + 1 }}</text>
+        </view>
+      </block>
+    </view>
+    <view class="footer">
+      <PointSwitcher
+        :onChange="(val) => (pMode = val)"
+        :style="{ zIndex: 999 }"
+      />
+    </view>
+    <view class="simul" v-if="env !== 'release'">
+      <button @click="simulShoot">模拟</button>
+      <button @click="simulShoot2">射箭</button>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: calc(100vw - 30px);
+  height: calc(100vw - 30px);
+  padding: 0px 15px;
+  position: relative;
+}
+.target {
+  position: relative;
+  margin: 10px;
+  width: calc(100% - 20px);
+  height: calc(100% - 20px);
+  z-index: 0;
+}
+.target-image {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+  pointer-events: none;
+}
+.target-highlight-layer {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+  pointer-events: none;
+}
+.e-value {
+  position: absolute;
+  background-color: #0006;
+  color: #fff;
+  font-size: 12px;
+  padding: 4px 7px;
+  border-radius: 5px;
+  z-index: 4;
+  width: 50px;
+  text-align: center;
+}
+.round-tip {
+  position: absolute;
+  color: #fff;
+  font-size: 30px;
+  font-weight: bold;
+  z-index: 4;
+  width: 100px;
+  text-align: center;
+}
+.round-tip > text {
+  font-size: 24px;
+  margin-left: 5px;
+}
+@keyframes target-tip-fade-in-out {
+  0% {
+    transform: translate(-50%, -50%) translateY(20px);
+    opacity: 0;
+  }
+
+  30% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  80% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate(-50%, -50%);
+    opacity: 0;
+  }
+}
+.round-tip.fade-in-out,
+.e-value.fade-in-out {
+  animation: target-tip-fade-in-out 1.2s ease forwards;
+}
+.hit {
+  position: absolute;
+  border-radius: 50%;
+  z-index: 3;
+  color: #fff;
+  transition: all 0.3s ease;
+  box-sizing: border-box;
+}
+.s-point {
+}
+.b-point {
+  border: 1px solid #fff;
+  z-index: 3;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.b-point > text {
+  font-size: 16rpx;
+  color: #fff;
+  font-family: "DINCondensed";
+  /* text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);*/
+  margin-top: 2rpx;
+}
+@keyframes target-pump-in {
+  from {
+    transform: translate(-50%, -50%) scale(2);
+  }
+
+  to {
+    transform: translate(-50%, -50%) scale(1);
+  }
+}
+.hit.pump-in {
+  animation: target-pump-in 0.3s ease-out forwards;
+  transform-origin: center center;
+}
+.header {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: -40px;
+}
+.header > image:first-child {
+  width: 40px;
+  height: 40px;
+}
+.round-count {
+  font-size: 20px;
+  color: #fed847;
+  top: 75px;
+  font-weight: bold;
+}
+.footer {
+  width: calc(100% - 20px);
+  padding: 0 10px;
+  display: flex;
+  margin-top: -40px;
+  justify-content: flex-end;
+}
+.footer > image {
+  width: 40px;
+  min-height: 40px;
+  max-height: 40px;
+  border-radius: 50%;
+  border: 1px solid #fff;
+}
+.simul {
+  position: absolute;
+  top: 0;
+  right: 20px;
+  margin-left: 20px;
+  z-index: 999;
+}
+.simul > button {
+  color: #fff;
+}
+.stop-sign {
+  position: absolute;
+  font-size: 44px;
+  color: #fff9;
+  text-align: center;
+  width: 200px;
+  height: 60px;
+  left: calc(50% - 100px);
+  top: calc(50% - 30px);
+  z-index: 5;
+  font-weight: bold;
+}
+.arrow-dir {
+  position: absolute;
+  width: 100%;
+  height: 52%;
+  left: 50%;
+  bottom: 50%;
+  z-index: 4;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.arrow-dir > view {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+}
+.arrow-dir > view > image {
+  width: 100rpx;
+  height: 100rpx;
+  transform: translate(-30%, -30%);
+}
+@keyframes spring-in {
+  0% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  15% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  30% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  45% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  60% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  75% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
+@keyframes disappear {
+  0% {
+    opacity: 1;
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.arrow-dir > view {
+  animation: disappear 3s ease forwards;
+}
+.arrow-dir > view > image {
+  animation: spring-in 3s ease forwards;
+  width: 100%;
+}
+</style>

src/pages/training/components/BubbleTip.vue

@@ -0,0 +1,62 @@
+<script setup>
+const props = defineProps({
+  type: {
+    type: String,
+    default: "normal",
+  },
+  location: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+</script>
+
+<template>
+  <view :class="`container ${type}`" :style="{ ...location }">
+    <slot />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  position: absolute;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  font-size: 24rpx;
+}
+.normal {
+  background-image: url("../static/bubble-tip.png");
+  width: 157rpx;
+  height: 105rpx;
+  padding-top: 10px;
+  padding-left: 30rpx;
+}
+.normal2 {
+  background-image: url("../static/bubble-tip4.png");
+  width: 190rpx;
+  height: 105rpx;
+  padding-top: 10px;
+  padding-left: 20rpx;
+  top: 0;
+  left: 15%;
+  z-index: 1;
+}
+.long {
+  background-image: url("../static/bubble-tip2.png");
+  width: 370rpx;
+  height: 70rpx;
+  top: -50%;
+  left: 49%;
+}
+.short {
+  background-image: url("../static/bubble-tip3.png");
+  width: 300rpx;
+  height: 70rpx;
+  top: -50%;
+  right: -1%;
+}
+</style>

src/pages/training/components/ScorePanel.vue

@@ -0,0 +1,157 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+const props = defineProps({
+  rowCount: {
+    type: Number,
+    default: 0,
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  fontSize: {
+    type: Number,
+    default: 25,
+  },
+  completeEffect: {
+    type: Boolean,
+    default: true,
+  },
+});
+const items = ref(new Array(props.total).fill(9));
+const bgImages = [
+  "../static/complete-light1.png",
+  "../static/complete-light2.png",
+];
+const bgIndex = ref(0);
+
+const getDisplayText = (arrow) => {
+  if (!arrow) return "-";
+  if (arrow.ringX) return "X";
+  return arrow.ring ?? "-";
+};
+
+const isLowScore = (arrow) => {
+  if (!arrow || arrow.ringX) return false;
+  const ring = Number(arrow.ring);
+  return Number.isFinite(ring) && ring < 6;
+};
+
+watch(
+  () => props.total,
+  (newValue) => {
+    items.value = new Array(newValue).fill(9);
+  }
+);
+const timer = ref(null);
+onMounted(() => {
+  timer.value = setInterval(() => {
+    bgIndex.value = bgIndex.value === 0 ? 1 : 0;
+  }, 200);
+});
+onBeforeUnmount(() => {
+  if (timer.value) {
+    clearInterval(timer.value);
+  }
+});
+</script>
+<template>
+  <view class="container">
+    <image
+      v-if="total > 0 && arrows.length === total && completeEffect"
+      :src="bgImages[bgIndex]"
+      class="complete-light"
+      :style="{
+        width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
+          (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
+        }px)`,
+        height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${
+          (100 / (total * 2)) *
+          ((total / rowCount) * 2 + (total === 12 ? 7 : 24))
+        }px)`,
+        top: `${total === 12 ? -2 : -3}vw`,
+      }"
+    />
+    <view
+      v-for="(_, index) in items"
+      :key="index"
+      class="score-item"
+    >
+      <image
+        class="score-item-bg"
+        :src="
+          isLowScore(arrows[index])
+            ? '/static/training-difficulty-design/block-gray.png'
+            : '/static/training-difficulty-design/block-gold.png'
+        "
+      />
+      <text
+        class="score-value"
+        :class="{ 'score-value--low': isLowScore(arrows[index]) }"
+      >
+        {{ getDisplayText(arrows[index]) }}
+      </text>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  position: relative;
+  padding: 30rpx 40rpx 0 40rpx;
+}
+.score-item {
+  position: relative;
+  width: 100rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 14rpx;
+}
+
+.score-item:nth-child(6n) {
+  margin-right: 0;
+}
+
+.score-item-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100rpx;
+  height: 56rpx;
+}
+
+.score-value {
+  position: relative;
+  z-index: 1;
+  min-width: 28rpx;
+  text-align: center;
+  font-size: 34rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+  color: #f6e3b2;
+  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
+  margin-left: -10rpx;
+}
+
+.score-value--low {
+  color: #cfcfcf;
+  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
+}
+
+.complete-light {
+  position: absolute;
+}
+</style>

src/pages/training/components/ScorePanel2.vue

@@ -0,0 +1,109 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+});
+
+const getDisplayText = (arrow = {}) => {
+  if (!arrow) return "";
+  if (!arrow.ring) return "-";
+  return arrow.ringX ? "X" : String(arrow.ring);
+};
+
+const isLowScore = (arrow = {}) => {
+  if (!arrow || arrow.ringX) return false;
+  return Number(arrow.ring) < 6;
+};
+
+const displayArrows = computed(() => {
+  const list = [...props.arrows];
+  if (props.total > 0 && list.length < props.total) {
+    list.push(null);
+  }
+  return list;
+});
+</script>
+
+<template>
+  <view v-if="displayArrows.length" class="score-panel">
+    <view class="score-grid">
+      <view
+        v-for="(arrow, index) in displayArrows"
+        :key="index"
+        class="score-card"
+      >
+        <image class="score-card-bg" :src="isLowScore(arrow)?'/static/training-difficulty-design/block-gray.png':'/static/training-difficulty-design/block-gold.png'"></image>
+        <text
+          class="score-value"
+          :class="{ 'score-value--low': isLowScore(arrow) }"
+        >
+          {{ getDisplayText(arrow) }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.score-panel {
+  width: 100%;
+  padding: 30rpx 40rpx 0 40rpx;
+  box-sizing: border-box;
+}
+
+.score-grid {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.score-card {
+  position: relative;
+  width: 100rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 14rpx;
+}
+
+.score-card:nth-child(6n) {
+  margin-right: 0;
+}
+
+.score-card-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100rpx;
+  height: 56rpx;
+}
+
+.score-value {
+  position: relative;
+  z-index: 1;
+  min-width: 28rpx;
+  text-align: center;
+  font-size: 34rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+  color: #f6e3b2;
+  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
+  margin-left: -10rpx;
+}
+
+.score-value--low {
+  color: #cfcfcf;
+  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
+}
+</style>

src/pages/training/components/ScoreResult.vue

@@ -0,0 +1,628 @@
+<script setup>
+import { ref, onMounted, computed } from "vue";
+import ScreenHint from "./ScreenHint.vue";
+import BowData from "./BowData.vue";
+import UserUpgrade from "@/components/UserUpgrade.vue";
+import { directionAdjusts } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const props = defineProps({
+  onClose: {
+    type: Function,
+    default: () => { },
+  },
+  onRetry: {
+    type: Function,
+    default: () => { },
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+  rowCount: {
+    type: Number,
+    default: 0,
+  },
+  result: {
+    type: Object,
+    default: () => ({}),
+  },
+  tipSrc: {
+    type: String,
+    default: "",
+  },
+});
+
+const showPanel = ref(true);
+const showComment = ref(false);
+const showBowData = ref(false);
+const showUpgrade = ref(false);
+
+const closePanel = () => {
+  showPanel.value = false;
+  setTimeout(() => {
+    props.onClose();
+  }, 300);
+};
+
+const retryPractice = () => {
+  showPanel.value = false;
+  setTimeout(() => {
+    props.onRetry();
+  }, 300);
+};
+
+function onClickShare() {
+  uni.$emit("share-image");
+}
+
+onMounted(() => {
+  if (props.result.lvl > user.value.lvl) {
+    showUpgrade.value = true;
+  }
+});
+
+const details = computed(() => props.result.details || []);
+
+const arrows = computed(() => {
+  const data = new Array(props.total).fill(null);
+  details.value.forEach((arrow, index) => {
+    data[index] = arrow;
+  });
+  return data;
+});
+
+const validArrows = computed(() => arrows.value.filter((a) => !!a?.ring).length);
+const totalRing = computed(() =>
+  details.value.reduce((last, next) => last + (Number(next.ring) || 0), 0)
+);
+
+const gainedExp = computed(
+  () => props.result.exp || props.result.experience || validArrows.value
+);
+
+const currentLevel = computed(
+  () => props.result.lvl || user.value.lvl || user.value.rankLvl || 1
+);
+
+const currentExp = computed(
+  () => props.result.currentExp || props.result.score || user.value.scores || 0
+);
+
+const nextExp = computed(
+  () => props.result.nextExp || props.result.upgradeScore || 100
+);
+
+const expPercent = computed(() => {
+  if (!nextExp.value) return 0;
+  return Math.min(100, Math.max(0, (currentExp.value / nextExp.value) * 100));
+});
+
+const findValue = (...keys) => {
+  const item = keys.find((key) => props.result[key] !== undefined);
+  return item ? props.result[item] : undefined;
+};
+
+const formatDuration = (value) => {
+  const seconds = Number(value || 0);
+  if (!seconds) return "--";
+  const minutes = Math.floor(seconds / 60);
+  const rest = seconds % 60;
+  return minutes ? `${minutes}分${rest}秒` : `${rest}秒`;
+};
+
+const usedTime = computed(() =>
+  findValue("duration", "usedTime", "shootTime", "time")
+);
+
+const hitCompare = computed(
+  () => Number(findValue("hitCompare", "hitDiff", "hitDelta") || 0)
+);
+
+const timeCompare = computed(
+  () => Number(findValue("timeCompare", "timeDiff", "durationDiff") || 0)
+);
+
+const calories = computed(
+  () => Number(findValue("calories", "calorie", "kcal") || 0)
+);
+</script>
+
+<template>
+  <view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']">
+    <image class="hero-glow" src="/static/training-difficulty-design/result-bg.png" mode="widthFix" />
+    <view class="result-title">
+      <image class="result-title-bg" src="/static/training-difficulty-design/result-t-bg.png" mode="widthFix" />
+      <view class="result-title-text">Lv{{ currentLevel }}</view>
+    </view>
+
+    <view class="result-panel">
+      <view class="line-top"></view>
+      <view class="line-bottom"></view>
+      <view class="stats">
+        <view class="stat-row">
+          <image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <view class="stat-cell">
+            <text class="stat-label">共命中目标</text>
+            <view class="stat-value">
+              <text>{{ validArrows }}</text>
+              <text class="stat-unit">次</text>
+            </view>
+          </view>
+          <view class="stat-divider"></view>
+          <view class="stat-cell stat-cell--compare">
+            <text class="stat-label">对比上次</text>
+            <view class="stat-value">
+              <text>{{ Math.abs(hitCompare) }}</text>
+              <text class="stat-unit">次</text>
+              <image class="trend-icon" :class="{ 'trend-icon--down': hitCompare < 0 }"
+                src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
+            </view>
+          </view>
+        </view>
+
+        <view class="stat-row">
+          <image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <view class="stat-cell">
+            <text class="stat-label">用时</text>
+            <view class="stat-value">
+              <text>{{ formatDuration(usedTime) }}</text>
+            </view>
+          </view>
+          <view class="stat-divider"></view>
+          <view class="stat-cell stat-cell--compare">
+            <text class="stat-label">对比上次</text>
+            <view class="stat-value">
+              <text>{{ formatDuration(Math.abs(timeCompare)) }}</text>
+              <image class="trend-icon" :class="{ 'trend-icon--down': timeCompare <= 0 }"
+                src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
+            </view>
+          </view>
+        </view>
+         <view class="stat-row">
+          <image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <view class="stat-cell">
+            <text class="stat-label">消耗卡路里</text>
+            <view class="stat-value">
+              <text>{{ calories }}卡</text>
+            </view>
+          </view>
+          <text class="stat-equal">≈</text>
+          <!-- <view class="stat-divider"></view> -->
+          <view class="stat-cell stat-cell--compare">
+            <view class="stat-value">
+              <image v-for="index in 3" :key="index" class="rice-icon"
+                  src="/static/training-difficulty-design/result-rice.png" mode="widthFix" />
+            </view>
+          </view>
+        </view>
+
+     
+        <view class="actions">
+          <view class="action-item" @click="() => (showBowData = true)">
+            <image class="action-icon" src="/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
+            <text>查看靶纸</text>
+          </view>
+          <view v-if="validArrows === total" class="action-item" @click="() => (showComment = true)">
+            <image class="action-icon" src="/static/training-difficulty-design/result-icon-2.png" mode="widthFix" />
+            <text>教练点评</text>
+          </view>
+          <view v-if="validArrows === total" class="action-item" @click="onClickShare">
+            <image class="action-icon" src="/static/training-difficulty-design/result-icon-3.png" mode="widthFix" />
+            <text>分享成绩</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="oper-box">
+      <view class="exp-area">
+        <text class="exp-gain">+{{ gainedExp }}经验</text>
+        <view class="level-progress">
+          <text class="level-text">LV.{{ currentLevel }}</text>
+          <view class="progress-track">
+            <view class="progress-fill" :style="{ width: `${expPercent}%` }"></view>
+          </view>
+          <text class="progress-text">{{ currentExp }} / {{ nextExp }}</text>
+        </view>
+      </view>
+
+      <view class="footer-actions">
+        <view class="result-btn result-btn--muted" @click="closePanel">
+          <text>{{ validArrows === total ? "完成" : "返回" }}</text>
+        </view>
+        <view class="result-btn result-btn--primary" @click="retryPractice">
+          <text>再来一次</text>
+        </view>
+      </view>
+    </view>
+
+    <ScreenHint :show="showComment" :onClose="() => (showComment = false)" mode="tall">
+      <view class="coach-comment">
+        <text>
+          您本次练习取得了<text class="gold-text">{{ totalRing }}</text>环的成绩，所有箭支上靶后的平均点间距离为<text class="gold-text">{{
+            Number((result.average_distance || 0).toFixed(2))
+            }}</text>，{{
+              result.spreadEvaluation === "Dispersed"
+                ? "还需要持续改进哦~"
+                : "成绩优秀。"
+            }}
+        </text>
+        <view>
+          <image src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png" mode="widthFix" />
+          <text class="coach-suggestion">
+            针对您本次的练习，{{
+              result.spreadEvaluation === "Dispersed"
+                ? "我们建议您充分练习推弓、靠位以及撒放动作一致性。"
+                : totalRing >= 100
+                  ? "我们建议您继续保持即可。"
+                  : `我们建议您将设备的瞄准器${directionAdjusts[result.adjustmentHint]
+                  }调整。`
+            }}
+          </text>
+        </view>
+      </view>
+    </ScreenHint>
+    <BowData :total="arrows.length" :arrows="result.details" :show="showBowData"
+      :onClose="() => (showBowData = false)" />
+    <UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="result.lvl" />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.result-mask {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  background:
+    linear-gradient(180deg,
+      rgba(24, 22, 17, 0.38) 0%,
+      rgba(24, 22, 17, 0.56) 28%,
+      rgba(17, 17, 25, 0.92) 58%),
+    rgba(0, 0, 0, 0.72);
+  z-index: 999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.result-mask--show {
+  opacity: 1;
+}
+
+.result-mask--hide {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.hero-glow {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+
+.result-title {
+  position: relative;
+  width: 100%;
+  height: 264rpx;
+  z-index: 2;
+}
+
+.result-title-bg {
+  width: 100%;
+  height: 264rpx;
+  display: block;
+}
+
+.result-title-text {
+  width: 100%;
+  font-size: 28rpx;
+  color: #FBFCE6;
+  font-weight: 600;
+  line-height: 40rpx;
+  text-align: center;
+  position: absolute;
+  top: 116rpx;
+  left: 0;
+}
+
+.result-panel {
+  width: 100vw;
+  height: 634rpx;
+  padding: 144rpx 80rpx 0 80rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.8);
+  z-index: 1;
+  margin-top: -100rpx;
+  position: relative;
+}
+
+.stats {
+  width: 100%;
+  margin-top: 34rpx;
+}
+
+.line-top {
+  background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
+  width: 100%;
+  height: 4rpx;
+  opacity: 0.9;
+  position: absolute;
+  top: 2rpx;
+  left: 0;
+}
+
+.line-bottom {
+  background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
+  width: 100%;
+  height: 4rpx;
+  opacity: 0.9;
+  position: absolute;
+  bottom: 2rpx;
+  left: 0;
+}
+
+.stat-row {
+  width: 100%;
+  height: 62rpx;
+  position: relative;
+  display: flex;
+  align-items: center;
+  margin-bottom: 52rpx;
+  // border: 2rpx solid rgba(209, 184, 125, 0.72);
+  // border-radius: 14rpx;
+  transform: skewX(-12deg);
+  box-sizing: border-box;
+}
+
+.stat-cell {
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  transform: skewX(12deg);
+}
+
+.stat-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 582rpx;
+  height: 62rpx;
+}
+
+.stat-cell--compare {
+  padding-left: 8rpx;
+  box-sizing: border-box;
+}
+
+.stat-label {
+  position: absolute;
+  top: -30rpx;
+  color: rgba(255, 255, 255, 0.7);
+  font-size: 20rpx;
+  line-height: 1;
+}
+
+.stat-value {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 120rpx;
+  color: #F3E0B9;
+  font-size: 32rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+}
+
+.stat-unit {
+  margin-left: 4rpx;
+  font-size: 24rpx;
+}
+
+.stat-divider {
+  width: 2rpx;
+  height: 34rpx;
+  background: rgba(197, 160, 92, 0.64);
+  transform: skewX(12deg);
+}
+
+.stat-equal{
+  width: 30rpx;
+  height: 40rpx;
+  color: #F3E0B9;
+  font-size: 30rpx;
+  margin-left: 10rpx;
+}
+
+.trend-icon {
+  width: 28rpx;
+  height: 42rpx;
+  margin-left: 16rpx;
+}
+
+.trend-icon--down {
+  transform: rotate(180deg);
+}
+
+.stat-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 582rpx;
+  height: 62rpx;
+}
+
+.rice-list {
+  width: 160rpx;
+  display: flex;
+  align-items: center;
+}
+
+.rice-icon {
+  width: 36rpx;
+  height: 34rpx;
+  margin-right: 14rpx;
+}
+
+.oper-box {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 598rpx;
+}
+
+.actions {
+  width: 350rpx;
+  display: flex;
+  justify-content: space-between;
+  margin: 0 auto;
+  margin-top: 38rpx;
+}
+
+.action-item {
+  width: 80rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.action-icon {
+  width: 70rpx;
+  height: 68rpx;
+}
+
+.action-item>text {
+  margin-top: 4rpx;
+  color: #FAE6BC;
+  font-size: 20rpx;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.exp-area {
+  width: 100%;
+  margin-top: auto;
+  padding-top: 122rpx;
+}
+
+.exp-gain {
+  display: block;
+  margin-bottom: 14rpx;
+  color: #f6e3b2;
+  font-size: 22rpx;
+  line-height: 1;
+  text-align: center;
+}
+
+.level-progress {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.level-text,
+.progress-text {
+  color: rgba(255, 255, 255, 0.86);
+  font-size: 24rpx;
+  line-height: 1;
+}
+
+.level-text {
+  min-width: 60rpx;
+}
+
+.progress-text {
+  min-width: 72rpx;
+  text-align: right;
+}
+
+.progress-track {
+  flex: 1;
+  height: 10rpx;
+  margin: 0 14rpx;
+  border-radius: 999rpx;
+  overflow: hidden;
+  background: rgba(255, 255, 255, 0.26);
+}
+
+.progress-fill {
+  height: 100%;
+  border-radius: 999rpx;
+  background: linear-gradient(90deg, #ff940f 0%, #ffbb33 58%, #fff0a7 100%);
+}
+
+.footer-actions {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 70rpx;
+}
+
+.result-btn {
+  width: 234rpx;
+  height: 72rpx;
+  border-radius: 999rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 18rpx;
+}
+
+.result-btn>text {
+  font-size: 28rpx;
+  line-height: 1;
+  font-weight: 700;
+}
+
+.result-btn--muted {
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.2);
+}
+
+.result-btn--primary {
+  background: #FED847;
+  color: #151515;
+}
+
+.gold-text {
+  color: #fed847;
+}
+
+.coach-comment {
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+}
+
+.coach-comment>view {
+  display: flex;
+}
+
+.coach-comment>view>image {
+  width: 420rpx;
+  height: 420rpx;
+  margin-right: 20rpx;
+}
+
+.coach-suggestion {
+  margin-top: 12px;
+}
+</style>

src/pages/training/components/ScreenHint.vue

@@ -0,0 +1,89 @@
+<script setup>
+import IconButton from "@/components/IconButton.vue";
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: null,
+  },
+  mode: {
+    type: String,
+    default: "normal",
+  },
+});
+const getContentHeight = () => {
+  if (props.mode === "tall") return "50vw";
+  if (props.mode === "square") return "74vw";
+  return "36vw";
+};
+</script>
+
+<template>
+  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
+    <view class="scale-in" :style="{ height: getContentHeight() }">
+      <image
+        v-if="mode === 'normal'"
+        src="/static/screen-hint-bg.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'tall'"
+        src="/static/coach-comment.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'square'"
+        src="/static/prompt-bg-square.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'small'"
+        src="/static/finish-frame.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+    <IconButton
+      v-if="!!onClose"
+      src="/static/close-gold-outline.png"
+      :width="30"
+      :onClick="onClose"
+    />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.8);
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+.container > view:first-child {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  width: 70vw;
+  color: #fff;
+  margin-bottom: 15px;
+}
+.container > view:first-child > image {
+  position: absolute;
+  width: 80vw;
+  left: -7%;
+  bottom: -18vw;
+  z-index: -1;
+  transform: translateY(-75px);
+}
+</style>

src/pages/training/components/ShootProgress.vue

@@ -0,0 +1,387 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
+import audioManager from "@/audioManager";
+import { MESSAGETYPESV2 } from "@/constants";
+import { getDirectionText } from "@/util";
+import Avatar from "@/components/Avatar.vue";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: true,
+  },
+  start: {
+    type: Boolean,
+    default: false,
+  },
+  tips: {
+    type: String,
+    default: "",
+  },
+  total: {
+    type: Number,
+    default: 120,
+  },
+  currentRound: {
+    type: Number,
+    default: 0,
+  },
+  battleId: {
+    type: String,
+    default: "",
+  },
+  melee: {
+    type: Boolean,
+    default: false,
+  },
+  onStop: {
+    type: Function,
+    default: () => {},
+  },
+});
+
+const barColor = ref("#fed847");
+const remain = ref(props.total);
+const timer = ref(null);
+const sound = ref(true);
+const currentRound = ref(props.currentRound);
+const currentRoundEnded = ref(false);
+const halfTime = ref(false);
+const wait = ref(0);
+const transitionStyle = ref("all 1s linear");
+
+const progressPercent = computed(() => {
+  if (!props.total) return 0;
+  return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
+});
+
+const displayName = computed(() => {
+  return (
+    user.value?.nickName ||
+    user.value?.nickname ||
+    user.value?.name ||
+    "Archer"
+  );
+});
+
+const avatarSrc = computed(() => {
+  return user.value?.avatar || "/static/shooter2.png";
+});
+
+watch(
+  () => props.tips,
+  (newVal) => {
+    let key = "";
+    if (newVal.includes("红队")) key = "请红方射箭";
+    if (newVal.includes("蓝队")) key = "请蓝方射箭";
+    if (key) {
+      if (currentRoundEnded.value) {
+        currentRound.value += 1;
+        currentRoundEnded.value = false;
+        if (currentRound.value === 1) audioManager.play("第一轮");
+        if (currentRound.value === 2) audioManager.play("第二轮");
+        if (currentRound.value === 3) audioManager.play("第三轮");
+        if (currentRound.value === 4) audioManager.play("第四轮");
+        if (currentRound.value === 5) audioManager.play("第五轮");
+        setTimeout(() => {
+          audioManager.play(key);
+        }, 1000);
+      } else {
+        audioManager.play(key);
+      }
+    }
+  }
+);
+
+const resetTimer = (count) => {
+  if (timer.value) clearInterval(timer.value);
+  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) {
+        clearInterval(timer.value);
+        props.onStop();
+      }
+      if (remain.value > 0) remain.value--;
+    }, 1000);
+  }
+};
+
+watch(
+  () => props.start,
+  (newVal) => {
+    if (newVal) {
+      resetTimer(props.total);
+    } else {
+      remain.value = 0;
+      clearInterval(timer.value);
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+const tipContent = computed(() => {
+  if (halfTime.value) {
+    return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`;
+  }
+  return props.start && remain.value === 0 ? "时间到！" : props.tips;
+});
+
+const updateSound = () => {
+  sound.value = !sound.value;
+  audioManager.setMuted(!sound.value);
+};
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    halfTime.value = false;
+    audioManager.play("比赛开始");
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    audioManager.play("比赛结束", false);
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    let arrow = {};
+    if (msg.details && Array.isArray(msg.details)) {
+      arrow = msg.details[msg.details.length - 1];
+    } else {
+      if (msg.shootData.playerId !== user.value.id) return;
+      if (msg.shootData) arrow = msg.shootData;
+    }
+    let key = [];
+    key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
+    if (arrow.angle !== null) {
+      key.push(`向${getDirectionText(arrow.angle)}调整`);
+    }
+    audioManager.play(key, false);
+  } else if (msg.type === MESSAGETYPESV2.HalfRest) {
+    halfTime.value = true;
+    audioManager.play("中场休息");
+  } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
+    uni.showToast({
+      title: "距离不足，无效",
+      icon: "none",
+    });
+    audioManager.play("射击无效");
+  }
+}
+
+const playSound = (key) => {
+  audioManager.play(key);
+};
+
+onMounted(() => {
+  uni.$on("update-remain", resetTimer);
+  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("play-sound", playSound);
+});
+
+onBeforeUnmount(() => {
+  uni.$off("update-remain", resetTimer);
+  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("play-sound", playSound);
+  if (timer.value) clearInterval(timer.value);
+});
+</script>
+
+<template>
+  <view v-if="show" class="progress-card">
+    <view class="progress-card__header">
+      <view class="progress-card__profile">
+        <view class="progress-card__avatar-shell">
+          <Avatar
+            :src="avatarSrc"
+            :size="80"
+            size-unit="rpx"
+            image-mode="aspectFill"
+          />
+        </view>
+        <text class="progress-card__name">{{ displayName }}</text>
+      </view>
+
+      <!-- <button class="progress-card__sound" hover-class="none" @click="updateSound">
+        <image
+          class="progress-card__sound-icon"
+          :src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
+          mode="aspectFit"
+        />
+      </button> -->
+    </view>
+
+    <view class="progress-card__track-wrap">
+      <image
+          class="progress-card__titile"
+          src="../../../static/training-difficulty-design/text-icon-cgxl.png"
+          mode="aspectFit"
+        />
+      <view class="progress-card__track">
+        <view
+          class="progress-card__fill"
+          :style="{
+            width: `${progressPercent}%`,
+            backgroundColor: barColor,
+            right: tips.includes('红队') ? 0 : 'unset',
+            transition: transitionStyle,
+          }"
+        />
+        <view class="progress-card__badge">
+          <text class="progress-card__badge-text">剩余{{ remain }}秒</text>
+        </view>
+      </view>
+      <!-- <text v-if="tipContent" class="progress-card__tip">{{ tipContent }}123</text> -->
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.progress-card {
+  box-sizing: border-box;
+  /* padding: 50rpx 30rpx 0 30rpx; */
+  margin: 70rpx 30rpx 0 30rpx;
+}
+
+.progress-card__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+
+.progress-card__profile {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.progress-card__avatar-shell {
+  width: 86rpx;
+  height: 86rpx;
+  padding: 3rpx;
+  box-sizing: border-box;
+  border-radius: 50%;
+  background: linear-gradient(180deg, rgba(255, 209, 153, 1), rgba(162, 119, 55, 1));
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.progress-card__avatar {
+  width: 100%;
+  height: 100%;
+  display: block;
+  border-radius: 50%; 
+}
+
+.progress-card__name {
+  width: 86rpx;
+  color: #E7BA80;
+  font-size: 18rpx;
+  line-height: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+  margin-top: 10rpx;
+}
+
+.progress-card__sound {
+  width: 68rpx;
+  height: 68rpx;
+  margin: 0;
+  padding: 0;
+  border: none;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(28, 24, 21, 0.72);
+  box-shadow: 0 8rpx 18rpx rgba(0, 0, 0, 0.18);
+}
+
+.progress-card__sound::after {
+  border: none;
+}
+
+.progress-card__sound-icon {
+  width: 34rpx;
+  height: 34rpx;
+}
+
+.progress-card__track-wrap {
+  margin-top: -156rpx;
+  padding-left: 102rpx;
+}
+
+.progress-card__titile{
+  width: 260rpx;
+  height: 72rpx;
+  margin-left: 110rpx;
+}
+
+.progress-card__track {
+  position: relative;
+  width: 100%;
+  height: 24rpx;
+  border-radius: 18rpx;
+  overflow: hidden;
+  background: #444444;
+}
+
+.progress-card__fill {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  border-radius: 18rpx;
+  background: linear-gradient( 133deg, #FFD19A 0%, #A17636 100%);
+}
+
+.progress-card__badge {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  min-width: 156rpx;
+  height: 40rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+  border-radius: 999rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* background: rgba(164, 117, 47, 0.94); */
+  /* box-shadow: 0 4rpx 10rpx rgba(76, 45, 7, 0.22); */
+}
+
+.progress-card__badge-text {
+  color: #fff7de;
+  font-size: 18rpx;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.progress-card__tip {
+  display: block;
+  margin-top: 16rpx;
+  color: rgba(255, 243, 216, 0.88);
+  font-size: 24rpx;
+  line-height: 1.4;
+  text-align: center;
+}
+</style>

src/pages/training/components/TestDistance.vue

@@ -0,0 +1,196 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import Guide from "@/components/Guide.vue";
+import BowPower from "@/components/BowPower.vue";
+import Avatar from "@/components/Avatar.vue";
+import audioManager from "@/audioManager";
+import { simulShootAPI } from "@/apis";
+import { MESSAGETYPESV2 } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+const props = defineProps({
+  guide: {
+    type: Boolean,
+    default: true,
+  },
+  isBattle: {
+    type: Boolean,
+    default: false,
+  },
+  count: {
+    type: Number,
+    default: 15,
+  },
+});
+const arrow = ref({});
+const distance = ref(0);
+const showsimul = ref(false);
+const count = ref(props.count);
+const timer = ref(null);
+
+const updateTimer = (value) => {
+  count.value = Math.round(value);
+};
+onMounted(() => {
+  audioManager.play("请射箭测试距离");
+  if (props.isBattle) {
+    timer.value = setInterval(() => {
+      count.value -= 1;
+      if (count.value < 0) clearInterval(timer.value);
+    }, 1000);
+  }
+  uni.$on("update-timer", updateTimer);
+});
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
+  uni.$off("update-timer", updateTimer);
+});
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.TestDistance) {
+    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
+    if (distance.value >= 5) audioManager.play("距离合格");
+    else audioManager.play("距离不足");
+  }
+}
+
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  const accountInfo = uni.getAccountInfoSync();
+  const envVersion = accountInfo.miniProgram.envVersion;
+  if (envVersion !== "release") showsimul.value = true;
+});
+
+onBeforeUnmount(() => {
+  uni.$off("socket-inbox", onReceiveMessage);
+});
+</script>
+
+<template>
+  <view class="container">
+    <view class="test-area">
+      <image
+        class="text-bg"
+        src="../../../static/training-difficulty-design/par-bg.png"
+        mode="widthFix"
+      />
+      <button
+        class="simul"
+        @click="simulShoot"
+        hover-class="none"
+        v-if="showsimul"
+      >
+        模拟射箭
+      </button>
+      <view class="warnning-text">
+        <view class="target-tip">当前靶子为<text class="text-yellow">20cm</text>全环靶,请更换靶子</view>
+        <block v-if="distance > 0">
+          <text>当前距离<text class="text-yellow">{{ distance }}</text>米</text>
+          <text v-if="distance >= 5">已达到距离要求</text>
+          <text v-else>请调整站位</text>
+        </block>
+        <block v-else>
+          <text>请射箭，测试站距</text>
+        </block>
+      </view>
+      <view class="user-row">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower />
+      </view>
+    </view>
+    <view v-if="isBattle" class="ready-timer">
+      <image src="../../../static/test-tip.png" mode="widthFix" />
+      <view v-if="count >= 0">
+        <text>具体正式比赛还有</text>
+        <text>{{ count }}</text>
+        <text>秒</text>
+      </view>
+      <view v-else> 进入中... </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  max-height: 70vh;
+}
+.ready-timer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  transform: translateY(-10vw);
+}
+.ready-timer > image:first-child {
+  width: 40%;
+}
+.ready-timer > view {
+  width: 80%;
+  height: 45px;
+  background-color: #545454;
+  border-radius: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transform: translateY(-8vw);
+  color: #bebebe;
+  font-size: 15px;
+}
+.ready-timer > view > text:nth-child(2) {
+  color: #fed847;
+  font-size: 20px;
+  width: 22px;
+  text-align: center;
+}
+.test-area {
+  width: 100%;
+  height: auto;
+  position: relative;
+}
+
+.text-bg {
+  width: 100%;
+  position: relative;
+}
+.warnning-text {
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  height: 200rpx;
+  position: absolute;
+  top: 142rpx;
+  left: 0;
+  width: 100%;
+  font-size: 36rpx;
+  text-align: center;
+}
+.target-tip{
+  margin-bottom: 28rpx;
+}
+.text-yellow{
+  color: #FED847;
+}
+.simul {
+  position: absolute;
+  color: #fff;
+  right: 10px;
+  top: 30rpx;
+}
+.user-row{
+  position: absolute;
+  bottom: 34rpx;
+  left: 0rpx;
+  width: 100%;
+  padding: 0 34rpx;
+  box-sizing: border-box;
+}
+
+
+</style>

src/pages/training/components/TrainingDifficultyBadge.vue

@@ -0,0 +1,327 @@
+<script setup>
+import { computed } from "vue";
+
+const lockedBadgeBackground =
+  "/static/training-difficulty-design/unlock.svg";
+const unlockedBadgeBackground =
+  "/static/training-difficulty-design/lock.svg";
+
+const props = defineProps({
+  node: {
+    type: Object,
+    required: true,
+  },
+  active: {
+    type: Boolean,
+    default: false,
+  },
+  completedProgress: {
+    type: Number,
+    default: 0,
+  },
+  locked: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(["click"]);
+
+const badgeStyle = computed(() => {
+  const { left, top } = props.node.style || {};
+
+  return {
+    left,
+    top,
+  };
+});
+
+const progressValue = computed(() => {
+  const value = Number(props.completedProgress);
+
+  if (!Number.isFinite(value)) return 0;
+
+  return Math.max(0, Math.min(100, value));
+});
+
+const badgeStateStyle = computed(() => {
+  const label = String(props.node?.label || "");
+  const estimatedLabelWidthRpx = Math.max(36, label.length * 14);
+  const labelCircleSizeRpx = Math.max(58, estimatedLabelWidthRpx + 18);
+  const badgeSizeRpx = Math.max(
+    124,
+    Math.round(labelCircleSizeRpx / 0.4727)
+  );
+
+  return {
+    "--badge-progress": progressValue.value,
+    "--badge-size": `${badgeSizeRpx}rpx`,
+    "--badge-label-size": `${labelCircleSizeRpx}rpx`,
+    "--badge-orbit-offset": "12rpx",
+    "--badge-locked-ring-offset": "12rpx",
+  };
+});
+
+const showProgress = computed(() => {
+  return !props.locked;
+});
+
+const badgeFillSrc = computed(() => {
+  return props.locked ? lockedBadgeBackground : unlockedBadgeBackground;
+});
+
+const handleClick = () => {
+  emit("click", props.node);
+};
+</script>
+
+<template>
+  <view
+    class="difficulty-badge"
+    :class="{
+      'difficulty-badge--active': active,
+      'difficulty-badge--progress': showProgress,
+      'difficulty-badge--locked': locked,
+    }"
+    :style="[badgeStyle, badgeStateStyle]"
+    @click="handleClick"
+  >
+    <view class="difficulty-badge__fill">
+      <image class="difficulty-badge__bg" :src="badgeFillSrc" mode="aspectFit" />
+      <view v-if="active" class="difficulty-badge__active-orbit">
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--top"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--right"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--bottom"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--left"
+        ></view>
+      </view>
+      <view class="difficulty-badge__label-wrap">
+        <view class="difficulty-badge__label">{{ node.label }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.difficulty-badge,
+.difficulty-badge__fill,
+.difficulty-badge__label-wrap {
+  box-sizing: border-box;
+}
+
+.difficulty-badge {
+  position: absolute;
+  transform: translate(-50%, -50%);
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: transform 0.2s ease, opacity 0.2s ease;
+}
+
+.difficulty-badge--active {
+  transform: translate(-50%, -50%) scale(1.04);
+}
+
+.difficulty-badge--active::before {
+  content: "";
+  position: absolute;
+  inset: calc(var(--badge-orbit-offset) * -1);
+  border: 4rpx solid transparent;
+  border-radius: 50%;
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge--active::after {
+  content: "";
+  position: absolute;
+  inset: -24rpx;
+  border: 4rpx solid rgba(254, 208, 152, 0.96);
+  border-radius: 50%;
+  box-shadow: inset 0 0 10rpx rgba(254, 208, 152, 0.88),
+    inset 0 0 22rpx rgba(254, 208, 152, 0.32),
+    0 0 14rpx rgba(254, 208, 152, 0.92),
+    0 0 32rpx rgba(254, 208, 152, 0.52),
+    0 0 52rpx rgba(254, 208, 152, 0.22);
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge__active-orbit {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: calc(100% + var(--badge-orbit-offset) * 2);
+  height: calc(100% + var(--badge-orbit-offset) * 2);
+  border-radius: 50%;
+  z-index: 3;
+  pointer-events: none;
+  transform: translate(-50%, -50%);
+  animation: badge-orbit-spin 5.4s linear infinite;
+  transform-origin: center;
+}
+
+.difficulty-badge__active-triangle {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  z-index: 2;
+  pointer-events: none;
+  opacity: 0.92;
+  filter: drop-shadow(0 0 8rpx rgba(255, 255, 255, 0.45));
+}
+
+.difficulty-badge__active-triangle--top {
+  top: -3rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  border-width: 11rpx 8rpx 0 8rpx;
+  border-color: #ffffff transparent transparent transparent;
+}
+
+.difficulty-badge__active-triangle--right {
+  right: -3rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  border-width: 8rpx 11rpx 8rpx 0;
+  border-color: transparent #ffffff transparent transparent;
+}
+
+.difficulty-badge__active-triangle--bottom {
+  bottom: -3rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  border-width: 0 8rpx 11rpx 8rpx;
+  border-color: transparent transparent #ffffff transparent;
+}
+
+.difficulty-badge__active-triangle--left {
+  left: -3rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  border-width: 8rpx 0 8rpx 11rpx;
+  border-color: transparent transparent transparent #ffffff;
+}
+
+.difficulty-badge__fill {
+  width: var(--badge-size);
+  height: var(--badge-size);
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+}
+
+.difficulty-badge__bg {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  display: block;
+  z-index: 1;
+}
+
+.difficulty-badge--active .difficulty-badge__fill::before,
+.difficulty-badge--active .difficulty-badge__fill::after {
+  content: none;
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::before,
+.difficulty-badge--progress .difficulty-badge__fill::after {
+  content: "";
+  position: absolute;
+  inset: -12rpx;
+  padding: 6rpx;
+  border-radius: inherit;
+  -webkit-mask: linear-gradient(#fff 0 0) content-box,
+    linear-gradient(#fff 0 0);
+  -webkit-mask-composite: xor;
+  mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+  mask-composite: exclude;
+  pointer-events: none;
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::before {
+  background: rgba(255, 255, 255, 0.35);
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::after {
+  background: conic-gradient(
+    from -90deg,
+    rgba(254, 208, 152, 1) 0,
+    rgba(255, 229, 198, 1) calc(var(--badge-progress) * 1%),
+    transparent calc(var(--badge-progress) * 1%) 100%
+  );
+}
+
+.difficulty-badge--active .difficulty-badge__label,
+.difficulty-badge--progress .difficulty-badge__label {
+  color: #333333;
+}
+
+.difficulty-badge--locked {
+  opacity: 1;
+}
+
+.difficulty-badge--locked::before {
+  content: "";
+  position: absolute;
+  inset: calc(var(--badge-locked-ring-offset) * -1);
+  border: 2rpx solid rgba(160, 160, 160, 0.5);
+  border-radius: 50%;
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge--locked .difficulty-badge__label {
+  color: rgba(51, 51, 51, 0.54);
+}
+
+.difficulty-badge__label-wrap {
+  width: var(--badge-label-size);
+  height: var(--badge-label-size);
+  border-radius: 50%;
+  position: relative;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: -5rpx;
+}
+
+.difficulty-badge__label {
+  color: rgba(51, 51, 51, 0.7);
+  font-size: 24rpx;
+  max-width: 100%;
+  height: 34rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  font-weight: 600;
+  text-align: center;
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+}
+
+@keyframes badge-orbit-spin {
+  from {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+
+  to {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+</style>

src/pages/training/components/TrainingDifficultyPreviewCard.vue

@@ -0,0 +1,86 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  lines: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const previewLines = computed(() => {
+  return props.lines.map((line) => String(line || "").trim()).filter(Boolean);
+});
+</script>
+
+<template>
+  <view class="difficulty-preview">
+    <image
+      class="difficulty-preview__bg"
+      src="/static/training-difficulty-design/text.png"
+      mode="widthFix"
+    />
+    <view class="difficulty-preview__content">
+      <text class="difficulty-preview__title">{{ title }}</text>
+      <view class="difficulty-preview__copy">
+        <text
+          v-for="(line, index) in previewLines"
+          :key="`${line}-${index}`"
+          class="difficulty-preview__line"
+        >
+          {{ line }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.difficulty-preview {
+  position: relative;
+  width: 100%;
+}
+
+.difficulty-preview__bg {
+  display: block;
+  width: 100%;
+}
+
+.difficulty-preview__content {
+  position: absolute;
+  top: 28rpx;
+  left: 30rpx;
+  box-sizing: border-box;
+  width: 486rpx;
+}
+
+.difficulty-preview__title {
+  display: block;
+  color: #ffd543;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  text-align: center;
+}
+
+.difficulty-preview__copy {
+  width: 80%;
+  margin: 0 auto;
+  display: block;
+  color: #ffffff;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  text-align: center;
+}
+
+.difficulty-preview__line {
+  display: block;
+}
+
+
+</style>

src/pages/training/components/TrainingDifficultyStartButton.vue

@@ -0,0 +1,81 @@
+<script setup>
+const props = defineProps({
+  text: {
+    type: String,
+    default: "开始",
+  },
+});
+
+const emit = defineEmits(["click"]);
+
+const handleClick = () => {
+  emit("click");
+};
+</script>
+
+<template>
+  <button
+    class="difficulty-start"
+    hover-class="difficulty-start--hover"
+    @click="handleClick"
+  >
+    <image
+      class="difficulty-start__button"
+      src="/static/training-difficulty-design/btn.png"
+      mode="widthFix"
+    />
+  </button>
+</template>
+
+<style scoped>
+.difficulty-start {
+  position: relative;
+  width: 302rpx;
+  height: 170rpx;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  margin: 0 auto;
+}
+
+.difficulty-start::after {
+  border: 0;
+}
+
+.difficulty-start--hover {
+  transform: translateY(2rpx) scale(0.99);
+}
+
+.difficulty-start__mascot {
+  position: absolute;
+  left: 50%;
+  top: 0;
+  z-index: 1;
+  width: 112rpx;
+  transform: translateX(-50%);
+}
+
+.difficulty-start__button {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 2;
+  width: 100%;
+}
+
+.difficulty-start__text {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 58rpx;
+  z-index: 3;
+  color: #9f4d00;
+  font-size: 64rpx;
+  line-height: 76rpx;
+  text-align: center;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 800;
+  text-shadow: 0 3rpx 0 rgba(255, 245, 205, 0.78);
+}
+</style>

src/pages/training/difficulty.vue

@@ -0,0 +1,801 @@
+<script setup>
+import { computed, nextTick, ref } from "vue";
+import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import TrainingDifficultyBadge from "./components/TrainingDifficultyBadge.vue";
+import TrainingDifficultyPreviewCard from "./components/TrainingDifficultyPreviewCard.vue";
+import TrainingDifficultyStartButton from "./components/TrainingDifficultyStartButton.vue";
+import { getTrainingDifficultyListAPI } from "@/apis";
+
+// 难度页接口数据源：
+// 1. 接口：GET /training/difficulty/list?type=base/endurance/precision/rhythm
+// 2. 当前进度：接口 user_levels / list.completed，路由参数可覆盖选中难度
+const trainingDifficultyStorageKey = "training-selection";
+const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
+const defaultTrainingType = "precision";
+const defaultUnlockedDifficultyId = "lv1";
+const trainingTypeMetaMap = {
+  base: {
+    key: "base",
+    title: "基础训练",
+  },
+  endurance: {
+    key: "endurance",
+    title: "耐力训练",
+  },
+  precision: {
+    key: "precision",
+    title: "精准训练",
+  },
+  rhythm: {
+    key: "rhythm",
+    title: "节奏训练",
+  },
+};
+const routeModeTypeMap = {
+  basic: "base",
+  base: "base",
+  endurance: "endurance",
+  precision: "precision",
+  rhythm: "rhythm",
+};
+const defaultTargetType = 1;
+
+const resolveTrainingType = (mode) => {
+  const normalizedMode = String(mode || "").toLowerCase();
+  return routeModeTypeMap[normalizedMode] || defaultTrainingType;
+};
+
+const createDifficultyId = (level) => `lv${level}`;
+
+const toNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const clampProgress = (value) => {
+  return Math.min(Math.max(value, 0), 100);
+};
+
+const getDifficultyProgress = (item = {}) => {
+  const completedCnt = toNumber(item.completed_cnt);
+  const promoteCnt = toNumber(item.promote_cnt);
+
+  if (item.completed) {
+    return 100;
+  }
+
+  if (promoteCnt <= 0) {
+    return 0;
+  }
+
+  return clampProgress(Math.round((completedCnt / promoteCnt) * 100));
+};
+
+const checkDifficultyCompleted = (item = {}) => {
+  const completedCnt = toNumber(item.completed_cnt);
+  const promoteCnt = toNumber(item.promote_cnt);
+
+  return Boolean(item.completed) || (promoteCnt > 0 && completedCnt >= promoteCnt);
+};
+
+const getDifficultyModeText = (mode) => {
+  return Number(mode) === 1 ? "随机区域+指定环数" : "随机区域命中";
+};
+
+const createEmptyModeConfig = (type = defaultTrainingType) => {
+  const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
+
+  return {
+    key: meta.key,
+    title: meta.title,
+    nodes: [],
+    details: {},
+    activeDifficultyId: defaultUnlockedDifficultyId,
+    progressMap: {},
+  };
+};
+
+const createDifficultySummary = (item = {}) => {
+  const desc = String(item.desc || "").trim();
+  const type = item.type;
+  const arrows = toNumber(item.arrows);
+  const timeLimit = toNumber(item.time_limit);
+  const hitReq = toNumber(item.hit_req);
+  const totalReq = toNumber(item.total_req);
+  const blocks = toNumber(item.blocks);
+  const promoteCnt = toNumber(item.promote_cnt);
+  const timeText = timeLimit > 0 ? `${timeLimit}秒内完成` : "不限时完成";
+  const promoteText = promoteCnt > 0 ? `完成${promoteCnt}次晋级` : "";
+
+  const summaryMap = {
+    base: [
+      desc || (hitReq > 0 ? `每箭命中${hitReq}环以上` : "上靶即可"),
+      [`${arrows}箭`, promoteText].filter(Boolean).join(" · "),
+    ],
+    endurance: [
+      desc || `${timeText}${arrows}箭`,
+      [`累计${totalReq}环`, promoteText].filter(Boolean).join(" · "),
+    ],
+    precision: [
+      desc || `命中${blocks}个指定区域`,
+      [
+        `${arrows}箭`,
+        timeText,
+        getDifficultyModeText(item.mode),
+        promoteText,
+      ]
+        .filter(Boolean)
+        .join(" · "),
+    ],
+    rhythm: [
+      desc || `间隔${timeLimit}秒射击`,
+      [
+        `${arrows}箭`,
+        hitReq > 0 ? `每箭${hitReq}环以上` : "上靶即可",
+        getDifficultyModeText(item.mode),
+        promoteText,
+      ]
+        .filter(Boolean)
+        .join(" · "),
+    ],
+  };
+
+  return (summaryMap[type] || [desc]).filter(Boolean);
+};
+
+const normalizeTrainingDifficultyConfig = (result, type) => {
+  const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
+  const list = Array.isArray(result?.list) ? result.list : [];
+  const rawItems = list.filter((item) => !item?.type || item.type === meta.key);
+  const difficultyItems = rawItems
+    .map((item) => {
+      const level = toNumber(item?.difficulty);
+
+      if (level <= 0) {
+        return null;
+      }
+
+      const id = createDifficultyId(level);
+      const label = `Lv${level}`;
+
+      return {
+        ...item,
+        recordId: item.id,
+        completedCnt: toNumber(item.completed_cnt),
+        promoteCnt: toNumber(item.promote_cnt),
+        id,
+        level,
+        label,
+        title: `${label}难度`,
+        summary: createDifficultySummary(item),
+        startText: "开始",
+        targetPaperType: "20CM全环靶",
+      };
+    })
+    .filter(Boolean)
+    .sort((first, second) => first.level - second.level);
+  const maxLevel = difficultyItems.reduce(
+    (currentMax, item) => Math.max(currentMax, item.level),
+    0
+  );
+  const completedLevelFromList = difficultyItems.reduce((currentMax, item) => {
+    return checkDifficultyCompleted(item)
+      ? Math.max(currentMax, item.level)
+      : currentMax;
+  }, 0);
+  const userCompletedLevel = toNumber(result?.user_levels?.[meta.key]);
+  const highestCompletedLevel = userCompletedLevel || completedLevelFromList;
+  const unlockedLevel = maxLevel
+    ? Math.min(Math.max(highestCompletedLevel + 1, 1), maxLevel)
+    : 1;
+
+  return {
+    key: meta.key,
+    title: meta.title,
+    nodes: difficultyItems.map((item) => ({
+      id: item.id,
+      label: item.label,
+    })),
+    details: Object.fromEntries(
+      difficultyItems.map((item) => [item.id, item])
+    ),
+    activeDifficultyId: createDifficultyId(unlockedLevel),
+    progressMap: Object.fromEntries(
+      difficultyItems.map((item) => [item.id, getDifficultyProgress(item)])
+    ),
+  };
+};
+
+// 难度轴布局参数，节点按“等级越低越靠下”的方式排列。
+const nodesLayout = {
+  viewportHeightRpx: 1020,
+  topPaddingRpx: 136,
+  bottomPaddingRpx: 144,
+  verticalGapRpx: 188,
+  anchorOffsetRpx: 796,
+  horizontalPatternRpx: [388, 232, 516, 258, 458, 304],
+  nearHorizontalDistanceRpx: 170,
+  extraGapScale: 0.5,
+};
+
+const emptyDifficulty = {
+  id: "",
+  label: "",
+  title: "",
+  summary: [],
+  startText: "开始",
+  targetPaperType: "",
+};
+
+// 页面基础状态
+const pageConfig = ref(createEmptyModeConfig(defaultTrainingType));
+const unlockedDifficultyId = ref(defaultUnlockedDifficultyId);
+const selectedDifficultyId = ref(defaultUnlockedDifficultyId);
+const nodesScrollTop = ref(0);
+const nodesScrollWithAnimation = ref(false);
+const routeOptions = ref({});
+const needRefreshProgress = ref(false);
+
+const difficultyProgressMap = computed(() => {
+  return pageConfig.value?.progressMap || {};
+});
+
+const clamp = (value, min, max) => {
+  return Math.min(Math.max(value, min), max);
+};
+
+// 从 lv1 / lv20 这类 id 中提取等级数值，统一用于排序、解锁判断和进度比较。
+const getDifficultyLevel = (difficultyId = "") => {
+  const matched = String(difficultyId).match(/\d+/);
+  return matched ? Number(matched[0]) : 0;
+};
+
+// 合并节点基础信息和难度详情，并统一按等级升序整理。
+const createDifficultyNodes = (config) => {
+  const details = config?.details || {};
+  const rawNodes = Array.isArray(config?.nodes) ? config.nodes : [];
+  const nodeMap = new Map(rawNodes.map((node) => [node.id, node]));
+  const difficultyIds = new Set([
+    ...rawNodes.map((node) => node.id),
+    ...Object.keys(details),
+  ]);
+
+  return Array.from(difficultyIds)
+    .map((difficultyId) => {
+      const level = getDifficultyLevel(difficultyId);
+      const node = nodeMap.get(difficultyId) || {};
+      const detail = details[difficultyId] || {};
+      const label = node.label || detail.label || `Lv${level || ""}`;
+
+      return {
+        ...node,
+        ...detail,
+        id: difficultyId,
+        level,
+        label,
+        title: detail.title || `${label}难度`,
+        summary: Array.isArray(detail.summary) ? detail.summary : [],
+        startText: detail.startText || "开始",
+        targetPaperType: detail.targetPaperType || "",
+      };
+    })
+    .filter((node) => node.id && node.level > 0)
+    .sort((first, second) => first.level - second.level);
+};
+
+const findValidDifficultyId = (difficultyId, nodes) => {
+  return nodes.some((node) => node.id === difficultyId) ? difficultyId : "";
+};
+
+const getNextDifficultyId = (difficultyId, nodes) => {
+  const currentLevel = getDifficultyLevel(difficultyId);
+  return (
+    nodes.find((node) => node.level === currentLevel + 1)?.id || difficultyId
+  );
+};
+
+// 统一解析当前最新已解锁难度：
+// completedDifficultyId 优先级最高，可在完成当前难度后自动推进到下一关。
+const resolveUnlockedDifficultyId = (options, config, nodes) => {
+  const completedDifficultyId = findValidDifficultyId(
+    options.completedDifficultyId,
+    nodes
+  );
+
+  if (completedDifficultyId) {
+    return getNextDifficultyId(completedDifficultyId, nodes);
+  }
+
+  return (
+    [
+      options.currentDifficultyId,
+      options.latestDifficultyId,
+      options.activeDifficultyId,
+      config.activeDifficultyId,
+      defaultUnlockedDifficultyId,
+    ].find((difficultyId) => findValidDifficultyId(difficultyId, nodes)) ||
+    nodes[0]?.id ||
+    defaultUnlockedDifficultyId
+  );
+};
+
+// 如果传入的默认选中项尚未解锁，则自动回退到当前最新已解锁难度。
+const resolveSelectedDifficultyId = (difficultyId, nodes, currentUnlockedId) => {
+  const safeDifficultyId = findValidDifficultyId(difficultyId, nodes);
+
+  if (!safeDifficultyId) {
+    return currentUnlockedId;
+  }
+
+  return getDifficultyLevel(safeDifficultyId) <=
+    getDifficultyLevel(currentUnlockedId)
+    ? safeDifficultyId
+    : currentUnlockedId;
+};
+
+// 页面渲染使用的难度节点列表，包含纵向轨道坐标。
+const difficultyNodes = computed(() => {
+  const nodes = createDifficultyNodes(pageConfig.value);
+  const leftPositions = nodes.map((_, index) => {
+    return nodesLayout.horizontalPatternRpx[
+      index % nodesLayout.horizontalPatternRpx.length
+    ];
+  });
+  const offsetsFromBottom = [];
+  let accumulatedOffsetRpx = 0;
+
+  nodes.forEach((node, index) => {
+    if (index > 0) {
+      const previousLeftRpx = leftPositions[index - 1];
+      const currentLeftRpx = leftPositions[index];
+      const horizontalDistanceRpx = Math.abs(currentLeftRpx - previousLeftRpx);
+      const extraGapRpx =
+        Math.max(
+          0,
+          nodesLayout.nearHorizontalDistanceRpx - horizontalDistanceRpx
+        ) * nodesLayout.extraGapScale;
+
+      accumulatedOffsetRpx +=
+        nodesLayout.verticalGapRpx + Math.round(extraGapRpx);
+    }
+
+    offsetsFromBottom.push(accumulatedOffsetRpx);
+  });
+
+  const contentHeightRpx = Math.max(
+    nodesLayout.viewportHeightRpx,
+    nodesLayout.topPaddingRpx +
+      nodesLayout.bottomPaddingRpx +
+      (offsetsFromBottom[offsetsFromBottom.length - 1] || 0)
+  );
+
+  return nodes.map((node, index) => {
+    const leftRpx = leftPositions[index];
+    const topRpx =
+      contentHeightRpx -
+      nodesLayout.bottomPaddingRpx -
+      offsetsFromBottom[index];
+
+    return {
+      ...node,
+      leftRpx,
+      topRpx,
+      style: {
+        left: `${leftRpx}rpx`,
+        top: `${topRpx}rpx`,
+      },
+    };
+  });
+});
+
+const difficultyConnectors = computed(() => {
+  const nodes = difficultyNodes.value;
+
+  return nodes.slice(1).map((currentNode, index) => {
+    const previousNode = nodes[index];
+    const startX = Number(previousNode?.leftRpx || 0);
+    const startY = Number(previousNode?.topRpx || 0);
+    const endX = Number(currentNode?.leftRpx || 0);
+    const endY = Number(currentNode?.topRpx || 0);
+    const midX = (startX + endX) / 2;
+    const midY = (startY + endY) / 2;
+    const angle =
+      (Math.atan2(endY - startY, endX - startX) * 180) / Math.PI + 90;
+
+    return {
+      id: `${previousNode.id}-${currentNode.id}`,
+      left: `${midX}rpx`,
+      top: `${midY}rpx`,
+      transform: `translate(-50%, -50%) rotate(${angle}deg)`,
+    };
+  });
+});
+
+const nodesTrackHeightRpx = computed(() => {
+  const bottomNode = difficultyNodes.value[0];
+
+  if (!bottomNode) {
+    return nodesLayout.viewportHeightRpx;
+  }
+
+  return Math.max(
+    nodesLayout.viewportHeightRpx,
+    bottomNode.topRpx + nodesLayout.bottomPaddingRpx
+  );
+});
+
+const nodesTrackStyle = computed(() => {
+  return {
+    height: `${nodesTrackHeightRpx.value}rpx`,
+  };
+});
+
+const selectedDifficulty = computed(() => {
+  return (
+    difficultyNodes.value.find((node) => node.id === selectedDifficultyId.value) ||
+    difficultyNodes.value[0] ||
+    emptyDifficulty
+  );
+});
+
+// 优先显示配置中的难度进度；没有配置时，再按已解锁等级推导完成态。
+const getCompletedDifficultyProgress = (node) => {
+  const configuredProgress = Number(difficultyProgressMap.value[node?.id]);
+
+  if (Number.isFinite(configuredProgress) && configuredProgress > 0) {
+    return configuredProgress;
+  }
+
+  return getDifficultyLevel(node?.id) < getDifficultyLevel(unlockedDifficultyId.value)
+    ? 100
+    : 0;
+};
+
+const checkDifficultyLocked = (node) => {
+  return getDifficultyLevel(node?.id) > getDifficultyLevel(unlockedDifficultyId.value);
+};
+
+// 根据目标难度计算 scroll-view 应滚动到的位置，顶部/底部会自动吸附边界。
+const scrollToDifficulty = (difficultyId, animated = false) => {
+  const node = difficultyNodes.value.find((item) => item.id === difficultyId);
+
+  if (!node) {
+    return;
+  }
+
+  const maxScrollRpx = Math.max(
+    nodesTrackHeightRpx.value - nodesLayout.viewportHeightRpx,
+    0
+  );
+  const targetScrollRpx = clamp(
+    node.topRpx - nodesLayout.anchorOffsetRpx,
+    0,
+    maxScrollRpx
+  );
+
+  nodesScrollWithAnimation.value = animated;
+  nodesScrollTop.value = uni.upx2px(targetScrollRpx);
+};
+
+// 首次进入页面需要静默定位到默认难度；
+// 定位完成后再开启滚动动画，避免第一次手动切换时丢失过渡效果。
+const initScrollPosition = () => {
+  scrollToDifficulty(selectedDifficultyId.value, false);
+
+  nextTick(() => {
+    nodesScrollWithAnimation.value = true;
+  });
+};
+
+const normalizeRouteOptions = (options = {}) => {
+  const difficultyLevel = toNumber(options.difficulty);
+  const completedDifficultyLevel = toNumber(options.completedDifficulty);
+
+  return {
+    ...options,
+    difficultyId:
+      options.difficultyId ||
+      (difficultyLevel > 0 ? createDifficultyId(difficultyLevel) : ""),
+    completedDifficultyId:
+      options.completedDifficultyId ||
+      (completedDifficultyLevel > 0
+        ? createDifficultyId(completedDifficultyLevel)
+        : ""),
+  };
+};
+
+const applyPageState = (options = {}, config) => {
+  const safeOptions = normalizeRouteOptions(options);
+  const nodes = createDifficultyNodes(config);
+  const currentUnlockedId = resolveUnlockedDifficultyId(
+    safeOptions,
+    config,
+    nodes
+  );
+
+  pageConfig.value = config;
+  unlockedDifficultyId.value = currentUnlockedId;
+  selectedDifficultyId.value = resolveSelectedDifficultyId(
+    safeOptions.difficultyId,
+    nodes,
+    currentUnlockedId
+  );
+
+  nextTick(() => {
+    initScrollPosition();
+  });
+};
+
+const initPageState = async (options = {}, refreshOptions = {}) => {
+  const { keepCurrent = false } = refreshOptions;
+  const trainingType = resolveTrainingType(options.mode);
+  const fallbackConfig = createEmptyModeConfig(trainingType);
+
+  if (!keepCurrent) {
+    pageConfig.value = fallbackConfig;
+  }
+
+  try {
+    const result = await getTrainingDifficultyListAPI(trainingType);
+    applyPageState(
+      options,
+      normalizeTrainingDifficultyConfig(result, trainingType)
+    );
+  } catch (error) {
+    console.log("training difficulty load failed", error);
+    if (!keepCurrent) {
+      applyPageState(options, fallbackConfig);
+    }
+    uni.showToast({
+      title: "训练难度加载失败",
+      icon: "none",
+    });
+  }
+};
+
+const cleanQueryValue = (value) => {
+  if (value === undefined || value === null || value === "") {
+    return "";
+  }
+
+  if (typeof value === "number" && !Number.isFinite(value)) {
+    return "";
+  }
+
+  return value;
+};
+
+const createPracticeQuery = (difficulty) => {
+  const trainingType = pageConfig.value.key || defaultTrainingType;
+  const commonQuery = {
+    type: trainingType,
+    difficultyId: difficulty.id,
+    difficulty: difficulty.level,
+    recordId: difficulty.recordId,
+    arrows: toNumber(difficulty.arrows, 12),
+    time: toNumber(difficulty.time_limit, 120) || 120,
+    target: defaultTargetType,
+  };
+  const typedQueryMap = {
+    base: {
+      hitReq: toNumber(difficulty.hit_req),
+    },
+    endurance: {
+      totalReq: toNumber(difficulty.total_req),
+    },
+    precision: {
+      blocks: toNumber(difficulty.blocks),
+      mode: toNumber(difficulty.mode),
+    },
+    rhythm: {
+      hitReq: toNumber(difficulty.hit_req),
+      mode: toNumber(difficulty.mode),
+    },
+  };
+
+  return {
+    ...commonQuery,
+    ...(typedQueryMap[trainingType] || {}),
+  };
+};
+
+const createPracticeUrl = (difficulty) => {
+  const query = Object.entries(createPracticeQuery(difficulty))
+    .map(([key, value]) => [key, cleanQueryValue(value)])
+    .filter(([, value]) => value !== "")
+    .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+    .join("&");
+
+  return `/pages/training/practise-one${query ? `?${query}` : ""}`;
+};
+
+const saveTrainingContext = () => {
+  const difficulty = selectedDifficulty.value;
+
+  if (!difficulty.id) {
+    return;
+  }
+
+  uni.setStorageSync(trainingDifficultyStorageKey, {
+    trainingType: pageConfig.value.key,
+    trainingTitle: pageConfig.value.title,
+    difficultyId: difficulty.id,
+    difficultyLabel: difficulty.label,
+    targetType: defaultTargetType,
+    targetPaperType: difficulty.targetPaperType,
+  });
+};
+
+const handleSelectDifficulty = (node) => {
+  if (!node?.id) {
+    return;
+  }
+
+  if (checkDifficultyLocked(node)) {
+    uni.showToast({
+      title: "难度尚未解锁",
+      icon: "none",
+    });
+    return;
+  }
+
+  if (node.id === selectedDifficultyId.value) {
+    return;
+  }
+
+  selectedDifficultyId.value = node.id;
+  nextTick(() => {
+    scrollToDifficulty(node.id, true);
+  });
+};
+
+const handleStart = () => {
+  if (!selectedDifficulty.value.id) {
+    return;
+  }
+
+  saveTrainingContext();
+  uni.navigateTo({
+    url: createPracticeUrl(selectedDifficulty.value),
+  });
+};
+
+const markProgressRefresh = () => {
+  needRefreshProgress.value = true;
+};
+
+onLoad((options = {}) => {
+  routeOptions.value = { ...options };
+  uni.$on(trainingDifficultyRefreshEvent, markProgressRefresh);
+  initPageState(options);
+});
+
+onShow(() => {
+  if (!needRefreshProgress.value) {
+    return;
+  }
+
+  needRefreshProgress.value = false;
+  initPageState(routeOptions.value, {
+    keepCurrent: true,
+  });
+});
+
+onUnload(() => {
+  uni.$off(trainingDifficultyRefreshEvent, markProgressRefresh);
+});
+</script>
+
+<template>
+  <Container
+    :title="pageConfig.title"
+    :bgType="8"
+    bgColor="#1c1c23"
+    :scroll="false"
+  >
+    <view class="difficulty-page">
+      <view class="difficulty-page__nodes">
+        <scroll-view
+          class="difficulty-page__nodes-scroll"
+          scroll-y
+          enhanced
+          :scroll-top="nodesScrollTop"
+          :scroll-with-animation="nodesScrollWithAnimation"
+          :show-scrollbar="false"
+        >
+          <view class="difficulty-page__nodes-track" :style="nodesTrackStyle">
+            <image
+              v-for="connector in difficultyConnectors"
+              :key="connector.id"
+              class="difficulty-page__connector"
+              src="../../static/training-difficulty-design/jiantou.png"
+              mode="aspectFit"
+              :style="connector"
+            />
+            <TrainingDifficultyBadge
+              v-for="node in difficultyNodes"
+              :key="node.id"
+              :node="node"
+              :active="node.id === selectedDifficultyId"
+              :locked="checkDifficultyLocked(node)"
+              :completedProgress="getCompletedDifficultyProgress(node)"
+              @click="handleSelectDifficulty"
+            />
+          </view>
+        </scroll-view>
+      </view>
+
+      <view class="difficulty-page__preview">
+        <TrainingDifficultyPreviewCard
+          :title="selectedDifficulty.title"
+          :lines="selectedDifficulty.summary"
+        />
+      </view>
+
+      <view class="difficulty-page__start">
+        <TrainingDifficultyStartButton
+          :text="selectedDifficulty.startText"
+          @click="handleStart"
+        />
+      </view>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.difficulty-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  padding: 18rpx 0 40rpx;
+  overflow: hidden;
+}
+
+.difficulty-page__nodes {
+  position: relative;
+  flex: 1;
+  min-height: 0;
+  z-index: 2;
+  margin-bottom: 8rpx;
+}
+
+.difficulty-page__nodes-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.difficulty-page__nodes-track {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+}
+
+.difficulty-page__connector {
+  position: absolute;
+  width: 18rpx;
+  height: 28rpx;
+  z-index: 1;
+  pointer-events: none;
+}
+
+.difficulty-page__preview {
+  position: relative;
+  flex: none;
+  z-index: 3;
+  width: 540rpx;
+  height: 172rpx;
+  margin: 0 auto;
+}
+
+.difficulty-page__start {
+  position: relative;
+  flex: none;
+  z-index: 4;
+  width: 302rpx;
+  height: 190rpx;
+  margin: 0 auto;
+  top: -16rpx;
+}
+</style>

src/pages/training/index.vue

@@ -0,0 +1,885 @@
+<script setup>
+import { nextTick, onMounted, ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import TargetPicker from "@/components/TargetPicker.vue";
+import { getPersonalTrainingAPI } from "@/apis";
+
+const checkedIcon = "../../static/training-home/done.png";
+const missedIcon = "../../static/training-home/missed.png";
+// 后端训练项目 id 与难度页 mode 参数的映射关系。
+const trainingModeRouteMap = {
+  base: "basic",
+  endurance: "endurance",
+  precision: "precision",
+  rhythm: "rhythm",
+  strength: "power",
+};
+// 训练项目卡片右侧主图标。
+const trainingModeIconMap = {
+  base_bow: "../../static/training-home/img_22.png",
+  bow: "../../static/training-home/img_3.png",
+  target: "../../static/training-home/img_4.png",
+  wave: "../../static/training-home/img_5.png",
+  muscle: "../../static/training-home/img_6.png",
+};
+// 训练项目卡片标题图，按接口 id 映射本地资源。
+const trainingModeTitleImageMap = {
+  endurance: "../../static/training-home/nailixunlian.png",
+  precision: "../../static/training-home/jingzhunxunlian.png",
+  rhythm: "../../static/training-home/jiezouxunlian.png",
+  strength: "../../static/training-home/liliangxulian.png",
+};
+const defaultWeekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
+const defaultRadarDimensions = [
+  { name: "基础", score: 0 },
+  { name: "精准", score: 0 },
+  { name: "力量", score: 0 },
+  { name: "节奏", score: 0 },
+  { name: "耐力", score: 0 },
+];
+
+// 页面始终直接消费接口字段，这里只保留一份兜底结构，避免模板访问空值。
+const createDefaultTrainingData = () => ({
+  week_days: defaultWeekDays.map((day) => ({ day, status: "cross" })),
+  stats: {
+    total_training_days: 0,
+    total_arrows: 0,
+    hit_rate: 0,
+    endurance_shoot_speed: 0,
+    total_calories: 0,
+    overtake_rate: 0,
+  },
+  radar: {
+    dimensions: defaultRadarDimensions,
+  },
+  training_items: [],
+});
+
+const trainingData = ref(createDefaultTrainingData());
+const pageMounted = ref(false);
+const showRoutineTargetPicker = ref(false);
+const trainingRadarCanvasId = "training-home-radar";
+const radarImageWidth = 225;
+const radarImageHeight = 224;
+const radarFigureWidthRpx = 448;
+const radarFigureHeightRpx = Math.round(
+  (radarFigureWidthRpx * radarImageHeight) / radarImageWidth
+);
+const radarCanvasWidth = Math.round(uni.upx2px(radarFigureWidthRpx));
+const radarCanvasHeight = Math.round(uni.upx2px(radarFigureHeightRpx));
+const radarScaleX = radarCanvasWidth / radarImageWidth;
+const radarScaleY = radarCanvasHeight / radarImageHeight;
+const radarScale = Math.min(radarScaleX, radarScaleY);
+const radarCenterX = 112.0624 * radarScaleX;
+const radarCenterY = 111.4645 * radarScaleY;
+const radarStrokeWidth = Math.max(1, 2 * radarScale);
+const radarPointRadius = Math.max(2.5, 3.5 * radarScale);
+const radarOuterRadiusX = 110.7089 * radarScaleX;
+const radarOuterRadiusY = 110.7089 * radarScaleY;
+const radarMaxValue = 100;
+const radarFigureStyle = {
+  width: `${radarFigureWidthRpx}rpx`,
+  height: `${radarFigureHeightRpx}rpx`,
+};
+
+const formatValue = (value, digits = 1) => {
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue)) return "--";
+  return String(Number(numberValue.toFixed(digits)));
+};
+
+const getLevelText = (item) => {
+  if (!item) return "";
+  const level = Number(item.current_level) || 0;
+  return item.is_locked ? `Coming! LV${level}` : `当前进度 LV${level} >`;
+};
+
+// 卡路里字段按需求做 K / W 缩写展示。
+const getCaloriesValue = (value) => {
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue)) return "--";
+  if (numberValue >= 10000) return `${formatValue(numberValue / 10000)}W`;
+  if (numberValue >= 1000) return `${formatValue(numberValue / 1000)}K`;
+  return formatValue(numberValue, 0);
+};
+
+const getTrainingIcon = (item = {}) =>
+  trainingModeIconMap[item.icon] || trainingModeIconMap.bow;
+
+const getTrainingTitleImage = (item = {}) =>
+  trainingModeTitleImageMap[item.id] || "";
+
+const getTrainingMode = (item = {}) =>
+  trainingModeRouteMap[item.id] || item.id || "";
+
+const getRadarPoint = (centerX, centerY, radiusX, radiusY, angle) => ({
+  x: centerX + radiusX * Math.cos(angle),
+  y: centerY + radiusY * Math.sin(angle),
+});
+
+// 雷达图直接使用接口的 5 维 score，按 0-100 等比映射到顶点位置。
+const drawRadar = () => {
+  const dimensions = Array.isArray(trainingData.value.radar?.dimensions)
+    ? trainingData.value.radar.dimensions.slice(0, 5)
+    : [];
+
+  if (dimensions.length !== 5) return;
+
+  const ctx = uni.createCanvasContext(trainingRadarCanvasId);
+  const angles = dimensions.map(
+    (_, index) => (-90 + index * 72) * (Math.PI / 180)
+  );
+
+  ctx.clearRect(0, 0, radarCanvasWidth, radarCanvasHeight);
+
+  const points = dimensions.map((item, index) => {
+    const normalized = Math.max(
+      0,
+      Math.min(Number(item.score) || 0, radarMaxValue)
+    );
+    const progress = normalized / radarMaxValue;
+
+    return getRadarPoint(
+      radarCenterX,
+      radarCenterY,
+      radarOuterRadiusX * progress,
+      radarOuterRadiusY * progress,
+      angles[index]
+    );
+  });
+
+  ctx.beginPath();
+  points.forEach((point, index) => {
+    if (index === 0) ctx.moveTo(point.x, point.y);
+    else ctx.lineTo(point.x, point.y);
+  });
+  ctx.closePath();
+  ctx.setFillStyle("rgba(255, 209, 154, 0.26)");
+  ctx.fill();
+  ctx.setStrokeStyle("rgba(220, 162, 92, 0.92)");
+  ctx.setLineWidth(radarStrokeWidth);
+  ctx.stroke();
+
+  points.forEach((point) => {
+    ctx.beginPath();
+    ctx.arc(point.x, point.y, radarPointRadius, 0, 2 * Math.PI);
+    ctx.setFillStyle("rgba(221, 162, 90, 1)");
+    ctx.fill();
+  });
+
+  ctx.beginPath();
+  ctx.arc(radarCenterX, radarCenterY, radarPointRadius, 0, 2 * Math.PI);
+  ctx.setFillStyle("rgba(125, 107, 83, 0.65)");
+  ctx.fill();
+  ctx.draw();
+};
+
+// 小程序 canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
+const refreshRadar = async () => {
+  await nextTick();
+  setTimeout(() => {
+    drawRadar();
+  }, 30);
+};
+
+const loadPersonalTrainingData = async () => {
+  try {
+    const result = await getPersonalTrainingAPI();
+    trainingData.value = {
+      week_days:
+        Array.isArray(result?.week_days) && result.week_days.length
+          ? result.week_days
+          : createDefaultTrainingData().week_days,
+      stats: {
+        total_training_days: result?.stats?.total_training_days ?? 0,
+        total_arrows: result?.stats?.total_arrows ?? 0,
+        hit_rate: result?.stats?.hit_rate ?? 0,
+        endurance_shoot_speed: result?.stats?.endurance_shoot_speed ?? 0,
+        total_calories: result?.stats?.total_calories ?? 0,
+        overtake_rate: result?.stats?.overtake_rate ?? 0,
+      },
+      radar: {
+        dimensions:
+          Array.isArray(result?.radar?.dimensions) &&
+          result.radar.dimensions.length === 5
+            ? result.radar.dimensions
+            : createDefaultTrainingData().radar.dimensions,
+      },
+      training_items: Array.isArray(result?.training_items)
+        ? result.training_items
+        : [],
+    };
+  } catch (error) {
+    console.log("personal training load failed", error);
+    trainingData.value = createDefaultTrainingData();
+  } finally {
+    await refreshRadar();
+  }
+};
+
+const openTrainingRecord = () => {
+  uni.navigateTo({
+    url: "/pages/my-growth?tab=2",
+  });
+};
+
+const openTrainingItem = (item = {}) => {
+  const mode = getTrainingMode(item);
+  if (!mode) return;
+
+  if (item.is_locked) {
+    uni.showToast({
+      title: `${item.name || "训练"} 暂未开放`,
+      icon: "none",
+    });
+    return;
+  }
+
+  uni.navigateTo({
+    url: `/pages/training/difficulty?mode=${mode}`,
+  });
+};
+
+const openRoutineTraining = () => {
+  showRoutineTargetPicker.value = true;
+};
+
+const handleRoutineTargetConfirm = (target) => {
+  showRoutineTargetPicker.value = false;
+  uni.navigateTo({
+    url: `/pages/practise-one?target=${target}`,
+  });
+};
+
+// 首次进入页面时拉取数据并完成雷达图初始化。
+onMounted(async () => {
+  await loadPersonalTrainingData();
+  pageMounted.value = true;
+});
+
+// 从其他页面返回时刷新训练数据，保持进度与推荐状态最新。
+onShow(async () => {
+  if (!pageMounted.value) return;
+  await loadPersonalTrainingData();
+});
+</script>
+
+<template>
+  <Container :showBackToGame="true" :bgType="7" bgColor="#050b19">
+    <view class="training-home">
+      <view class="week-grid">
+        <view
+          v-for="item in trainingData.week_days"
+          :key="item.day"
+          class="week-item"
+        >
+          <view class="week-item-bg"></view>
+          <image
+            class="week-item-icon"
+            :src="item.status === 'checked' ? checkedIcon : missedIcon"
+            mode="widthFix"
+          />
+          <text
+            class="week-item-label"
+            :class="{ 'week-item-label-active': item.status === 'checked' }"
+          >
+            {{ item.day }}
+          </text>
+        </view>
+      </view>
+
+      <view class="stats-card">
+        <view class="stats-card-bg"></view>
+        <image
+          class="stats-quote stats-quote-left"
+          src="../../static/training-home/img_17.png"
+          mode="widthFix"
+        />
+        <image
+          class="stats-quote stats-quote-right"
+          src="../../static/training-home/img_16.png"
+          mode="widthFix"
+        />
+        <view class="stats-grid">
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.total_training_days, 0) }}
+                </text>
+                <text class="stats-unit">天</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">共训练</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.total_arrows, 0) }}
+                </text>
+                <text class="stats-unit">支</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">累计射箭</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.hit_rate) }}
+                </text>
+                <text class="stats-unit">%</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">命中率</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.endurance_shoot_speed, 0) }}
+                </text>
+                <text class="stats-unit">支/分钟</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">耐力射击</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ getCaloriesValue(trainingData.stats.total_calories) }}
+                </text>
+                <text class="stats-unit">卡路里</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">共消耗</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="radar-section">
+        <view class="record-bubble" @click="openTrainingRecord">
+          <image
+            class="record-bubble-bg"
+            src="../../static/training-home/img_28.png"
+            mode="widthFix"
+          />
+          <view class="record-bubble-copy">
+            <view class="record-main">
+              已超越<text class="record-main-highlight">{{ formatValue(trainingData.stats.overtake_rate) }}%</text>对手
+            </view>
+            <view class="record-sub-row">
+              <text class="record-sub-text">我的训练记录</text>
+              <image
+                class="record-arrow"
+                src="../../static/training-home/img_7.png"
+                mode="widthFix"
+              />
+            </view>
+          </view>
+        </view>
+
+        <view class="radar-board">
+          <text class="radar-label radar-label-top">
+            {{ trainingData.radar.dimensions[0].name }}
+          </text>
+          <text class="radar-label radar-label-right">
+            {{ trainingData.radar.dimensions[1].name }}
+          </text>
+          <text class="radar-label radar-label-bottom-right">
+            {{ trainingData.radar.dimensions[2].name }}
+          </text>
+          <text class="radar-label radar-label-bottom-left">
+            {{ trainingData.radar.dimensions[3].name }}
+          </text>
+          <text class="radar-label radar-label-left">
+            {{ trainingData.radar.dimensions[4].name }}
+          </text>
+
+          <view class="radar-figure" :style="radarFigureStyle">
+            <image
+              class="radar-grid-image"
+              :style="radarFigureStyle"
+              src="../../static/training-home/img_19.png"
+            />
+            <canvas
+              :canvas-id="trainingRadarCanvasId"
+              :id="trainingRadarCanvasId"
+              class="radar-canvas"
+              :style="radarFigureStyle"
+              :width="radarCanvasWidth"
+              :height="radarCanvasHeight"
+            />
+            <image
+              class="radar-mascot"
+              src="../../static/training-home/img_21.png"
+              mode="widthFix"
+            />
+          </view>
+        </view>
+      </view>
+
+      <view class="featured-card" @click="openRoutineTraining">
+        <image
+          class="featured-card-bg"
+          src="../../static/training-home/img_22.png"
+          mode="widthFix"
+        />
+        <view class="featured-card-mask"></view>
+        <view class="featured-card-copy">
+          <text class="featured-card-title">常规训练</text>
+          <text class="featured-card-subtitle">12箭练习</text>
+        </view>
+      </view>
+
+      <view class="mode-grid">
+        <view
+          v-for="item in trainingData.training_items.filter((item) => item.id !== 'strength')"
+          :key="item.id"
+          class="mode-card"
+          @click="openTrainingItem(item)"
+        >
+          <view v-if="item.is_recommended" class="mode-tag">推荐</view>
+          <view class="mode-card-copy">
+            <image
+              v-if="getTrainingTitleImage(item)"
+              class="mode-card-title-image"
+              :src="getTrainingTitleImage(item)"
+              mode="widthFix"
+            />
+            <text v-else class="mode-card-title">{{ item.name }}</text>
+            <text class="mode-card-progress">{{ getLevelText(item) }}</text>
+          </view>
+          <image
+            class="mode-card-icon"
+            :src="getTrainingIcon(item)"
+            mode="aspectFit"
+          />
+        </view>
+      </view>
+    </view>
+    <TargetPicker
+      :show="showRoutineTargetPicker"
+      :onClose="() => (showRoutineTargetPicker = false)"
+      :onConfirm="handleRoutineTargetConfirm"
+    />
+  </Container>
+</template>
+
+<style scoped>
+.training-home {
+  position: relative;
+  overflow: hidden;
+  padding: 18rpx 20rpx 60rpx 20rpx;
+}
+
+.week-grid {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 18rpx;
+}
+
+.week-item {
+  position: relative;
+  width: 92rpx;
+  height: 96rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.week-item-bg {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
+  opacity: 0.5;
+}
+
+.week-item-icon {
+  position: absolute;
+  left: 28rpx;
+  top: 14rpx;
+  width: 36rpx;
+}
+
+.week-item-label {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 10rpx;
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 20rpx;
+  text-align: center;
+  line-height: 28rpx;
+}
+
+.week-item-label-active {
+  color: #e7ba80;
+}
+
+.stats-card {
+  position: relative;
+  margin-top: 32rpx;
+  width: 100%;
+  height: 124rpx;
+  overflow: hidden;
+  border-radius: 24rpx;
+}
+
+.stats-card-bg {
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
+  opacity: 0.5;
+}
+
+.stats-quote {
+  position: absolute;
+  z-index: 1;
+  width: 53rpx;
+  height: 50rpx;
+}
+
+.stats-quote-left {
+  left: 4rpx;
+  top: 4rpx;
+}
+
+.stats-quote-right {
+  right: 4rpx;
+  bottom: 4rpx;
+}
+
+.stats-grid {
+  position: absolute;
+  z-index: 1;
+  left: 36rpx;
+  right: 36rpx;
+  top: 22rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+
+.stats-item {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+}
+
+.stats-value-row {
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  width: 100%;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.stats-value-group {
+  position: relative;
+  display: inline-flex;
+  align-items: flex-end;
+  justify-content: center;
+  min-width: 72rpx;
+  white-space: nowrap;
+}
+
+.stats-value-decoration {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 6rpx;
+  min-width: 72rpx;
+  height: 12rpx;
+  border-radius: 6rpx;
+  background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
+  opacity: 0.5;
+}
+
+.stats-value {
+  position: relative;
+  z-index: 1;
+  color: #fff;
+  font-size: 34rpx;
+  font-family: Helvetica, Arial, sans-serif;
+  font-weight: 500;
+  line-height: 46rpx;
+}
+
+.stats-unit {
+  position: relative;
+  z-index: 1;
+  margin-left: 4rpx;
+  padding-bottom: 8rpx;
+  color: #fff;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  opacity: 0.6;
+}
+
+.stats-label {
+  display: inline-block;
+  margin-top: 6rpx;
+  color: #fcce96;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  opacity: 0.6;
+}
+
+.radar-section {
+  position: relative;
+  padding-top: 34rpx;
+}
+
+.record-bubble {
+  position: absolute;
+  right: 0;
+  top: 10rpx;
+  width: 202rpx;
+  height: 122rpx;
+  z-index: 3;
+}
+
+.record-bubble-bg {
+  width: 202rpx;
+}
+
+.record-bubble-copy {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 24rpx;
+  text-align: center;
+}
+
+.record-main {
+  color: #fff;
+  font-size: 24rpx;
+  line-height: 30rpx;
+}
+
+.record-main-highlight {
+  color: #e7ba80;
+}
+
+.record-sub-row {
+  margin-top: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.record-sub-text {
+  color: #ffd947;
+  font-size: 24rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+}
+
+.record-arrow {
+  width: 24rpx;
+}
+
+.radar-board {
+  position: relative;
+  width: 100%;
+  height: 514rpx;
+}
+
+.radar-label {
+  position: absolute;
+  color: rgba(255, 255, 255, 0.78);
+  font-size: 28rpx;
+  line-height: 40rpx;
+}
+
+.radar-label-top {
+  left: 350rpx;
+  top: 14rpx;
+  transform: translateX(-50%);
+  opacity: 0.5;
+}
+
+.radar-label-right {
+  right: 77rpx;
+  top: 190rpx;
+  opacity: 0.5;
+}
+
+.radar-label-bottom-right {
+  right: 170rpx;
+  bottom: 18rpx;
+  opacity: 0.5;
+}
+
+.radar-label-bottom-left {
+  left: 170rpx;
+  bottom: 18rpx;
+  opacity: 0.5;
+}
+
+.radar-label-left {
+  left: 75rpx;
+  top: 180rpx;
+  opacity: 0.5;
+}
+
+.radar-figure {
+  position: absolute;
+  left: 50%;
+  top: 54rpx;
+  transform: translateX(-50%);
+  overflow: visible;
+}
+
+.radar-grid-image,
+.radar-canvas {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.radar-mascot {
+  position: absolute;
+  right: 38rpx;
+  top: 0;
+  width: 92rpx;
+}
+
+.featured-card {
+  position: relative;
+  width: 100%;
+  height: 150rpx;
+  margin-top: 70rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.featured-card-bg {
+  width: 100%;
+}
+
+.featured-card-mask {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 278rpx;
+  height: 150rpx;
+  background: linear-gradient(90deg, #ffdaa0 0%, #f5c580 74%, rgba(245, 197, 128, 0) 100%);
+}
+
+.featured-card-copy {
+  position: absolute;
+  left: 30rpx;
+  top: 34rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.featured-card-title {
+  display: block;
+  color: #895409;
+  font-size: 34rpx;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 700;
+  line-height: 42rpx;
+}
+
+.featured-card-subtitle {
+  display: block;
+  margin-top: 10rpx;
+  color: #895409;
+  font-size: 22rpx;
+  line-height: 32rpx;
+  opacity: 0.72;
+}
+
+.mode-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 16rpx 18rpx;
+  margin-top: 16rpx;
+}
+
+.mode-card {
+  position: relative;
+  height: 150rpx;
+  box-shadow: inset 2rpx 2rpx 6rpx 0rpx rgba(255, 255, 255, 0.27);
+  border-radius: 16rpx;
+  border: 2rpx solid rgba(235, 184, 123, 0.5);
+  background: rgba(0, 0, 0, 0.5);
+  overflow: hidden;
+}
+
+.mode-tag {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 72rpx;
+  height: 34rpx;
+  line-height: 34rpx;
+  text-align: center;
+  font-size: 20rpx;
+  color: #000;
+  border-bottom-right-radius: 16rpx;
+  background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
+}
+
+.mode-card-copy {
+  position: absolute;
+  left: 30rpx;
+  top: 40rpx;
+}
+
+.mode-card-title {
+  display: block;
+  background-image: linear-gradient(
+    133deg,
+    rgba(235, 184, 123, 0.8) 0%,
+    rgba(181, 140, 78, 0.8) 100%
+  );
+  color: #e7ba80;
+  font-size: 32rpx;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 700;
+  line-height: 38rpx;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.mode-card-title-image {
+  display: block;
+  width: 128rpx;
+}
+
+.mode-card-progress {
+  display: block;
+  margin-top: 14rpx;
+  color: #fcce96;
+  font-size: 22rpx;
+  line-height: 32rpx;
+  opacity: 0.5;
+}
+
+.mode-card-icon {
+  position: absolute;
+  right: 12rpx;
+  top: 14rpx;
+  width: 124rpx;
+  height: 124rpx;
+}
+</style>

src/pages/training/practise-one.vue

@@ -0,0 +1,537 @@
+<script setup>
+import { computed, ref, onMounted, onBeforeUnmount } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import ShootProgress from "./components/ShootProgress.vue";
+import BowTarget from "./components/BowTarget.vue";
+import ScorePanel2 from "./components/ScorePanel2.vue";
+import ScoreResult from "./components/ScoreResult.vue";
+import Avatar from "@/components/Avatar.vue";
+import BowPower from "@/components/BowPower.vue";
+import TestDistance from "./components/TestDistance.vue";
+import BubbleTip from "./components/BubbleTip.vue";
+import audioManager from "@/audioManager";
+
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
+import { sharePractiseData } from "@/canvas";
+import { wxShare, debounce } from "@/util";
+import { MESSAGETYPESV2, roundsName } from "@/constants";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const sound = ref(true);
+const start = ref(false);
+const pageStages = Object.freeze({
+  DISTANCE: "distance",
+  SHOOTING: "shooting",
+  RESULT: "result",
+  LOADING: "loading",
+});
+const pageStage = ref(pageStages.DISTANCE);
+const scores = ref([]);
+const defaultTotal = 12;
+const defaultShootTime = 120;
+const defaultTargetType = 1;
+const total = ref(defaultTotal);
+const shootTime = ref(defaultShootTime);
+const practiseResult = ref({});
+const practiseId = ref("");
+const showGuide = ref(false);
+const tips = ref("");
+const targetType = ref(defaultTargetType);
+const trainingParams = ref({});
+const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
+const useHighlightTest = ref(false);
+const highlightTestTimer = ref(null);
+
+const env = computed(() => {
+  try {
+    return uni.getAccountInfoSync().miniProgram.envVersion;
+  } catch (error) {
+    return "release";
+  }
+});
+
+const isDistanceStage = computed(() => pageStage.value === pageStages.DISTANCE);
+const isShootingStage = computed(() => pageStage.value === pageStages.SHOOTING);
+const hasPractiseResult = computed(() => !!practiseResult.value?.details);
+const showResult = computed(
+  () => pageStage.value === pageStages.RESULT && hasPractiseResult.value
+);
+
+const defaultHighlightAreas = [{ quadrant: 1, rings: [7] }];
+
+// 临时高亮测试数据：第 N 项对应第 N 箭，每箭展示一个不同区域。
+const highlightTestAreas = [
+  { arrowIndex: 1, quadrant: 1, rings: [10] },
+  { arrowIndex: 2, quadrant: 2, rings: [9, 10] },
+  { arrowIndex: 3, quadrant: 3, rings: [8, 9] },
+  { arrowIndex: 4, quadrant: 4, rings: [7, 8] },
+  { arrowIndex: 5, quadrant: 1, rings: [6, 7] },
+  { arrowIndex: 6, quadrant: 2, rings: [5, 6] },
+  { arrowIndex: 7, quadrant: 3, rings: [4, 5] },
+  { arrowIndex: 8, quadrant: 4, rings: [3, 4] },
+  { arrowIndex: 9, quadrant: 1, rings: "all", scope: "sector" },
+  { arrowIndex: 10, quadrant: 2, rings: "all", scope: "sector" },
+  { arrowIndex: 11, quadrant: 3, rings: "all", scope: "sector" },
+  { arrowIndex: 12, quadrant: 4, rings: "all", scope: "sector" },
+];
+
+const targetHighlightAreas = computed(() => {
+  return useHighlightTest.value ? highlightTestAreas : defaultHighlightAreas;
+});
+
+const toRouteNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const toPositiveRouteNumber = (value, fallback) => {
+  const numberValue = toRouteNumber(value, fallback);
+  return numberValue > 0 ? numberValue : fallback;
+};
+
+const createPractice = async () => {
+  const result = await createPractiseAPI(
+    total.value,
+    shootTime.value,
+    targetType.value
+  );
+
+  if (result) practiseId.value = result.id;
+};
+
+const clearHighlightTestTimer = () => {
+  if (highlightTestTimer.value) {
+    clearInterval(highlightTestTimer.value);
+    highlightTestTimer.value = null;
+  }
+};
+
+const buildHighlightTestScore = (index) => ({
+  playerId: user.value?.id,
+  ring: 9,
+  ringX: false,
+  x: ((index % 4) - 1.5) * 2,
+  y: (Math.floor(index / 4) - 1) * 2,
+  angle: null,
+});
+
+const setHighlightTestArrow = (arrowIndex) => {
+  const completedCount = Math.max(arrowIndex - 1, 0);
+  scores.value = Array.from({ length: completedCount }, (_, index) =>
+    buildHighlightTestScore(index)
+  );
+};
+
+// 临时测试入口：自动切换第 1 到第 12 箭，让 BowTarget 按当前箭展示不同高亮。
+const runHighlightTest = () => {
+  clearHighlightTestTimer();
+  useHighlightTest.value = true;
+  practiseResult.value = {};
+  pageStage.value = pageStages.SHOOTING;
+  start.value = true;
+
+  let arrowIndex = 1;
+  setHighlightTestArrow(arrowIndex);
+
+  highlightTestTimer.value = setInterval(() => {
+    if (arrowIndex >= highlightTestAreas.length) {
+      clearHighlightTestTimer();
+      return;
+    }
+
+    arrowIndex += 1;
+    setHighlightTestArrow(arrowIndex);
+  }, 1000);
+};
+
+const resetHighlightTest = () => {
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  scores.value = [];
+};
+
+onLoad((options = {}) => {
+  targetType.value = toPositiveRouteNumber(options.target, defaultTargetType);
+  total.value = toPositiveRouteNumber(options.arrows, defaultTotal);
+  shootTime.value = toPositiveRouteNumber(options.time, defaultShootTime);
+  trainingParams.value = {
+    type: options.type || "",
+    difficultyId: options.difficultyId || "",
+    difficulty: toRouteNumber(options.difficulty),
+    recordId: options.recordId || "",
+    hitReq: toRouteNumber(options.hitReq),
+    totalReq: toRouteNumber(options.totalReq),
+    blocks: toRouteNumber(options.blocks),
+    mode: toRouteNumber(options.mode),
+  };
+});
+
+const onReady = async () => {
+  pageStage.value = pageStages.LOADING;
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  try {
+    await startPractiseAPI();
+    practiseResult.value = {};
+    scores.value = [];
+    start.value = true;
+    pageStage.value = pageStages.SHOOTING;
+    audioManager.play("练习开始");
+  } catch (error) {
+    start.value = false;
+    pageStage.value = pageStages.DISTANCE;
+    throw error;
+  }
+};
+
+const onOver = async () => {
+  if (!isShootingStage.value) return;
+
+  clearHighlightTestTimer();
+  pageStage.value = pageStages.LOADING;
+  start.value = false;
+
+  try {
+    practiseResult.value = (await getPractiseAPI(practiseId.value)) || {};
+    pageStage.value = hasPractiseResult.value
+      ? pageStages.RESULT
+      : pageStages.DISTANCE;
+  } catch (error) {
+    start.value = true;
+    pageStage.value = pageStages.SHOOTING;
+    throw error;
+  }
+};
+
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult && isShootingStage.value) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    // setTimeout(onOver, 1500);
+  }
+}
+
+function onComplete() {
+  pageStage.value = pageStages.LOADING;
+  start.value = false;
+  uni.$emit(trainingDifficultyRefreshEvent);
+  uni.navigateBack();
+}
+
+async function onRetry() {
+  pageStage.value = pageStages.LOADING;
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  practiseId.value = "";
+  practiseResult.value = {};
+  start.value = false;
+  scores.value = [];
+  try {
+    await createPractice();
+  } finally {
+    pageStage.value = pageStages.DISTANCE;
+  }
+}
+
+const onClickShare = debounce(async () => {
+  await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
+  await wxShare("shareCanvas");
+});
+
+function onAudioEnded(s) {
+  if (s.indexOf("比赛结束") >= 0) {
+    onOver()
+  }
+}
+
+const updateSound = () => {
+  sound.value = !sound.value;
+  audioManager.setMuted(!sound.value);
+};
+
+
+onMounted(async () => {
+  // audioManager.play("第一轮");
+  uni.setKeepScreenOn({
+    keepScreenOn: true,
+  });
+  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("share-image", onClickShare);
+  uni.$on("audioEnded", onAudioEnded);
+  await createPractice();
+});
+
+onBeforeUnmount(() => {
+  uni.setKeepScreenOn({
+    keepScreenOn: false,
+  });
+  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
+  audioManager.stopAll();
+  clearHighlightTestTimer();
+  endPractiseAPI();
+});
+</script>
+
+<template>
+  <Container
+    :bgType="isDistanceStage ? 9 : 10"
+    :showBottom="isDistanceStage"
+    :scroll="!isShootingStage"
+  >
+    <view class="practise-content">
+      <TestDistance v-if="isDistanceStage" />
+      <view v-else-if="isShootingStage" class="shooting-layout">
+        <view class="shooting-fixed">
+          <ShootProgress
+            :start="start"
+            :onStop="onOver"
+          />
+          <view class="user-row">
+            <!-- <Avatar :src="user.avatar" :size="35" /> -->
+            <BubbleTip v-if="showGuide" type="normal2">
+              <text>还有两场，坚持</text>
+              <text>就是胜利！💪</text>
+            </BubbleTip>
+            <!-- <BowPower /> -->
+          </view>
+          <BowTarget
+            :totalRound="start ? total / 4 : 0"
+            :currentRound="scores.length % 3"
+            :scores="scores"
+            :showCrosshair="false"
+            :highlightAreas="targetHighlightAreas"
+          />
+          <view v-if="env !== 'release'" class="highlight-test-actions">
+            <button
+              class="highlight-test-btn"
+              hover-class="none"
+              @click="runHighlightTest"
+            >
+              高亮测试
+            </button>
+            <button
+              class="highlight-test-btn"
+              hover-class="none"
+              @click="resetHighlightTest"
+            >
+              重置高亮
+            </button>
+          </view>
+          <view class="sound-text-box">
+            <button class="sound-btn" hover-class="none" @click="updateSound">
+              <image
+                class="sound-icon"
+                :src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
+                mode="aspectFit"
+              />
+            </button>
+            <view class="bat-text-big-box">
+              <image
+                class="dao-icon"
+                src="../../static/training-difficulty-design/dao-icon.png"
+                mode="widthFix"
+              />
+              <view class="bat-text-box">
+                <view class="bat-text-small-box">
+                  <view class="text-round-box">
+                    <view class="text1">每箭命中9环之上</view>
+                    <view class="text2">剩余<text class="text2-yellow">3</text>箭</view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <scroll-view
+          class="score-scroll"
+          scroll-y
+          :enhanced="true"
+          :show-scrollbar="false"
+        >
+          <ScorePanel2 :arrows="scores" :total="total" />
+        </scroll-view>
+      </view>
+      <ScoreResult
+        v-else-if="showResult"
+        :rowCount="6"
+        :total="total"
+        :onClose="onComplete"
+        :onRetry="onRetry"
+        :result="practiseResult"
+      />
+      <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
+    </view>
+    <template #bottom>
+      <view class="btn-box">
+        <image
+          class="btn-box-bg"
+          src="../../static/training-difficulty-design/par-star.png"
+          mode="widthFix"
+        />
+        <button class="btn" @click="onReady">准备好了，开始练习</button>
+      </view>
+    </template>
+  </Container>
+</template>
+
+<style scoped>
+.practise-content {
+  height: 100%;
+  min-height: 0;
+}
+
+.shooting-layout {
+  height: 100%;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.shooting-fixed {
+  flex-shrink: 0;
+}
+
+.score-scroll {
+  flex: 1;
+  height: 0;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.btn-box{
+  width: 488rpx;
+  height: 234rpx;
+  position: fixed;
+  bottom: 130rpx;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.btn-box-bg{
+  width: 100%;
+}
+.btn{
+  width: 330rpx;
+  height: 70rpx;
+  line-height: 70rpx;
+  background: #FED847;
+  border-radius: 44rpx;
+  text-align: center;
+  color: #000000;
+  font-size: 28rpx;
+  font-weight: 500;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: -36rpx;
+}
+
+.highlight-test-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: -24rpx;
+  position: relative;
+  z-index: 10;
+}
+
+.highlight-test-btn {
+  width: 150rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  padding: 0;
+  border-radius: 24rpx;
+  background: rgba(0, 0, 0, 0.48);
+  color: #fed847;
+  font-size: 22rpx;
+}
+
+.highlight-test-btn::after {
+  border: none;
+}
+
+.highlight-test-btn + .highlight-test-btn {
+  margin-left: 16rpx;
+}
+
+.sound-text-box{
+  height: 125rpx;
+  padding: 0 56rpx;
+  display: flex;
+  align-items: flex-end;
+}
+.sound-btn {
+  width: 76rpx;
+  height: 70rpx;
+  border: none;
+}
+
+.sound-btn::after {
+  border: none;
+}
+
+.sound-icon {
+  width: 76rpx;
+  height: 70rpx;
+}
+.bat-text-big-box{
+  flex: 1;
+  position: relative;
+}
+.dao-icon{
+  width: 160rpx;
+  height: 125rpx;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+.text-round-box{
+  width: 100%;
+}
+.bat-text-box{
+  display: flex;
+}
+.bat-text-small-box{
+  background: rgba(0, 0, 0, 0.5);
+  width: auto;
+  min-width: 100rpx;
+  border-radius: 16rpx 60rpx 60rpx 16rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 176rpx;
+  height: 112rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  color: #E7BA80;
+}
+.text1{
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #E7BA80;
+  line-height: 42rpx;
+}
+.text2{
+  color: #FFFFFF;
+  font-size: 26rpx;
+  font-weight: 400;
+  line-height: 36rpx;
+}
+.text2-yellow{
+  font-size: 30rpx;
+  color: #FFD947;
+  font-weight: 500;
+  margin: 0 4rpx;
+}
+</style>

src/pages/user.vue

@@ -69,6 +69,10 @@ onMounted(() => {
   const envVersion = accountInfo.miniProgram.envVersion;
   if (envVersion !== "release") showLogout.value = true;
 });
+
+/* global __BUILD_TIME__ */
+/** 构建时刻，由 vite.config.js define 在打包时自动注入；仅开发/体验版展示 */
+const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : '';
 </script>
 
 <template>
@@ -140,6 +144,10 @@ onMounted(() => {
           :onClick="toAudioTestPage"
           v-if="showLogout"
         />
+        <UserItem
+          title="版本信息(仅用于测试)"
+          v-if="showLogout"
+        >{{ buildVersion }}</UserItem>
         <UserItem
           title="退出登录(仅用于测试)"
           :onClick="logout"