update:代码备份

.gitignore

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

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "i18n-ally.localesPaths": []
+}

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`

src/App.vue

@@ -1,13 +1,28 @@
 <script setup>
-import { watch } from "vue";
-import { onShow, onHide } from "@dcloudio/uni-app";
+	import {
+		watch
+	} from "vue";
+	import {
+		onShow,
+		onHide
+	} from "@dcloudio/uni-app";
 	import websocket from "@/websocket";
-import { getDeviceBatteryAPI } from "@/apis";
+	import {
+		getDeviceBatteryAPI
+	} from "@/apis";
 	import useStore from "@/store";
-import { storeToRefs } from "pinia";
+	import {
+		storeToRefs
+	} from "pinia";
+	import audioManager from "./audioManager";
 	const store = useStore();
-const { user } = storeToRefs(store);
-const { updateUser, updateOnline } = store;
+	const {
+		user
+	} = storeToRefs(store);
+	const {
+		updateUser,
+		updateOnline
+	} = store;
 
 	watch(
 		() => user.value.id,
@@ -16,15 +31,12 @@ watch(
 				`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 			);
 			if (newVal && token) {
-      websocket.createWebSocket(token, (content) => {
-        uni.$emit("socket-inbox", content);
-      });
+				websocket.createWebSocket(token, onShootWsMsg);
 			}
 			if (!newVal) {
 				websocket.closeWebSocket();
 			}
-  },
-  {
+		}, {
 			deep: false, // 如果 user 是一个对象或数组，建议开启
 			immediate: false, // 若想在初始化时立即执行一次回调，可开启。
 		}
@@ -39,6 +51,17 @@ async function emitUpdateOnline() {
 		updateOnline(data.online);
 	}
 
+	function onDeviceShoot() {
+		// audioManager.play("射箭声音")
+	}
+
+	function onShootWsMsg(content) {
+		if(content.type === 'shoot-trigger'){
+			onDeviceShoot()
+		}
+		uni.$emit("socket-inbox", content);
+	}
+
 	onShow(() => {
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
@@ -47,9 +70,7 @@ onShow(() => {
 		);
 		if (user.value.id && token) {
 			console.log("回到前台，重新连接 websocket");
-    websocket.createWebSocket(token, (content) => {
-      uni.$emit("socket-inbox", content);
-    });
+			websocket.createWebSocket(token, onShootWsMsg);
 		}
 	});
 
@@ -93,9 +114,11 @@ button::after {
 		flex-direction: column;
 		font-size: 28rpx;
 	}
+
 	.guide-tips>text:first-child {
 		color: #fed847;
 	}
+
 	.guide-tips>text:nth-child(2) {
 		font-size: 24rpx;
 	}
@@ -105,13 +128,16 @@ button::after {
 			transform: translateY(20px);
 			opacity: 0;
 		}
+
 		30% {
 			transform: translateY(0);
 			opacity: 1;
 		}
+
 		80% {
 			opacity: 1;
 		}
+
 		100% {
 			opacity: 0;
 		}
@@ -126,6 +152,7 @@ button::after {
 			transform: translateY(0);
 			opacity: 1;
 		}
+
 		to {
 			transform: translateY(20px);
 			opacity: 0;
@@ -141,6 +168,7 @@ button::after {
 			transform: scale(0);
 			opacity: 0;
 		}
+
 		to {
 			transform: scale(1);
 			opacity: 1;
@@ -157,6 +185,7 @@ button::after {
 			transform: scale(1);
 			opacity: 1;
 		}
+
 		to {
 			transform: scale(0);
 			opacity: 0;
@@ -172,6 +201,7 @@ button::after {
 		from {
 			transform: rotate(0deg);
 		}
+
 		to {
 			transform: rotate(360deg);
 		}
@@ -181,6 +211,7 @@ button::after {
 		from {
 			transform: scale(2);
 		}
+
 		to {
 			transform: scale(1);
 		}
@@ -212,6 +243,7 @@ button::after {
 		align-items: center;
 		justify-content: center;
 	}
+
 	.user-row {
 		display: flex;
 		align-items: center;
@@ -220,6 +252,7 @@ button::after {
 		padding-top: 7px;
 		position: relative;
 	}
+
 	.half-time-tip {
 		width: 100%;
 		display: flex;
@@ -227,28 +260,31 @@ button::after {
 		justify-content: center;
 		align-items: center;
 	}
+
 	.half-time-tip>text:last-child {
 		margin-top: 20px;
 		color: #fff9;
 	}
+
 	.see-more {
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		margin-top: 20rpx;
 	}
+
 	.see-more>text {
 		color: #39a8ff;
 		font-size: 13px;
 	}
+
 	.see-more>image {
 		width: 15px;
 	}
 
 	@font-face {
 		font-family: "DINCondensed";
-  src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf")
-    format("truetype");
+		src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf") format("truetype");
 		font-weight: 700;
 		font-style: normal;
 		font-display: swap;

src/apis.js

@@ -6,7 +6,7 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-      // BASE_URL = "http://192.168.1.242:8000/api/shoot";
+            // BASE_URL = "http://localhost:8000/api/shoot";
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
@@ -179,12 +179,39 @@ export const loginAPI = async (phone, nickName, avatarData, code) => {
     return result;
 };
 
+export const silentLoginAPI = async (code) => {
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const checkUserBindAPI = async (code) => {
+    return request("POST", "/index/checkBind", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+};
+
 export const bindDeviceAPI = (device) => {
     return request("POST", "/user/device/bindDevice", {
         device,
     });
 };
 
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
+};
+
 export const unbindDeviceAPI = (deviceId) => {
     return request("POST", "/user/device/unbindDevice", {
         deviceId,
@@ -196,24 +223,31 @@ export const getMyDevicesAPI = () => {
     return request("GET", "/user/device/getBindings");
 };
 
-export const createPractiseAPI = (arrows, mode) => {
+export const createPractiseAPI = (arrows, time, target) => {
     return request("POST", "/user/practice/create", {
-    arrows,
-    mode,
+        shootNumber: arrows,
+        shootTime: time,
+        targetType: target * 20,
     });
 };
 
-export const getPractiseAPI = async (id) => {
-  const result = await request("GET", `/user/practice/get?id=${id}`);
-  const data = { ...(result.UserPracticeRound || {}) };
-  if (data.arrows) data.arrows = JSON.parse(data.arrows);
-  return data;
+export const startPractiseAPI = () => {
+    return request("POST", "/user/practice/begin");
 };
 
-export const createRoomAPI = (gameType, teamSize) => {
+export const endPractiseAPI = () => {
+    return request("POST", "/user/practice/stop");
+};
+
+export const getPractiseAPI = async (id) => {
+    return request("GET", `/user/practice/get?id=${id}`);
+};
+
+export const createRoomAPI = (gameType, teamSize, targetType) => {
     return request("POST", "/user/createroom", {
         gameType,
         teamSize,
+        targetType,
     });
 };
 
@@ -255,6 +289,8 @@ export const matchGameAPI = (match, gameType, teamSize) => {
         match,
         gameType,
         teamSize,
+        readyTime: 15,
+        targetType: 20,
     });
 };
 
@@ -264,78 +300,6 @@ export const readyGameAPI = (battleId) => {
     });
 };
 
-export const getGameAPI = async (battleId) => {
-  const result = await request("POST", "/user/battle/detail", {
-    id: battleId,
-  });
-  if (!result.battleStats) return {};
-  const {
-    battleStats = {},
-    playerStats = {},
-    goldenRoundRecords = [],
-  } = result;
-  const data = {
-    id: battleId,
-    mode: battleStats.mode, // 1.几V几 2.大乱斗
-    gameMode: battleStats.gameMode, // 1.约战 2.排位
-    teamSize: battleStats.teamSize,
-  };
-  if (battleStats && battleStats.mode === 1) {
-    data.winner = battleStats.winner;
-    data.roundsData = {};
-    data.redPlayers = {};
-    data.bluePlayers = {};
-    data.mvps = [];
-    data.goldenRounds =
-      goldenRoundRecords && goldenRoundRecords.length ? goldenRoundRecords : [];
-    playerStats.forEach((item) => {
-      const { playerBattleStats = {}, roundRecords = [] } = item;
-      if (playerBattleStats.team === 0) {
-        data.redPlayers[playerBattleStats.playerId] = playerBattleStats;
-      }
-      if (playerBattleStats.team === 1) {
-        data.bluePlayers[playerBattleStats.playerId] = playerBattleStats;
-      }
-      if (playerBattleStats.mvp) {
-        data.mvps.push(playerBattleStats);
-      }
-      roundRecords.forEach((round) => {
-        data.roundsData[round.roundNumber] = {
-          ...data.roundsData[round.roundNumber],
-          [round.playerId]: round.arrowHistory,
-        };
-      });
-    });
-    const totalRounds = Object.keys(data.roundsData).length;
-    (goldenRoundRecords || []).forEach((item, index) => {
-      item.arrowHistory.forEach((arrow) => {
-        if (!data.roundsData[totalRounds + index + 1]) {
-          data.roundsData[totalRounds + index + 1] = {};
-        }
-        if (!data.roundsData[totalRounds + index + 1][arrow.playerId]) {
-          data.roundsData[totalRounds + index + 1][arrow.playerId] = [];
-        }
-        data.roundsData[totalRounds + index + 1][arrow.playerId].push(arrow);
-      });
-    });
-
-    data.mvps.sort((a, b) => b.totalRings - a.totalRings);
-  }
-  if (battleStats && battleStats.mode === 2) {
-    data.players = [];
-    playerStats.forEach((item) => {
-      data.players.push({
-        ...item.playerBattleStats,
-        arrowHistory: item.roundRecords[0].arrowHistory,
-      });
-    });
-    data.players = data.players.sort((a, b) => b.totalScore - a.totalScore);
-  }
-  // console.log("game result:", result);
-  // console.log("format data:", data);
-  return data;
-};
-
 export const simulShootAPI = (device_id, x, y) => {
     const data = {
         device_id,
@@ -348,39 +312,12 @@ export const simulShootAPI = (device_id, x, y) => {
 };
 
 export const getBattleListAPI = async (page, battleType) => {
-  const data = [];
     const result = await request("POST", "/user/battle/details/list", {
         page,
+        pageSize: 10,
         battleType,
-    modeType: 0,
     });
-  (result.Battles || []).forEach((item) => {
-    let name = "";
-    if (item.battleStats.mode === 1) {
-      name = `${item.playerStats.length / 2}V${item.playerStats.length / 2}`;
-    }
-    if (item.battleStats.mode === 2) {
-      name = `${item.playerStats.length}人大乱斗`;
-    }
-    data.push({
-      name,
-      battleId: item.battleStats.battleId,
-      mode: item.battleStats.mode,
-      createdAt: item.battleStats.createdAt,
-      gameEndAt: item.battleStats.gameEndAt,
-      winner: item.battleStats.winner,
-      players: item.playerStats
-        .map((p) => p.playerBattleStats)
-        .sort((a, b) => b.totalScore - a.totalScore),
-      redPlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 0)
-        .map((p) => p.playerBattleStats),
-      bluePlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 1)
-        .map((p) => p.playerBattleStats),
-    });
-  });
-  return data;
+    return result.list;
 };
 
 export const getRankListAPI = () => {
@@ -417,12 +354,6 @@ export const getUserGameState = () => {
     return request("GET", "/user/state");
 };
 
-export const getCurrentGameAPI = async () => {
-  uni.$emit("update-header-loading", true);
-  const result = await request("GET", "/user/join/battle");
-  return result.currentGame || {};
-};
-
 export const getPointBookConfigAPI = async () => {
     return request("GET", "/user/score/sheet/option");
 };
@@ -476,6 +407,15 @@ export const getPractiseDataAPI = async () => {
     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");
 };
@@ -552,3 +492,76 @@ export const getReadyAPI = (roomId) => {
         roomId,
     });
 };
+
+export const getBattleAPI = async (battleId) => {
+    return request("POST", "/user/match/info", {
+        id: battleId,
+    });
+};
+
+export const kickPlayerAPI = (number, userId) => {
+    return request("POST", "/user/room/kicking", {
+        number,
+        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

@@ -40,25 +40,26 @@ export const audioFils = {
   未上靶:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
   "1环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin1aq7gxjih5l.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/1.mp3",
   "2环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin64tdgx2s4at.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/2.mp3",
   "3环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinlmf87vt8z65.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/3.mp3",
   "4环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinniv97sx0q9u.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/4.mp3",
   "5环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin7j01kknpb7k.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/5.mp3",
   "6环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin4syy1015rtq.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/6.mp3",
   "7环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin3iz3dvmjdai.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/7.mp3",
   "8环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinnjd42lhpfiw.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/8.mp3",
   "9环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxin69nj1xh7yfz.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/9.mp3",
   "10环":
-    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutxinnvsx0tt7ksa.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/10.mp3",
+  X环: "https://static.shelingxingqiu.com/shootaudio/v4/v4/X%E7%8E%AF.mp3",
   向上调整:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellf5pfvu3l8dhr.mp3",
   向右上调整:
@@ -79,6 +80,10 @@ export const audioFils = {
     "https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
   练习开始:
     "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
+  射箭声音:
+	"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
+  命中:
+	"https://static.shelingxingqiu.com/shootaudio/%E5%91%BD%E4%B8%AD.mp3"
 };
 
 // 版本控制日志函数
@@ -357,6 +362,7 @@ class AudioManager {
         }
         this.allowPlayMap.set(key, false);
         this.onAudioEnded(key);
+        uni.$emit('audioEnded', key);
       });
 
       audio.onStop(() => {

src/canvas.js

@@ -1,3 +1,5 @@
+import { formatTimestamp } from "@/util";
+
 const loadImage = (src) =>
   new Promise((resolve, reject) => {
     try {
@@ -635,7 +637,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
       }
       renderText(
         ctx,
-        item.ring,
+        item.ringX ? "X" : item.ring,
         18,
         "#fed847",
         29.5 + (i % 9) * 30,
@@ -657,7 +659,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
       }
       renderText(
         ctx,
-        item.ring,
+        item.ringX ? "X" : item.ring,
         23,
         "#fed847",
         43 + rowIndex * 42,
@@ -737,9 +739,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
 
     let subTitle = "正式开启弓箭手之路";
     if (type > 1) {
-      subTitle = `今日弓箭练习打卡 ${data.createdAt
-        .split(" ")[0]
-        .replaceAll("-", ".")}`;
+      subTitle = `今日弓箭练习打卡 ${formatTimestamp(data.startTime)}`;
     }
 
     ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40);
@@ -748,14 +748,14 @@ export async function sharePractiseData(canvasId, type, user, data) {
     renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center");
 
     renderText(ctx, "共", 14, "#fff", 122, 300);
-    const totalRing = data.arrows.reduce((last, next) => last + next.ring, 0);
+    const totalRing = data.details.reduce((last, next) => last + next.ring, 0);
     renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center");
     renderText(ctx, "环", 14, "#fff", 161, 300);
 
     renderLine(ctx, 77);
     renderLine(ctx, 185);
 
-    renderScores(ctx, data.arrows, scoreBgImg);
+    renderScores(ctx, data.details, scoreBgImg);
 
     ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52);
     renderText(ctx, "射灵平台", 12, "#fff", width * 0.26, height * 0.9);

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/BackToGame.vue

@@ -2,7 +2,7 @@
 import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 
-import { getCurrentGameAPI, getUserGameState } from "@/apis";
+import { getBattleAPI, getUserGameState } from "@/apis";
 import { debounce } from "@/util";
 
 import useStore from "@/store";
@@ -44,10 +44,21 @@ const onClick = debounce(async () => {
   if (loading.value) return;
   try {
     loading.value = true;
-    if (game.value.inBattle) {
+    const result = await getBattleAPI();
+    if (result && result.matchId) {
       await uni.$checkAudio();
-      const result = await getCurrentGameAPI();
-    } else if (game.value.roomID) {
+      if (result.mode <= 3) {
+        uni.navigateTo({
+          url: `/pages/team-battle?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,
       });

src/components/BattleFooter.vue

@@ -22,9 +22,10 @@ const props = defineProps({
   },
 });
 
-const normalRounds = computed(
-  () => props.roundResults.length - props.goldenRound
-);
+const normalRounds = computed(() => {
+  const count = props.roundResults.findIndex((item) => !!item.ifGold);
+  return count > 0 ? count : props.roundResults.length;
+});
 </script>
 
 <template>
@@ -59,8 +60,8 @@ const normalRounds = computed(
           </block>
           <view>
             <text>{{
-              result.blueArrows.length
-                ? result.blueArrows
+              result.shoots[1] && result.shoots[1].length
+                ? result.shoots[1]
                     .map((item) => item.ring)
                     .reduce((last, next) => last + next, 0)
                 : ""
@@ -94,8 +95,8 @@ const normalRounds = computed(
           </block>
           <view>
             <text>{{
-              result.redArrows.length
-                ? result.redArrows
+              result.shoots[2] && result.shoots[2].length
+                ? result.shoots[2]
                     .map((item) => item.ring)
                     .reduce((last, next) => last + next, 0)
                 : ""

src/components/BattleHeader.vue

@@ -73,7 +73,7 @@ defineProps({
           <text class="player-name">{{ player.name }}</text>
         </view>
         <image
-          v-if="winner === 0"
+          v-if="winner === 2"
           src="../static/winner-badge.png"
           mode="widthFix"
           class="right-winner-badge"

src/components/BowData.vue

@@ -49,16 +49,16 @@ const props = defineProps({
     <view class="desc">
       <text>{{ arrows.length }}</text>
       <text>支箭，共</text>
-      <text>{{ arrows.reduce((a, b) => a + b.ring, 0) }}</text>
+      <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
       <text>环</text>
     </view>
     <ScorePanel
       :completeEffect="false"
-      :rowCount="arrows.length === 12 ? 6 : 9"
+      :rowCount="total === 12 ? 6 : 9"
       :total="total"
-      :scores="arrows.map((a) => a.ring)"
-      :margin="arrows.length === 12 ? 4 : 1"
-      :fontSize="arrows.length === 12 ? 25 : 22"
+      :arrows="arrows"
+      :margin="total === 12 ? 4 : 1"
+      :fontSize="total === 12 ? 25 : 22"
     />
   </view>
 </template>

src/components/BowTarget.vue

@@ -2,7 +2,7 @@
 import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
 import PointSwitcher from "@/components/PointSwitcher.vue";
 
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import { simulShootAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -92,7 +92,10 @@ const simulShoot = async () => {
   if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
 };
 const simulShoot2 = async () => {
-  if (device.value.deviceId) await simulShootAPI(device.value.deviceId, 1, 1);
+  if (device.value.deviceId) {
+    const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
+    await simulShootAPI(device.value.deviceId, r1, r1);
+  }
 };
 
 const env = computed(() => {
@@ -108,28 +111,26 @@ const arrowStyle = computed(() => {
   };
 });
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) return;
+  if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
     if (
-      msg.constructor === MESSAGETYPES.ShootSyncMeArrowID ||
-      msg.constructor === MESSAGETYPES.ShootResult
-    ) {
-      if (
-        msg.userId === user.value.id &&
-        !msg.target.ring &&
-        msg.target.angle >= 0
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
     ) {
       angle.value = null;
       setTimeout(() => {
         if (props.scores[0]) {
           circleColor.value =
-              msg.userId === props.scores[0].playerId ? "#ff4444" : "#1840FF";
+            message.shootData.playerId === props.scores[0].playerId
+              ? "#ff4444"
+              : "#1840FF";
         }
-          angle.value = msg.target.angle;
+        angle.value = message.shootData.angle;
       }, 200);
     }
   }
-  });
 }
 
 onMounted(() => {
@@ -182,7 +183,8 @@ onBeforeUnmount(() => {
           left: calcRealX(latestOne.ring ? latestOne.x : 0, 28),
           top: calcRealY(latestOne.ring ? latestOne.y : 0, 28),
         }"
-        >{{ latestOne.ring || "未上靶" }}<text v-if="latestOne.ring">环</text>
+        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
+        }}<text v-if="latestOne.ring">环</text>
       </view>
       <view
         v-if="
@@ -205,7 +207,7 @@ onBeforeUnmount(() => {
           left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 28),
           top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 28),
         }"
-        >{{ bluelatestOne.ring || "未上靶"
+        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
         }}<text v-if="bluelatestOne.ring">环</text></view
       >
       <block v-for="(bow, index) in scores" :key="index">

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 { getCurrentGameAPI, laserAimAPI } from "@/apis";
+import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
 import AudioManager from "@/audioManager";
 const props = defineProps({
@@ -111,15 +111,19 @@ const backToGame = debounce(async () => {
 
   try {
     isLoading.value = true;
-    const game = await getCurrentGameAPI();
-    if (!game || !game.gameId) {
-      uni.showToast({
-        title: "没有进行中的对局",
-        icon: "none",
+    const result = await getBattleAPI();
+    if (result && result.matchId) {
+      await checkAudioProgress();
+      if (result.mode <= 3) {
+        uni.navigateTo({
+          url: `/pages/team-battle?battleId=${result.matchId}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/melee-battle?battleId=${result.matchId}`,
         });
       }
-
-    showHint.value = false;
+    }
   } catch (error) {
     console.error("获取当前游戏失败:", error);
   } finally {
@@ -131,6 +135,10 @@ const goBack = () => {
   uni.navigateBack();
 };
 
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
 const goCalibration = async () => {
   await laserAimAPI();
   uni.navigateTo({
@@ -198,7 +206,7 @@ const goCalibration = async () => {
           <button hover-class="none" @click="() => (showHint = false)">
             取消
           </button>
-          <button hover-class="none" @click="goBack">确认</button>
+          <button hover-class="none" @click="cancelMatching">确认</button>
         </view>
       </view>
       <view v-if="hintType === 4" class="tip-content">

src/components/CreateRoom.vue

@@ -18,6 +18,7 @@ const props = defineProps({
 });
 
 const battleMode = ref(1);
+const targetMode = ref(1);
 const loading = ref(false);
 const roomNumber = ref("");
 
@@ -32,23 +33,33 @@ const createRoom = debounce(async () => {
   if (battleMode.value === 2) size = 10;
   if (battleMode.value === 3) size = 4;
   if (battleMode.value === 4) size = 6;
+  try {
     const result = await createRoomAPI(
       battleMode.value === 2 ? 2 : 1,
-    battleMode.value === 2 ? 10 : size
+      battleMode.value === 2 ? 10 : size,
+        targetMode.value*20,
     );
     if (result.number) {
       props.onConfirm();
       await joinRoomAPI(result.number);
       uni.navigateTo({
-      url: "/pages/battle-room?roomNumber=" + result.number,
+        url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value,
       });
     }
+  } catch (error) {
+    console.log(error);
+  } finally {
     loading.value = false;
+  }
 });
 </script>
 <template>
   <view class="container">
-    <image src="../static/choose-battle-mode.png" mode="widthFix" />
+    <view class="target-options-header">
+      <view class="target-options-header-line-left"></view>
+      <image class="target-options-header-title-img" src="../static/choose-battle-mode.png" mode="widthFix" />
+      <view class="target-options-header-line-right"></view>
+    </view>
     <view class="create-options">
       <view
         :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }"
@@ -75,6 +86,25 @@ const createRoom = debounce(async () => {
         <text>乱斗模式（3-10人）</text>
       </view>
     </view>
+    <view class="target-options-header">
+      <view class="target-options-header-line-left"></view>
+      <view class="target-options-header-title">选择靶纸</view>
+      <view class="target-options-header-line-right"></view>
+    </view>
+    <view class="target-options">
+      <view
+        :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 1 }"
+        @click="() => (targetMode = 1)"
+      >
+        <text>20厘米全环靶</text>
+      </view>
+      <view
+        :class="{ 'battle-btn': true, 'battle-choosen': targetMode === 2 }"
+        @click="() => (targetMode = 2)"
+      >
+        <text>40厘米全环靶</text>
+      </view>
+    </view>
     <SButton :onClick="createRoom">创建房间</SButton>
   </view>
 </template>
@@ -86,6 +116,7 @@ const createRoom = debounce(async () => {
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-top: 44rpx;
 }
 .container > image:first-child {
   width: 45%;
@@ -100,6 +131,50 @@ const createRoom = debounce(async () => {
   justify-content: center;
   margin-bottom: 15px;
 }
+.target-options-header{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 24rpx;
+}
+.target-options-header-title-img{
+  width: 196rpx;
+  height: 40rpx;
+}
+.target-options-header-title{
+  width: 112rpx;
+  height: 40rpx;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  text-align: center;
+  font-style: normal;
+  text-transform: none;
+  color: #FFEFBA;
+  margin: 0 18rpx;
+}
+.target-options-header-line-left{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 0), rgba(133, 119, 96, 1)) 1 1;
+}
+.target-options-header-line-right{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+}
+.target-options {
+  width: 100%;
+  padding: 0 10px;
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin-bottom: 15px;
+}
 .battle-btn {
   width: 45%;
   height: 55px;

src/components/GuideTwo.vue

@@ -0,0 +1,54 @@
+<script setup>
+defineProps({
+  noBg: {
+    type: Boolean,
+    default: false,
+  }
+});
+</script>
+
+<template>
+  <view class="container">
+    <image class="shooter2" src="../static/shooter2.png" mode="widthFix" />
+    <view class="bg-box">
+      <image
+        class="bg"
+        v-if="!noBg"
+        src="../static/long-bubble-border.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  padding: 0 15px;
+  margin-bottom: 14rpx;
+  width: clac(100% - 30px);
+}
+.container .shooter2 {
+  width: 150rpx;
+  height: 162rpx;
+}
+.container .bg-box {
+  color: #fff;
+  font-size: 28rpx;
+  position: relative;
+  flex: 1;
+  min-height: 55px;
+  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();
@@ -56,10 +56,10 @@ const signin = () => {
 };
 
 const loading = ref(false);
-const showLoader = ref(false);
 const pointBook = ref(null);
 const showProgress = ref(false);
 const heat = ref(0);
+
 const updateLoading = (value) => {
   loading.value = value;
 };
@@ -80,20 +80,12 @@ onMounted(() => {
       pointBook.value = uni.getStorageSync("last-point-book");
     }
   }
-  if (
-    currentPage.route === "pages/team-battle" ||
-    currentPage.route === "pages/melee-match"
-  ) {
-    showLoader.value = true;
-  }
   if (currentPage.route === "pages/team-battle") {
     showProgress.value = true;
   }
-  uni.$on("update-header-loading", updateLoading);
   uni.$on("update-hot", updateHot);
 });
 onBeforeUnmount(() => {
-  uni.$off("update-header-loading", updateLoading);
   uni.$off("update-hot", updateHot);
 });
 </script>
@@ -161,12 +153,6 @@ onBeforeUnmount(() => {
         </view>
       </block>
     </view>
-    <image
-      :style="{ opacity: showLoader && loading ? 0 : 0 }"
-      src="../static/btn-loading.png"
-      mode="widthFix"
-      class="loading"
-    />
     <view v-if="pointBook" class="point-book-info">
       <text>{{ pointBook.bowType.name }}</text>
       <text>{{ pointBook.distance }} 米</text>
@@ -187,6 +173,16 @@ onBeforeUnmount(() => {
     <view v-if="showProgress" class="battle-progress">
       <HeaderProgress />
     </view>
+    <!-- 对战房间：整个胶囊为分享按钮，房号从 Store 读取 -->
+    <button
+      v-if="currentPage === 'pages/battle-room' && game.roomNumber"
+      open-type="share"
+      hover-class="none"
+      class="battle-room-number"
+    >
+      <text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
+      <image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
+    </button>
   </view>
 </template>
 
@@ -230,14 +226,6 @@ onBeforeUnmount(() => {
   font-size: 16px;
   color: #fff;
 }
-.loading {
-  width: 20px;
-  height: 20px;
-  margin-left: 10px;
-  transition: all 0.3s ease;
-  background-blend-mode: darken;
-  animation: rotate 2s linear infinite;
-}
 .point-book-info {
   color: #333;
   position: fixed;
@@ -282,4 +270,37 @@ onBeforeUnmount(() => {
   margin: 0 20rpx;
   max-width: 300rpx;
 }
+/* 对战房间：整个胶囊作为分享按钮，靠右对齐 */
+.battle-room-number {
+  margin-left: auto;
+  margin-right: 10rpx;
+  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;
+  flex-shrink: 0;
+  padding: 0;
+  line-height: normal;
+}
+/* 重置 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

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 import audioManager from "@/audioManager";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import { getDirectionText } from "@/util";
 
 import useStore from "@/store";
@@ -26,9 +26,8 @@ watch(
     let key = [];
     if (newVal.includes("重回")) return;
     if (currentRoundEnded.value) {
-      currentRound.value += 1;
       // 播放当前轮次语音
-      key.push(`第${["一", "二", "三", "四", "五"][currentRound.value - 1]}轮`);
+      key.push(`第${["一", "二", "三", "四", "五"][currentRound.value]}轮`);
     }
     key.push(
       newVal.includes("你")
@@ -47,80 +46,42 @@ const updateSound = () => {
   audioManager.setMuted(!sound.value);
 };
 
-async function onReceiveMessage(messages = []) {
+async function onReceiveMessage(message) {
   if (ended.value) return;
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.ShootResult) {
-      if (melee.value && msg.userId !== user.value.id) return;
-      if (msg.userId === user.value.id) currentShot.value++;
-      if (msg.battleInfo && msg.userId === user.value.id) {
-        const players = [
-          ...(msg.battleInfo.blueTeam || []),
-          ...(msg.battleInfo.redTeam || []),
-        ];
-        const currentPlayer = players.find((p) => p.id === msg.userId);
-        currentShot.value = 0;
-        try {
-          if (
-            currentPlayer &&
-            currentPlayer.shotHistory &&
-            currentPlayer.shotHistory[msg.battleInfo.currentRound]
-          ) {
-            currentShot.value =
-              currentPlayer.shotHistory[msg.battleInfo.currentRound].length;
-          }
-        } catch (_) {}
-      }
-      if (!halfTime.value && msg.target) {
+  if (Array.isArray(message)) return;
+  const { type, mode, current, shootData } = message;
+  if (type === MESSAGETYPESV2.BattleStart) {
+    melee.value = Boolean(mode > 3);
+    totalShot.value = mode === 1 ? 3 : 2;
+    currentRoundEnded.value = true;
+    audioManager.play("比赛开始");
+  } else if (type === MESSAGETYPESV2.BattleEnd) {
+    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++;
+    if (message.shootData) {
       let key = [];
-        key.push(msg.target.ring ? `${msg.target.ring}环` : "未上靶");
-        if (!msg.target.ring)
-          key.push(`向${getDirectionText(msg.target.angle)}调整`);
-        audioManager.play(key);
+      key.push(
+        shootData.ring
+          ? `${shootData.ringX ? "X" : shootData.ring}环`
+          : "未上靶"
+      );
+      if (shootData.angle !== null)
+        key.push(`向${getDirectionText(shootData.angle)}调整`);
+      audioManager.play(key, false);
     }
-    } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
-      if (msg.userId === user.value.id) {
+  } else if (type === MESSAGETYPESV2.NewRound) {
+    currentShot.value = 0;
+    currentRound.value = current.round;
+    currentRoundEnded.value = true;
+  } else if (type === MESSAGETYPESV2.InvalidShot) {
     uni.showToast({
       title: "距离不足，无效",
       icon: "none",
     });
     audioManager.play("射击无效");
   }
-    } else if (msg.constructor === MESSAGETYPES.AllReady) {
-      const { config } = msg.groupUserStatus;
-      if (config && config.mode === 1) {
-        totalShot.value = config.teamSize === 2 ? 3 : 2;
-      }
-      currentRoundEnded.value = true;
-      audioManager.play("比赛开始");
-    } else if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
-      melee.value = true;
-      halfTime.value = false;
-      audioManager.play("比赛开始");
-    } else if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
-      currentShot.value = 0;
-      if (msg.preRoundResult && msg.preRoundResult.currentRound) {
-        currentRound.value = msg.preRoundResult.currentRound;
-        currentRoundEnded.value = true;
-      }
-    } else if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
-      halfTime.value = true;
-      audioManager.play("中场休息");
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      audioManager.play("比赛结束");
-    } else if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      totalShot.value = 0;
-      audioManager.play("决金箭轮");
-      tips.value = "即将开始...";
-      currentRoundEnded.value = false;
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      ended.value = true;
-    } else if (msg.constructor === MESSAGETYPES.BackToGame) {
-      if (msg.battleInfo) {
-        melee.value = msg.battleInfo.config.mode === 2;
-      }
-    }
-  });
 }
 
 const playSound = (key) => {

src/components/PlayerScore.vue

@@ -3,7 +3,7 @@ import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const { user } = storeToRefs(useStore());
 
-defineProps({
+const props = defineProps({
   player: {
     type: Object,
     default: () => ({}),
@@ -23,7 +23,10 @@ const rowCount = new Array(6).fill(0);
     :style="{ borderColor: player.id === user.id ? '#FED847' : '#fff3' }"
   >
     <image
-      :style="{ opacity: scores.length === 12 ? 1 : 0 }"
+      :style="{
+        opacity:
+          (scores[0] || []).length + (scores[1] || []).length === 12 ? 1 : 0,
+      }"
       src="../static/checked-green.png"
       mode="widthFix"
     />
@@ -32,20 +35,24 @@ const rowCount = new Array(6).fill(0);
     <view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
-          <text>{{ scores[index] ? `${scores[index].ring}环` : "-" }}</text>
+          <text>{{
+            scores[0] && scores[0][index] ? `${scores[0][index].ring}环` : "-"
+          }}</text>
         </view>
       </view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
           <text>{{
-            scores[index + 6] ? `${scores[index + 6].ring}环` : "-"
+            scores[1] && scores[1][index] ? `${scores[0][index].ring}环` : "-"
           }}</text>
         </view>
       </view>
     </view>
     <text
       >{{
-        scores.map((s) => s.ring).reduce((last, next) => last + next, 0)
+        scores
+          .map((s) => s.reduce((last, next) => last + next.ring, 0))
+          .reduce((last, next) => last + next, 0)
       }}环</text
     >
   </view>

src/components/PlayerScore2.vue

@@ -9,7 +9,7 @@ defineProps({
     type: String,
     default: "",
   },
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -21,10 +21,6 @@ defineProps({
     type: Number,
     default: 0,
   },
-  totalRing: {
-    type: Number,
-    default: 0,
-  },
 });
 const rowCount = new Array(6).fill(0);
 </script>
@@ -60,19 +56,19 @@ const rowCount = new Array(6).fill(0);
     <view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
-          <text>{{ scores[index] ? `${scores[index].ring}环` : "-" }}</text>
+          <text>{{ arrows[index] ? `${arrows[index].ring}环` : "-" }}</text>
         </view>
       </view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
           <text>{{
-            scores[index + 6] ? `${scores[index + 6].ring}环` : "-"
+            arrows[index + 6] ? `${arrows[index + 6].ring}环` : "-"
           }}</text>
         </view>
       </view>
     </view>
     <view>
-      <text>{{ totalRing }}环</text>
+      <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text>
       <text>积分{{ totalScore }}</text>
     </view>
   </view>

src/components/PlayerSeats.vue

@@ -1,4 +1,6 @@
 <script setup>
+import Avatar from "@/components/Avatar.vue";
+
 const props = defineProps({
   total: {
     type: Number,
@@ -8,6 +10,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  removePlayer: {
+    type: Function,
+    default: () => {},
+  },
 });
 const seats = new Array(props.total).fill(1);
 </script>
@@ -16,11 +22,16 @@ const seats = new Array(props.total).fill(1);
   <view class="players">
     <view v-for="(_, index) in seats" :key="index">
       <image src="../static/player-bg.png" mode="widthFix" />
-      <image
-        v-if="players[index] && players[index].name"
+      <view v-if="players[index] && players[index].name" class="avatar">
+        <Avatar
           :src="players[index].avatar || '../static/user-icon.png'"
-        mode="widthFix"
+          :size="40"
         />
+        <text
+          :style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }"
+          >已准备</text
+        >
+      </view>
       <view v-else class="player-unknow">
         <image src="../static/question-mark.png" mode="widthFix" />
       </view>
@@ -28,48 +39,68 @@ const seats = new Array(props.total).fill(1);
         players[index].name
       }}</text>
       <text v-else :style="{ color: '#fff9' }">虚位以待</text>
-      <view v-if="index === 0" class="founder">创建者</view>
-      <image
+      <view v-if="index === 0" class="founder">管理员</view>
+      <!-- <image
         :src="`../static/player-${index + 1}.png`"
         mode="widthFix"
         class="player-bg"
-      />
+      /> -->
+      <button
+        v-if="index > 0 && players[index]"
+        hover-class="none"
+        class="remove-player"
+        @click="() => removePlayer(players[index])"
+      >
+        <image src="../static/close-white.png" mode="widthFix" />
+      </button>
     </view>
   </view>
 </template>
 
 <style scoped>
 .players {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-  -moz-column-gap: 20px;
-  column-gap: 14px;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  row-gap: 20rpx;
+  column-gap: 25rpx;
   margin-bottom: 20px;
   font-size: 14px;
   padding: 0 14px;
 }
 .players > view {
-  width: calc(50% - 7px);
   display: flex;
   align-items: center;
   position: relative;
   color: #fff;
-  height: 100px;
+  height: 176rpx;
   overflow: hidden;
 }
 .players > view > image:first-child {
   width: 100%;
+  height: 100%;
   position: absolute;
   z-index: -1;
+  top: 0;
 }
-.players > view > image:nth-child(2) {
-  width: 40px;
-  height: 40px;
-  min-height: 40px;
-  margin: 0 10px;
-  border: 1px solid #fff;
-  border-radius: 50%;
+.avatar {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 0 24rpx;
+  margin-top: 16rpx;
+}
+.avatar > text {
+  background-color: #2c261fb3;
+  border: 1rpx solid #a3793f66;
+  color: #fed847;
+  font-size: 16rpx;
+  border-radius: 20rpx;
+  width: 70rpx;
+  text-align: center;
+  margin-top: -16rpx;
+  position: relative;
+  height: 28rpx;
+  line-height: 28rpx;
 }
 .players > view > text:nth-child(3) {
   width: 20vw;
@@ -80,30 +111,48 @@ const seats = new Array(props.total).fill(1);
 .founder {
   position: absolute;
   background-color: #fed847;
-  top: 6px;
+  top: 0;
+  left: 0;
   color: #000;
   font-size: 10px;
   padding: 2px 5px;
   border-top-left-radius: 10px;
   border-bottom-right-radius: 10px;
 }
-.player-bg {
+/* .player-bg {
   position: absolute;
   width: 52px;
   right: 0;
-}
+} */
 .player-unknow {
-  width: 40px;
-  height: 40px;
-  margin: 0 10px;
-  border: 1px solid #fff3;
+  width: 84rpx;
+  height: 84rpx;
+  margin: 0 24rpx;
+  border: 1rpx solid #fff3;
   border-radius: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
   background-color: #69686866;
+  box-sizing: border-box;
 }
 .player-unknow > image {
   width: 40%;
 }
+.remove-player {
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 10rpx;
+  right: 0;
+}
+.remove-player > image {
+  width: 100%;
+  height: 100%;
+  opacity: 0.6;
+}
 </style>

src/components/PlayersRow.vue

@@ -1,137 +0,0 @@
-<script setup>
-defineProps({
-  avatar: {
-    type: String,
-    default: "",
-  },
-  blueTeam: {
-    type: Array,
-    default: () => [],
-  },
-  redTeam: {
-    type: Array,
-    default: () => [],
-  },
-  currentShooterId: {
-    type: Number,
-    default: 0,
-  },
-});
-</script>
-
-<template>
-  <view class="container">
-    <image v-if="avatar" class="avatar" :src="avatar" mode="widthFix" />
-    <view
-      v-if="blueTeam.length && redTeam.length"
-      :style="{ height: 20 + blueTeam.length * 20 + 'px' }"
-    >
-      <view
-        v-for="(player, index) in blueTeam"
-        :key="index"
-        :style="{
-          top: index * 20 + 'px',
-          zIndex: blueTeam.length - index,
-          left: 0,
-        }"
-      >
-        <image
-          class="avatar"
-          :src="player.avatar || '../static/user-icon.png'"
-          mode="widthFix"
-          :style="{
-            borderColor: currentShooterId === player.id ? '#5fadff' : '#fff',
-          }"
-        />
-        <text
-          :style="{
-            color: currentShooterId === player.id ? '#5fadff' : '#fff',
-            fontSize: currentShooterId === player.id ? 16 : 12 + 'px',
-          }"
-        >
-          {{ player.name }}
-        </text>
-      </view>
-    </view>
-    <view
-      v-if="!avatar"
-      :style="{
-        height: 20 + redTeam.length * 20 + 'px',
-      }"
-    >
-      <view
-        v-for="(player, index) in redTeam"
-        :key="index"
-        :style="{
-          top: index * 20 + 'px',
-          zIndex: redTeam.length - index,
-          right: 0,
-        }"
-      >
-        <text
-          :style="{
-            color: currentShooterId === player.id ? '#ff6060' : '#fff',
-            fontSize: currentShooterId === player.id ? 16 : 12 + 'px',
-            textAlign: 'right',
-          }"
-        >
-          {{ player.name }}
-        </text>
-        <image
-          class="avatar"
-          :src="player.avatar || '../static/user-icon.png'"
-          mode="widthFix"
-          :style="{
-            borderColor: currentShooterId === player.id ? '#ff6060' : '#fff',
-          }"
-        />
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.container {
-  width: calc(100% - 30px);
-  margin: 0 15px;
-  margin-top: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-}
-.container > view {
-  width: 50%;
-  position: relative;
-}
-.container > view > view {
-  position: absolute;
-  top: -20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 0.3s linear;
-}
-.container > view > view > text {
-  margin: 0 10px;
-  overflow: hidden;
-  width: 120px;
-  transition: all 0.3s linear;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.avatar {
-  width: 40px;
-  height: 40px;
-  min-width: 40px;
-  min-height: 40px;
-  border: 1px solid #fff;
-  border-radius: 50%;
-}
-.red-avatar {
-  border: 1px solid #ff6060;
-}
-.blue-avatar {
-  border: 1px solid #5fadff;
-}
-</style>

src/components/RoundEndTip.vue

@@ -52,14 +52,14 @@ onBeforeUnmount(() => {
       <view class="point-view1" v-if="bluePoint !== 0 || redPoint !== 0">
         <text>本轮蓝队</text>
         <text>{{
-          (roundData.blueArrows || []).reduce(
+          (roundData.shoots[1] || []).reduce(
             (last, next) => last + next.ring,
             0
           )
         }}</text>
         <text>环，红队</text>
         <text>{{
-          (roundData.redArrows || []).reduce(
+          (roundData.shoots[2] || []).reduce(
             (last, next) => last + next.ring,
             0
           )

src/components/SModal.vue

@@ -88,6 +88,7 @@ watch(
   transform: translateY(100%);
   transition: all 0.3s ease;
   position: relative;
+  background-color: #372E1D;
 }
 .modal-content > image:first-child {
   width: 100%;

src/components/ScorePanel.vue

@@ -9,7 +9,7 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
 <template>
   <view class="container">
     <image
-      v-if="total > 0 && scores.length === total && completeEffect"
+      v-if="total > 0 && arrows.length === total && completeEffect"
       :src="bgImages[bgIndex]"
       class="complete-light"
       :style="{
@@ -79,8 +79,10 @@ onBeforeUnmount(() => {
     >
       <image src="../static/score-bg.png" mode="widthFix" />
       <text
-        :style="{ fontWeight: scores[index] !== undefined ? 'bold' : 'normal' }"
-        >{{ scores[index] !== undefined ? scores[index] : "-" }}</text
+        :style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
+        >{{
+          !arrows[index] ? "-" : arrows[index].ringX ? "X" : arrows[index].ring
+        }}</text
       >
     </view>
   </view>

src/components/ScorePanel2.vue

@@ -1,6 +1,6 @@
 <script setup>
 const props = defineProps({
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -10,37 +10,34 @@ const getSum = (a, b, c) => {
   return sum > 0 ? sum + "环" : "-";
 };
 const roundsName = ["第一轮", "第二轮", "第三轮", "第四轮"];
+const getShowText = (arrow = {}) => {
+  return arrow.ring ? (arrow.ringX ? "X" : arrow.ring + "环") : "-";
+};
 </script>
 <template>
   <view class="container">
     <view>
       <text :style="{ transform: 'translateX(-10%)' }">总成绩</text>
-      <text>{{ scores.reduce((last, next) => last + next, 0) }}环</text>
+      <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text>
     </view>
     <view
       v-for="(_, index) in new Array(
         Math.min(
-          Math.ceil(scores.length / 3) + (scores.length % 3 === 0 ? 1 : 0),
+          Math.ceil(arrows.length / 3) + (arrows.length % 3 === 0 ? 1 : 0),
           4
         )
       ).fill(1)"
       :key="index"
     >
       <text>{{ roundsName[index] }}</text>
-      <text>{{
-        scores[index * 3 + 0] ? scores[index * 3 + 0] + "环" : "-"
-      }}</text>
-      <text>{{
-        scores[index * 3 + 1] ? scores[index * 3 + 1] + "环" : "-"
-      }}</text>
-      <text>{{
-        scores[index * 3 + 2] ? scores[index * 3 + 2] + "环" : "-"
-      }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 0]) }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 1]) }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 2]) }}</text>
       <text :style="{ width: '40%', transform: 'translateX(20%)' }">{{
         getSum(
-          scores[index * 3 + 0],
-          scores[index * 3 + 1],
-          scores[index * 3 + 2]
+          arrows[index * 3 + 0],
+          arrows[index * 3 + 1],
+          arrows[index * 3 + 2]
         )
       }}</text>
     </view>

src/components/ScoreResult.vue

@@ -50,22 +50,26 @@ onMounted(() => {
   if (props.result.lvl > user.value.lvl) {
     showUpgrade.value = true;
   }
-  totalRing.value = (props.result.arrows || []).reduce(
+  totalRing.value = (props.result.details || []).reduce(
     (last, next) => last + next.ring,
     0
   );
 });
 
-const validArrows = computed(() => {
-  return (props.result.arrows || []).filter(
-    (arrow) => arrow.x !== -30 && arrow.y !== -30
-  ).length;
+const getRing = (arrow) => {
+  if (arrow.ringX) return "X";
+  return arrow.ring ? arrow.ring : "-";
+};
+
+const arrows = computed(() => {
+  const data = new Array(props.total).fill({ ring: 0 });
+  (props.result.details || []).forEach((arrow, index) => {
+    data[index] = arrow;
+  });
+  return data;
 });
 
-const getRing = (arrow) => {
-  if (arrow && arrow.x !== -30 && arrow.y !== -30) return arrow.ring;
-  return "-";
-};
+const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
 </script>
 
 <template>
@@ -96,8 +100,8 @@ const getRing = (arrow) => {
       </view>
       <view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }">
         <view v-for="(_, index) in new Array(total).fill(0)" :key="index">
-          {{ getRing(result.arrows[index])
-          }}<text v-if="getRing(result.arrows[index]) !== '-'">环</text>
+          {{ getRing(arrows[index])
+          }}<text v-if="getRing(arrows[index]) !== '-'">环</text>
         </view>
       </view>
       <view>
@@ -133,7 +137,7 @@ const getRing = (arrow) => {
           }}</text
           >环的成绩，所有箭支上靶后的平均点间距为<text
             :style="{ color: '#fed847' }"
-            >{{ Number(result.average_distance.toFixed(2)) }}</text
+            >{{ Number((result.average_distance || 0).toFixed(2)) }}</text
           >，{{
             result.spreadEvaluation === "Dispersed"
               ? "还需要持续改进哦~"
@@ -160,8 +164,8 @@ const getRing = (arrow) => {
       </view>
     </ScreenHint>
     <BowData
-      :total="result.completed_arrows"
-      :arrows="result.arrows"
+      :total="arrows.length"
+      :arrows="result.details"
       :show="showBowData"
       :onClose="() => (showBowData = false)"
     />

src/components/ShootProgress.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
 import audioManager from "@/audioManager";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import { getDirectionText } from "@/util";
 
 import useStore from "@/store";
@@ -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) {
@@ -96,8 +109,12 @@ const resetTimer = (count) => {
 watch(
   () => props.start,
   (newVal) => {
-    if (newVal) resetTimer(props.total);
-    else if (timer.value) clearInterval(timer.value);
+    if (newVal) {
+      resetTimer(props.total);
+    } else {
+      remain.value = 0;
+      clearInterval(timer.value);
+    }
   },
   {
     immediate: true,
@@ -116,62 +133,36 @@ const updateSound = () => {
   audioManager.setMuted(!sound.value);
 };
 
-async function onReceiveMessage(messages = []) {
-  if (ended.value) return;
-  messages.forEach((msg) => {
-    if (
-      (props.battleId && msg.constructor === MESSAGETYPES.ShootResult) ||
-      (!props.battleId && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID)
-    ) {
-      if (props.melee && msg.userId !== user.value.id) return;
-      if (!halfTime.value && msg.target) {
-        let key = [];
-        key.push(msg.target.ring ? `${msg.target.ring}环` : "未上靶");
-        if (!msg.target.ring)
-          key.push(`向${getDirectionText(msg.target.angle)}调整`);
-        audioManager.play(key);
+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;
     }
-    } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
-      if (msg.userId === user.value.id) {
+    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("射击无效");
   }
-    } else if (msg.constructor === MESSAGETYPES.AllReady) {
-      audioManager.play("比赛开始");
-    } else if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
-      halfTime.value = false;
-      audioManager.play("比赛开始");
-    } else if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
-      currentRoundEnded.value = true;
-    } else if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
-      if (props.battleId) {
-        halfTime.value = true;
-        audioManager.play("中场休息");
-        return;
-      }
-      if (wait.value !== msg.wait) {
-        setTimeout(() => {
-          wait.value = msg.wait;
-          if (msg.wait === 20) {
-            halfTime.value = true;
-            audioManager.play("中场休息", false);
-          }
-          if (msg.wait === 0) {
-            halfTime.value = false;
-          }
-        }, 200);
-      }
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      audioManager.play("比赛结束");
-    } else if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      audioManager.play("决金箭轮");
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      ended.value = true;
-    }
-  });
 }
 
 const playSound = (key) => {
@@ -179,13 +170,13 @@ const playSound = (key) => {
 };
 
 onMounted(() => {
-  uni.$on("update-ramain", resetTimer);
+  uni.$on("update-remain", resetTimer);
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("play-sound", playSound);
 });
 
 onBeforeUnmount(() => {
-  uni.$off("update-ramain", resetTimer);
+  uni.$off("update-remain", resetTimer);
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("play-sound", playSound);
   if (timer.value) clearInterval(timer.value);
@@ -210,6 +201,7 @@ onBeforeUnmount(() => {
           width: `${(remain / total) * 100}%`,
           backgroundColor: barColor,
           right: tips.includes('红队') ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
       <text>剩余{{ remain }}秒</text>
@@ -264,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 {RoundGoldImages} from "@/constants";
+
 const props = defineProps({
   tips: {
     type: String,
@@ -19,44 +20,59 @@ const props = defineProps({
 const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
+const loading = ref(false);
+const transitionStyle = ref("all 1s linear");
+const currentTeam = ref(null);
+
+const updateRemain = (value) => {
+  if (value.stop) {
+    if (timer.value) clearInterval(timer.value);
+    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) {
+    remain.value = value.value;
+    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;
+  }
+
+  timer.value = setInterval(() => {
+    loading.value = remain.value === 0;
+    if (remain.value > 0) remain.value--;
+  }, 1000);
+};
 
 watch(
     () => props.tips,
     (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%)";
-    if (newVal.includes("重回")) return;
-    if (newVal.includes("红队") || newVal.includes("蓝队")) {
-      if (timer.value) clearInterval(timer.value);
-      remain.value = props.total;
-      timer.value = setInterval(() => {
-        if (remain.value > 0) remain.value--;
-      }, 1000);
-    }
+
     },
     {
       immediate: true,
     }
 );
 
-const updateRemain = (value) => {
-  if (Math.ceil(value) === remain.value || Math.floor(value) === remain.value)
-    return;
-  if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(value);
-  timer.value = setInterval(() => {
-    if (remain.value > 0) remain.value--;
-  }, 1000);
-};
-
 onMounted(() => {
-  uni.$on("update-ramain", updateRemain);
+  uni.$on("update-remain", updateRemain);
 });
 
 onBeforeUnmount(() => {
-  uni.$off("update-ramain", updateRemain);
+  uni.$off("update-remain", updateRemain);
   if (timer.value) clearInterval(timer.value);
 });
 </script>
@@ -66,17 +82,19 @@ onBeforeUnmount(() => {
     <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
     <view
         :style="{
-        justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start',
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
       }"
     >
       <view
           :style="{
           width: `${(remain / total) * 100}%`,
           background: barColor,
-          right: tips.includes('红队') ? 0 : 'unset',
+          right: currentTeam==='red' ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
-      <text>剩余{{ remain }}秒</text>
+      <text v-if="!loading">剩余{{ remain }}秒</text>
+      <text v-else>···</text>
     </view>
   </view>
 </template>
@@ -88,11 +106,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;
@@ -104,11 +124,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,29 +86,34 @@ const handleLogin = async () => {
       icon: "none",
     });
   }
+  await doLogin();
+};
+
+async function doLogin() {
   loading.value = true;
+  try {
     const wxResult = await wxLogin();
     const fileManager = uni.getFileSystemManager();
     const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
     const base64Url = `data:image/png;base64,${avatarBase64}`;
-  const result = await loginAPI(
-    phone.value,
-    nickName.value,
-    base64Url,
-    wxResult.code
-  );
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
     const data = await getHomeData();
     if (data.user) updateUser(data.user);
     const devices = await getMyDevicesAPI();
     if (devices.bindings && devices.bindings.length) {
-    updateDevice(devices.bindings[0].deviceId, devices.bindings[0].deviceName);
-    try {
+      updateDevice(
+        devices.bindings[0].deviceId,
+        devices.bindings[0].deviceName
+      );
       const data = await getDeviceBatteryAPI();
       updateOnline(data.online);
-    } catch (error) {}
     }
-  loading.value = false;
     props.onClose();
+  } catch (error) {
+    console.log("login error", error);
+  } finally {
+    loading.value = false;
+  }
 };
 
 const openServiceLink = () => {
@@ -133,6 +138,10 @@ const openPrivacyLink = () => {
 
 onShow(() => {
   loading.value = false;
+  agree.value = false;
+  phone.value = "";
+  avatarUrl.value = "";
+  nickName.value = "";
 });
 </script>
 

src/components/Swiper.vue

@@ -75,7 +75,7 @@ const handleChange = (e) => {
 
 .dots {
   position: absolute;
-  bottom: 15%;
+  bottom: 5%;
   left: 50%;
   transform: translateX(-50%);
   display: flex;
@@ -90,6 +90,6 @@ const handleChange = (e) => {
 }
 
 .dot.active {
-  background-color: #000;
+  background-color: #fed847;
 }
 </style>

src/components/TargetPicker.vue

@@ -0,0 +1,197 @@
+<script setup>
+import { ref, watch } from "vue";
+import SButton from "@/components/SButton.vue";
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: () => {},
+  },
+  onConfirm: {
+    type: Function,
+    default: () => {},
+  },
+});
+
+const selectedTarget = ref(2);
+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);
+    }
+  },
+  {}
+);
+
+const handleConfirm = () => {
+  props.onConfirm(selectedTarget.value);
+  props.onClose();
+};
+</script>
+
+<template>
+  <view
+    class="container"
+    v-if="showContainer"
+    :class="{ 'container-show': showContent }"
+    @click="onClose"
+  >
+    <view
+      class="modal-content"
+      :class="{ 'modal-show': showContent }"
+      @click.stop=""
+    >
+      <view class="header">
+        <view class="header-title">
+          <view class="header-title-line-left"></view>
+          <text>选择靶型</text>
+          <view class="header-title-line-right"></view>
+        </view>
+        <view class="close-btn" @click="onClose">
+          <image src="../static/close-yellow.png" mode="widthFix" />
+        </view>
+      </view>
+      <view class="target-options">
+        <view
+          :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }"
+          @click="() => (selectedTarget = 1)"
+        >
+          <text>20厘米全环靶</text>
+        </view>
+        <view style="width: 30rpx"></view>
+        <view
+          :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }"
+          @click="() => (selectedTarget = 2)"
+        >
+          <text>40厘米全环靶</text>
+        </view>
+      </view>
+      <SButton width="694rpx" :onClick="handleConfirm">确定</SButton>
+    </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;
+}
+.container-show {
+  opacity: 1;
+}
+.modal-content {
+  width: 100%;
+  transform: translateY(100%);
+  transition: all 0.3s ease;
+  background: url("https://static.shelingxingqiu.com/attachment/2025-12-04/dep11770wzxg6o2alo.png")
+    no-repeat center top;
+  background-size: 100% auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  box-sizing: border-box;
+  padding-bottom: 68rpx;
+  padding-top: 44rpx;
+}
+.modal-show {
+  transform: translateY(0%);
+}
+.header {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  margin-bottom: 44rpx;
+}
+.header-title{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.header-title text{
+  width: 196rpx;
+  height: 40rpx;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 400;
+  font-size: 28rpx;
+  text-align: center;
+  font-style: normal;
+  text-transform: none;
+  color: #FFEFBA;
+}
+.header-title-line-left{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+}
+.header-title-line-right{
+  width: 214rpx;
+  height: 0rpx;
+  border-radius: 0rpx 0rpx 0rpx 0rpx;
+  border: 1rpx solid;
+  border-image: linear-gradient(90deg, rgba(133, 119, 96, 1), rgba(133, 119, 96, 0)) 1 1;
+ }
+.close-btn {
+  position: absolute;
+  right: 0;
+  top: -10px;
+}
+.close-btn > image {
+  width: 40px;
+  height: 40px;
+}
+.target-options {
+  width: 750rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  margin-bottom: 38rpx;
+}
+.target-btn {
+  width: 332rpx;
+  height: 92rpx;
+  text-align: center;
+  border-radius: 10px;
+  border: 2rpx solid #fff3;
+  box-sizing: border-box;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.target-choosen {
+  color: #fed847;
+  border: 4rpx solid #fed847;
+}
+</style>

src/components/TestDistance.vue

@@ -5,7 +5,7 @@ import BowPower from "@/components/BowPower.vue";
 import Avatar from "@/components/Avatar.vue";
 import audioManager from "@/audioManager";
 import { simulShootAPI } from "@/apis";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -19,12 +19,15 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  count: {
+    type: Number,
+    default: 15,
+  },
 });
 const arrow = ref({});
 const distance = ref(0);
-const debugInfo = ref("");
 const showsimul = ref(false);
-const count = ref(15);
+const count = ref(props.count);
 const timer = ref(null);
 
 const updateTimer = (value) => {
@@ -32,10 +35,12 @@ const updateTimer = (value) => {
 };
 onMounted(() => {
   audioManager.play("请射箭测试距离");
+  if (props.isBattle) {
     timer.value = setInterval(() => {
-    if (count.value > 0) count.value -= 1;
-    else clearInterval(timer.value);
+      count.value -= 1;
+      if (count.value < 0) clearInterval(timer.value);
     }, 1000);
+  }
   uni.$on("update-timer", updateTimer);
 });
 onBeforeUnmount(() => {
@@ -43,18 +48,13 @@ onBeforeUnmount(() => {
   uni.$off("update-timer", updateTimer);
 });
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
-      arrow.value = msg.target;
-      distance.value = Number((msg.target.dst / 100).toFixed(2));
-      debugInfo.value = msg.target;
-      audioManager.play("距离合格");
-    } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
-      distance.value = Number((msg.target.dst / 100).toFixed(2));
-      audioManager.play("距离不足");
+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 () => {
@@ -112,11 +112,12 @@ onBeforeUnmount(() => {
     </view>
     <view v-if="isBattle" class="ready-timer">
       <image src="../static/test-tip.png" mode="widthFix" />
-      <view>
+      <view v-if="count >= 0">
         <text>具体正式比赛还有</text>
         <text>{{ count }}</text>
         <text>秒</text>
       </view>
+      <view v-else> 进入中... </view>
     </view>
   </view>
 </template>

src/components/training/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/components/training/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/components/training/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/constants.js

@@ -30,13 +30,29 @@ export const MESSAGETYPES = {
   SomeoneIsReady: 4168086628,
 };
 
+export const MESSAGETYPESV2 = {
+  AboutToStart: 1,
+  BattleStart: 2,
+  ToSomeoneShoot: 3,
+  ShootResult: 4,
+  NewRound: 5,
+  BattleEnd: 6,
+  HalfRest: 7,
+  TestDistance: 8,
+  MatchSuccess: 9,
+  InvalidShot: 10,
+};
+
 export const topThreeColors = ["#FFD947", "#D2D2D2", "#FFA515"];
 
 export const getMessageTypeName = (id) => {
   for (let key in MESSAGETYPES) {
     if (MESSAGETYPES[key] === id) return key;
   }
-  return null;
+  for (let key in MESSAGETYPESV2) {
+    if (MESSAGETYPESV2[key] === id) return key;
+  }
+  return id;
 };
 
 export const roundsName = {
@@ -102,7 +118,7 @@ export const getBattleResultTips = (
 ) => {
   const getRandomIndex = (len) => Math.floor(Math.random() * len);
   if (gameMode === 1) {
-    if (mode === 1) {
+    if (mode <= 3) {
       if (win) {
         const tests = [
           "https://static.shelingxingqiu.com/attachment/2025-08-01/dbqq1fglywucyoh9zn.png",
@@ -124,7 +140,7 @@ export const getBattleResultTips = (
         ];
         return tests[getRandomIndex(3)];
       }
-    } else if (mode === 2) {
+    } else {
       if (rank <= 3) {
         const tests = [
           "好成绩!全国排位赛等着你!",
@@ -136,7 +152,7 @@ export const getBattleResultTips = (
       }
     }
   } else if (gameMode === 2) {
-    if (mode === 1) {
+    if (mode <= 3) {
       if (win) {
         const tests = [
           "https://static.shelingxingqiu.com/attachment/2025-08-01/dbqq1fgtb29jbdus4g.png",
@@ -158,7 +174,7 @@ export const getBattleResultTips = (
         ];
         return tests[getRandomIndex(3)];
       }
-    } else if (mode === 2) {
+    } else {
       if (score > 0) {
         const tests = [
           "王者一定属于你!",

src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "shoot-miniprograms",
-  "appid": "",
+    "appid" : "__UNI__B03E251",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -40,7 +40,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-      "ios": {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {}
         }
     },

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,10 +31,13 @@
       }
     },
     {
-      "path": "pages/battle-result"
+      "path": "pages/team-battle"
     },
     {
-      "path": "pages/team-battle"
+      "path": "pages/melee-battle"
+    },
+    {
+      "path": "pages/battle-result"
     },
     {
       "path": "pages/point-book-edit"
@@ -102,9 +105,6 @@
     {
       "path": "pages/rank-list"
     },
-    {
-      "path": "pages/melee-match"
-    },
     {
       "path": "pages/match-detail"
     },
@@ -116,6 +116,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

@@ -1,9 +1,9 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, computed, onMounted } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
 import UserUpgrade from "@/components/UserUpgrade.vue";
-import { getGameAPI } from "@/apis";
+import { getBattleAPI } from "@/apis";
 import { topThreeColors, getBattleResultTips } from "@/constants";
 import audioManager from "@/audioManager";
 import useStore from "@/store";
@@ -16,14 +16,10 @@ const ifWin = ref(false);
 const data = ref({});
 const totalPoints = ref(0);
 const rank = ref(0);
+const players = ref([]);
 
 function exit() {
-  const battleInfo = uni.getStorageSync("last-battle");
-  if (battleInfo && battleInfo.roomId) {
-    uni.redirectTo({
-      url: `/pages/battle-room?roomNumber=${battleInfo.roomId}`,
-    });
-  } else if (data.value.roomId) {
+  if (data.value.roomId) {
     uni.redirectTo({
       url: `/pages/battle-room?roomNumber=${data.value.roomId}`,
     });
@@ -33,128 +29,95 @@ function exit() {
 }
 
 onLoad(async (options) => {
+  if (!options.battleId) return;
   const myId = user.value.id;
-  if (options.battleId) {
-    const result = await getGameAPI(
-      options.battleId || "BATTLE-1758270367040321900-868"
+  const result = await getBattleAPI(options.battleId || "60049406950510592");
+  data.value = result;
+  if (result.winTeam) {
+    ifWin.value = result.teams[result.winTeam].players.some(
+      (p) => p.id === myId
     );
-    data.value = {
-      ...result,
-      battleMode: result.gameMode,
-    };
-    if (result.mode === 1) {
-      data.value.redPlayers = Object.values(result.redPlayers);
-      data.value.bluePlayers = Object.values(result.bluePlayers);
-      if (result.redPlayers[myId]) {
-        totalPoints.value = result.redPlayers[myId].totalScore;
-        data.value.myTeam = result.redPlayers[myId].team;
-        ifWin.value = result.winner === 0;
   }
-      if (result.bluePlayers[myId]) {
-        totalPoints.value = result.bluePlayers[myId].totalScore;
-        data.value.myTeam = result.bluePlayers[myId].team;
-        ifWin.value = result.winner === 1;
-      }
-    }
-    if (result.mode === 2) {
-      data.value.playerStats = result.players.map((p) => ({
-        ...p,
-        id: p.playerId,
-      }));
-      const mine = result.players.find((p) => p.playerId === myId);
-      if (mine) totalPoints.value = mine.totalScore;
-      rank.value = result.players.findIndex((p) => p.playerId === myId) + 1;
-    }
-  } else {
-    const battleInfo = uni.getStorageSync("last-battle");
-    if (!battleInfo) return;
-    data.value = {
-      mvps: [],
-      ...battleInfo,
-    };
-    if (battleInfo.mode === 1) {
-      battleInfo.playerStats.forEach((p) => {
-        if (p.team === 1) data.value.bluePlayers = [p];
-        if (p.team === 0) data.value.redPlayers = [p];
-        if (p.mvp) data.value.mvps.push(p);
-      });
-      data.value.mvps.sort((a, b) => b.totalRings - a.totalRings);
-    }
-    rank.value = 0;
-    const mine = battleInfo.playerStats.find((p, index) => {
-      rank.value = index + 1;
-      return p.id === myId;
-    });
-    if (mine) {
-      data.value.myTeam = mine.team;
-      totalPoints.value = mine.totalScore;
-      if (battleInfo.mode === 1) {
-        ifWin.value = mine.team === battleInfo.winner;
-      }
-    }
-  }
-  if (data.value.mode === 1) {
+  if (result.mode <= 3) {
     audioManager.play(ifWin.value ? "胜利" : "失败");
-  } else if (data.value.mode === 2) {
-    if (data.value.battleMode === 1) {
-      if (rank.value <= data.value.playerStats.length * 0.3) {
-        audioManager.play("胜利");
+  } else {
+    players.value = result.resultList.map((item, index) => {
+      const plist = result.teams[0] ? result.teams[0].players : [];
+      const p = plist.find((p) => p.id === item.userId);
+      if (p.id === user.value.id) {
+        totalPoints.value = p.score;
+        rank.value = index + 1;
       }
-    } else if (data.value.battleMode === 2) {
-      if (totalPoints.value > 0) {
+      return {
+        ...item,
+        rank: index + 1,
+        name: p.name,
+        avatar: p.avatar || "",
+      };
+    });
+    if (rank.value <= players.value * 0.3) {
+      audioManager.play("胜利");
+    } else {
       audioManager.play("胜利");
-      } else if (totalPoints.value < 0) {
-        audioManager.play("失败");
-      }
     }
   }
 });
 
+const myTeam = computed(() => {
+  const teams = data.value.teams;
+  if (teams && teams.length) {
+    if (teams[1].players.some((p) => p.id === user.value.id)) return 1;
+  }
+  return 2;
+});
+
 const checkBowData = () => {
   uni.navigateTo({
-    url: `/pages/match-detail?id=${data.value.id}`,
+    url: `/pages/match-detail?battleId=${data.value.matchId}`,
   });
 };
 </script>
 
 <template>
   <view class="container">
-    <block v-if="data.mode === 1">
+    <block v-if="data.mode <= 3">
       <view class="header-team" :style="{ marginTop: '25%' }">
         <image src="../static/battle-result.png" mode="widthFix" />
-        <view class="header-solo" v-if="data.teamSize === 2">
+        <view class="header-solo" v-if="data.mode === 1">
           <text
             :style="{
               background:
-                data.winner === 1
+                data.winTeam === 1
                   ? 'linear-gradient(270deg, #3597ff 0%, rgba(0,0,0,0) 100%);'
                   : 'linear-gradient(270deg, #fd4444 0%, rgba(0, 0, 0, 0) 100%)',
             }"
-            >{{ data.winner === 1 ? "蓝队" : "红队" }}获胜</text
+            >{{ data.winTeam === 1 ? "蓝队" : "红队" }}获胜</text
           >
           <Avatar
             :size="32"
             :src="
-              data.winner === 1
-                ? data.bluePlayers[0].avatar
-                : data.redPlayers[0].avatar
+              data.winTeam === 1
+                ? data.teams[1].players[0].avatar
+                : data.teams[2].players[0].avatar
             "
-            :borderColor="data.winner === 1 ? '#5FADFF' : '#FF5656'"
+            :borderColor="data.winTeam === 1 ? '#5FADFF' : '#FF5656'"
             mode="widthFix"
           />
         </view>
       </view>
-      <view class="header-mvp" v-if="data.teamSize !== 2">
+      <view class="header-mvp" v-if="data.mode === 2 || data.mode === 3">
         <image
-          :src="`../static/${data.winner === 1 ? 'blue' : 'red'}-team-win.png`"
+          :src="`../static/${data.winTeam === 1 ? 'blue' : 'red'}-team-win.png`"
           mode="widthFix"
         />
         <view
           :style="{
-            transform: `translateY(50px) rotate(-${5 + data.mvps.length}deg)`,
+            transform: `translateY(50px) rotate(-${
+              5 + (data.mvp || []).length
+            }deg)`,
           }"
         >
-          <view v-if="data.mvps && data.mvps[0].totalRings">
+          <view v-if="data.mvp && data.mvp[0].totalRings">
             <image src="../static/title-mvp.png" mode="widthFix" />
             <text
               >斩获<text
@@ -164,22 +127,22 @@ const checkBowData = () => {
                   margin: '0 3px',
                   fontWeight: '600',
                 }"
-                >{{ data.mvps[0].totalRings }}</text
+                >{{ data.mvp[0].totalRings }}</text
               >环</text
             >
           </view>
-          <view v-if="data.mvps && data.mvps.length">
-            <view v-for="(player, index) in data.mvps" :key="index">
+          <view v-if="data.mvp && data.mvp.length">
+            <view v-for="(player, index) in data.mvp" :key="index">
               <view class="team-avatar">
                 <Avatar
                   :src="player.avatar"
                   :size="40"
-                  :borderColor="data.myTeam === 1 ? '#5fadff' : '#ff6060'"
+                  :borderColor="myTeam === 1 ? '#5fadff' : '#ff6060'"
                 />
                 <text
                   v-if="player.id === user.id"
                   :style="{
-                    backgroundColor: data.myTeam === 1 ? '#5fadff' : '#ff6060',
+                    backgroundColor: myTeam === 1 ? '#5fadff' : '#ff6060',
                   }"
                   >自己</text
                 >
@@ -198,7 +161,7 @@ const checkBowData = () => {
         />
         <image
           :src="
-            getBattleResultTips(data.battleMode, data.mode, {
+            getBattleResultTips(data.way, data.mode, {
               win: ifWin,
             })
           "
@@ -207,7 +170,7 @@ const checkBowData = () => {
         />
       </view>
     </block>
-    <block v-if="data.mode === 2">
+    <block v-else>
       <view class="header-melee">
         <view />
         <image src="../static/battle-result.png" mode="widthFix" />
@@ -216,11 +179,11 @@ const checkBowData = () => {
       <view
         class="players"
         :style="{
-          height: `${Math.max(data.playerStats.length > 5 ? '330' : '300')}px`,
+          height: `${Math.max(players.length > 5 ? '330' : '300')}px`,
         }"
       >
         <view
-          v-for="(player, index) in data.playerStats"
+          v-for="(player, index) in players"
           :key="index"
           :style="{
             border: player.id === user.id ? '1px solid #B04630' : 'none',
@@ -275,7 +238,7 @@ const checkBowData = () => {
             <text>{{ getLvlName(player.rank_lvl) }}</text>
           </view>
           <text
-            ><text :style="{ color: '#fff' }">{{ player.totalRings }}</text>
+            ><text :style="{ color: '#fff' }">{{ player.totalRing }}</text>
             环</text
           >
         </view>
@@ -283,36 +246,36 @@ const checkBowData = () => {
     </block>
     <view
       class="battle-e"
-      :style="{ marginTop: data.mode === 2 ? '20px' : '20vw' }"
+      :style="{ marginTop: data.mode > 3 ? '20px' : '20vw' }"
     >
       <image src="../static/row-yellow-bg.png" mode="widthFix" />
       <view class="team-avatar">
         <Avatar
           :src="user.avatar"
           :size="40"
-          :borderColor="data.myTeam === 1 ? '#5fadff' : '#ff6060'"
+          :borderColor="myTeam === 1 ? '#5fadff' : '#ff6060'"
         />
         <text
           :style="{ backgroundColor: '#5fadff' }"
-          v-if="data.mode === 1 && data.myTeam === 1"
+          v-if="data.mode <= 3 && myTeam === 1"
           >蓝队</text
         >
         <text
           :style="{ backgroundColor: '#ff6060' }"
-          v-if="data.mode === 1 && data.myTeam === 0"
+          v-if="data.mode <= 3 && myTeam === 2"
           >红队</text
         >
       </view>
-      <text v-if="data.battleMode === 1">
+      <text v-if="data.way === 1">
         你的经验 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
       </text>
-      <text v-if="data.battleMode === 2">
+      <text v-if="data.way === 2">
         你的积分 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}
       </text>
     </view>
-    <text v-if="data.mode === 2" class="description">
+    <text v-if="data.mode > 3" class="description">
       {{
-        getBattleResultTips(data.battleMode, data.mode, {
+        getBattleResultTips(data.way, data.mode, {
           win: ifWin,
           score: totalPoints,
           rank,

src/pages/battle-room.vue

@@ -1,12 +1,12 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
-import { onLoad, onShareAppMessage } from "@dcloudio/uni-app";
+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 SModal from "@/components/SModal.vue";
 import Avatar from "@/components/Avatar.vue";
+import ScreenHint from "@/components/ScreenHint.vue";
 import {
   getRoomAPI,
   destroyRoomAPI,
@@ -14,9 +14,9 @@ import {
   startRoomAPI,
   chooseTeamAPI,
   getReadyAPI,
+  kickPlayerAPI,
 } from "@/apis";
-
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -30,18 +30,34 @@ const players = ref([]);
 const blueTeam = ref([]);
 const redTeam = ref([]);
 
-const showModal = ref(false);
-const battleType = ref(0);
-const refreshRoomTimer = ref(null);
+/**
+ * 根据对战类型和房间人数动态生成页面标题
+ * 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}对抗赛`;
+});
+
 const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
+const goBattle = ref(false);
 
+/**
+ * 从服务端刷新当前房间数据，更新成员列表、准备状态等信息
+ * 仅在 roomNumber 有效且房间未开始时执行
+ */
 async function refreshRoomData() {
+  if (!roomNumber.value) return;
   const result = await getRoomAPI(roomNumber.value);
   if (result.started) return;
   room.value = result;
-  battleType.value = result.battleType;
+  owner.value = {};
+  opponent.value = {};
   const members = result.members || [];
   if (members.length === result.count) {
     allReady.value = members.every((m) => !!m.userInfo.state);
@@ -60,6 +76,7 @@ async function refreshRoomData() {
         name: m.userInfo.name,
         avatar: m.userInfo.avatar,
         rankLvl: m.userInfo.rankLvl,
+        ready: !!m.userInfo.state,
       };
       return true;
     }
@@ -73,6 +90,7 @@ async function refreshRoomData() {
           name: m.userInfo.name,
           avatar: m.userInfo.avatar,
           rankLvl: m.userInfo.rankLvl,
+          ready: !!m.userInfo.state,
         };
       }
     });
@@ -94,7 +112,7 @@ async function refreshRoomData() {
     refreshMembers(result.members);
   }
   if (timer.value) clearInterval(timer.value);
-  timer.value = setTimeout(refreshRoomData, 1000);
+  // timer.value = setTimeout(refreshRoomData, 2000);
 }
 
 const startGame = async () => {
@@ -112,8 +130,8 @@ const refreshMembers = (members = []) => {
     players.value[index] = { ...m.userInfo, groupType: m.groupType };
     if (m.groupType === 1) {
       blueTeam.value.push({ ...m.userInfo, groupType: 1 });
-    } else if (m.groupType === 0) {
-      redTeam.value.push({ ...m.userInfo, groupType: 0 });
+    } else if (m.groupType === 2) {
+      redTeam.value.push({ ...m.userInfo, groupType: 2 });
     }
   });
   for (let i = 0; i < room.value.count / 2; i++) {
@@ -122,66 +140,28 @@ const refreshMembers = (members = []) => {
   }
 };
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.roomNumber === roomNumber.value) {
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) {
+    message.forEach((msg) => {
+      if (msg.roomNumber !== roomNumber.value) return;
       if (msg.constructor === MESSAGETYPES.UserEnterRoom) {
-        if (battleType.value === 1) {
-          if (msg.userId === room.value.creator) {
-            owner.value = {
-              id: msg.userId,
-              name: msg.name,
-              avatar: msg.avatar,
-              rankLvl: msg.rankLvl,
-            };
-          } else {
-            opponent.value = {
-              id: msg.userId,
-              name: msg.name,
-              avatar: msg.avatar,
-              rankLvl: msg.rankLvl,
-            };
-          }
-        }
-        if (battleType.value === 2) {
-          if (room.value.creator === msg.userId) {
-            players.value[0] = {
-              id: msg.userId,
-              name: msg.name,
-              avatar: msg.avatar,
-              rankLvl: msg.rankLvl,
-            };
-          } else {
-            players.value.push({
-              id: msg.userId,
-              name: msg.name,
-              avatar: msg.avatar,
-              rankLvl: msg.rankLvl,
-            });
-          }
-        }
+        refreshRoomData();
       } else if (msg.constructor === MESSAGETYPES.UserExitRoom) {
-        if (battleType.value === 1) {
-          if (msg.userId === room.value.creator) {
-            owner.value = {
-              id: "",
-            };
+        if (msg.userId === user.value.id) {
+          uni.showToast({
+            title: "你被踢出房间",
+            icon: "none",
+          });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 1000);
         } else {
-            opponent.value = {
-              id: "",
-            };
-          }
-        }
-        if (battleType.value === 2) {
-          players.value = players.value.filter((p) => p.id !== msg.userId);
-        }
-        if (msg.room && msg.room.members) {
-          refreshMembers(msg.room.members);
+          refreshRoomData();
         }
       } else if (msg.constructor === MESSAGETYPES.TeamUpdate) {
-        if (msg.room && msg.room.members) {
-          refreshMembers(msg.room.members);
-        }
+        refreshRoomData();
+      } else if (msg.constructor === MESSAGETYPES.SomeoneIsReady) {
+        refreshRoomData();
       } else if (msg.constructor === MESSAGETYPES.RoomDestroy) {
         uni.showToast({
           title: "房间已解散",
@@ -190,41 +170,25 @@ async function onReceiveMessage(messages = []) {
         setTimeout(() => {
           uni.navigateBack();
         }, 1000);
-      } else if (msg.constructor === MESSAGETYPES.SomeoneIsReady) {
-        refreshRoomData();
       }
-    } else if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      if (msg.groupUserStatus) {
-        uni.setStorageSync("red-team", msg.groupUserStatus.redTeam);
-        uni.setStorageSync("blue-team", msg.groupUserStatus.blueTeam);
-        uni.setStorageSync("melee-players", [
-          ...msg.groupUserStatus.redTeam,
-          ...msg.groupUserStatus.blueTeam,
-        ]);
-        uni.removeStorageSync("current-battle");
-        // 避免离开页面，触发退出房间
-        roomNumber.value = "";
-        if (msg.groupUserStatus.config.mode == 1) {
+    });
+  } else if (message.type === MESSAGETYPESV2.AboutToStart) {
+    goBattle.value = true;
+    if (message.mode <= 3) {
+      uni.setStorageSync("blue-team", message.teams[1].players || []);
+      uni.setStorageSync("red-team", message.teams[2].players || []);
       uni.redirectTo({
-            url: `/pages/team-battle?battleId=${msg.id}&gameMode=1`,
+        url: "/pages/team-battle?battleId=" + message.matchId,
       });
-        } else if (msg.groupUserStatus.config.mode == 2) {
+    } else {
       uni.redirectTo({
-            url: `/pages/melee-match?battleId=${msg.id}&gameMode=1`,
+        url: "/pages/melee-battle?battleId=" + message.matchId,
       });
     }
   }
 }
-  });
-}
 
 const chooseTeam = async (team) => {
-  if (team !== 2) {
-    const notInTeam = room.value.members.some(
-      (m) => m.userInfo.id === user.value.id && m.groupType === 2
-    );
-    if (!notInTeam) return;
-  }
   const result = await chooseTeamAPI(roomNumber.value, team);
   refreshMembers(result.members);
 };
@@ -237,15 +201,46 @@ const exitRoom = async () => {
   uni.navigateBack();
 };
 
-const setClipboardData = () => {
-  uni.setClipboardData({
-    data: roomNumber.value,
-    success() {
-      uni.showToast({ title: "复制成功" });
-    },
-  });
+/** 待确认踢出的玩家信息 */
+const playerToKick = ref(null);
+/** 控制踢出确认弹窗的显示状态 */
+const showKickConfirm = ref(false);
+
+/**
+ * 点击踢出按钮，弹出二次确认弹窗
+ * @param {object} player - 被踢的玩家信息
+ */
+const removePlayer = (player) => {
+  playerToKick.value = player;
+  showKickConfirm.value = true;
 };
 
+/** 确认踢出：调用 API 并关闭弹窗 */
+const confirmKick = async () => {
+  if (!playerToKick.value) return;
+  await kickPlayerAPI(roomNumber.value, playerToKick.value.id);
+  showKickConfirm.value = false;
+  playerToKick.value = null;
+};
+
+/** 取消踢出：关闭弹窗 */
+const cancelKick = () => {
+  showKickConfirm.value = false;
+  playerToKick.value = null;
+};
+
+const canClick = computed(() => {
+  if (ready.value) return false;
+  const { members = [] } = room.value;
+  if (members.length < 2) return false;
+  if (
+    owner.value.id === user.value.id &&
+    members.some((m) => !m.userInfo.state && m.userInfo.id !== owner.value.id)
+  )
+    return false;
+  return true;
+});
+
 onShareAppMessage(() => {
   return {
     title: "邀请您进入房间对战",
@@ -254,13 +249,32 @@ onShareAppMessage(() => {
   };
 });
 
+/**
+ * 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;
-    refreshRoomData();
+    store.updateRoomNumber(options.roomNumber);
   }
 });
 
+/**
+ * 组件挂载后：保持屏幕常亮、注册 WebSocket 消息监听
+ * 房间号已通过 onLoad 同步到 Store，Header 从 Store 直接读取，无需额外通知
+ */
 onMounted(() => {
   uni.setKeepScreenOn({
     keepScreenOn: true,
@@ -269,189 +283,137 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
-  if (refreshRoomTimer.value) clearInterval(refreshRoomTimer.value);
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (roomNumber.value) exitRoomAPI(roomNumber.value);
+  if (!goBattle.value) exitRoomAPI(roomNumber.value);
   if (timer.value) clearInterval(timer.value);
   timer.value = null;
 });
 </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 v-if="battleType === 1">{{
+            <text v-if="room.battleType === 1">{{
               `${room.count / 2}v${room.count / 2}比赛即将开始!`
             }}</text>
-            <text v-if="battleType === 2">大乱斗即将开始! </text>
+            <text v-if="room.battleType === 2">大乱斗即将开始! </text>
           </view>
-          <button hover-class="none" open-type="share">邀请</button>
         </view>
-      </Guide>
-      <view v-if="battleType === 1 && room.count === 2" class="team-mode">
-        <image
-          src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png"
-          mode="widthFix"
-        />
+      </GuideTwo>
+      <view v-if="room.battleType === 1 && room.count === 2" class="team-mode">
+        <image src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png" mode="widthFix" />
         <view>
-          <view
-            v-if="owner.id"
-            class="player"
-            :style="{ transform: 'translateY(-60px)' }"
-          >
-            <Avatar :rankLvl="owner.rankLvl" :src="owner.avatar" :size="60" />
+          <view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }">
+            <Avatar :src="owner.avatar" :size="60" />
+            <text>管理员</text>
             <text>{{ owner.name }}</text>
-            <text>创建者</text>
           </view>
-          <view
-            v-else
-            class="no-player"
-            :style="{ transform: 'translateY(-60px)' }"
-          >
+          <view 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
-            v-if="opponent.id"
-            class="player"
-            :style="{ transform: 'translateY(60px)' }"
-          >
-            <Avatar
-              :rankLvl="opponent.rankLvl"
-              :src="opponent.avatar"
-              :size="60"
-            />
-            <text v-if="opponent.name">{{ opponent.name }}</text>
+          <view 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 v-if="owner.id === user.id" hover-class="none" class="remove-player"
+              @click="() => removePlayer(opponent)">
+              <image src="../static/close-white.png" mode="widthFix" />
+            </button>
           </view>
           <view class="no-player" v-else>
             <image src="../static/question-mark.png" mode="widthFix" />
           </view>
         </view>
       </view>
-      <PlayerSeats
-        v-if="battleType === 2"
-        :total="room.count || 10"
-        :players="players"
-      />
-      <block v-if="battleType === 1 && room.count >= 4">
+      <block v-if="room.battleType === 1 && room.count >= 4">
         <view class="all-players">
-          <image
-            src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.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"
-          />
+          <image src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.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>
+              <text v-if="owner.id === item.id">管理员</text>
+              <button v-if="owner.id !== item.id && item.id" hover-class="none" class="remove-player"
+                @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
+                <image src="../static/close-white.png" mode="widthFix" />
+              </button>
             </view>
           </view>
         </view>
         <view class="choose-side">
           <view>
-            <view
-              v-for="(item, index) in blueTeam"
-              :key="index"
-              class="choose-side-left-item"
-            >
-              <button
-                hover-class="none"
-                v-if="item.id === user.id"
-                @click="chooseTeam(2)"
-              >
+            <view v-for="(item, index) in redTeam" :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>
-              <Avatar v-if="item.id" :src="item.avatar" :size="36" />
+              <view v-if="item.id">
+                <Avatar :src="item.avatar" :size="36" />
+                <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
+              </view>
+              <button v-else hover-class="none" @click="chooseTeam(2)">
+                <image src="../static/add-grey.png" mode="widthFix" />
+              </button>
+            </view>
+          </view>
+          <view>
+            <view 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>
+              </view>
               <button v-else hover-class="none" @click="chooseTeam(1)">
                 <image src="../static/add-grey.png" mode="widthFix" />
               </button>
-            </view>
-          </view>
-          <view>
-            <view
-              v-for="(item, index) in redTeam"
-              :key="index"
-              class="choose-side-right-item"
-            >
-              <Avatar v-if="item.id" :src="item.avatar" :size="36" />
-              <button v-else hover-class="none" @click="chooseTeam(0)">
-                <image src="../static/add-grey.png" mode="widthFix" />
-              </button>
               <text class="truncate">{{ item.name || "我要加入" }}</text>
-              <button
-                hover-class="none"
-                v-if="item.id === user.id"
-                @click="chooseTeam(2)"
-              >
+              <button 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 v-if="room.battleType === 2" :total="room.count || 10" :players="players"
+        :removePlayer="removePlayer" />
       <view>
-        <!-- <SButton
-          v-if="user.id === owner.id && battleType === 1 && room.count === 2"
-          :disabled="!opponent.id"
-          :onClick="startGame"
-          >进入对战</SButton
-        >
-        <SButton
-          v-if="user.id === owner.id && battleType === 2"
-          :disabled="players.length < 3"
-          :onClick="startGame"
-          >进入大乱斗</SButton
-        >
-        <SButton
-          v-if="user.id === owner.id && battleType === 1 && room.count >= 4"
-          :disabled="
-            players.some((p) => p.groupType === undefined || p.groupType === 2)
-          "
-          :onClick="startGame"
-          >开启对局</SButton
-        >
-        <SButton v-if="user.id !== owner.id" disabled>等待房主开启对战</SButton> -->
-        <SButton :disabled="ready" :onClick="getReady">{{
-          allReady.value ? "即将进入对局..." : "我准备好了"
-        }}</SButton>
-        <!-- <text class="tips">创建者点击下一步，所有人即可进入游戏。</text> -->
-      </view>
-    </view>
-    <!-- <SModal
-      :show="showModal"
-      :onClose="() => (showModal = false)"
-      height="520rpx"
-    >
-      <view class="btns">
-        <SButton :onClick="exitRoom" width="200px" :rounded="20">
-          暂时离开
+        <SButton :disabled="!canClick" :onClick="getReady">
+          {{
+            allReady.value
+              ? "即将进入对局..."
+              : owner.id === user.id
+                ? "开始对局"
+                : "我准备好了"
+          }}
         </SButton>
-        <block v-if="owner.id === user.id">
-          <view :style="{ height: '20px' }"></view>
-          <SButton :onClick="destroyRoom" width="200px" :rounded="20">
-            解散房间
-          </SButton>
-        </block>
+        <text class="tips">所有人准备好后由房主点击开始</text>
+      </view>
     </view>
-    </SModal> -->
   </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>
@@ -460,6 +422,7 @@ onBeforeUnmount(() => {
   height: calc(100% - 40px);
   overflow-x: hidden;
 }
+
 .tips {
   color: #fff9;
   width: 100%;
@@ -468,6 +431,7 @@ onBeforeUnmount(() => {
   margin-top: 10px;
   font-size: 12px;
 }
+
 .player-unknow {
   width: 40px;
   height: 40px;
@@ -479,25 +443,30 @@ onBeforeUnmount(() => {
   justify-content: center;
   background-color: #69686866;
 }
+
 .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 {
   position: absolute;
   width: calc(100vw - 30px);
   z-index: -1;
 }
+
 .team-mode>view {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 95%;
 }
+
 .player {
   width: 70px;
   display: flex;
@@ -507,7 +476,9 @@ onBeforeUnmount(() => {
   transform: translateY(-60px);
   color: #fff;
   font-size: 14px;
+  position: relative;
 }
+
 .player>image {
   width: 70px;
   height: 70px;
@@ -515,6 +486,22 @@ onBeforeUnmount(() => {
   background-color: #ccc;
   margin-bottom: 5px;
 }
+
+.player>text:nth-child(2) {
+  color: #000;
+  background-color: #fed847;
+  font-size: 16rpx;
+  border-radius: 20rpx;
+  line-height: 26rpx;
+  padding: 0 10rpx;
+  margin-top: -16rpx;
+  position: relative;
+}
+
+.player>text:nth-child(3) {
+  margin-top: 6rpx;
+}
+
 .player>text {
   max-width: 100px;
   white-space: nowrap;
@@ -522,16 +509,95 @@ onBeforeUnmount(() => {
   text-overflow: ellipsis;
   text-align: center;
 }
-.player > text:nth-child(3) {
-  color: #000;
-  background-color: #fed847;
-  font-size: 8px;
-  border-radius: 10px;
-  padding: 2rpx 10rpx;
+
+.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;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: linear-gradient(0deg, #996c29b8 0%, #201e1aaf 100%);
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+
+.remove-player>image {
+  width: 90%;
+  height: 90%;
+}
+
 .team-mode>view>image:nth-child(2) {
   width: 120px;
 }
+
 .no-player {
   width: 70px;
   height: 70px;
@@ -542,10 +608,12 @@ onBeforeUnmount(() => {
   align-items: center;
   transform: translateY(60px);
 }
+
 .no-player>image {
   width: 20px;
   margin-right: 2px;
 }
+
 .btns {
   height: 100%;
   display: flex;
@@ -553,11 +621,13 @@ onBeforeUnmount(() => {
   align-items: center;
   justify-content: center;
 }
+
 .battle-guide {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
+
 .battle-guide>button:last-child {
   color: #fed847;
   border: 1px solid #fed847;
@@ -567,6 +637,7 @@ onBeforeUnmount(() => {
   position: relative;
   font-size: 28rpx;
 }
+
 .all-players {
   position: relative;
   display: flex;
@@ -574,67 +645,72 @@ onBeforeUnmount(() => {
   align-items: center;
   height: 83vw;
 }
+
 .all-players>image:first-child {
   position: absolute;
   width: 100%;
 }
+
 .all-players>image:nth-child(2) {
   width: 25vw;
   position: relative;
 }
+
 .all-players>view {
   position: relative;
   width: 42vw;
   height: 42vw;
   margin-top: 7vw;
 }
+
 .all-players>view>view {
   position: absolute;
   left: 50%;
   top: 50%;
 }
+
 /* 4个头像 - 正方形排列 */
 .all-players>view>view:nth-child(1):nth-last-child(4) {
-  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw)
-    rotate(30deg);
+  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21.5vw) rotate(30deg);
 }
+
 .all-players>view>view:nth-child(2):nth-last-child(3) {
-  transform: translate(-50%, -50%) rotate(-120deg) translateY(-21.5vw)
-    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)
-    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)
-    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) {
-  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw)
-    rotate(30deg);
+  transform: translate(-50%, -50%) rotate(-30deg) translateY(-21vw) rotate(30deg);
 }
+
 .all-players>view>view:nth-child(2):nth-last-child(5) {
-  transform: translate(-50%, -50%) rotate(-90deg) translateY(-21vw)
-    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)
-    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)
-    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)
-    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)
-    rotate(330deg);
+  transform: translate(-50%, -50%) rotate(-330deg) translateY(-21vw) rotate(330deg);
 }
+
 .all-players>view>view>text {
   position: absolute;
   background-color: #fed847;
@@ -645,19 +721,25 @@ onBeforeUnmount(() => {
   left: calc(50% - 15px);
   width: 30px;
   text-align: center;
+  color: #333;
 }
+
 .choose-side {
   display: flex;
 }
+
 .choose-side>view {
   width: 50%;
 }
+
 .choose-side>view:first-child>view {
   background: linear-gradient(270deg, #6a1212 0%, rgba(74, 0, 0, 0) 100%);
 }
+
 .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;
@@ -669,24 +751,29 @@ onBeforeUnmount(() => {
   margin: 10px 5px;
   position: relative;
 }
+
 .choose-side-left-item {
   justify-content: flex-end;
 }
+
 .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 {
   position: absolute;
   top: 0;
 }
+
 .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 {
   left: 0;
 }
@@ -694,6 +781,7 @@ onBeforeUnmount(() => {
 .choose-side-right-item>button:last-child {
   right: 0;
 }
+
 .choose-side-left-item>button:last-child,
 .choose-side-right-item>button:first-child {
   background-color: #fff;
@@ -703,9 +791,31 @@ onBeforeUnmount(() => {
   display: flex;
   justify-content: center;
   align-items: center;
+  margin-bottom: 14rpx;
 }
+
 .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 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.choose-side-left-item>view>text,
+.choose-side-right-item>view>text {
+  font-size: 16rpx;
+  border-radius: 20rpx;
+  line-height: 26rpx;
+  padding: 0 10rpx;
+  margin-top: -16rpx;
+  position: relative;
+  background-color: #2c261fb3;
+  border: 1rpx solid #a3793f66;
+  color: #fed847;
+}
 </style>

src/pages/device-intro.vue

@@ -5,15 +5,15 @@ import SButton from "@/components/SButton.vue";
 import { capsuleHeight } from "@/util";
 
 const images = [
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmf6yitekatwe.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmi475gqdtrvx.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmgy8ej5wuap5.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmg6y7nveaadv.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlqg9zxastyn3.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlfr041aedqmb.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlpnlyxndnor5.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmg68a8mezgzx.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-10-14/ddht51a3hiyw7ueli4.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_01.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_02.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_03.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_04.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_05.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_06.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_07.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_08.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_09.jpg",
 ];
 
 const addBg = ref(false);
@@ -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

@@ -13,10 +13,15 @@ import BowPower from "@/components/BowPower.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
 import audioManager from "@/audioManager";
-import { createPractiseAPI, getPractiseAPI } from "@/apis";
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -40,14 +45,13 @@ const practiseId = ref("");
 const showGuide = ref(false);
 
 const guideImages = [
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68bs7z5elwvw7.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68qmi7grgreen.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68hgrw1ip4wae.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x684x8zmfrmbla.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x67sding7fodnk.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68mpug7cac4yt.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68my783mlmgxv.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68p48ylzirtb0.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",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wtkcvaxxv0s8.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wry5tw7ltmxr.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wu3kcdrwzwpd.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wwr6hfjhyfn5.png",
 ];
 
 const onSwiperIndexChange = (index) => {
@@ -62,24 +66,35 @@ const createPractise = async (arrows) => {
 };
 
 const onOver = async () => {
-  start.value = false;
   practiseResult.value = await getPractiseAPI(practiseId.value);
+  start.value = false;
 };
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
-      if (step.value === 2 && msg.target.dst / 100 >= 5) {
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    setTimeout(onOver, 1500);
+  } else if (msg.type === MESSAGETYPESV2.TestDistance) {
+    if (msg.shootData.distance / 100 >= 5) {
+      audioManager.play("距离合格");
       btnDisabled.value = false;
       showGuide.value = true;
-      } else if (scores.value.length < total) {
-        scores.value.push(msg.target);
+    } else audioManager.play("距离不足");
   }
-      if (scores.value.length === total) {
-        setTimeout(onOver, 1500);
-      }
-    }
-  });
+  // messages.forEach((msg) => {
+  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+  //     if (step.value === 2 && msg.target.dst / 100 >= 5) {
+  //       btnDisabled.value = false;
+  //       showGuide.value = true;
+  //     } else if (scores.value.length < total) {
+  //       scores.value.push(msg.target);
+  //     }
+  //     if (scores.value.length === total) {
+  //       setTimeout(onOver, 1500);
+  //     }
+  //   }
+  // });
 }
 
 const onClickShare = debounce(async () => {
@@ -102,6 +117,7 @@ onBeforeUnmount(() => {
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
   audioManager.stopAll();
+  endPractiseAPI();
 });
 
 const nextStep = async () => {
@@ -113,13 +129,15 @@ const nextStep = async () => {
     btnDisabled.value = true;
     step.value = 2;
     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) {
     title.value = "小试牛刀";
-    await createPractise(total);
+    await startPractiseAPI();
     scores.value = [];
     step.value = 4;
     start.value = true;
@@ -133,8 +151,8 @@ const nextStep = async () => {
   }
 };
 
-const onClose = () => {
-  const validArrows = (practiseResult.value.arrows || []).filter(
+const onClose = async () => {
+  const validArrows = (practiseResult.value.details || []).filter(
     (a) => a.x !== -30 && a.y !== -30
   );
   if (validArrows.length === total) {
@@ -148,6 +166,8 @@ const onClose = () => {
     start.value = false;
     scores.value = [];
     step.value = 3;
+    const result = await createPractiseAPI(total, 120);
+    if (result) practiseId.value = result.id;
   }
 };
 </script>
@@ -242,16 +262,16 @@ const onClose = () => {
         v-if="step === 4"
         :total="total"
         :rowCount="6"
-        :scores="scores.map((s) => s.ring)"
+        :arrows="scores"
       />
       <ScoreResult
-        v-if="practiseResult.arrows"
+        v-if="practiseResult.details"
         :rowCount="6"
         :total="total"
         :onClose="onClose"
         :result="practiseResult"
         :tipSrc="`../static/${
-          practiseResult.arrows.filter(
+          practiseResult.details.filter(
             (arrow) => arrow.x !== -30 && arrow.y !== -30
           ).length < total
             ? 'un'

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";
@@ -23,8 +23,10 @@ const warnning = ref("");
 const roomNumber = ref("");
 const data = ref({});
 const roomID = ref("");
+const loading = ref(false);
 
 const enterRoom = debounce(async (number) => {
+  if (loading.value) return;
   if (!canEenter(user.value, device.value, online.value)) return;
   if (game.value.inBattle) {
     uni.$showHint(1);
@@ -33,9 +35,15 @@ const enterRoom = debounce(async (number) => {
   if (!number) {
     warnning.value = "请输入房间号";
     showModal.value = true;
-  } else {
+    return;
+  }
+  try {
     const room = await getRoomAPI(number);
-    if (room.number) {
+    if (!room.number) {
+      warnning.value = room.started ? "该房间对战已开始，无法加入" : "查无此房";
+      showModal.value = true;
+      return;
+    }
     const alreadyIn = room.members.find(
       (item) => item.userInfo.id === user.value.id
     );
@@ -47,13 +55,12 @@ const enterRoom = debounce(async (number) => {
         return;
       }
     }
+    loading.value = true;
     uni.navigateTo({
       url: "/pages/battle-room?roomNumber=" + number,
     });
-    } else {
-      warnning.value = room.started ? "该房间对战已开始，无法加入" : "查无此房";
-      showModal.value = true;
-    }
+  } finally {
+    loading.value = false;
   }
 });
 const onCreateRoom = async () => {
@@ -65,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();
@@ -83,16 +97,15 @@ onLoad(async (options) => {
 <template>
   <Container title="好友约战" :showBackToGame="true">
     <view :style="{ width: '100%', height: '100%' }">
-      <Guide>
-        <view class="guide-tips">
-          <text>约上朋友开几局，欢乐多，不寂寞</text>
+      <GuideTwo>
+        <text :style="{color: 'rgba(255,217,71,0.8)'}">约上朋友开几局，欢乐多，不寂寞</text>
         <text>一起练升级更快，早日加入全国排位赛！</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>
@@ -112,16 +125,9 @@ onLoad(async (options) => {
           <view>
             <view class="stars">
               <block v-for="i in 5" :key="i">
-                <image
-                  v-if="data.totalWinningRate >= i * 0.2"
-                  src="../static/star-full.png"
-                  mode="widthFix"
-                />
-                <image
-                  v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1"
-                  src="../static/star-half.png"
-                  mode="widthFix"
-                />
+                <image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" 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>
@@ -132,19 +138,12 @@ onLoad(async (options) => {
       <view class="founded-room">
         <image src="../static/founded-room.png" mode="widthFix" />
         <view>
-          <input
-            placeholder="输入房间号"
-            v-model="roomNumber"
-            placeholder-style="color: #ccc"
-          />
+          <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
           <view @click="enterRoom(roomNumber)">进入房间</view>
         </view>
       </view>
       <view class="create-room">
-        <image
-          src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png"
-          mode="widthFix"
-        />
+        <image 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" />
@@ -159,11 +158,7 @@ onLoad(async (options) => {
           </SButton>
         </view>
       </view>
-      <SModal
-        :show="showModal"
-        :onClose="() => (showModal = false)"
-        height="520rpx"
-      >
+      <SModal :show="showModal" :onClose="() => (showModal = false)" height="716rpx">
         <view v-if="warnning" class="warnning">
           {{ warnning }}
         </view>
@@ -185,9 +180,11 @@ onLoad(async (options) => {
   border-radius: 10px;
   padding: 15px;
 }
+
 .founded-room>image {
   width: 16vw;
 }
+
 .founded-room>view {
   display: flex;
   justify-content: space-between;
@@ -198,6 +195,7 @@ onLoad(async (options) => {
   width: 100%;
   overflow: hidden;
 }
+
 .founded-room>view>input {
   width: 70%;
   text-align: center;
@@ -205,6 +203,7 @@ onLoad(async (options) => {
   height: 40px;
   color: #000;
 }
+
 .founded-room>view>view {
   background-color: #fed847;
   width: 30%;
@@ -216,20 +215,24 @@ onLoad(async (options) => {
   color: #000;
   text-align: center;
 }
+
 .create-room {
   position: relative;
   margin: 15px;
   height: 50vw;
 }
+
 .create-room>image:first-of-type {
   position: absolute;
   width: 100%;
 }
+
 .create-room>image:nth-of-type(2) {
   padding: 15px;
   width: 25vw;
   position: relative;
 }
+
 .create-room>view:nth-child(3) {
   margin: 12vw auto;
   position: relative;
@@ -237,16 +240,19 @@ onLoad(async (options) => {
   align-items: center;
   justify-content: center;
 }
+
 .create-room>view>image:first-child {
   width: 19vw;
   transform: translateY(-60%);
   border-radius: 50%;
   position: relative;
 }
+
 .create-room>view>image:nth-child(2) {
   width: 37vw;
   position: relative;
 }
+
 .create-room>view>view:nth-child(3) {
   position: relative;
   width: 19vw;
@@ -258,10 +264,12 @@ onLoad(async (options) => {
   align-items: center;
   transform: translateY(60%);
 }
+
 .create-room>view>view:nth-child(3)>image {
   width: 20px;
   margin-right: 2px;
 }
+
 .warnning {
   width: 100%;
   height: 100%;
@@ -270,6 +278,7 @@ onLoad(async (options) => {
   align-items: center;
   color: #fff9;
 }
+
 .my-data {
   width: calc(100% - 30px);
   margin: 15px;
@@ -279,11 +288,13 @@ onLoad(async (options) => {
   overflow: hidden;
   background-color: #54431d33;
 }
+
 .my-data>view {
   width: 100%;
   display: flex;
   color: #fff9;
 }
+
 .my-data>view:first-child {
   width: calc(100% - 30px);
   align-items: flex-end;
@@ -292,15 +303,28 @@ onLoad(async (options) => {
   margin: 15px;
   margin-bottom: 0;
 }
+
+.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 {
   margin-bottom: 15px;
 }
+
 .my-data>view:last-child>view {
   width: 33%;
   margin-top: 15px;
@@ -309,24 +333,29 @@ onLoad(async (options) => {
   align-items: center;
   font-size: 12px;
 }
+
 .my-data>view:last-child>view>view {
   margin-bottom: 5px;
 }
+
 .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) {
   border-left: 1px solid #48494e;
   border-right: 1px solid #48494e;
 }
+
 .my-data>view:last-child>view>view {
   display: flex;
   align-items: flex-end;
   height: 20px;
 }
+
 .stars>image {
   width: 4vw;
   height: 4vw;

src/pages/index.vue

@@ -1,51 +1,59 @@
 <script setup>
-import { ref, onMounted } from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+import {onMounted, ref} from "vue";
+import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
-import AppBackground from "@/components/AppBackground.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
 
 import {
+  checkUserBindAPI,
   getAppConfig,
-  getRankListAPI,
+  getDeviceBatteryAPI,
   getHomeData,
   getMyDevicesAPI,
-  getDeviceBatteryAPI,
+  getScoreRankList,
+  silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
-import { canEenter } from "@/util";
 
 import useStore from "@/store";
 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) {
     showModal.value = true;
     return;
   }
-  if (path === "/pages/first-try") {
-    if (canEenter(user.value, device.value, online.value, path)) {
-      await uni.$checkAudio();
-    } else {
-      return;
-    }
-  }
+  // if (path === "/pages/first-try") {
+  // if (canEenter(user.value, device.value, online.value, path)) {
+  //   await uni.$checkAudio();
+  // }
+  // }
   uni.navigateTo({url: path});
 };
 
@@ -56,19 +64,43 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
+  const token = uni.getStorageSync(`${env}_token`);
 
-  const promises = [getRankListAPI()];
-  if (token) {
+  if (!user.value.id && !token) {
+    try {
+      const wxResult = await uni.login({provider: "weixin"});
+      const bindResult = await checkUserBindAPI(wxResult.code);
+      if (bindResult.binded) {
+        const newResult = await uni.login({provider: "weixin"});
+        const silentResult = await silentLoginAPI(newResult.code);
+        if (silentResult.user) updateUser(silentResult.user);
+        const devices = await getMyDevicesAPI();
+        if (devices.bindings && devices.bindings.length) {
+          updateDevice(
+              devices.bindings[0].deviceId,
+              devices.bindings[0].deviceName
+          );
+          const data = await getDeviceBatteryAPI();
+          updateOnline(data.online);
+        }
+      } else {
+        showModal.value = true;
+      }
+    } catch (e) {
+      console.log("检查绑定状态失败", e);
+    }
+  }
+
+  const promises = [getScoreRankList(undefined, 1, 10)];
+  if (token || user.value.id) {
     promises.push(getHomeData());
   }
 
   const [rankList, homeData] = await Promise.all(promises);
 
-  console.log("排行数据", rankList);
-  updateRank(rankList);
+  console.log("积分榜数据", rankList);
+  scoreRankList.value = getScoreRankData(rankList).slice(0, 10);
 
   if (homeData) {
     console.log("首页数据：", homeData);
@@ -77,7 +109,6 @@ onShow(async () => {
       if ("823,209,293,257".indexOf(homeData.user.id) !== -1) {
         const show = uni.getStorageSync("show-the-user");
         if (!show) {
-          showTheUser.value = true;
           uni.setStorageSync("show-the-user", true);
         }
       }
@@ -165,7 +196,8 @@ onShareTimeline(() => {
             </BubbleTip>
           </view>
           <view class="play-card">
-            <view @click="() => toPage('/pages/practise')">
+            <!-- toPage('/pages/practise') -->
+            <view @click="() => toPage('/pages/training/index')">
               <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
             <view @click="() => toPage('/pages/friend-battle')">
@@ -193,7 +225,7 @@ onShareTimeline(() => {
                   class="player-avatar"
                   :style="{
                   zIndex: 8 - i,
-                  borderColor: rankData.rank[i - 1]
+                  borderColor: scoreRankList[i - 1]
                     ? topThreeColors[i - 1] || '#000'
                     : '#000',
                 }"
@@ -204,15 +236,15 @@ onShareTimeline(() => {
                 <view v-if="i > 3">{{ i }}</view>
                 <image
                     :src="
-                    rankData.rank[i - 1]
-                      ? rankData.rank[i - 1].avatar
+                    scoreRankList[i - 1]
+                      ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
                       : '../static/user-icon-dark.png'
                   "
                     mode="aspectFill"
                 />
               </view>
               <view class="more-players">
-                <text>{{ rankData.rank.length }}</text>
+                <text>{{ scoreRankList.length }}</text>
               </view>
             </view>
           </view>
@@ -224,8 +256,9 @@ onShareTimeline(() => {
               <view>
                 <text>段位</text>
                 <text>{{
-                  user.rankLvl ? getLvlName(user.rankLvl) : "暂无"
-                }}</text>
+                    user.lvlName || "暂无"
+                  }}
+                </text>
               </view>
               <view>
                 <text>赛季平均环数</text>
@@ -237,7 +270,8 @@ onShareTimeline(() => {
                     user.avg_win
                         ? Number((user.avg_win * 100).toFixed(2)) + "%"
                         : "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
             </view>
           </view>
@@ -366,6 +400,7 @@ onShareTimeline(() => {
   width: 32rpx;
   height: 32rpx;
 }
+
 .player-avatar > view:first-child {
   border-radius: 50%;
   background: #777777;
@@ -376,6 +411,7 @@ onShareTimeline(() => {
   height: 18px;
   color: #fff;
 }
+
 .player-avatar > image:last-child {
   width: 100%;
   height: 100%;
@@ -394,18 +430,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;
@@ -413,9 +453,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;
@@ -425,11 +467,13 @@ onShareTimeline(() => {
   align-items: center;
   justify-content: center;
 }
+
 .my-data > view:nth-child(2) > view > text:last-child {
   color: #fff;
   line-height: 25px;
   font-weight: 500;
 }
+
 .top-theme {
   position: absolute;
   display: flex;
@@ -439,6 +483,7 @@ onShareTimeline(() => {
   height: 60px;
   z-index: -1;
 }
+
 .top-theme > image {
   width: 300rpx;
   transform: translate(-4%, -14%);

src/pages/match-detail.vue

@@ -5,87 +5,49 @@ import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import Avatar from "@/components/Avatar.vue";
 import PlayerScore2 from "@/components/PlayerScore2.vue";
-import { getGameAPI } from "@/apis";
+import { getBattleAPI } from "@/apis";
 
-const blueTeam = ref([]);
-const redTeam = ref([]);
-const roundsData = ref([]);
-const goldenRoundsData = ref([]);
 const battleId = ref("");
 const data = ref({
-  players: [],
+  teams: [],
+  rounds: [],
 });
+const players = ref([]);
 
 onLoad(async (options) => {
-  if (options.id) {
-    battleId.value = options.id || "BATTLE-1755484626207409508-955";
-    const result = await getGameAPI(battleId.value);
+  if (!options.battleId) return;
+  battleId.value = options.battleId || "60510101693403136";
+  const result = await getBattleAPI(battleId.value);
   data.value = result;
-    if (result.mode === 1) {
-      blueTeam.value = Object.values(result.bluePlayers || {});
-      redTeam.value = Object.values(result.redPlayers || {});
-      Object.values(result.roundsData).forEach((item) => {
-        let bluePoint = 1;
-        let redPoint = 1;
-        let blueTotalRings = 0;
-        let redTotalRings = 0;
-        let blueArrows = [];
-        let redArrows = [];
-        blueTeam.value.forEach((p) => {
-          if (!item[p.playerId]) return;
-          blueTotalRings += item[p.playerId].reduce((a, b) => a + b.ring, 0);
-          blueArrows = [...blueArrows, ...item[p.playerId]];
-        });
-        redTeam.value.forEach((p) => {
-          if (!item[p.playerId]) return;
-          redTotalRings += item[p.playerId].reduce((a, b) => a + b.ring, 0);
-          redArrows = [...redArrows, ...item[p.playerId]];
-        });
-        if (blueTotalRings > redTotalRings) {
-          bluePoint = 2;
-          redPoint = 0;
-        } else if (blueTotalRings < redTotalRings) {
-          bluePoint = 0;
-          redPoint = 2;
-        }
-        roundsData.value.push({
-          blue: {
-            avatars: blueTeam.value.map((p) => p.avatar),
-            arrows: blueArrows,
-            totalRing: blueTotalRings,
-            totalScore: bluePoint,
-          },
-          red: {
-            avatars: redTeam.value.map((p) => p.avatar),
-            arrows: redArrows,
-            totalRing: redTotalRings,
-            totalScore: redPoint,
-          },
-        });
-      });
-      result.goldenRounds.forEach((round) => {
-        goldenRoundsData.value.push({
-          blue: {
-            avatars: blueTeam.value.map((p) => p.avatar),
-            arrows: round.arrowHistory.filter((a) => a.team === 1),
-          },
-          red: {
-            avatars: redTeam.value.map((p) => p.avatar),
-            arrows: round.arrowHistory.filter((a) => a.team === 0),
-          },
-          winner: round.winner,
-        });
+  if (result.mode > 3) {
+    players.value = result.resultList.map((item, index) => {
+      const plist = result.teams[0] ? result.teams[0].players : [];
+      const p = plist.find((p) => p.id === item.userId);
+      const arrows = new Array(12);
+      result.rounds.forEach((r, index) => {
+        if (r.shoots[item.userId]) {
+          r.shoots[item.userId].forEach((s, index2) => {
+            arrows[index2 + index * 6] = s;
           });
         }
+      });
+      return {
+        ...item,
+        rank: index + 1,
+        name: p.name,
+        avatar: p.avatar || "",
+        arrows,
+      };
+    });
   }
 });
 
-const checkBowData = () => {
-  if (data.value.mode === 1) {
+const checkBowData = (selected) => {
+  if (data.value.mode <= 3) {
     uni.navigateTo({
-      url: `/pages/team-bow-data?battleId=${battleId.value}`,
+      url: `/pages/team-bow-data?battleId=${battleId.value}&selected=${selected}`,
     });
-  } else if (data.value.mode === 2) {
+  } else {
     uni.navigateTo({
       url: `/pages/melee-bow-data?battleId=${battleId.value}`,
     });
@@ -97,13 +59,13 @@ const checkBowData = () => {
   <Container title="详情">
     <view class="container">
       <BattleHeader
-        :winner="data.winner"
-        :blueTeam="blueTeam"
-        :redTeam="redTeam"
-        :players="data.players"
+        :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.players && data.players.length"
+        v-if="data.mode >= 3"
         class="score-header"
         :style="{ border: 'none', padding: '5px 15px' }"
       >
@@ -114,141 +76,61 @@ const checkBowData = () => {
         </view>
       </view>
       <PlayerScore2
-        v-if="data.players && data.players.length"
-        v-for="(player, index) in data.players"
+        v-if="data.mode >= 3"
+        v-for="(player, index) in players"
         :key="index"
         :name="player.name"
         :avatar="player.avatar"
-        :scores="player.arrowHistory"
+        :arrows="player.arrows"
         :totalScore="player.totalScore"
-        :totalRing="player.totalRings"
         :rank="index + 1"
       />
-      <block v-for="(round, index) in goldenRoundsData" :key="index">
-        <view class="score-header">
-          <text>决金箭轮（环数）</text>
-          <view @click="checkBowData">
-            <text>查看靶纸</text>
-            <image src="../static/back.png" mode="widthFix" />
-          </view>
-        </view>
-        <view class="score-row">
-          <view>
-            <view>
-              <image
-                v-for="(src, index) in round.blue.avatars"
-                :style="{
-                  borderColor: '#64BAFF',
-                  transform: `translateX(-${index * 15}px)`,
-                }"
-                :src="src"
-                :key="index"
-                mode="widthFix"
-              />
-            </view>
-            <text v-for="(arrow, index) in round.blue.arrows" :key="index">
-              {{ arrow.ring }}环
-            </text>
-          </view>
-          <image
-            v-if="round.winner === 1"
-            src="../static/winner-badge.png"
-            mode="widthFix"
-          />
-        </view>
-        <view class="score-row" :style="{ marginBottom: '5px' }">
-          <view>
-            <view>
-              <image
-                v-for="(src, index) in round.red.avatars"
-                :style="{
-                  borderColor: '#FF6767',
-                  transform: `translateX(-${index * 15}px)`,
-                }"
-                :src="src || '../static/user-icon.png'"
-                :key="index"
-                mode="widthFix"
-              />
-            </view>
-            <text v-for="(arrow, index) in round.red.arrows" :key="index">
-              {{ arrow.ring }}环
-            </text>
-          </view>
-          <image
-            v-if="round.winner === 0"
-            src="../static/winner-badge.png"
-            mode="widthFix"
-          />
-        </view>
-      </block>
       <view
-        v-for="(round, index) in roundsData"
+        v-if="data.mode <= 3"
+        v-for="(round, index) in data.rounds"
         :key="index"
         :style="{ marginBottom: '5px' }"
-      >
-        <block
-          v-if="
-            index < Object.keys(roundsData).length - goldenRoundsData.length
-          "
       >
         <view class="score-header">
-            <text>第{{ index + 1 }}轮</text>
-            <view @click="checkBowData">
+          <text>{{ round.ifGold ? "决金箭" : `第${index + 1}轮` }}</text>
+          <view @click="() => checkBowData(index)">
             <text>查看靶纸</text>
             <image src="../static/back.png" mode="widthFix" />
           </view>
         </view>
-          <view class="score-row">
+        <view
+          class="score-row"
+          v-for="team in Object.keys(round.shoots)"
+          :key="team"
+        >
           <view>
             <view>
               <image
-                  v-for="(src, index) in round.blue.avatars"
+                v-for="(p, index) in data.teams[team].players"
                 :style="{
                   borderColor: '#64BAFF',
                   transform: `translateX(-${index * 15}px)`,
                 }"
-                  :src="src || '../static/user-icon.png'"
+                :src="p.avatar || '../static/user-icon.png'"
                 :key="index"
                 mode="widthFix"
               />
             </view>
-              <text v-for="(arrow, index2) in round.blue.arrows" :key="index2">
-                {{ arrow.ring }}环
+            <text
+              v-for="(arrow, index2) in round.shoots[team]"
+              :key="index2"
+              :style="{ color: arrow.ringX ? '#fed847' : '#ccc' }"
+            >
+              {{ arrow.ringX ? "X" : `${arrow.ring}环` }}
             </text>
           </view>
           <view>
-              <text :style="{ color: '#64BAFF' }">
-                {{ round.blue.totalRing }}环
+            <text :style="{ color: team == 1 ? '#64BAFF' : '#FF6767' }">
+              {{ round.shoots[team].reduce((acc, cur) => acc + cur.ring, 0) }}环
             </text>
-              <text>得分 {{ round.blue.totalScore }}</text>
+            <text>得分 {{ round.scores[team].score }}</text>
           </view>
         </view>
-          <view class="score-row">
-            <view>
-              <view>
-                <image
-                  v-for="(src, index) in round.red.avatars"
-                  :style="{
-                    borderColor: '#FF6767',
-                    transform: `translateX(-${index * 15}px)`,
-                  }"
-                  :src="src || '../static/user-icon.png'"
-                  :key="index"
-                  mode="widthFix"
-                />
-              </view>
-              <text v-for="(arrow, index2) in round.red.arrows" :key="index2">
-                {{ arrow.ring }}环
-              </text>
-            </view>
-            <view>
-              <text :style="{ color: '#FF6767' }">
-                {{ round.red.totalRing }}环
-              </text>
-              <text>得分 {{ round.red.totalScore }}</text>
-            </view>
-          </view>
-        </block>
       </view>
       <view :style="{ height: '20px' }"></view>
     </view>

src/pages/match-page.vue

@@ -3,10 +3,8 @@ import { ref, onMounted, onBeforeUnmount } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Matching from "@/components/Matching.vue";
-import RoundEndTip from "@/components/RoundEndTip.vue";
-import TestDistance from "@/components/TestDistance.vue";
 import { matchGameAPI } from "@/apis";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 
 const gameType = ref(0);
 const teamSize = ref(0);
@@ -16,34 +14,29 @@ async function stopMatch() {
   uni.$showHint(3);
 }
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      if (!onComplete.value) {
-        onComplete.value = () => {
-          if (msg.groupUserStatus) {
-            uni.setStorageSync("red-team", msg.groupUserStatus.redTeam);
-            uni.setStorageSync("blue-team", msg.groupUserStatus.blueTeam);
-            uni.setStorageSync("melee-players", [
-              ...msg.groupUserStatus.redTeam,
-              ...msg.groupUserStatus.blueTeam,
-            ]);
+async function cancelMatch() {
+  if (gameType.value && teamSize.value) {
+    await matchGameAPI(false, gameType.value, teamSize.value);
   }
-          uni.removeStorageSync("current-battle");
+  uni.navigateBack()
+}
+
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.MatchSuccess) {
+    onComplete.value = () => {}
+  }
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
     if (gameType.value == 1) {
       uni.redirectTo({
         url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
       });
     } else if (gameType.value == 2) {
       uni.redirectTo({
-              url: `/pages/melee-match?battleId=${msg.id}&gameMode=2`,
+        url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
       });
     }
-        };
   }
 }
-  });
-}
 
 onLoad(async (options) => {
   if (options.gameType && options.teamSize) {
@@ -57,6 +50,7 @@ onMounted(() => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("cancelMatching", cancelMatch);
 });
 
 onBeforeUnmount(() => {
@@ -64,9 +58,7 @@ onBeforeUnmount(() => {
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+  uni.$off("cancelMatching", cancelMatch);
 });
 
 onShow(async () => {
@@ -76,9 +68,7 @@ onShow(async () => {
 });
 
 onHide(() => {
-  if (gameType.value && teamSize.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
+
 });
 </script>
 

src/pages/melee-battle.vue

@@ -0,0 +1,219 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import BowTarget from "@/components/BowTarget.vue";
+import ShootProgress from "@/components/ShootProgress.vue";
+import BattleHeader from "@/components/BattleHeader.vue";
+import PlayerScore from "@/components/PlayerScore.vue";
+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 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 title = ref("");
+const start = ref(null);
+const battleId = ref("");
+const currentRound = ref(1);
+const tips = ref("即将开始...");
+const players = ref([]);
+const playersSorted = ref([]);
+const playersScores = ref([]);
+const halfTimeTip = ref(false);
+const halfRest = ref(false);
+
+const navigateToResult = () => {
+  uni.redirectTo({ url: `/pages/battle-result?battleId=${battleId.value}` });
+};
+
+function recoverData(battleInfo, { force = false } = {}) {
+  if (!battleInfo) return;
+  try {
+    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
+    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
+    
+    // 优先使用接口数据，否则使用缓存
+    if (battleInfo.teams?.[0]?.players) {
+      players.value = [...battleInfo.teams[0].players];
+    } else {
+      // 大乱斗可能存的是 players 列表
+      // 这里的缓存逻辑根据 AboutToStart 消息结构可能不同，假设也是 teams[0]
+      // 如果是从 match-page 过来的，match-page 只存了 teams[1] 和 [2] 给对抗模式
+      // 大乱斗的匹配逻辑可能不同，暂时保持原样，只做安全保护
+      players.value = []; 
+    }
+    
+    start.value = battleInfo.status !== 0;
+
+    if (battleInfo.status === 0) {
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      if (readyRemain > 0 && readyRemain < 15) {
+        setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
+      }
+      return;
+    }
+
+    tips.value =
+      (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
+    playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
+    const totals = {};
+    players.value.forEach((p) => {
+      const total = playersScores.value.reduce((acc, round) => {
+        const arr = round[p.id] || [];
+        return acc + arr.length;
+      }, 0);
+      totals[p.id] = total;
+    });
+    playersSorted.value = players.value.slice().sort((a, b) => {
+      return totals[b.id] - totals[a.id];
+    });
+    if (battleInfo.status === 3) {
+      halfTimeTip.value = true;
+      halfRest.value = true;
+      tips.value = "准备下半场";
+      // 剩余休息时间
+      // const remain = (Date.now() - battleInfo.timeoutTime) / 1000;
+      setTimeout(() => {
+        uni.$emit("update-remain", 0);
+      }, 200);
+      return;
+    }
+    if (force) {
+      const remain = (Date.now() - (battleInfo.current?.startTime || Date.now())) / 1000;
+      console.log(`当前轮已进行${remain}秒`);
+      if (remain > 0 && remain < 90) {
+        setTimeout(() => {
+          uni.$emit("update-remain", 90 - remain - 0.2);
+        }, 200);
+      }
+    }
+  } catch (err) {
+    console.error("recoverData error:", err);
+  }
+}
+
+onLoad(async (options) => {
+  if (options.battleId) battleId.value = options.battleId;
+  // uni.enableAlertBeforeUnload({
+  //   message: "离开比赛可能导致比赛失败，是否继续？",
+  //   success: (res) => {
+  //     console.log("已启用离开提示");
+  //   },
+  // });
+});
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    halfTimeTip.value = false;
+    halfRest.value = false;
+    recoverData(msg);
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    recoverData(msg);
+  } 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,
+      });
+    }, 1000);
+  }
+}
+onMounted(async () => {
+  uni.setKeepScreenOn({
+    keepScreenOn: true,
+  });
+  uni.$on("socket-inbox", onReceiveMessage);
+  await laserCloseAPI();
+});
+onBeforeUnmount(() => {
+  uni.setKeepScreenOn({
+    keepScreenOn: false,
+  });
+  uni.$off("socket-inbox", onReceiveMessage);
+  audioManager.stopAll();
+});
+
+onShow(async () => {
+  if (battleId.value) {
+    const result = await getBattleAPI(battleId.value);
+    if (!result) return;
+    if (result.status === 2) {
+      uni.showToast({
+        title: "比赛已结束",
+        icon: "none",
+      });
+      uni.navigateBack({
+        delta: 2,
+      });
+    } else {
+      recoverData(result, { force: true });
+    }
+  }
+});
+</script>
+
+<template>
+  <Container :title="title" :bgType="1">
+    <view class="container">
+      <BattleHeader v-if="!start" :players="players" />
+      <TestDistance v-if="start === false" :guide="false" :isBattle="true" />
+      <ShootProgress
+        :show="start"
+        :start="start && !halfRest"
+        :tips="tips"
+        :total="90"
+        :melee="true"
+        :battleId="battleId"
+      />
+      <view v-if="start" class="user-row">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower />
+      </view>
+      <BowTarget
+        v-if="start"
+        :currentRound="
+          playersScores.map((s) => s[user.id].length).reduce((a, b) => a + b, 0)
+        "
+        :totalRound="12"
+        :scores="playersScores.map((r) => r[user.id]).flat()"
+        :stop="halfRest"
+      />
+      <view :style="{ paddingBottom: '20px' }">
+        <PlayerScore
+          v-if="start"
+          v-for="(player, index) in playersSorted"
+          :key="index"
+          :player="player"
+          :scores="playersScores.map((s) => s[player.id])"
+        />
+      </view>
+      <ScreenHint
+        :show="halfTimeTip"
+        mode="small"
+        :onClose="() => (halfTimeTip = false)"
+      >
+        <view class="half-time-tip">
+          <text>上半场结束，休息一下吧:）</text>
+          <text>20秒后开始下半场</text>
+        </view>
+      </ScreenHint>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.container {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/pages/melee-bow-data.vue

@@ -4,28 +4,39 @@ import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import Avatar from "@/components/Avatar.vue";
-import { getGameAPI } from "@/apis";
+import { getBattleAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-const scores = ref([]);
-const currentUser = ref({});
-const data = ref({});
-const onSelect = (userId) => {
-  const user = data.value.players.find((p) => p.playerId === userId);
-  currentUser.value = user;
-  if (user && user.arrowHistory) {
-    scores.value = user.arrowHistory;
-  }
-};
+const { user } = storeToRefs(useStore());
+const currentUser = ref({
+  arrows: [],
+});
+const players = ref([]);
+
 onLoad(async (options) => {
-  if (options.battleId) {
-    const result = await getGameAPI(options.battleId);
-    data.value = result;
-    if (result.players && result.players[0]) {
-      onSelect(result.players[0].playerId);
+  if (!options.battleId) return;
+  const result = await getBattleAPI(options.battleId || "59348111700660224");
+  players.value = result.resultList.map((item, index) => {
+    const plist = result.teams[0] ? result.teams[0].players : [];
+    const p = plist.find((p) => p.id === item.userId);
+    const arrows = new Array(12);
+    result.rounds.forEach((r, index) => {
+      if (r.shoots[item.userId]) {
+        r.shoots[item.userId].forEach((s, index2) => {
+          arrows[index2 + index * 6] = s;
+        });
       }
+    });
+    return {
+      ...item,
+      rank: index + 1,
+      name: p.name,
+      avatar: p.avatar || "",
+      arrows,
+    };
+  });
+  if (players.value[0]) {
+    currentUser.value = players.value[0];
   }
 });
 </script>
@@ -33,22 +44,26 @@ onLoad(async (options) => {
 <template>
   <Container title="靶纸">
     <view class="container">
-      <image src="../static/battle-header-melee.png" mode="widthFix" />
-      <view class="players" v-if="data.players">
+      <image
+        src="../static/battle-header-melee.png"
+        mode="widthFix"
+        :style="{ top: '-50rpx' }"
+      />
+      <view class="players">
         <view
-          v-for="(player, index) in data.players"
+          v-for="(player, index) in players"
           :key="index"
           :style="{
-            width: `${Math.max(100 / data.players.length, 18)}vw`,
-            color: player.playerId === currentUser.playerId ? '#000' : '#fff9',
+            width: `${Math.max(100 / players.length, 18)}vw`,
+            color: player.userId === currentUser.userId ? '#000' : '#fff9',
           }"
-          @click="() => onSelect(player.playerId)"
+          @click="currentUser = player"
         >
           <image
-            v-if="player.playerId === currentUser.playerId"
+            v-if="player.userId === currentUser.userId"
             src="../static/player-bg2.png"
             :style="{
-              width: `${Math.max(100 / data.players.length, 18)}vw`,
+              width: `${Math.max(100 / players.length, 18)}vw`,
             }"
             class="player-bg"
           />
@@ -57,23 +72,25 @@ onLoad(async (options) => {
         </view>
       </view>
       <view :style="{ marginTop: '10px' }">
-        <BowTarget :scores="scores" />
+        <BowTarget :scores="currentUser.arrows" />
       </view>
       <view class="score-text"
-        ><text :style="{ color: '#fed847' }">{{ scores.length }}</text
+        ><text :style="{ color: '#fed847' }">{{
+          currentUser.arrows.length
+        }}</text
         >支箭，共<text :style="{ color: '#fed847' }">{{
-          scores.reduce((last, next) => last + next.ring, 0)
+          currentUser.arrows.reduce((last, next) => last + next.ring, 0)
         }}</text
         >环</view
       >
-      <view class="score-row">
+      <view class="score-row" v-if="currentUser.arrows">
         <view
-          v-for="(score, index) in scores"
+          v-for="(score, index) in currentUser.arrows"
           :key="index"
           class="score-item"
           :style="{ width: '13vw', height: '13vw' }"
         >
-          {{ score.ring }}
+          {{ score.ringX ? "X" : score.ring }}
         </view>
       </view>
     </view>
@@ -97,7 +114,7 @@ onLoad(async (options) => {
   display: flex;
   width: 100%;
   overflow-x: auto;
-  margin-top: 25px;
+  margin-top: 50rpx;
 }
 .players::-webkit-scrollbar {
   width: 0;

src/pages/melee-match.vue

@@ -1,248 +0,0 @@
-<script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
-import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
-import Container from "@/components/Container.vue";
-import BowTarget from "@/components/BowTarget.vue";
-import ShootProgress from "@/components/ShootProgress.vue";
-import BattleHeader from "@/components/BattleHeader.vue";
-import PlayerScore from "@/components/PlayerScore.vue";
-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 audioManager from "@/audioManager";
-import { getCurrentGameAPI, laserCloseAPI } from "@/apis";
-import { isGameEnded } from "@/util";
-import { MESSAGETYPES } from "@/constants";
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-const title = ref("大乱斗");
-const start = ref(false);
-const startCount = ref(true);
-const battleId = ref("");
-const currentRound = ref(1);
-const scores = ref([]);
-const tips = ref("即将开始...");
-const players = ref([]);
-const playersSorted = ref([]);
-const playersScores = ref({});
-const halfTimeTip = ref(false);
-const isEnded = ref(false);
-
-watch(
-  () => [players.value, playersScores.value],
-  ([n_players, n_scores]) => {
-    if (n_players.length) {
-      playersSorted.value = Object.keys(n_scores)
-        .sort((a, b) => n_scores[b].length - n_scores[a].length)
-        .map((pid) => n_players.find((p) => p.id == pid));
-    }
-  },
-  {
-    deep: true, // 添加深度监听
-    immediate: true,
-  }
-);
-
-function recoverData(battleInfo) {
-  uni.removeStorageSync("last-awake-time");
-  // 注释用于测试
-  battleId.value = battleInfo.id;
-  players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
-  players.value.forEach((p) => {
-    playersScores.value[p.id] = [...p.arrows];
-    if (p.id === user.value.id) scores.value = [...p.arrows];
-  });
-  const remain = Date.now() / 1000 - battleInfo.startTime;
-  console.log(`当前局已进行${remain}秒`);
-  if (battleInfo.status === 0) {
-    if (remain > 0) {
-      setTimeout(() => {
-        uni.$emit("update-timer", 15 - remain);
-      }, 200);
-    }
-  } else {
-    start.value = true;
-  }
-  if (battleInfo.status === 2) {
-    const elapsedTime = (Date.now() - Date.parse(battleInfo.createdAt)) / 1000;
-    console.log("elapsedTime:", elapsedTime);
-    startCount.value = true;
-    // 这里的开始时间不是游戏开始时间，而是上半场或者下半场或者中场的开始时间，还要根据状态来判断
-    tips.value = battleInfo.halfGame
-      ? "下半场：请再射6箭"
-      : "上半场：请先射6箭";
-    setTimeout(() => {
-      uni.$emit("update-ramain", 90 - remain);
-    }, 200);
-  } else if (battleInfo.status === 9) {
-    startCount.value = false;
-    tips.value = "准备下半场";
-    setTimeout(() => {
-      uni.$emit("update-ramain", 0);
-    }, 200);
-  }
-}
-
-onLoad(async (options) => {
-  if (options.gameMode == 1) title.value = "好友约战 - 大乱斗";
-  if (options.gameMode == 2) title.value = "排位赛 - 大乱斗";
-  if (options.battleId) {
-    battleId.value = options.battleId;
-    const players = uni.getStorageSync("melee-players");
-    if (players) {
-      players.value = players;
-      players.value.forEach((p) => {
-        playersScores.value[p.id] = [];
-      });
-    }
-    const battleInfo = uni.getStorageSync("current-battle");
-    if (battleInfo) {
-      recoverData(battleInfo);
-      setTimeout(getCurrentGameAPI, 2000);
-    }
-  }
-  uni.enableAlertBeforeUnload({
-    message: "离开比赛可能导致比赛失败，是否继续？",
-    success: (res) => {
-      console.log("已启用离开提示");
-    },
-  });
-});
-
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.id !== battleId.value) return;
-    if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
-      start.value = true;
-      startCount.value = true;
-      tips.value = scores.value.length
-        ? "下半场：请再射6箭"
-        : "上半场：请先射6箭";
-      halfTimeTip.value = false;
-    }
-    if (msg.constructor === MESSAGETYPES.ShootResult) {
-      if (!start.value) getCurrentGameAPI();
-      if (msg.userId === user.value.id) {
-        scores.value.push({ ...msg.target });
-      }
-      playersScores.value[msg.userId].push({ ...msg.target });
-    }
-    if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
-      uni.$emit("update-ramain", 0);
-      [...msg.groupUserStatus.redTeam, ...msg.groupUserStatus.blueTeam].forEach(
-        (player) => {
-          playersScores.value[player.id] = [...player.arrows];
-          if (player.id === user.value.id) scores.value = [...player.arrows];
-        }
-      );
-      startCount.value = false;
-      halfTimeTip.value = true;
-      tips.value = "准备下半场";
-    }
-    if (msg.constructor === MESSAGETYPES.MatchOver) {
-      isEnded.value = true;
-      uni.setStorageSync("last-battle", msg.endStatus);
-      setTimeout(() => {
-        uni.redirectTo({
-          url: "/pages/battle-result",
-        });
-      }, 1000);
-    }
-    if (msg.constructor === MESSAGETYPES.BackToGame) {
-      uni.$emit("update-header-loading", false);
-      if (msg.battleInfo) recoverData(msg.battleInfo);
-    }
-  });
-}
-onMounted(async () => {
-  uni.setKeepScreenOn({
-    keepScreenOn: true,
-  });
-  uni.$on("socket-inbox", onReceiveMessage);
-  await laserCloseAPI();
-});
-onBeforeUnmount(() => {
-  uni.setKeepScreenOn({
-    keepScreenOn: false,
-  });
-  uni.$off("socket-inbox", onReceiveMessage);
-  audioManager.stopAll();
-});
-const refreshTimer = ref(null);
-onShow(async () => {
-  if (battleId.value) {
-    if (!isEnded.value && (await isGameEnded(battleId.value))) return;
-    getCurrentGameAPI();
-    const refreshData = () => {
-      const lastAwakeTime = uni.getStorageSync("last-awake-time");
-      if (lastAwakeTime) {
-        getCurrentGameAPI();
-      } else {
-        clearInterval(refreshTimer.value);
-      }
-    };
-    refreshTimer.value = setInterval(refreshData, 2000);
-  }
-});
-onHide(() => {
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
-  uni.setStorageSync("last-awake-time", Date.now());
-});
-</script>
-
-<template>
-  <Container :title="title" :bgType="1">
-    <view class="container">
-      <BattleHeader v-if="!start" :players="players" />
-      <TestDistance v-if="!start" :guide="false" :isBattle="true" />
-      <ShootProgress
-        :show="start"
-        :start="start && startCount"
-        :tips="tips"
-        :total="90"
-        :melee="true"
-        :battleId="battleId"
-      />
-      <view v-if="start" class="user-row">
-        <Avatar :src="user.avatar" :size="35" />
-        <BowPower />
-      </view>
-      <BowTarget
-        v-if="start"
-        :currentRound="scores.length"
-        :totalRound="12"
-        :scores="scores"
-        :stop="!startCount"
-      />
-      <view :style="{ paddingBottom: '20px' }">
-        <PlayerScore
-          v-if="start"
-          v-for="(player, index) in playersSorted"
-          :key="index"
-          :player="player"
-          :scores="playersScores[player.id] || []"
-        />
-      </view>
-      <ScreenHint
-        :show="halfTimeTip"
-        mode="small"
-        :onClose="() => (halfTimeTip = false)"
-      >
-        <view class="half-time-tip">
-          <text>上半场结束，休息一下吧:）</text>
-          <text>20秒后开始下半场</text>
-        </view>
-      </ScreenHint>
-    </view>
-  </Container>
-</template>
-
-<style scoped>
-.container {
-  width: 100%;
-  height: 100%;
-}
-</style>

src/pages/mine-bow-data.vue

@@ -14,11 +14,10 @@ const arrows = ref([]);
 const total = ref(0);
 
 onLoad(async (options) => {
-  if (options.id) {
-    const result = await getPractiseAPI(options.id);
-    arrows.value = result.arrows;
-    total.value = result.completed_arrows;
-  }
+  if (!options.id) return;
+  const result = await getPractiseAPI(options.id || 176);
+  arrows.value = result.details;
+  total.value = result.details.length;
 });
 </script>
 
@@ -47,7 +46,7 @@ onLoad(async (options) => {
         :completeEffect="false"
         :rowCount="total === 12 ? 6 : 9"
         :total="total"
-        :scores="arrows.map((a) => a.ring)"
+        :arrows="arrows"
         :margin="arrows.length === 12 ? 4 : 1"
         :fontSize="arrows.length === 12 ? 25 : 22"
       />

src/pages/my-device.vue

@@ -8,7 +8,7 @@ import {
   bindDeviceAPI,
   getMyDevicesAPI,
   unbindDeviceAPI,
-  laserAimAPI,
+  laserAimAPI, bindDeviceAPIV2,
 } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -20,6 +20,7 @@ const { updateDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
+const token = ref(null);
 
 // 扫描二维码方法
 const handleScan = () => {
@@ -30,13 +31,14 @@ const handleScan = () => {
     scanType: ["qrCode"],
     success: async (res) => {
       try {
-        const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
-
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // const base64Decode = (str) => {
+        //   // 将 base64 转换为 utf8 字符串
+        //   const bytes = wx.base64ToArrayBuffer(str);
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        // };
+        //
+        // addDevice.value = JSON.parse(base64Decode(res.result));
+        token.value = res.result;
         confirmBindTip.value = true;
       } catch (err) {
         uni.showToast({
@@ -57,8 +59,8 @@ const handleScan = () => {
 };
 
 const confirmBind = async () => {
-  if (!justBind.value && addDevice.value.id) {
-    const result = await bindDeviceAPI(addDevice.value);
+  if (!justBind.value && token.value) {
+    const result = await bindDeviceAPIV2(token.value);
     confirmBindTip.value = false;
     if (result.binded) {
       return uni.showToast({
@@ -66,7 +68,7 @@ const confirmBind = async () => {
         icon: "none",
       });
     }
-    updateDevice(addDevice.value.id, addDevice.value.name);
+    updateDevice(result.deviceId, result.name);
     justBind.value = true;
     uni.showToast({
       title: "绑定成功",

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";
@@ -17,7 +18,7 @@ const practiseList = ref([]);
 
 const toMatchDetail = (id) => {
   uni.navigateTo({
-    url: `/pages/match-detail?id=${id}`,
+    url: `/pages/match-detail?battleId=${id}`,
   });
 };
 const getPractiseDetail = async (id) => {
@@ -52,6 +53,21 @@ const onPractiseLoading = async (page) => {
   }
   return result.length;
 };
+const getName = (battle) => {
+  if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
+  return battle.mode + "人大乱斗";
+};
+
+/**
+ * 支持通过 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>
@@ -80,19 +96,19 @@ const onPractiseLoading = async (page) => {
             <view
               v-for="(item, index) in matchList"
               :key="index"
-              @click="() => toMatchDetail(item.battleId)"
+              @click="() => toMatchDetail(item.id)"
             >
               <view class="contest-header">
-                <text>{{ item.name }}</text>
-                <text>{{ item.createdAt }}</text>
+                <text>{{ getName(item) }}</text>
+                <text>{{ item.createTime }}</text>
                 <image src="../static/back.png" mode="widthFix" />
               </view>
               <BattleHeader
-                :players="item.mode === 1 ? [] : item.players"
-                :blueTeam="item.bluePlayers"
-                :redTeam="item.redPlayers"
-                :winner="item.winner"
-                :showRank="item.mode === 2"
+                :players="item.teams[0] ? item.teams[0].players : []"
+                :blueTeam="item.teams[1] ? item.teams[1].players : []"
+                :redTeam="item.teams[2] ? item.teams[2].players : []"
+                :winner="item.winTeam"
+                :showRank="item.teams[0]"
                 :showHeader="false"
               />
             </view>
@@ -103,19 +119,19 @@ const onPractiseLoading = async (page) => {
             <view
               v-for="(item, index) in battleList"
               :key="index"
-              @click="() => toMatchDetail(item.battleId)"
+              @click="() => toMatchDetail(item.id)"
             >
               <view class="contest-header">
-                <text>{{ item.name }}</text>
-                <text>{{ item.createdAt }}</text>
+                <text>{{ getName(item) }}</text>
+                <text>{{ item.createTime }}</text>
                 <image src="../static/back.png" mode="widthFix" />
               </view>
               <BattleHeader
-                :players="item.mode === 1 ? [] : item.players"
-                :blueTeam="item.bluePlayers"
-                :redTeam="item.redPlayers"
-                :winner="item.winner"
-                :showRank="item.mode === 2"
+                :players="item.teams[0] ? item.teams[0].players : []"
+                :blueTeam="item.teams[1] ? item.teams[1].players : []"
+                :redTeam="item.teams[2] ? item.teams[2].players : []"
+                :winner="item.winTeam"
+                :showRank="item.teams[0]"
                 :showHeader="false"
               />
             </view>
@@ -131,7 +147,7 @@ const onPractiseLoading = async (page) => {
             >
               <text
                 >{{ item.completed_arrows === 36 ? "耐力挑战" : "单组练习" }}
-                {{ item.createdAt }}</text
+                {{ item.createTime }}</text
               >
               <image src="../static/back.png" mode="widthFix" />
             </view>

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/practise-one.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount } from "vue";
-import { onShow } from "@dcloudio/uni-app";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -13,10 +13,15 @@ import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
 import audioManager from "@/audioManager";
 
-import { createPractiseAPI, getPractiseAPI } from "@/apis";
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
-import { MESSAGETYPES, roundsName } from "@/constants";
+import { MESSAGETYPESV2, roundsName } from "@/constants";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -26,51 +31,40 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 12;
-const currentRound = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
 const tips = ref("");
+const targetType = ref(1);
+
+onLoad((options) => {
+  if (options.target) {
+    targetType.value = Number(options.target);
+  }
+});
 
 const onReady = async () => {
-  const result = await createPractiseAPI(total, 2);
-  if (result) practiseId.value = result.id;
-  currentRound.value = 0;
+  await startPractiseAPI();
   scores.value = [];
   start.value = true;
   audioManager.play("练习开始");
 };
 
 const onOver = async () => {
-  start.value = false;
   practiseResult.value = await getPractiseAPI(practiseId.value);
+  start.value = false;
 };
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID && start.value) {
-      if (scores.value.length < total) {
-        scores.value.push(msg.target);
-        currentRound.value += 1;
-        if (currentRound.value === 4) {
-          currentRound.value = 1;
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    // setTimeout(onOver, 1500);
   }
-        if (practiseId && scores.value.length === total / 2) {
-          showGuide.value = true;
-          setTimeout(() => {
-            showGuide.value = false;
-          }, 3000);
-        }
-        if (scores.value.length === total) {
-          setTimeout(onOver, 1500);
-        }
-      }
-    }
-  });
 }
 
 async function onComplete() {
-  const validArrows = (practiseResult.value.arrows || []).filter(
+  const validArrows = (practiseResult.value.details || []).filter(
     (a) => a.x !== -30 && a.y !== -30
   );
   if (validArrows.length === total) {
@@ -80,7 +74,8 @@ async function onComplete() {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    currentRound.value = 0;
+    const result = await createPractiseAPI(total, 120);
+    if (result) practiseId.value = result.id;
   }
 }
 
@@ -89,13 +84,22 @@ const onClickShare = debounce(async () => {
   await wxShare("shareCanvas");
 });
 
-onMounted(() => {
-  audioManager.play("第一轮");
+function onAudioEnded(s) {
+  if (s.indexOf("比赛结束") >= 0) {
+    onOver()
+  }
+}
+
+onMounted(async () => {
+  // audioManager.play("第一轮");
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   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;
 });
 
 onBeforeUnmount(() => {
@@ -104,7 +108,9 @@ onBeforeUnmount(() => {
   });
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
   audioManager.stopAll();
+  endPractiseAPI();
 });
 </script>
 
@@ -115,8 +121,8 @@ onBeforeUnmount(() => {
     :showBottom="!start && !scores.length"
   >
     <view>
-      <TestDistance v-if="!practiseId" />
-      <block v-if="practiseId">
+      <TestDistance v-if="!start && !practiseResult.id" />
+      <block v-else>
         <ShootProgress
           :tips="`${
             !start || scores.length === 12
@@ -138,18 +144,18 @@ onBeforeUnmount(() => {
         </view>
         <BowTarget
           :totalRound="start ? total / 4 : 0"
-          :currentRound="currentRound"
+          :currentRound="scores.length % 3"
           :scores="scores"
         />
-        <ScorePanel2 :scores="scores.map((s) => s.ring)" />
+        <ScorePanel2 :arrows="scores" />
         <ScoreResult
-          v-if="practiseResult.arrows"
+          v-if="practiseResult.details"
           :rowCount="6"
           :total="total"
           :onClose="onComplete"
           :result="practiseResult"
           :tipSrc="`../static/${
-            practiseResult.arrows.filter(
+            practiseResult.details.filter(
               (arrow) => arrow.x !== -30 && arrow.y !== -30
             ).length < total
               ? 'un'

src/pages/practise-two.vue

@@ -12,13 +12,19 @@ import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
 import audioManager from "@/audioManager";
 
-import { createPractiseAPI, getPractiseAPI } from "@/apis";
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+import {onLoad} from "@dcloudio/uni-app";
 const store = useStore();
 const { user } = storeToRefs(store);
 
@@ -28,43 +34,52 @@ const total = 36;
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
+const targetType = ref(1);
+
+onLoad((options) => {
+  if (options.target) {
+    targetType.value = Number(options.target);
+  }
+});
 
 const onReady = async () => {
-  const result = await createPractiseAPI(total, 3);
-  if (result) practiseId.value = result.id;
+  await startPractiseAPI();
   scores.value = [];
   start.value = true;
-  setTimeout(() => {
   audioManager.play("练习开始");
-  }, 300);
 };
 
 const onOver = async () => {
-  start.value = false;
   practiseResult.value = await getPractiseAPI(practiseId.value);
+  start.value = false;
 };
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID && start.value) {
-      if (scores.value.length < total) {
-        scores.value.push(msg.target);
-        if (practiseId && scores.value.length === total / 2) {
-          showGuide.value = true;
-          setTimeout(() => {
-            showGuide.value = false;
-          }, 3000);
-        }
-        if (scores.value.length === total) {
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(onOver, 1500);
   }
-      }
-    }
-  });
+  // messages.forEach((msg) => {
+  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+  //     if (scores.value.length < total) {
+  //       scores.value.push(msg.target);
+  //       if (practiseId && scores.value.length === total / 2) {
+  //         showGuide.value = true;
+  //         setTimeout(() => {
+  //           showGuide.value = false;
+  //         }, 3000);
+  //       }
+  //       if (scores.value.length === total) {
+  //         setTimeout(onOver, 1500);
+  //       }
+  //     }
+  //   }
+  // });
 }
 
 async function onComplete() {
-  const validArrows = (practiseResult.value.arrows || []).filter(
+  const validArrows = (practiseResult.value.details || []).filter(
     (a) => a.x !== -30 && a.y !== -30
   );
   if (validArrows.length === total) {
@@ -74,7 +89,8 @@ async function onComplete() {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    currentRound.value = 0;
+    const result = await createPractiseAPI(total, 3600);
+    if (result) practiseId.value = result.id;
   }
 }
 
@@ -83,12 +99,14 @@ const onClickShare = debounce(async () => {
   await wxShare("shareCanvas");
 });
 
-onMounted(() => {
+onMounted(async () => {
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
+  const result = await createPractiseAPI(total, 3600, targetType.value);
+  if (result) practiseId.value = result.id;
 });
 
 onBeforeUnmount(() => {
@@ -98,18 +116,23 @@ onBeforeUnmount(() => {
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
   audioManager.stopAll();
+  endPractiseAPI();
 });
 </script>
 
 <template>
-  <Container :bgType="1" title="日常耐力挑战" :showBottom="!start && !scores.length">
+  <Container
+    :bgType="1"
+    title="日常耐力挑战"
+    :showBottom="!start && !scores.length"
+  >
     <view>
-      <TestDistance v-if="!practiseId" />
-      <block v-if="practiseId">
+      <TestDistance v-if="!start && !practiseResult.id" />
+      <block v-else>
         <ShootProgress
           :tips="`请连续射${total}支箭`"
           :start="start"
-          :total="0"
+          :total="3600"
           :onStop="onOver"
         />
         <view class="user-row">
@@ -127,20 +150,20 @@ onBeforeUnmount(() => {
         />
         <ScorePanel
           v-if="start"
-          :scores="scores.map((s) => s.ring)"
+          :arrows="scores"
           :total="total"
           :rowCount="total / 4"
           :margin="1.5"
           :font-size="20"
         />
         <ScoreResult
-          v-if="practiseResult.arrows"
+          v-if="practiseResult.details"
           :total="total"
           :rowCount="9"
           :onClose="onComplete"
           :result="practiseResult"
           :tipSrc="`../static/${
-            practiseResult.arrows.filter(
+            practiseResult.details.filter(
               (arrow) => arrow.x !== -30 && arrow.y !== -30
             ).length < total
               ? '2un'

src/pages/practise.vue

@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Guide from "@/components/Guide.vue";
 import Avatar from "@/components/Avatar.vue";
+import TargetPicker from "@/components/TargetPicker.vue";
 import { getPractiseDataAPI } from "@/apis";
 import { canEenter } from "@/util";
 
@@ -12,12 +13,20 @@ import { storeToRefs } from "pinia";
 const store = useStore();
 const { user, device, online } = storeToRefs(store);
 const data = ref({});
+const showTargetPicker = ref(false);
+const pendingPractiseType = ref("");
 
 const goPractise = async (type) => {
   if (!canEenter(user.value, device.value, online.value)) return;
-  await uni.$checkAudio();
+  pendingPractiseType.value = type;
+  showTargetPicker.value = true;
+};
+
+const handleTargetConfirm = (target) => {
+  showTargetPicker.value = false;
+  const type = pendingPractiseType.value;
   uni.navigateTo({
-    url: `/pages/practise-${type}`,
+    url: `/pages/practise-${type}?target=${target}`,
   });
 };
 
@@ -88,6 +97,11 @@ onShow(async () => {
         />
       </view>
     </view>
+    <TargetPicker
+      :show="showTargetPicker"
+      :onClose="() => (showTargetPicker = false)"
+      :onConfirm="handleTargetConfirm"
+    />
   </Container>
 </template>
 

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 createRankState = () => ({
+  list: [],
+  page: 0,
+  pageSize: PAGE_SIZE,
+  loading: false,
+  noMore: false,
+  loaded: false,
+  scrollTop: 0,
+  myData: null,
+  myDataLoaded: false,
+});
+
+const rankTabs = [
+  {
+    key: "score",
+    title: "积分榜",
+    subTitle: "排位赛积分",
+    listApi: getScoreRankList,
+    myApi: getMyScoreRank,
+  },
+  {
+    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 currentList = ref([]);
-const myData = ref({});
+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);
 
-onMounted(async () => {
-  handleSelect(0);
-});
+const getTabConfig = (index = selectedIndex.value) => rankTabs[index];
+const getTabKey = (index = selectedIndex.value) => getTabConfig(index).key;
 
-const handleSelect = (index) => {
-  selectedIndex.value = index;
-  myData.value = {};
-  currentList.value = [];
-  if (index === 0) {
-    currentList.value = rankData.value.rank;
-  } else if (index === 1) {
-    currentList.value = rankData.value.mvpRank;
-  } else if (index === 2) {
-    currentList.value = rankData.value.ringRank;
-  }
-  if (user.value.id) {
-    currentList.value.some((item) => {
-      if (item.userId === user.value.id) {
-        myData.value = item;
-        return true;
-      }
-      return false;
-    });
-    if (!myData.value.userId) {
-      myData.value = {
+// 统一提取榜单接口返回的列表数据，兼容数组和对象两种返回格式。
+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,
-        TotalGames: 0,
+  name: user.value.nickName,
+  avatar: user.value.avatar,
   totalScore: 0,
   mvpCount: 0,
-        TenRings: 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;
   }
+  stickyTabsActive.value = scrollTop >= tabsStickyThreshold.value;
+};
+
+// 只保留一条滚动恢复链路：从当前滚动位置平滑滚到目标位置，避免多套控制同时生效造成闪烁。
+const applyScrollPosition = async (
+  fromScrollTop = currentScrollTop.value,
+  toScrollTop = 0,
+  withAnimation = false
+) => {
+  tabSwitchAnimating.value = withAnimation;
+  restoreScrollTop.value = fromScrollTop;
+  await nextTick();
+  restoreScrollTop.value = toScrollTop;
+  syncScrollVisualState(toScrollTop);
+};
+
+// 请求指定榜单的某一页数据，只有当前榜单会追加分页，不影响其他榜单的浏览状态。
+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 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 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) => {
-  addBg.value = e.detail.scrollTop > 100;
+  const scrollTop = e.detail.scrollTop || 0;
+  if (suppressScrollSync.value) return;
+  syncScrollVisualState(scrollTop);
+  rankStates.value[currentTabKey.value].scrollTop = scrollTop;
 };
 
-const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
+// 计算 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-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']"
-          :key="index"
+        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 rankTabs"
+          :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 class="rank-item-integral" v-if="selectedIndex === 1">
-            <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
-            >次
+            {{ getRankUnit() }}
           </text>
         </view>
-        <view v-if="!currentList.length" class="no-data">
-          <text>筹备中...</text>
+        <view
+          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>
-      <Avatar :src="user.avatar" />
+      <text>{{ getDisplayMyRank(currentMyData) }}</text>
+      <Avatar :src="currentMyData.avatar || user.avatar" />
       <view class="rank-item-content">
-        <text class="truncate">{{ user.nickName }}</text>
-        <text>{{ user.lvlName }}，{{ myData.TotalGames }}场</text>
+        <text class="truncate">{{ currentMyData.name || user.nickName }}</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
-      >
-      <text class="rank-item-integral" v-if="selectedIndex === 1">
-        <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
         >
+          {{ getRankValue(currentMyData) }}
+        </text>
+        {{ getRankUnit() }}
+      </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;
-  margin-top: -15px;
+  padding: 20rpx 10px;
 }
+
 .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

@@ -4,7 +4,6 @@ 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";
-import PlayersRow from "@/components/PlayersRow.vue";
 import BattleFooter from "@/components/BattleFooter.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import SButton from "@/components/SButton.vue";
@@ -12,18 +11,18 @@ 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 { getCurrentGameAPI, laserCloseAPI } from "@/apis";
-import { isGameEnded } from "@/util";
-import { MESSAGETYPES, roundsName } from "@/constants";
+import {laserCloseAPI, getBattleAPI} from "@/apis";
+import {MESSAGETYPESV2} from "@/constants";
 import audioManager from "@/audioManager";
 import useStore from "@/store";
 import {storeToRefs} from "pinia";
+
 const store = useStore();
 const {user} = storeToRefs(store);
-const start = ref(false);
+const start = ref(null);
 const tips = ref("");
 const battleId = ref("");
-const currentRound = ref(1);
+const currentRound = ref(0);
 const goldenRound = ref(0);
 const currentRedPoint = ref(0);
 const currentBluePoint = ref(0);
@@ -37,294 +36,195 @@ const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
-const isEnded = ref(false);
+const matchStatus = ref(undefined);
+const updateRemainSecond = ref(0);
+
+const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
+  try {
+    battleId.value = battleInfo.matchId;
+
+    // 优先使用接口返回的队伍数据，如果没有则尝试从缓存读取（应对匹配刚完成接口未就绪的情况）
+    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;
 
-function recoverData(battleInfo) {
-  uni.removeStorageSync("last-awake-time");
-  battleId.value = battleInfo.id;
-  redTeam.value = battleInfo.redTeam;
-  blueTeam.value = battleInfo.blueTeam;
     if (battleInfo.status === 0) {
-    const readyRemain = Date.now() / 1000 - battleInfo.startTime;
-    console.log(`当前局已进行${readyRemain}秒`);
-    if (readyRemain > 0) {
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      if (readyRemain > 0 && readyRemain < 15) {
         setTimeout(() => {
-        uni.$emit("update-timer", 15 - readyRemain);
+          uni.$emit("update-timer", 15 - readyRemain - 0.2);
         }, 200);
       }
-  } else {
-    start.value = true;
-    bluePoints.value = 0;
-    redPoints.value = 0;
-    currentRound.value = battleInfo.currentRound;
-    roundResults.value = [...battleInfo.roundResults];
-    // 算得分
-    battleInfo.roundResults.forEach((round) => {
-      const blueTotal = round.blueArrows.reduce(
-        (last, next) => last + next.ring,
-        0
-      );
-      const redTotal = round.redArrows.reduce(
-        (last, next) => last + next.ring,
-        0
-      );
-      if (blueTotal === redTotal) {
-        bluePoints.value += 1;
-        redPoints.value += 1;
-      } else if (blueTotal > redTotal) {
-        bluePoints.value += 2;
-      } else {
-        redPoints.value += 2;
-      }
-    });
-    if (battleInfo.goldenRoundNumber) {
-      currentRound.value += battleInfo.goldenRoundNumber;
-      goldenRound.value = battleInfo.goldenRoundNumber;
-      isFinalShoot.value = true;
-      for (let i = 1; i <= battleInfo.goldenRoundNumber; i++) {
-        const redArrows = [];
-        battleInfo.redTeam.forEach((item) => {
-          if (item.shotHistory[roundResults.value.length + 1]) {
-            item.shotHistory[roundResults.value.length + 1]
-              .filter((item) => !!item.playerId)
-              .forEach((item) => redArrows.push(item));
-          }
-        });
-        const blueArrows = [];
-        battleInfo.blueTeam.forEach((item) => {
-          if (item.shotHistory[roundResults.value.length + 1]) {
-            item.shotHistory[roundResults.value.length + 1]
-              .filter((item) => !!item.playerId)
-              .forEach((item) => blueArrows.push(item));
-          }
-        });
-        roundResults.value.push({
-          number: roundResults.value.length + 1,
-          blueArrows,
-          redArrows,
-          blueTotal: blueArrows.reduce((last, next) => last + next.ring, 0),
-          redTotal: redArrows.reduce((last, next) => last + next.ring, 0),
-        });
-      }
-    } else {
-      const hasCurrentRoundData =
-        battleInfo.redTeam.some(
-          (item) => !!item.shotHistory[battleInfo.currentRound]
-        ) ||
-        battleInfo.blueTeam.some(
-          (item) => !!item.shotHistory[battleInfo.currentRound]
+      return;
+    }
+    if (!arrowOnly) {
+      currentShooterId.value = battleInfo.current.playerId;
+      const redPlayer = battleInfo.teams[2].players.find(
+          (item) => item.id === battleInfo.current.playerId
       );
+      let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
+      if (force) nextTips += "重回";
       if (
-        battleInfo.currentRound > battleInfo.roundResults.length &&
-        hasCurrentRoundData
+          battleInfo.current.playerId === user.value.id &&
+          redTeam.value.length > 1
       ) {
-        const blueArrows = [];
-        const redArrows = [];
-        battleInfo.redTeam.forEach((item) =>
-          item.shotHistory[battleInfo.currentRound]
-            .filter((item) => !!item.playerId)
-            .forEach((item) => redArrows.push(item))
-        );
-        battleInfo.blueTeam.forEach((item) =>
-          item.shotHistory[battleInfo.currentRound]
-            .filter((item) => !!item.playerId)
-            .forEach((item) => blueArrows.push(item))
-        );
-        roundResults.value.push({
-          redArrows,
-          blueArrows,
-        });
-      }
-      [...battleInfo.redTeam, ...battleInfo.blueTeam].some((p) => {
-        if (p.id === user.value.id) {
-          const roundArrows = Object.values(p.shotHistory);
-          if (roundArrows.length) {
-            uni.$emit("update-shot", {
-              currentShot: roundArrows[roundArrows.length - 1].length,
-              totalShot: battleInfo.config.teamSize === 2 ? 3 : 2,
-            });
-          }
-          return true;
-        }
-        return false;
-      });
-    }
-    const lastIndex = roundResults.value.length - 1;
-    if (roundResults.value[lastIndex]) {
-      const redArrows = roundResults.value[lastIndex].redArrows;
-      scores.value = [...redArrows]
-        .filter((item) => !!item.playerId)
-        .sort((a, b) => a.shotTimeUnix - b.shotTimeUnix);
-      const blueArrows = roundResults.value[lastIndex].blueArrows;
-      blueScores.value = [...blueArrows]
-        .filter((item) => !!item.playerId)
-        .sort((a, b) => a.shotTimeUnix - b.shotTimeUnix);
-    }
-    if (battleInfo.firePlayerIndex) {
-      currentShooterId.value = battleInfo.firePlayerIndex;
-      const redPlayer = redTeam.value.find(
-        (item) => item.id === currentShooterId.value
-      );
-      let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
-      nextTips += "重回";
-      // if (battleInfo.firePlayerIndex === user.value.id) nextTips += "你";
-      tips.value = nextTips;
-      uni.$emit("update-tips", nextTips);
-    }
-    if (battleInfo.fireTime > 0) {
-      const remain = Date.now() / 1000 - battleInfo.fireTime;
-      console.log(`当前箭已过${remain}秒`);
-      if (remain > 0 && remain <= 15) {
-        // 等渲染好再通知
-        setTimeout(() => {
-          uni.$emit("update-ramain", 15 - remain);
-        }, 300);
-      }
-    }
-  }
-}
-
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      redTeam.value = msg.groupUserStatus.redTeam;
-      blueTeam.value = msg.groupUserStatus.blueTeam;
-    }
-    if (msg.constructor === MESSAGETYPES.AllReady) {
-      start.value = true;
-    }
-    if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
-      if (currentShooterId.value !== msg.userId) {
-        currentShooterId.value = msg.userId;
-        const redPlayer = redTeam.value.find(
-          (item) => item.id === currentShooterId.value
-        );
-
-        let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
-        if (msg.userId === user.value.id && redTeam.value.length > 1) {
         nextTips += "你";
       }
-        if (nextTips !== tips.value) {
       tips.value = nextTips;
-          uni.$emit("update-tips", tips.value);
+      uni.$emit("update-tips", nextTips);
+      uni.$emit("update-remain", {reset: true, value: 15, team: redTeam?'red':'blue'});
+      if (force) {
+        const remain = (Date.now() - battleInfo.current.startTime) / 1000;
+        console.log(`当前轮已进行${remain}秒`);
+        if (remain > 0 && remain < 15) {
+          updateRemainSecond.value = 15 - remain - 0.2
+        }
       } else {
-          uni.$emit("update-ramain", 15);
+        updateRemainSecond.value = battleInfo.readyTime
+      }
+    } else {
+      currentRound.value = battleInfo.current.round || 1;
+      const latestRound = battleInfo.rounds[currentRound.value - 1];
+      if (latestRound) {
+        blueScores.value = latestRound.shoots[1];
+        scores.value = latestRound.shoots[2];
       }
     }
+    roundResults.value = battleInfo.rounds || [];
+    isFinalShoot.value = battleInfo.current.goldRound;
+    bluePoints.value = battleInfo.teams[1].score;
+    redPoints.value = battleInfo.teams[2].score;
+  } catch (err) {
+    console.log(err);
   }
-    if (msg.constructor === MESSAGETYPES.ShootResult) {
-      if (msg.battleInfo) recoverData(msg.battleInfo);
+};
+
+function onAudioEnded(s) {
+  if (s.indexOf('请红方射箭') >= 0 || s.indexOf('请蓝方射箭') >= 0) {
+    let team = s.indexOf('请红方射箭') >= 0 ? 'red' : 'blue';
+    uni.$emit("update-remain", {stop: false, value: updateRemainSecond.value, team: team});
   }
-    if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
-      const result = msg.preRoundResult;
-      scores.value = [];
-      blueScores.value = [];
-      currentShooterId.value = 0;
-      currentBluePoint.value = result.blueScore;
-      currentRedPoint.value = result.redScore;
-      bluePoints.value += result.blueScore;
-      redPoints.value += result.redScore;
-      if (!result.goldenRound) {
+  if (s.indexOf("比赛结束") >= 0) {
+    onBattleEnd()
+  }
+}
+
+function onBattleEnd() {
+  if (matchStatus.value === 2) {
+    uni.redirectTo({
+      url: `/pages/battle-result?battleId=${battleId.value}`,
+    });
+  }
+}
+
+function onNewRound(msg) {
   showRoundTip.value = true;
+  isFinalShoot.value = msg.current.goldRound;
+  const latestRound = msg.rounds[currentRound.value - 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;
     }
   }
-    if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      currentShooterId.value = 0;
-      currentBluePoint.value = bluePoints.value;
-      currentRedPoint.value = redPoints.value;
-      if (!isFinalShoot.value) {
-        isFinalShoot.value = true;
+}
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    start.value = true;
+  } else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) {
+    recoverData(msg);
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    uni.$emit("update-remain", {stop: true})
+    showRoundTip.value = false;
+    recoverData(msg, {arrowOnly: true});
+  } else if (msg.type === MESSAGETYPESV2.NewRound) {
+    setTimeout(() => {
+      onNewRound(msg)
+    }, 800)
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    matchStatus.value = msg.status;
+    if (msg.status === 4) {
       showRoundTip.value = true;
-        tips.value = "准备开始决金箭";
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.MatchOver) {
-      if (msg.endStatus.noSaved) {
       currentBluePoint.value = 0;
       currentRedPoint.value = 0;
-        showRoundTip.value = true;
-        isFinalShoot.value = false;
       setTimeout(() => {
         uni.navigateBack();
-        }, 3000);
-      } else {
-        isEnded.value = true;
-        uni.setStorageSync("last-battle", msg.endStatus);
-        setTimeout(() => {
-          uni.redirectTo({
-            url: "/pages/battle-result",
-          });
-        }, 1000);
+      }, 2000);
     }
   }
-    if (msg.constructor === MESSAGETYPES.BackToGame) {
-      uni.$emit("update-header-loading", false);
-      if (msg.battleInfo) recoverData(msg.battleInfo);
-    }
-  });
 }
 
 onLoad(async (options) => {
-  if (options.battleId) {
-    battleId.value = options.battleId;
-    redTeam.value = uni.getStorageSync("red-team");
-    blueTeam.value = uni.getStorageSync("blue-team");
-    const battleInfo = uni.getStorageSync("current-battle");
-    if (battleInfo) {
-      await nextTick(() => {
-        recoverData(battleInfo);
-      });
-      setTimeout(getCurrentGameAPI, 2000);
-    }
-  }
-  uni.enableAlertBeforeUnload({
-    message: "离开比赛可能导致比赛失败，是否继续？",
-    success: (res) => {
-      console.log("已启用离开提示");
-    },
-  });
+  if (options.battleId) battleId.value = options.battleId;
+  // uni.enableAlertBeforeUnload({
+  //   message: "离开比赛可能导致比赛失败，是否继续？",
+  //   success: (res) => {
+  //     console.log("已启用离开提示");
+  //   },
+  // });
 });
 onMounted(async () => {
   uni.setKeepScreenOn({
     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) {
-    if (!isEnded.value && (await isGameEnded(battleId.value))) return;
-    getCurrentGameAPI();
-    const refreshData = () => {
-      const lastAwakeTime = uni.getStorageSync("last-awake-time");
-      if (lastAwakeTime) {
-        getCurrentGameAPI();
-      } else {
-        clearInterval(refreshTimer.value);
-      }
-    };
-    refreshTimer.value = setInterval(refreshData, 2000);
-  }
+    const result = await getBattleAPI(battleId.value);
+    if (!result) return;
+    if (result.status === 2) {
+      uni.showToast({
+        title: "比赛已结束",
+        icon: "none",
       });
-onHide(() => {
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
-  uni.setStorageSync("last-awake-time", Date.now());
+      uni.navigateBack({
+        delta: 2,
+      });
+    } else {
+      recoverData(result, {force: true});
+    }
+  }
 });
 </script>
 
 <template>
   <Container :bgType="start ? 3 : 1">
     <view class="container">
-      <BattleHeader v-if="!start" :redTeam="redTeam" :blueTeam="blueTeam" />
-      <TestDistance v-if="!start" :guide="false" :isBattle="true" />
+      <BattleHeader
+          v-if="start === false"
+          :redTeam="redTeam"
+          :blueTeam="blueTeam"
+      />
+      <TestDistance v-if="start === false" :guide="false" :isBattle="true"/>
       <view v-if="start" class="players-row">
         <TeamAvatars
             :team="blueTeam"
@@ -366,7 +266,7 @@ onHide(() => {
             :roundData="
             roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
           "
-          :onAutoClose="() => (showRoundTip = false)"
+            :onAutoClose="()=>{ showRoundTip = false}"
         />
       </ScreenHint>
     </view>
@@ -378,6 +278,7 @@ onHide(() => {
   width: 100%;
   height: 100%;
 }
+
 .players-row {
   display: flex;
   align-items: center;

src/pages/team-bow-data.vue

@@ -5,105 +5,42 @@ import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import Avatar from "@/components/Avatar.vue";
 import { roundsName } from "@/constants";
-import { getGameAPI } from "@/apis";
+import { getBattleAPI } from "@/apis";
 const selected = ref(0);
 const redScores = ref([]);
 const blueScores = ref([]);
-const tabs = ref(["所有轮次"]);
+const tabs = ref([]);
 const players = ref([]);
-const allRoundsScore = ref({});
-const data = ref({
-  goldenRounds: [],
+const data = ref({});
+
+const loadArrows = (round) => {
+  round.shoots[1].forEach((arrow) => {
+    blueScores.value.push(arrow);
   });
+  round.shoots[2].forEach((arrow) => {
+    redScores.value.push(arrow);
+  });
+};
 onLoad(async (options) => {
-  if (options.battleId) {
-    const result = await getGameAPI(
-      options.battleId || "BATTLE-1756453741433684760-512"
-    );
+  if (!options.battleId) return;
+  const result = await getBattleAPI(options.battleId || "57943107462893568");
   data.value = result;
-    Object.values(result.bluePlayers).forEach((p, index) => {
+  data.value.teams[1].players.forEach((p, index) => {
     players.value.push(p);
-      if (
-        Object.values(result.redPlayers) &&
-        Object.values(result.redPlayers)[index]
-      ) {
-        players.value.push(Object.values(result.redPlayers)[index]);
-      }
+    players.value.push(data.value.teams[2].players[index]);
   });
-    if (result.goldenRounds) {
-      result.goldenRounds.forEach(() => {
-        tabs.value.push("决金箭");
+  Object.values(data.value.rounds).forEach((round, index) => {
+    if (round.ifGold) tabs.value.push(`决金箭`);
+    else tabs.value.push(`第${roundsName[index + 1]}轮`);
   });
-    }
-    Object.keys(result.roundsData).forEach((key, index) => {
-      if (
-        index <
-        Object.keys(result.roundsData).length - result.goldenRounds.length
-      ) {
-        tabs.value.push(`第${roundsName[key]}轮`);
-      }
-    });
-    onClickTab(0);
-  }
+  selected.value = Number(options.selected || 0);
+  onClickTab(selected.value);
 });
 const onClickTab = (index) => {
   selected.value = index;
   redScores.value = [];
   blueScores.value = [];
-  const { bluePlayers, redPlayers, roundsData, goldenRounds } = data.value;
-  let maxArrowLength = 0;
-  if (index === 0) {
-    Object.keys(bluePlayers).forEach((p) => {
-      allRoundsScore.value[p] = [];
-      Object.values(roundsData).forEach((round) => {
-        if (!round[p]) return;
-        allRoundsScore.value[p].push(
-          round[p].reduce((last, next) => last + next.ring, 0)
-        );
-        round[p].forEach((arrow) => {
-          blueScores.value.push(arrow);
-        });
-      });
-    });
-    Object.keys(redPlayers).forEach((p) => {
-      allRoundsScore.value[p] = [];
-      Object.values(roundsData).forEach((round) => {
-        if (!round[p]) return;
-        allRoundsScore.value[p].push(
-          round[p].reduce((last, next) => last + next.ring, 0)
-        );
-        round[p].forEach((arrow) => {
-          redScores.value.push(arrow);
-        });
-      });
-    });
-  } else if (index <= goldenRounds.length) {
-    const dataIndex =
-      Object.keys(roundsData).length - goldenRounds.length + index;
-    Object.keys(bluePlayers).forEach((p) => {
-      if (!roundsData[dataIndex][p]) return;
-      roundsData[dataIndex][p].forEach((arrow) => {
-        blueScores.value.push(arrow);
-      });
-    });
-    Object.keys(redPlayers).forEach((p) => {
-      if (!roundsData[dataIndex][p]) return;
-      roundsData[dataIndex][p].forEach((arrow) => {
-        redScores.value.push(arrow);
-      });
-    });
-  } else {
-    Object.keys(bluePlayers).forEach((p) => {
-      roundsData[index - goldenRounds.length][p].forEach((arrow) => {
-        blueScores.value.push(arrow);
-      });
-    });
-    Object.keys(redPlayers).forEach((p) => {
-      roundsData[index - goldenRounds.length][p].forEach((arrow) => {
-        redScores.value.push(arrow);
-      });
-    });
-  }
+  loadArrows(data.value.rounds[index]);
 };
 </script>
 
@@ -134,45 +71,18 @@ const onClickTab = (index) => {
         >
           <Avatar
             :src="player.avatar"
-            :borderColor="
-              data.bluePlayers[player.playerId] ? '#64BAFF' : '#FF6767'
-            "
+            :borderColor="index % 2 === 0 ? '#64BAFF' : '#FF6767'"
             :size="36"
           />
           <view>
             <view
-              v-if="selected === 0"
-              v-for="(ring, index) in allRoundsScore[player.playerId]"
+              v-for="(score, index) in data.rounds[selected].shoots[
+                index % 2 === 0 ? 1 : 2
+              ]"
               :key="index"
               class="score-item"
             >
-              {{ ring }}
-            </view>
-            <view
-              v-if="
-                selected > 0 &&
-                selected >= data.goldenRounds.length &&
-                selected <= data.goldenRounds.length
-              "
-              v-for="(score, index) in data.roundsData[
-                Object.keys(data.roundsData).length -
-                  data.goldenRounds.length +
-                  selected
-              ][player.playerId]"
-              :key="index"
-              class="score-item"
-            >
-              {{ score.ring }}
-            </view>
-            <view
-              v-if="selected > data.goldenRounds.length"
-              v-for="(score, index) in data.roundsData[
-                selected - data.goldenRounds.length
-              ][player.playerId]"
-              :key="index"
-              class="score-item"
-            >
-              {{ score.ring }}
+              {{ score.ringX ? "X" : score.ring }}
             </view>
           </view>
         </view>

src/pages/training/components/BowTarget.vue

@@ -0,0 +1,456 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
+import PointSwitcher from "@/components/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: () => [],
+  },
+  mode: {
+    type: String,
+    default: "solo", // solo 单排，team 双排
+  },
+  stop: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+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("");
+
+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,
+  }
+);
+
+function calcRealX(num, offset = 3.4) {
+  const len = 20.4 + num;
+  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
+}
+function calcRealY(num, offset = 3.4) {
+  const len = num < 0 ? Math.abs(num) + 20.4 : 20.4 - num;
+  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
+}
+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="{
+          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="{
+          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>
+      <view
+        v-if="
+          bluelatestOne &&
+          bluelatestOne.ring &&
+          user.id === bluelatestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="{
+          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="{
+          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
+      >
+      <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="{
+            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
+            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
+            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="{
+            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
+            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
+            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;
+}
+.target > image:last-child {
+  width: 100%;
+  height: 100%;
+}
+.hit {
+  position: absolute;
+  border-radius: 50%;
+  z-index: 1;
+  color: #fff;
+  transition: all 0.3s ease;
+}
+.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;
+}
+.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;
+}
+.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/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/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 "@/components/ScreenHint.vue";
+import BowData from "@/components/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/ShootProgress.vue

@@ -0,0 +1,379 @@
+<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="user.avatar" :size="40" />
+        </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));
+}
+
+.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,778 @@
+<script setup>
+import { computed, nextTick, ref } from "vue";
+import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import TargetPicker from "@/components/TargetPicker.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 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 showTargetPicker = ref(false);
+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 resolveTargetPaperType = (target) => {
+  return Number(target) === 1 ? "20厘米全环靶" : "40厘米全环靶";
+};
+
+const saveTrainingContext = (target) => {
+  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,
+    targetPaperType: target
+      ? resolveTargetPaperType(target)
+      : 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.showToast({
+    title: `${selectedDifficulty.value.title} 即将开始`,
+    icon: "none",
+  });
+};
+
+const openTargetPicker = () => {
+  if (!selectedDifficulty.value.id) {
+    return;
+  }
+
+  showTargetPicker.value = true;
+};
+
+const handleTargetConfirm = (target) => {
+  showTargetPicker.value = false;
+  saveTrainingContext(target);
+  // uni.showToast({
+  //   title: `${selectedDifficulty.value.title} 即将开始`,
+  //   icon: "none",
+  // });
+
+  uni.navigateTo({
+    url: `/pages/training/practise-one?target=${target}`,
+  });
+};
+
+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="openTargetPicker"
+        />
+      </view>
+    </view>
+    <TargetPicker
+      :show="showTargetPicker"
+      :onClose="() => (showTargetPicker = false)"
+      :onConfirm="handleTargetConfirm"
+    />
+  </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,862 @@
+<script setup>
+import { nextTick, onMounted, ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.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 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 getFeaturedItem = () =>
+  trainingData.value.training_items.find((item) => item.id === "base") ||
+  trainingData.value.training_items[0];
+
+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 openFeaturedTraining = () => {
+  const item = getFeaturedItem();
+  if (item) openTrainingItem(item);
+};
+
+// 首次进入页面时拉取数据并完成雷达图初始化。
+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="openFeaturedTraining">
+        <image
+          class="featured-card-bg"
+          src="../../static/training-home/img_22.png"
+          mode="widthFix"
+        />
+        <view class="featured-card-copy">
+          <text class="featured-card-progress">
+            {{ getLevelText(getFeaturedItem()) }}
+          </text>
+        </view>
+      </view>
+
+      <view class="mode-grid">
+        <view
+          v-for="item in trainingData.training_items.filter((item) => item.id !== 'base')"
+          :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>
+  </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;
+}
+
+.featured-card-bg {
+  width: 100%;
+}
+
+.featured-card-copy {
+  position: absolute;
+  left: 160rpx;
+  top: 68rpx;
+  display: flex;
+  align-items: center;
+}
+
+.featured-card-title {
+  color: #895409;
+  font-size: 28rpx;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 700;
+  line-height: 32rpx;
+}
+
+.featured-card-progress {
+  margin-left: 18rpx;
+  color: #895409;
+  font-size: 22rpx;
+  line-height: 32rpx;
+}
+
+.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,293 @@
+<script setup>
+import { 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 scores = ref([]);
+const total = 12;
+const practiseResult = ref({});
+const practiseId = ref("");
+const showGuide = ref(false);
+const tips = ref("");
+const targetType = ref(1);
+const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
+
+onLoad((options) => {
+  if (options.target) {
+    targetType.value = Number(options.target);
+  }
+});
+
+const onReady = async () => {
+  await startPractiseAPI();
+  scores.value = [];
+  start.value = true;
+  audioManager.play("练习开始");
+};
+
+const onOver = async () => {
+  practiseResult.value = await getPractiseAPI(practiseId.value);
+  start.value = false;
+};
+
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    // setTimeout(onOver, 1500);
+  }
+}
+
+function onComplete() {
+  uni.$emit(trainingDifficultyRefreshEvent);
+  uni.navigateBack();
+}
+
+async function onRetry() {
+  practiseId.value = "";
+  practiseResult.value = {};
+  start.value = false;
+  scores.value = [];
+  const result = await createPractiseAPI(total, 120, targetType.value);
+  if (result) practiseId.value = result.id;
+}
+
+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);
+  const result = await createPractiseAPI(total, 120, targetType.value);
+  if (result) practiseId.value = result.id;
+});
+
+onBeforeUnmount(() => {
+  uni.setKeepScreenOn({
+    keepScreenOn: false,
+  });
+  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
+  audioManager.stopAll();
+  endPractiseAPI();
+});
+</script>
+
+<template>
+  <Container
+    :bgType="!start && !practiseResult.id?9:10"
+    :showBottom="!start && !scores.length"
+  >
+    <view>
+      <TestDistance v-if="!start && !practiseResult.id" />
+      <block v-else>
+        <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"
+        />
+        <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>
+        <ScorePanel2 :arrows="scores" :total="total" />
+        <ScoreResult
+          v-if="practiseResult.details"
+          :rowCount="6"
+          :total="total"
+          :onClose="onComplete"
+          :onRetry="onRetry"
+          :result="practiseResult"
+        />
+        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
+      </block>
+    </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>
+.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;
+}
+
+.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>