Merge branch 'new-race-mode' into test

(cherry picked from commit a6becf67ff)

.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,269 @@
+# 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,256 +1,292 @@
 <script setup>
-import { watch } from "vue";
-import { onShow, onHide } from "@dcloudio/uni-app";
-import websocket from "@/websocket";
-import { getDeviceBatteryAPI } from "@/apis";
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-const { updateUser, updateOnline } = store;
+	import {
+		watch
+	} from "vue";
+	import {
+		onShow,
+		onHide
+	} from "@dcloudio/uni-app";
+	import websocket from "@/websocket";
+	import {
+		getDeviceBatteryAPI
+	} from "@/apis";
+	import useStore from "@/store";
+	import {
+		storeToRefs
+	} from "pinia";
+	import audioManager from "./audioManager";
+	const store = useStore();
+	const {
+		user
+	} = storeToRefs(store);
+	const {
+		updateUser,
+		updateOnline
+	} = store;
 
-watch(
-  () => user.value.id,
-  (newVal) => {
-    const token = uni.getStorageSync(
-      `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-    );
-    if (newVal && token) {
-      websocket.createWebSocket(token, (content) => {
-        uni.$emit("socket-inbox", content);
-      });
-    }
-    if (!newVal) {
-      websocket.closeWebSocket();
-    }
-  },
-  {
-    deep: false, // 如果 user 是一个对象或数组，建议开启
-    immediate: false, // 若想在初始化时立即执行一次回调，可开启。
-  }
-);
+	watch(
+		() => user.value.id,
+		(newVal) => {
+			const token = uni.getStorageSync(
+				`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+			);
+			if (newVal && token) {
+				websocket.createWebSocket(token, onShootWsMsg);
+			}
+			if (!newVal) {
+				websocket.closeWebSocket();
+			}
+		}, {
+			deep: false, // 如果 user 是一个对象或数组，建议开启
+			immediate: false, // 若想在初始化时立即执行一次回调，可开启。
+		}
+	);
 
-function emitUpdateUser(value) {
-  updateUser(value);
-}
+	function emitUpdateUser(value) {
+		updateUser(value);
+	}
 
-async function emitUpdateOnline() {
-  const data = await getDeviceBatteryAPI();
-  updateOnline(data.online);
-}
+	async function emitUpdateOnline() {
+		const data = await getDeviceBatteryAPI();
+		updateOnline(data.online);
+	}
 
-onShow(() => {
-  uni.$on("update-user", emitUpdateUser);
-  uni.$on("update-online", emitUpdateOnline);
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
-  if (user.value.id && token) {
-    console.log("回到前台，重新连接 websocket");
-    websocket.createWebSocket(token, (content) => {
-      uni.$emit("socket-inbox", content);
-    });
-  }
-});
+	function onDeviceShoot() {
+		// audioManager.play("射箭声音")
+	}
 
-onHide(() => {
-  uni.$off("update-user", emitUpdateUser);
-  uni.$off("update-online", emitUpdateOnline);
-  websocket.closeWebSocket();
-});
+	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);
+		const token = uni.getStorageSync(
+			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+		);
+		if (user.value.id && token) {
+			console.log("回到前台，重新连接 websocket");
+			websocket.createWebSocket(token, onShootWsMsg);
+		}
+	});
+
+	onHide(() => {
+		uni.$off("update-user", emitUpdateUser);
+		uni.$off("update-online", emitUpdateOnline);
+		websocket.closeWebSocket();
+	});
 </script>
 
 <style>
-page {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  user-select: none;
-  background-color: #000;
-}
+	page {
+		-webkit-touch-callout: none;
+		-webkit-user-select: none;
+		user-select: none;
+		background-color: #000;
+	}
 
-button {
-  margin: 0;
-  padding: 0;
-  border: none;
-  background: none;
-  line-height: 1;
-  outline: none;
-  box-sizing: border-box;
-}
+	button {
+		margin: 0;
+		padding: 0;
+		border: none;
+		background: none;
+		line-height: 1;
+		outline: none;
+		box-sizing: border-box;
+	}
 
-view::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
-}
+	view::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
 
-button::after {
-  border: none;
-}
+	button::after {
+		border: none;
+	}
 
-.guide-tips {
-  display: flex;
-  flex-direction: column;
-  font-size: 28rpx;
-}
-.guide-tips > text:first-child {
-  color: #fed847;
-}
-.guide-tips > text:nth-child(2) {
-  font-size: 24rpx;
-}
+	.guide-tips {
+		display: flex;
+		flex-direction: column;
+		font-size: 28rpx;
+	}
 
-@keyframes fadeInOut {
-  0% {
-    transform: translateY(20px);
-    opacity: 0;
-  }
-  30% {
-    transform: translateY(0);
-    opacity: 1;
-  }
-  80% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
+	.guide-tips>text:first-child {
+		color: #fed847;
+	}
 
-.fade-in-out {
-  animation: fadeInOut 1.2s ease forwards;
-}
+	.guide-tips>text:nth-child(2) {
+		font-size: 24rpx;
+	}
 
-@keyframes fadeOut {
-  from {
-    transform: translateY(0);
-    opacity: 1;
-  }
-  to {
-    transform: translateY(20px);
-    opacity: 0;
-  }
-}
+	@keyframes fadeInOut {
+		0% {
+			transform: translateY(20px);
+			opacity: 0;
+		}
 
-.fade-out {
-  animation: fadeOut 0.3s ease forwards;
-}
+		30% {
+			transform: translateY(0);
+			opacity: 1;
+		}
 
-@keyframes scaleIn {
-  from {
-    transform: scale(0);
-    opacity: 0;
-  }
-  to {
-    transform: scale(1);
-    opacity: 1;
-  }
-}
+		80% {
+			opacity: 1;
+		}
 
-.scale-in {
-  animation: scaleIn 0.3s ease-out forwards;
-  transform-origin: center center;
-}
+		100% {
+			opacity: 0;
+		}
+	}
 
-@keyframes scaleOut {
-  from {
-    transform: scale(1);
-    opacity: 1;
-  }
-  to {
-    transform: scale(0);
-    opacity: 0;
-  }
-}
+	.fade-in-out {
+		animation: fadeInOut 1.2s ease forwards;
+	}
 
-.scale-out {
-  animation: scaleOut 0.3s ease-out forwards;
-  transform-origin: center center;
-}
+	@keyframes fadeOut {
+		from {
+			transform: translateY(0);
+			opacity: 1;
+		}
 
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
+		to {
+			transform: translateY(20px);
+			opacity: 0;
+		}
+	}
 
-@keyframes pumpIn {
-  from {
-    transform: scale(2);
-  }
-  to {
-    transform: scale(1);
-  }
-}
+	.fade-out {
+		animation: fadeOut 0.3s ease forwards;
+	}
 
-.pump-in {
-  animation: pumpIn 0.3s ease-out forwards;
-  transform-origin: center center;
-}
+	@keyframes scaleIn {
+		from {
+			transform: scale(0);
+			opacity: 0;
+		}
 
-.share-canvas {
-  width: 300px;
-  height: 530px;
-  position: absolute;
-  top: -1000px;
-  left: 0;
-}
+		to {
+			transform: scale(1);
+			opacity: 1;
+		}
+	}
 
-.truncate {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
+	.scale-in {
+		animation: scaleIn 0.3s ease-out forwards;
+		transform-origin: center center;
+	}
 
-.modal {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-.user-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 15px;
-  padding-top: 7px;
-  position: relative;
-}
-.half-time-tip {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  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;
-}
+	@keyframes scaleOut {
+		from {
+			transform: scale(1);
+			opacity: 1;
+		}
 
-@font-face {
-  font-family: "DINCondensed";
-  src: url("https://static.shelingxingqiu.com/font/DIN-Condensed-Bold-2.ttf")
-    format("truetype");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}
+		to {
+			transform: scale(0);
+			opacity: 0;
+		}
+	}
+
+	.scale-out {
+		animation: scaleOut 0.3s ease-out forwards;
+		transform-origin: center center;
+	}
+
+	@keyframes rotate {
+		from {
+			transform: rotate(0deg);
+		}
+
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
+	@keyframes pumpIn {
+		from {
+			transform: scale(2);
+		}
+
+		to {
+			transform: scale(1);
+		}
+	}
+
+	.pump-in {
+		animation: pumpIn 0.3s ease-out forwards;
+		transform-origin: center center;
+	}
+
+	.share-canvas {
+		width: 300px;
+		height: 530px;
+		position: absolute;
+		top: -1000px;
+		left: 0;
+	}
+
+	.truncate {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.modal {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.user-row {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+		padding-top: 7px;
+		position: relative;
+	}
+
+	.half-time-tip {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		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");
+		font-weight: 700;
+		font-style: normal;
+		font-display: swap;
+	}
 </style>

src/apis.js

@@ -1,554 +1,558 @@
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
 
 try {
-  const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+    const accountInfo = uni.getAccountInfoSync();
+    const envVersion = accountInfo.miniProgram.envVersion;
 
-  switch (envVersion) {
-    case "develop": // 开发版
-      // BASE_URL = "http://192.168.1.242:8000/api/shoot";
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
-    case "trial": // 体验版
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-      break;
-    case "release": // 正式版
-      BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
-      break;
-    default:
-      // 保持默认值
-      break;
-  }
+    switch (envVersion) {
+        case "develop": // 开发版
+            // BASE_URL = "http://localhost:8000/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            break;
+        case "trial": // 体验版
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            break;
+        case "release": // 正式版
+            BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
+            break;
+        default:
+            // 保持默认值
+            break;
+    }
 } catch (e) {
-  console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
 }
 
 function request(method, url, data = {}) {
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
-  const header = {};
-  if (token) header.Authorization = `Bearer ${token || ""}`;
-  return new Promise((resolve, reject) => {
-    uni.request({
-      url: `${BASE_URL}${url}`,
-      method,
-      header,
-      data,
-      timeout: 10000,
-      success: (res) => {
-        if (res.data) {
-          const { code, data, message } = res.data;
-          if (code === 0) resolve(data);
-          else if (message) {
-            if (message.indexOf("登录身份已失效") !== -1) {
-              uni.removeStorageSync(
-                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-              );
-              uni.$emit("update-user");
-            }
-            if (message === "ROOM_FULL") {
-              resolve({ full: true });
-              return;
-            }
-            if (message === "ERROR_ROOM_GAME_START") {
-              resolve({ started: true });
-              return;
-            }
-            if (url.indexOf("/user/room") !== -1 && method === "GET") {
-              resolve({});
-              return;
-            }
-            if (message === "ERROR_BATTLE_GAMING") {
-              resolve({});
-              return;
-            }
-            if (message === "BIND_DEVICE") {
-              resolve({ binded: true });
-              return;
-            }
-            if (message === "ERROR_ORDER_UNPAY") {
-              uni.showToast({
-                title: "当前有未支付订单",
-                icon: "none",
-              });
-              resolve({});
-              return;
-            }
-            if (message === "ROOM_EMPTY") {
-              return uni.showToast({
-                title: "房间已过期",
-                icon: "none",
-              });
-            }
-            uni.showToast({
-              title: message,
-              icon: "none",
-            });
-          }
-          reject("");
-        }
-      },
-      fail: (err) => {
-        handleRequestError(err, url);
-        reject(err);
-      },
+    const token = uni.getStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+    );
+    const header = {};
+    if (token) header.Authorization = `Bearer ${token || ""}`;
+    return new Promise((resolve, reject) => {
+        uni.request({
+            url: `${BASE_URL}${url}`,
+            method,
+            header,
+            data,
+            timeout: 10000,
+            success: (res) => {
+                if (res.data) {
+                    const {code, data, message} = res.data;
+                    if (code === 0) resolve(data);
+                    else if (message) {
+                        if (message.indexOf("登录身份已失效") !== -1) {
+                            uni.removeStorageSync(
+                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+                            );
+                            uni.$emit("update-user");
+                        }
+                        if (message === "ROOM_FULL") {
+                            resolve({full: true});
+                            return;
+                        }
+                        if (message === "ERROR_ROOM_GAME_START") {
+                            resolve({started: true});
+                            return;
+                        }
+                        if (url.indexOf("/user/room") !== -1 && method === "GET") {
+                            resolve({});
+                            return;
+                        }
+                        if (message === "ERROR_BATTLE_GAMING") {
+                            resolve({});
+                            return;
+                        }
+                        if (message === "BIND_DEVICE") {
+                            resolve({binded: true});
+                            return;
+                        }
+                        if (message === "ERROR_ORDER_UNPAY") {
+                            uni.showToast({
+                                title: "当前有未支付订单",
+                                icon: "none",
+                            });
+                            resolve({});
+                            return;
+                        }
+                        if (message === "ROOM_EMPTY") {
+                            return uni.showToast({
+                                title: "房间已过期",
+                                icon: "none",
+                            });
+                        }
+                        uni.showToast({
+                            title: message,
+                            icon: "none",
+                        });
+                    }
+                    reject("");
+                }
+            },
+            fail: (err) => {
+                handleRequestError(err, url);
+                reject(err);
+            },
+        });
     });
-  });
 }
 
 // 统一的错误处理函数
 function handleRequestError(err, url) {
-  console.log("请求失败:", { err, url });
+    console.log("请求失败:", {err, url});
 
-  // 根据错误类型显示不同提示
-  if (err.errMsg) {
-    if (err.errMsg.includes("timeout")) {
-      showCustomToast("请求超时，请稍后重试", "timeout");
-    } else if (err.errMsg.includes("fail")) {
-      // 检查网络状态
-      uni.getNetworkType({
-        success: (res) => {
-          if (res.networkType === "none") {
-            showCustomToast("网络连接已断开，请检查网络设置", "network");
-          } else {
-            showCustomToast("服务器连接失败，请稍后重试", "server");
-          }
-        },
-        fail: () => {
-          showCustomToast("网络异常，请检查网络连接", "unknown");
-        },
-      });
+    // 根据错误类型显示不同提示
+    if (err.errMsg) {
+        if (err.errMsg.includes("timeout")) {
+            showCustomToast("请求超时，请稍后重试", "timeout");
+        } else if (err.errMsg.includes("fail")) {
+            // 检查网络状态
+            uni.getNetworkType({
+                success: (res) => {
+                    if (res.networkType === "none") {
+                        showCustomToast("网络连接已断开，请检查网络设置", "network");
+                    } else {
+                        showCustomToast("服务器连接失败，请稍后重试", "server");
+                    }
+                },
+                fail: () => {
+                    showCustomToast("网络异常，请检查网络连接", "unknown");
+                },
+            });
+        } else {
+            showCustomToast("请求失败，请稍后重试", "general");
+        }
     } else {
-      showCustomToast("请求失败，请稍后重试", "general");
+        showCustomToast("网络异常，请稍后重试", "unknown");
     }
-  } else {
-    showCustomToast("网络异常，请稍后重试", "unknown");
-  }
 }
 
 // 自定义提示函数
 function showCustomToast(message, type) {
-  const config = {
-    title: message,
-    icon: "none",
-    duration: 3000,
-  };
+    const config = {
+        title: message,
+        icon: "none",
+        duration: 3000,
+    };
 
-  // 根据错误类型可以添加不同的处理逻辑
-  switch (type) {
-    case "timeout":
-      config.duration = 4000; // 超时提示显示更久
-      break;
-    case "network":
-      config.duration = 5000; // 网络问题提示显示更久
-      break;
-    default:
-      break;
-  }
+    // 根据错误类型可以添加不同的处理逻辑
+    switch (type) {
+        case "timeout":
+            config.duration = 4000; // 超时提示显示更久
+            break;
+        case "network":
+            config.duration = 5000; // 网络问题提示显示更久
+            break;
+        default:
+            break;
+    }
 
-  uni.showToast(config);
+    uni.showToast(config);
 }
 
 // 获取全局配置
 export const getAppConfig = () => {
-  return request("GET", "/index/appConfig");
+    return request("GET", "/index/appConfig");
 };
 
 export const getHomeData = (seasonId) => {
-  return request("GET", `/user/myHome?seasonId=${seasonId}`);
+    return request("GET", `/user/myHome?seasonId=${seasonId}`);
 };
 
 export const getProvinceData = () => {
-  return request("GET", "/index/provinces/list");
+    return request("GET", "/index/provinces/list");
 };
 
 export const loginAPI = async (phone, nickName, avatarData, code) => {
-  const result = await request("POST", "/index/code", {
-    appName: "shoot",
-    appId: "wxa8f5989dcd45cc23",
-    nickName,
-    avatarData,
-    code,
-    phone,
-  });
-  uni.setStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
-    result.token
-  );
-  return result;
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        nickName,
+        avatarData,
+        code,
+        phone,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const silentLoginAPI = async (code) => {
+    const result = await request("POST", "/index/code", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
+    uni.setStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`,
+        result.token
+    );
+    return result;
+};
+
+export const checkUserBindAPI = async (code) => {
+    return request("POST", "/index/checkBind", {
+        appName: "shoot",
+        appId: "wxa8f5989dcd45cc23",
+        code,
+    });
 };
 
 export const bindDeviceAPI = (device) => {
-  return request("POST", "/user/device/bindDevice", {
-    device,
-  });
+    return request("POST", "/user/device/bindDevice", {
+        device,
+    });
+};
+
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
 };
 
 export const unbindDeviceAPI = (deviceId) => {
-  return request("POST", "/user/device/unbindDevice", {
-    deviceId,
-  });
+    return request("POST", "/user/device/unbindDevice", {
+        deviceId,
+    });
 };
 
 export const getMyDevicesAPI = () => {
-  // "/user/device/getBinding?deviceId=9ZF9oVXs"
-  return request("GET", "/user/device/getBindings");
+    // "/user/device/getBinding?deviceId=9ZF9oVXs"
+    return request("GET", "/user/device/getBindings");
 };
 
-export const createPractiseAPI = (arrows, mode) => {
-  return request("POST", "/user/practice/create", {
-    arrows,
-    mode,
-  });
+export const createPractiseAPI = (arrows, time, target) => {
+    return request("POST", "/user/practice/create", {
+        shootNumber: arrows,
+        shootTime: time,
+        targetType: target * 20,
+    });
+};
+
+export const startPractiseAPI = () => {
+    return request("POST", "/user/practice/begin");
+};
+
+export const endPractiseAPI = () => {
+    return request("POST", "/user/practice/stop");
 };
 
 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;
+    return request("GET", `/user/practice/get?id=${id}`);
 };
 
-export const createRoomAPI = (gameType, teamSize) => {
-  return request("POST", "/user/createroom", {
-    gameType,
-    teamSize,
-  });
+export const createRoomAPI = (gameType, teamSize, targetType) => {
+    return request("POST", "/user/createroom", {
+        gameType,
+        teamSize,
+        targetType,
+    });
 };
 
 export const getRoomAPI = (number) => {
-  return request("GET", `/user/room?number=${number}`);
+    return request("GET", `/user/room?number=${number}`);
 };
 
 export const joinRoomAPI = (number) => {
-  return request("POST", `/user/room/join`, { number });
+    return request("POST", `/user/room/join`, {number});
 };
 
 export const destroyRoomAPI = (roomNumber) => {
-  return request("POST", "/user/room/destroyRoom", {
-    roomNumber,
-  });
+    return request("POST", "/user/room/destroyRoom", {
+        roomNumber,
+    });
 };
 
 export const exitRoomAPI = (number, userId) => {
-  return request("POST", "/user/room/exitRoom", {
-    number,
-    userId,
-  });
+    return request("POST", "/user/room/exitRoom", {
+        number,
+        userId,
+    });
 };
 
 export const startRoomAPI = (number) => {
-  return request("POST", "/user/room/start", { number });
+    return request("POST", "/user/room/start", {number});
 };
 
 export const getPractiseResultListAPI = async (page = 1, page_size = 15) => {
-  const reuslt = await request(
-    "GET",
-    `/user/practice/list?page=${page}&page_size=${page_size}`
-  );
-  return reuslt.list;
+    const reuslt = await request(
+        "GET",
+        `/user/practice/list?page=${page}&page_size=${page_size}`
+    );
+    return reuslt.list;
 };
 
 export const matchGameAPI = (match, gameType, teamSize) => {
-  return request("POST", "/user/game/match", {
-    match,
-    gameType,
-    teamSize,
-  });
+    return request("POST", "/user/game/match", {
+        match,
+        gameType,
+        teamSize,
+        readyTime: 15,
+        targetType: 20,
+    });
 };
 
 export const readyGameAPI = (battleId) => {
-  return request("POST", "/user/game/prepare", {
-    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,
-        };
-      });
+    return request("POST", "/user/game/prepare", {
+        battleId,
     });
-    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,
-  };
-  if (x !== undefined && y !== undefined) {
-    data.x = x;
-    data.y = y;
-  }
-  return request("POST", "/index/arrow", data);
+    const data = {
+        device_id,
+    };
+    if (x !== undefined && y !== undefined) {
+        data.x = x;
+        data.y = y;
+    }
+    return request("POST", "/index/arrow", data);
 };
 
 export const getBattleListAPI = async (page, battleType) => {
-  const data = [];
-  const result = await request("POST", "/user/battle/details/list", {
-    page,
-    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),
+    const result = await request("POST", "/user/battle/details/list", {
+        page,
+        pageSize: 10,
+        battleType,
     });
-  });
-  return data;
+    return result.list;
 };
 
 export const getRankListAPI = () => {
-  return request("GET", "/index/ranklist");
+    return request("GET", "/index/ranklist");
 };
 
 export const createOrderAPI = (vipId) => {
-  return request("POST", "/user/order/create", {
-    vipId,
-    quanity: 1,
-    tradeType: "mini",
-    payType: "wxpay",
-  });
+    return request("POST", "/user/order/create", {
+        vipId,
+        quanity: 1,
+        tradeType: "mini",
+        payType: "wxpay",
+    });
 };
 
 export const payOrderAPI = (id) => {
-  return request("POST", "/user/order/pay", {
-    id,
-    tradeType: "mini",
-    payType: "wxpay",
-  });
+    return request("POST", "/user/order/pay", {
+        id,
+        tradeType: "mini",
+        payType: "wxpay",
+    });
 };
 
 export const getOrderListAPI = async (page) => {
-  const reuslt = await request("GET", `/user/order/list?page=${page}`);
-  return reuslt.items || [];
+    const reuslt = await request("GET", `/user/order/list?page=${page}`);
+    return reuslt.items || [];
 };
 
 export const cancelOrderListAPI = async (id) => {
-  return request("POST", "/user/order/cancelOrder", { id });
+    return request("POST", "/user/order/cancelOrder", {id});
 };
 
 export const getUserGameState = () => {
-  return request("GET", "/user/state");
-};
-
-export const getCurrentGameAPI = async () => {
-  uni.$emit("update-header-loading", true);
-  const result = await request("GET", "/user/join/battle");
-  return result.currentGame || {};
+    return request("GET", "/user/state");
 };
 
 export const getPointBookConfigAPI = async () => {
-  return request("GET", "/user/score/sheet/option");
+    return request("GET", "/user/score/sheet/option");
 };
 
 export const savePointBookAPI = async (
-  bowType,
-  distance,
-  targetType,
-  groups,
-  arrows,
-  data = []
-) => {
-  return request("POST", "/user/score/sheet/report", {
     bowType,
     distance,
     targetType,
     groups,
     arrows,
-    group_data: data.map((item) =>
-      item.map((i) => ({
-        ...i,
-        ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
-      }))
-    ),
-  });
+    data = []
+) => {
+    return request("POST", "/user/score/sheet/report", {
+        bowType,
+        distance,
+        targetType,
+        groups,
+        arrows,
+        group_data: data.map((item) =>
+            item.map((i) => ({
+                ...i,
+                ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+            }))
+        ),
+    });
 };
 
 export const getPointBookListAPI = async (
-  page = 1,
-  bowType,
-  distance,
-  targetType
+    page = 1,
+    bowType,
+    distance,
+    targetType
 ) => {
-  let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
-  if (bowType) url += `&bowType=${bowType}`;
-  if (distance) url += `&distance=${distance}`;
-  if (targetType) url += `&targetType=${targetType}`;
-  const result = await request("GET", url);
-  return result.list || [];
+    let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+    if (bowType) url += `&bowType=${bowType}`;
+    if (distance) url += `&distance=${distance}`;
+    if (targetType) url += `&targetType=${targetType}`;
+    const result = await request("GET", url);
+    return result.list || [];
 };
 
 export const getPointBookDetailAPI = async (id) => {
-  return request("GET", `/user/score/sheet/detail?id=${id}`);
+    return request("GET", `/user/score/sheet/detail?id=${id}`);
 };
 
 export const getPointBookDataAPI = async () => {
-  return request("GET", "/user/score/sheet/statistics");
+    return request("GET", "/user/score/sheet/statistics");
 };
 
 export const getPractiseDataAPI = async () => {
-  return request("GET", "/user/practice/statistics");
+    return request("GET", "/user/practice/statistics");
 };
 
 export const getBattleDataAPI = async () => {
-  return request("GET", "/user/fight/statistics");
+    return request("GET", "/user/fight/statistics");
 };
 
 export const chooseTeamAPI = async (number, group) => {
-  return request("POST", "/user/room/group", { number, group });
+    return request("POST", "/user/room/group", {number, group});
 };
 
 export const getVIPDescAPI = async () => {
-  return request("GET", "/index/memberVipDescribe");
+    return request("GET", "/index/memberVipDescribe");
 };
 
 export const getPointBookStatisticsAPI = async () => {
-  return request("GET", `/v2/user/score/sheet/statistics`);
+    return request("GET", `/v2/user/score/sheet/statistics`);
 };
 
 export const donateAPI = async (amount, name, phone, organizer, advice) => {
-  return request("POST", `/user/donate`, {
-    amount,
-    name,
-    phone,
-    organizer,
-    advice,
-  });
+    return request("POST", `/user/donate`, {
+        amount,
+        name,
+        phone,
+        organizer,
+        advice,
+    });
 };
 
 export const laserAimAPI = async () => {
-  return request("POST", "/user/device/laserAim");
+    return request("POST", "/user/device/laserAim");
 };
 
 export const laserCloseAPI = async () => {
-  return request("POST", "/user/device/closeAim");
+    return request("POST", "/user/device/closeAim");
 };
 
 export const getDeviceBatteryAPI = async () => {
-  return request("GET", "/user/device/battery");
+    return request("GET", "/user/device/battery");
 };
 
 export const addNoteAPI = async (id, remark) => {
-  return request("POST", "/user/score/sheet/remark", { id, remark });
+    return request("POST", "/user/score/sheet/remark", {id, remark});
 };
 
 export const removePointRecord = async (id) => {
-  return request("DELETE", `/user/score/sheet/delete?id=${id}`);
+    return request("DELETE", `/user/score/sheet/delete?id=${id}`);
 };
 
 export const getPhoneNumberAPI = (data) => {
-  return request("POST", "/index/getPhone", data);
+    return request("POST", "/index/getPhone", data);
 };
 
 export const getPointBookRankListAPI = (page = 1) => {
-  return request(
-    "GET",
-    `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
-  );
+    return request(
+        "GET",
+        `/user/score/sheet/week/shoot/rank/list?pageNum=${page}&pageSize=100`
+    );
 };
 
 export const clickLikeAPI = (userId, ifLike) => {
-  return request("POST", "/user/score/sheet/week/shoot/rank/like", {
-    userId,
-    ifLike,
-  });
+    return request("POST", "/user/score/sheet/week/shoot/rank/like", {
+        userId,
+        ifLike,
+    });
 };
 
 export const getMyLikeList = (page = 1, pageSize = 10) => {
-  return request(
-    "GET",
-    `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
-  );
+    return request(
+        "GET",
+        `/user/score/sheet/week/shoot/rank/like/list?pageNum=${page}&pageSize=${pageSize}`
+    );
 };
 
 export const getReadyAPI = (roomId) => {
-  return request("POST", `/user/room/ready`, {
-    roomId,
-  });
+    return request("POST", `/user/room/ready`, {
+        roomId,
+    });
+};
+
+export const getBattleAPI = async (battleId) => {
+    return request("POST", "/user/match/info", {
+        id: battleId,
+    });
+};
+
+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
@@ -51,6 +51,12 @@ const props = defineProps({
       src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
       mode="widthFix"
     />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
     <view class="bg-overlay" v-if="type === 0"></view>
   </view>
 </template>
@@ -67,7 +73,7 @@ const props = defineProps({
 
 .bg-image {
   width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }
 
 .bg-overlay {

src/components/AppFooter.vue

@@ -1,122 +1,83 @@
 <script setup>
-import { ref } from "vue";
+const tabs = [
+  { image: "../static/tab-vip.png" },
+  { image: "../static/tab-point-book.png" },
+  { image: "../static/tab-mall.png" },
+];
 
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const { user } = storeToRefs(useStore());
-
-const props = defineProps({
-  selected: {
-    type: Number,
-    default: 0,
-  },
-  onSignin: {
-    type: Function,
-    default: () => {},
-  },
-  onChange: {
-    type: Function,
-    default: () => {},
-  },
-});
-
-const isIOS = uni.getDeviceInfo().osName === "ios";
-const tabs = {
-  VIP: "vip",
-  智能弓: "mall",
-  计分本: "tab-point-book",
-  勋章: "medal",
-  个人中心: "user",
-};
-const onTabChange = (index) => {
+function handleTabClick(index) {
   if (index === 0) {
-    return uni.navigateTo({
+    uni.navigateTo({
       url: "/pages/be-vip",
     });
   }
   if (index === 1) {
-    return uni.navigateTo({
-      url: "/pages/device-intro",
-    });
-  }
-  if (index === 2) {
-    return uni.navigateTo({
+    uni.navigateTo({
       url: "/pages/point-book",
     });
   }
-  if (index === 4) {
-    if (!user.value.id) {
-      props.onSignin();
-      return;
-    }
-    return uni.navigateTo({
-      url: "/pages/user",
+  if (index === 2) {
+    uni.navigateTo({
+      url: "/pages/device-intro",
     });
   }
-  // props.onChange(index);
-};
+}
 </script>
 
 <template>
-  <view class="footer" :style="{ paddingBottom: isIOS ? '30rpx' : '0' }">
-    <button
-      hover-class="none"
-      v-for="(key, index) in Object.keys(tabs)"
-      :key="key"
-      @click="onTabChange(index)"
-      :class="index === 2 ? 'point-book-tab' : ''"
+  <view class="footer">
+    <image class="footer-bg" src="../static/tab-bg.png" mode="widthFix" />
+    <view
+      v-for="(tab, index) in tabs"
+      :key="index"
+      class="tab-item"
+      @click="handleTabClick(index)"
+      :style="{
+        width: index === 1 ? '36%' : '20%',
+      }"
     >
-      <image
-        v-if="index !== 2"
-        :src="`../static/tab-${tabs[key]}.png`"
-        mode="widthFix"
-      />
-      <image v-else src="../static/tab-point-book.png" mode="widthFix" />
-      <text v-if="index !== 2">{{ key }}</text>
-    </button>
+      <image :src="tab.image" mode="widthFix" />
+    </view>
   </view>
 </template>
 
 <style scoped>
 .footer {
-  height: 140rpx;
+  height: 120px;
   width: 100vw;
   position: relative;
   display: flex;
-  justify-content: center;
+  justify-content: space-around;
   align-items: center;
-  background: linear-gradient(
-      180deg,
-      rgba(70, 55, 34, 0.75) 0%,
-      rgba(5, 11, 25, 0.58) 77%
-    ),
-    #000000;
-  /* box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(0, 0, 0, 0.06); */
+  overflow: hidden;
 }
-.footer > button {
+.footer-bg {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 0;
+}
+.tab-item {
+  z-index: 1;
   display: flex;
-  flex-direction: column;
-  align-items: center;
   justify-content: center;
-  width: 19%;
-  color: #8e7d5c;
 }
-.footer > button > image {
-  width: 46rpx;
-  height: 46rpx;
+.tab-item > image {
+  width: 65rpx;
 }
-.footer > button > text {
-  font-weight: 500;
-  font-size: 20rpx;
-  margin-top: 10rpx;
+.tab-item:last-child > image {
+  width: 85rpx;
 }
-.point-book-tab {
-  overflow: unset;
-  margin: 0 1%;
+.tab-item:nth-child(2) {
+  transform: translate(10%, 40%);
 }
-.point-book-tab > image {
-  width: 144rpx !important;
-  height: 144rpx !important;
-  transform: translateY(-20rpx);
+.tab-item:nth-child(3) {
+  margin-bottom: 25rpx;
+}
+.tab-item:nth-child(3) > image {
+  width: 140rpx;
+}
+.tab-item:nth-child(4) {
+  transform: translate(-10%, 44%);
 }
 </style>

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
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
     ) {
-      if (
-        msg.userId === user.value.id &&
-        !msg.target.ring &&
-        msg.target.angle >= 0
-      ) {
-        angle.value = null;
-        setTimeout(() => {
-          if (props.scores[0]) {
-            circleColor.value =
-              msg.userId === props.scores[0].playerId ? "#ff4444" : "#1840FF";
-          }
-          angle.value = msg.target.angle;
-        }, 200);
-      }
+      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(() => {
@@ -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({
@@ -25,6 +25,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  isHome: {
+    type: Boolean,
+    default: false,
+  },
   showBackToGame: {
     type: Boolean,
     default: false,
@@ -107,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 {
@@ -127,6 +135,10 @@ const goBack = () => {
   uni.navigateBack();
 };
 
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
 const goCalibration = async () => {
   await laserAimAPI();
   uni.navigateTo({
@@ -138,7 +150,12 @@ const goCalibration = async () => {
 <template>
   <view :style="{ paddingTop: capsuleHeight + 'px' }">
     <AppBackground :type="bgType" :bgColor="bgColor" />
-    <Header :title="title" :onBack="onBack" :whiteBackArrow="whiteBackArrow" />
+    <Header
+      v-if="!isHome"
+      :title="title"
+      :onBack="onBack"
+      :whiteBackArrow="whiteBackArrow"
+    />
     <BackToGame v-if="showBackToGame" />
     <scroll-view
       :scroll-y="scroll"
@@ -146,7 +163,7 @@ const goCalibration = async () => {
       :bounces="false"
       :show-scrollbar="false"
       :style="{
-        height: `calc(100vh - ${capsuleHeight + 50}px - ${
+        height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${
           $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
         })`,
       }"
@@ -189,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;
-  const result = await createRoomAPI(
-    battleMode.value === 2 ? 2 : 1,
-    battleMode.value === 2 ? 10 : size
-  );
-  if (result.number) {
-    props.onConfirm();
-    await joinRoomAPI(result.number);
-    uni.navigateTo({
-      url: "/pages/battle-room?roomNumber=" + result.number,
-    });
+  try {
+    const result = await createRoomAPI(
+      battleMode.value === 2 ? 2 : 1,
+      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 + "&target=" + targetMode.value,
+      });
+    }
+  } catch (error) {
+    console.log(error);
+  } finally {
+    loading.value = false;
   }
-  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,55 @@
+<script setup>
+defineProps({
+  noBg: {
+    type: Boolean,
+    default: false,
+  }
+});
+</script>
+
+<template>
+  <view class="container">
+    <image class="shooter2" src="https://static.shelingxingqiu.com/shootmini/static/shooter2.png" mode="widthFix" />
+    <view class="bg-box">
+      <image
+        class="bg"
+        v-if="!noBg"
+        src="https://static.shelingxingqiu.com/shootmini/static/long-bubble-border.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  align-items: center;
+  padding: 0 26rpx 0 28rpx;
+  margin-bottom: 14rpx;
+  width: clac(100% - 54rpx);
+}
+.container .shooter2 {
+  display: block;
+  width: 133rpx;
+  height: 144rpx;
+}
+.container .bg-box {
+  color: #fff;
+  font-size: 28rpx;
+  position: relative;
+  flex: 1;
+  height: 128rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.container .bg-box .bg {
+  position: absolute;
+  left: 0;
+  right: 0;
+  width: 100%;
+}
+</style>

src/components/Header.vue

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

src/components/HeaderProgress.vue

@@ -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) {
-        let key = [];
-        key.push(msg.target.ring ? `${msg.target.ring}环` : "未上靶");
-        if (!msg.target.ring)
-          key.push(`向${getDirectionText(msg.target.angle)}调整`);
-        audioManager.play(key);
-      }
-    } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
-      if (msg.userId === user.value.id) {
-        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;
-      }
+  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(
+        shootData.ring
+          ? `${shootData.ringX ? "X" : shootData.ring}环`
+          : "未上靶"
+      );
+      if (shootData.angle !== null)
+        key.push(`向${getDirectionText(shootData.angle)}调整`);
+      audioManager.play(key, false);
     }
-  });
+  } 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("射击无效");
+  }
 }
 
 const playSound = (key) => {

src/components/LiveItem.vue

@@ -1,142 +0,0 @@
-<script setup>
-import { ref, onMounted } from "vue";
-
-const props = defineProps({});
-
-onMounted(async () => {});
-</script>
-
-<template>
-  <view class="live-item">
-    <view>
-      <image src="../static/user-icon-dark.png" mode="widthFix" />
-    </view>
-    <view>
-      <text>陈百强姓陈</text>
-      <view>
-        <text>节奏迅猛</text>
-        <text>节奏迅猛</text>
-      </view>
-      <view class="live-item-avatars">
-        <view :style="{ width: `${25 * 5 + 25}rpx` }">
-          <image
-            v-for="(avatar, i) in [1, 2, 3, 4, 5]"
-            :key="avatar"
-            :src="'../static/user-icon.png'"
-            :style="{
-              zIndex: i,
-              transform: `translateX(-${10 * i}rpx)`,
-            }"
-          />
-        </view>
-        <text>观战中...</text>
-      </view>
-    </view>
-    <view>
-      <view>
-        <image src="../static/race-title-bg.png" mode="widthFix" />
-        <text>1v1对抗</text>
-      </view>
-      <view>
-        <text>本轮环数</text>
-        <text>62</text>
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.live-item {
-  display: flex;
-  align-items: center;
-  background: #252831;
-  padding: 25rpx;
-  border-radius: 25rpx;
-}
-.live-item > view:nth-child(1) {
-  width: 150rpx;
-  height: 150rpx;
-}
-.live-item > view:nth-child(1) > image {
-  width: 100%;
-  height: 100%;
-  border-radius: 25rpx;
-}
-.live-item > view:nth-child(2) {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  margin: 0 20rpx;
-}
-.live-item > view:nth-child(2) > text {
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-}
-.live-item > view:nth-child(2) > view:nth-child(2) {
-  font-weight: 500;
-  font-size: 20rpx;
-  color: #ffa61b;
-  margin-top: 10rpx;
-  margin-bottom: 20rpx;
-}
-.live-item > view:nth-child(2) > view:nth-child(2) > text {
-  line-height: 28rpx;
-  border-radius: 15rpx;
-  border: 2rpx solid #ffc05d;
-  padding: 0 10rpx;
-  margin-right: 10rpx;
-}
-.live-item-avatars {
-  display: flex;
-  align-items: center;
-  font-size: 20rpx;
-  color: #999999;
-}
-.live-item-avatars > view {
-  display: flex;
-  align-items: center;
-}
-.live-item-avatars > view > image {
-  width: 36rpx;
-  height: 36rpx;
-  border-radius: 50%;
-  flex-shrink: 0;
-  border: 1rpx solid #000;
-  box-sizing: border-box;
-}
-.live-item > view:nth-child(3) {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  justify-content: space-around;
-  height: 150rpx;
-}
-.live-item > view:nth-child(3) > view:first-child {
-  display: flex;
-  align-items: center;
-  font-size: 24rpx;
-  color: #c46e36;
-  transform: translateX(100rpx);
-}
-.live-item > view:nth-child(3) > view:first-child > text {
-  transform: translateX(-90rpx);
-}
-.live-item > view:nth-child(3) > view:first-child > image {
-  width: 160rpx;
-  height: 50rpx;
-}
-.live-item > view:nth-child(3) > view:last-child {
-  display: flex;
-  align-items: flex-end;
-  font-size: 20rpx;
-  color: #999999;
-}
-.live-item > view:nth-child(3) > view:last-child > text:last-child {
-  font-weight: 600;
-  font-size: 48rpx;
-  color: #ffd299;
-  margin-left: 10rpx;
-  line-height: 40rpx;
-}
-</style>

src/components/MyRank.vue

@@ -1,204 +0,0 @@
-<script setup>
-import { ref, watch } from "vue";
-
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { getLvlName } = store;
-const { config, user } = storeToRefs(store);
-
-const props = defineProps({});
-
-const nextLvlPoints = ref(0);
-
-watch(
-  () => [config.value, user.value],
-  ([n_config, n_user]) => {
-    const rankInfos = n_config.randInfos || [];
-    if (n_user.id && rankInfos.length) {
-      rankInfos.some((r, index) => {
-        if (r.upgrade_scores && r.upgrade_scores > n_user.scores) {
-          nextLvlPoints.value = r.upgrade_scores;
-          return true;
-        }
-        return false;
-      });
-    }
-  },
-  {
-    immediate: true,
-    deep: true,
-  }
-);
-</script>
-
-<template>
-  <view class="my-rank">
-    <view>
-      <image :src="user.avatar || '../static/user-icon.png'" mode="widthFix" />
-      <view>
-        <text class="score color1">积分榜：分</text>
-        <text class="score color2">Mvp榜：次</text>
-        <text class="score color3">十环榜：次</text>
-      </view>
-    </view>
-    <view>
-      <text class="truncate">{{ user.nickName }}</text>
-      <image class="user-name-image" src="../static/vip1.png" mode="widthFix" />
-    </view>
-    <view>
-      <text>lv{{ user.lvl }}</text>
-      <view>
-        <view
-          :style="{
-            width: `${(Math.max(user.scores, 0) / nextLvlPoints) * 100}%`,
-          }"
-        ></view>
-        <text>{{ Math.max(user.scores, 0) }}/{{ nextLvlPoints }}</text>
-      </view>
-    </view>
-    <view>
-      <view>
-        <text>段位</text>
-        <text>{{ user.rankLvl ? getLvlName(user.rankLvl) : "暂无" }}</text>
-      </view>
-      <view>
-        <text>平均环数</text>
-        <text>{{ user.avg_ring ? user.avg_ring + "环" : "暂无" }}</text>
-      </view>
-      <view>
-        <text>胜率</text>
-        <text>{{
-          user.avg_win ? Number((user.avg_win * 100).toFixed(2)) + "%" : "暂无"
-        }}</text>
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.my-rank {
-  display: flex;
-  flex-direction: column;
-  padding-left: 40rpx;
-}
-.my-rank > view:first-child {
-  display: flex;
-  align-items: center;
-}
-.my-rank > view:first-child > image {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-  margin-right: 30rpx;
-}
-.my-rank > view:first-child > view {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-.score {
-  line-height: 40rpx;
-  font-size: 20rpx;
-  color: #fff;
-  position: relative;
-  z-index: 1;
-}
-.score::before {
-  content: "";
-  width: calc(100% + 20rpx);
-  height: 10rpx;
-  border-radius: 10rpx;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: -1;
-}
-.color1::before {
-  background-color: #c9ff7e;
-}
-.color2::before {
-  background-color: #fff14b;
-}
-.color3::before {
-  background-color: #7efff7;
-}
-.my-rank > view:nth-child(2) {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  margin-top: 10rpx;
-}
-.my-rank > view:nth-child(2) > text {
-  font-weight: 500;
-  font-size: 26rpx;
-  color: #ffffff;
-  margin-right: 20rpx;
-  max-width: 80%;
-}
-.my-rank > view:nth-child(2) > image {
-  width: 40rpx;
-  height: 40rpx;
-}
-.my-rank > view:nth-child(3) {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 10rpx;
-  font-weight: 500;
-  font-size: 16rpx;
-  color: #ffffff;
-}
-.my-rank > view:nth-child(3) > text:first-child {
-  width: 80rpx;
-  height: 20rpx;
-  background: #978eff;
-  border-radius: 16rpx;
-  line-height: 22rpx;
-  text-align: center;
-  text-align: center;
-}
-.my-rank > view:nth-child(3) > view {
-  position: relative;
-  width: calc(100% - 100rpx);
-  height: 20rpx;
-  background: #c8c8c8;
-  border-radius: 16rpx;
-}
-.my-rank > view:nth-child(3) > view > view {
-  background-color: #c7a670;
-  height: 20rpx;
-  border-radius: 16rpx;
-}
-.my-rank > view:nth-child(3) > view > text {
-  width: 100%;
-  text-align: center;
-  display: block;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.my-rank > view:nth-child(4) {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  column-gap: 20rpx;
-  margin-top: 20rpx;
-}
-.my-rank > view:nth-child(4) > view {
-  height: 112rpx;
-  background: #f6f6f61a;
-  border-radius: 16rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: 20rpx;
-  color: #999999;
-  line-height: 40rpx;
-}
-.my-rank > view:nth-child(4) > view > text:last-child {
-  color: #fff;
-  font-size: 22rpx;
-}
-</style>

src/components/NoticeBar.vue

@@ -1,98 +0,0 @@
-<script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
-
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const { user } = storeToRefs(useStore());
-
-const props = defineProps({});
-const list = [1, 2, 3, 4, 5];
-const timer = ref(null);
-const offset = ref(0);
-
-onMounted(async () => {
-  timer.value = setInterval(() => {
-    if (offset.value <= -100 * list.length) {
-      offset.value = 100;
-    } else {
-      offset.value -= 0.2;
-    }
-  }, 10);
-});
-onBeforeUnmount(() => {
-  clearInterval(timer.value);
-});
-</script>
-
-<template>
-  <view class="notice-bar">
-    <image src="../static/announce.png" mode="heightFix" />
-    <view>
-      <view
-        v-for="(item, index) in list"
-        :key="item"
-        :style="{
-          transform: `translateX(${offset}%)`,
-        }"
-      >
-        <image src="../static/user-icon.png" mode="widthFix" />
-        <text class="truncate">{{ index + 1 }}毛毛丛</text>
-        <text>成功晋升</text>
-        <text>荣耀王者</text>
-        <text>段位，从此横着走！</text>
-      </view>
-    </view>
-    <image src="../static/enter.png" mode="widthFix" />
-  </view>
-</template>
-
-<style scoped>
-.notice-bar {
-  margin-top: 10rpx;
-  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
-  border-radius: 25rpx;
-  height: 80rpx;
-  display: flex;
-  align-items: center;
-}
-.notice-bar > image:first-child {
-  height: 100%;
-}
-.notice-bar > view {
-  flex: 1;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-}
-.notice-bar > view > view {
-  flex-shrink: 0;
-  font-size: 24rpx;
-  padding-left: 15rpx;
-  color: #999;
-  display: flex;
-  align-items: center;
-}
-.notice-bar > view > view > image {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 10rpx;
-  border-radius: 50%;
-}
-.notice-bar > view > view > text {
-  word-break: keep-all;
-  display: inline-block;
-}
-.notice-bar > view > view > text:nth-child(2) {
-  color: #fff;
-  width: 100rpx;
-  display: block;
-}
-.notice-bar > view > view > text:nth-child(4) {
-  color: #e7ba80;
-}
-.notice-bar > image:last-child {
-  width: 30rpx;
-  height: 30rpx;
-  margin: 0 20rpx;
-}
-</style>

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"
-        :src="players[index].avatar || '../static/user-icon.png'"
-        mode="widthFix"
-      />
+      <view v-if="players[index] && players[index].name" class="avatar">
+        <Avatar
+          :src="players[index].avatar || '../static/user-icon.png'"
+          :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);
-      }
-    } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
-      if (msg.userId === user.value.id) {
-        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;
+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) => {
@@ -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";
+import {ref, watch, onMounted, onBeforeUnmount} from "vue";
+import {RoundGoldImages} from "@/constants";
+
 const props = defineProps({
   tips: {
     type: String,
@@ -19,64 +20,81 @@ const props = defineProps({
 const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
-
-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 loading = ref(false);
+const transitionStyle = ref("all 1s linear");
+const currentTeam = ref(null);
 
 const updateRemain = (value) => {
-  if (Math.ceil(value) === remain.value || Math.floor(value) === remain.value)
+  if (value.stop) {
+    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;
-  if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(value);
+  }
+  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) => {
+
+    },
+    {
+      immediate: true,
+    }
+);
+
 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>
 
 <template>
   <view class="container">
-    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix" />
+    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
     <view
-      :style="{
-        justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start',
+        :style="{
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
       }"
     >
       <view
-        :style="{
+          :style="{
           width: `${(remain / total) * 100}%`,
           background: barColor,
-          right: tips.includes('红队') ? 0 : 'unset',
+          right: currentTeam==='red' ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
-      <text>剩余{{ 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;
-  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
-  );
-  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 {
+  try {
+    const wxResult = await wxLogin();
+    const fileManager = uni.getFileSystemManager();
+    const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
+    const base64Url = `data:image/png;base64,${avatarBase64}`;
+    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
+      );
       const data = await getDeviceBatteryAPI();
       updateOnline(data.online);
-    } catch (error) {}
+    }
+    props.onClose();
+  } catch (error) {
+    console.log("login error", error);
+  } finally {
+    loading.value = false;
   }
-  loading.value = false;
-  props.onClose();
 };
 
 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("请射箭测试距离");
-  timer.value = setInterval(() => {
-    if (count.value > 0) count.value -= 1;
-    else clearInterval(timer.value);
-  }, 1000);
+  if (props.isBattle) {
+    timer.value = setInterval(() => {
+      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/TopRank.vue

@@ -1,162 +0,0 @@
-<script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
-
-const props = defineProps({
-  data: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const titles = ["积分榜", "MVP榜", "十环榜"];
-const selected = ref(0);
-const timer = ref(0);
-
-const onClick = (index) => {
-  selected.value = index;
-  clearInterval(timer.value);
-  timer.value = setInterval(() => {
-    selected.value = (selected.value + 1) % titles.length;
-  }, 3000);
-};
-onMounted(async () => {
-  timer.value = setInterval(() => {
-    selected.value = (selected.value + 1) % titles.length;
-  }, 3000);
-});
-onBeforeUnmount(() => {
-  clearInterval(timer.value);
-});
-</script>
-
-<template>
-  <view class="top-rank">
-    <view>
-      <button
-        hover-class="none"
-        v-for="(name, index) in titles"
-        :key="index"
-        @click="onClick(index)"
-        :style="{ color: selected === index ? '#E7BA80' : '#999' }"
-      >
-        {{ name }}
-      </button>
-    </view>
-    <swiper
-      :current="selected"
-      @change="(e) => (selected = e.detail.current)"
-      :style="{ width: '100%' }"
-    >
-      <swiper-item v-for="(list, index1) in data" :key="index1">
-        <view v-for="(item, index2) in list" :key="index2" class="rank-item">
-          <view>
-            <text>{{ index2 + 1 }}</text>
-            <image
-              :src="item.avatar || '../static/user-icon-dark.png'"
-              mode="widthFix"
-            />
-          </view>
-          <view>
-            <text>{{ item.name }}</text>
-            <text>积分：{{ item.totalScore }}</text>
-          </view>
-        </view>
-      </swiper-item>
-    </swiper>
-    <view>
-      <view
-        v-for="(item, index) in data"
-        :key="index"
-        :style="{
-          width: selected === index ? '20rpx' : '6rpx',
-          backgroundColor: selected === index ? '#656565;' : '#e4e4e4',
-        }"
-      />
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.top-rank {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-.top-rank > view:first-child {
-  display: flex;
-  align-items: center;
-}
-.top-rank > view:first-child > button {
-  margin-right: 20rpx;
-  font-weight: 600;
-  font-size: 24rpx;
-}
-.rank-item {
-  display: flex;
-  align-items: center;
-  height: 80rpx;
-  margin-top: 20rpx;
-  margin-left: 1rpx;
-}
-.rank-item > view:first-child {
-  position: relative;
-  margin-right: 20rpx;
-}
-.rank-item > view:first-child > text {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 28rpx;
-  height: 28rpx;
-  line-height: 28rpx;
-  text-align: center;
-  background: #ffa711;
-  border-radius: 14rpx 0rpx 14rpx 0rpx;
-  color: #fff;
-  font-weight: 600;
-  font-size: 20rpx;
-}
-.rank-item > view:first-child > image {
-  width: 80rpx;
-  height: 80rpx;
-  border-radius: 20rpx;
-}
-.rank-item > view:last-child {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-  align-items: flex-start;
-  height: 100%;
-}
-.rank-item > view:last-child > text:first-child {
-  font-weight: 500;
-  font-size: 24rpx;
-  color: #ffffff;
-  line-height: 34rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 180rpx;
-}
-.rank-item > view:last-child > text:last-child {
-  background: rgb(255 250 234 / 0.1);
-  border-radius: 16rpx;
-  font-size: 20rpx;
-  color: #e7ba80;
-  line-height: 28rpx;
-  padding: 5rpx 10rpx;
-}
-.top-rank > view:last-child {
-  width: 100%;
-  display: flex;
-  justify-content: center;
-  margin-top: 20rpx;
-}
-.top-rank > view:last-child > view {
-  height: 6rpx;
-  border-radius: 3rpx;
-  background: #e4e4e4;
-  margin: 0 5rpx;
-  transition: all 0.3s ease;
-}
-</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,68 +1,70 @@
 {
-  "name": "shoot-miniprograms",
-  "appid": "",
-  "description": "",
-  "versionName": "1.0.0",
-  "versionCode": "100",
-  "transformPx": false,
-  "uniStatistics": {
-    "enable": false
-  },
-  "app-plus": {
-    "bounce": "none",
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
+    "name" : "shoot-miniprograms",
+    "appid" : "__UNI__B03E251",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "uniStatistics" : {
+        "enable" : false
     },
-    "modules": {},
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-        ]
-      },
-      "ios": {},
-      "sdkConfigs": {}
+    "app-plus" : {
+        "bounce" : "none",
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {}
+        }
+    },
+    "h5" : {
+        "darkmode" : true,
+        "themeLocation" : "theme.json"
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxa8f5989dcd45cc23",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "uglifyFileName" : true,
+            "useCompilerModule" : true,
+            "useIsolateContext" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true,
+        "darkmode" : true,
+        "themeLocation" : "theme.json",
+        "permission" : {},
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     }
-  },
-  "h5": {
-    "darkmode": true,
-    "themeLocation": "theme.json"
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wxa8f5989dcd45cc23",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "uglifyFileName": true,
-      "useCompilerModule": true,
-      "useIsolateContext": true
-    },
-    "lazyCodeLoading": "requiredComponents",
-    "usingComponents": true,
-    "darkmode": true,
-    "themeLocation": "theme.json",
-    "permission": {},
-    "requiredPrivateInfos": ["getLocation", "chooseLocation"]
-  }
 }

src/pages.json

@@ -30,11 +30,17 @@
         "navigationBarTitleText": ""
       }
     },
+    {
+      "path": "pages/team-battle"
+    },
+    {
+      "path": "pages/melee-battle"
+    },
     {
       "path": "pages/battle-result"
     },
     {
-      "path": "pages/team-battle"
+      "path": "pages/friend-battle-result"
     },
     {
       "path": "pages/point-book-edit"
@@ -102,9 +108,6 @@
     {
       "path": "pages/rank-list"
     },
-    {
-      "path": "pages/melee-match"
-    },
     {
       "path": "pages/match-detail"
     },

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 if (data.value.battleMode === 2) {
-      if (totalPoints.value > 0) {
-        audioManager.play("胜利");
-      } else if (totalPoints.value < 0) {
-        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;
       }
+      return {
+        ...item,
+        rank: index + 1,
+        name: p.name,
+        avatar: p.avatar || "",
+      };
+    });
+    if (rank.value <= players.value * 0.3) {
+      audioManager.play("胜利");
+    } else {
+      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.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.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/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) {
-        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);
-      }
-    }
-  });
+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 audioManager.play("距离不足");
+  }
+  // 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,27 +35,32 @@ const enterRoom = debounce(async (number) => {
   if (!number) {
     warnning.value = "请输入房间号";
     showModal.value = true;
-  } else {
+    return;
+  }
+  try {
     const room = await getRoomAPI(number);
-    if (room.number) {
-      const alreadyIn = room.members.find(
-        (item) => item.userInfo.id === user.value.id
-      );
-      if (!alreadyIn) {
-        const result = await joinRoomAPI(number);
-        if (result.full) {
-          warnning.value = "房间已满员";
-          showModal.value = true;
-          return;
-        }
-      }
-      uni.navigateTo({
-        url: "/pages/battle-room?roomNumber=" + number,
-      });
-    } else {
+    if (!room.number) {
       warnning.value = room.started ? "该房间对战已开始，无法加入" : "查无此房";
       showModal.value = true;
+      return;
     }
+    const alreadyIn = room.members.find(
+      (item) => item.userInfo.id === user.value.id
+    );
+    if (!alreadyIn) {
+      const result = await joinRoomAPI(number);
+      if (result.full) {
+        warnning.value = "房间已满员";
+        showModal.value = true;
+        return;
+      }
+    }
+    loading.value = true;
+    uni.navigateTo({
+      url: "/pages/battle-room?roomNumber=" + number,
+    });
+  } 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>
-          <text>一起练升级更快，早日加入全国排位赛！</text>
-        </view>
-      </Guide>
+      <GuideTwo>
+        <text :style="{color: 'rgba(255,217,71,0.8)'}">约上朋友开几局，欢乐多，不寂寞</text>
+        <text>一起练升级更快，早日加入全国排位赛！</text>
+      </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,10 +180,12 @@ onLoad(async (options) => {
   border-radius: 10px;
   padding: 15px;
 }
-.founded-room > image {
+
+.founded-room>image {
   width: 16vw;
 }
-.founded-room > view {
+
+.founded-room>view {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -198,14 +195,16 @@ onLoad(async (options) => {
   width: 100%;
   overflow: hidden;
 }
-.founded-room > view > input {
+
+.founded-room>view>input {
   width: 70%;
   text-align: center;
   font-size: 14px;
   height: 40px;
   color: #000;
 }
-.founded-room > view > view {
+
+.founded-room>view>view {
   background-color: #fed847;
   width: 30%;
   line-height: 40px;
@@ -216,38 +215,45 @@ onLoad(async (options) => {
   color: #000;
   text-align: center;
 }
+
 .create-room {
   position: relative;
   margin: 15px;
   height: 50vw;
 }
-.create-room > image:first-of-type {
+
+.create-room>image:first-of-type {
   position: absolute;
   width: 100%;
 }
-.create-room > image:nth-of-type(2) {
+
+.create-room>image:nth-of-type(2) {
   padding: 15px;
   width: 25vw;
   position: relative;
 }
-.create-room > view:nth-child(3) {
+
+.create-room>view:nth-child(3) {
   margin: 12vw auto;
   position: relative;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.create-room > view > image:first-child {
+
+.create-room>view>image:first-child {
   width: 19vw;
   transform: translateY(-60%);
   border-radius: 50%;
   position: relative;
 }
-.create-room > view > image:nth-child(2) {
+
+.create-room>view>image:nth-child(2) {
   width: 37vw;
   position: relative;
 }
-.create-room > view > view:nth-child(3) {
+
+.create-room>view>view:nth-child(3) {
   position: relative;
   width: 19vw;
   height: 19vw;
@@ -258,10 +264,12 @@ onLoad(async (options) => {
   align-items: center;
   transform: translateY(60%);
 }
-.create-room > view > view:nth-child(3) > image {
+
+.create-room>view>view:nth-child(3)>image {
   width: 20px;
   margin-right: 2px;
 }
+
 .warnning {
   width: 100%;
   height: 100%;
@@ -270,6 +278,7 @@ onLoad(async (options) => {
   align-items: center;
   color: #fff9;
 }
+
 .my-data {
   width: calc(100% - 30px);
   margin: 15px;
@@ -279,12 +288,14 @@ onLoad(async (options) => {
   overflow: hidden;
   background-color: #54431d33;
 }
-.my-data > view {
+
+.my-data>view {
   width: 100%;
   display: flex;
   color: #fff9;
 }
-.my-data > view:first-child {
+
+.my-data>view:first-child {
   width: calc(100% - 30px);
   align-items: flex-end;
   padding-bottom: 15px;
@@ -292,16 +303,29 @@ onLoad(async (options) => {
   margin: 15px;
   margin-bottom: 0;
 }
-.my-data > view:first-child > text {
+
+.my-data>view:first-child>.my-record-btn {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #76D4FF;
+  text-align: center;
+  font-style: normal;
+  width: auto;
+  margin-left: auto;
+}
+
+.my-data>view:first-child>text {
   color: #fff;
   font-size: 17px;
   margin-left: 10px;
   width: 120px;
 }
-.my-data > view:last-child {
+
+.my-data>view:last-child {
   margin-bottom: 15px;
 }
-.my-data > view:last-child > view {
+
+.my-data>view:last-child>view {
   width: 33%;
   margin-top: 15px;
   display: flex;
@@ -309,25 +333,30 @@ onLoad(async (options) => {
   align-items: center;
   font-size: 12px;
 }
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
   margin-bottom: 5px;
 }
-.my-data > view:last-child > view > view > text:first-child {
+
+.my-data>view:last-child>view>view>text:first-child {
   color: #fff;
   font-size: 20px;
   margin-right: 5px;
   transform: translateY(4px);
 }
-.my-data > view:last-child > view:nth-child(2) {
+
+.my-data>view:last-child>view:nth-child(2) {
   border-left: 1px solid #48494e;
   border-right: 1px solid #48494e;
 }
-.my-data > view:last-child > view > view {
+
+.my-data>view:last-child>view>view {
   display: flex;
   align-items: flex-end;
   height: 20px;
 }
-.stars > image {
+
+.stars>image {
   width: 4vw;
   height: 4vw;
   margin: 0 1px;

src/pages/index.vue

@@ -1,52 +1,60 @@
 <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 UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
-import NoticeBar from "@/components/NoticeBar.vue";
-import TopRank from "@/components/TopRank.vue";
-import MyRank from "@/components/MyRank.vue";
-import LiveItem from "@/components/LiveItem.vue";
+import BubbleTip from "@/components/BubbleTip.vue";
 
 import {
+  checkUserBindAPI,
   getAppConfig,
-  getRankListAPI,
+  getDeviceBatteryAPI,
   getHomeData,
   getMyDevicesAPI,
-  getDeviceBatteryAPI,
+  getScoreRankList,
+  silentLoginAPI,
 } from "@/apis";
-import { canEenter, capsuleHeight } from "@/util";
+import {topThreeColors} from "@/constants";
 
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { updateConfig, updateUser, updateDevice, updateRank, updateOnline } =
-  store;
-const { user, device, rankData, online, game } = storeToRefs(store);
+const {
+  updateConfig,
+  updateUser,
+  updateDevice,
+  getLvlName,
+  getLvlNameByScore,
+  updateOnline,
+} = store;
+const {user, device, online, game} = storeToRefs(store);
 
 const showModal = ref(false);
-const selected = ref(0);
-const liveType = ref(0);
-const liveTypes = {
-  大神赛: "../static/dashen.png",
-  新人王: "../static/xinren.png",
-  女神赛: "../static/nvshen.png",
+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 ranks = ref([]);
 
 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;
-    }
-  }
-  uni.navigateTo({ url: path });
+  // if (path === "/pages/first-try") {
+  // if (canEenter(user.value, device.value, online.value, path)) {
+  //   await uni.$checkAudio();
+  // }
+  // }
+  uni.navigateTo({url: path});
 };
 
 const toRankListPage = () => {
@@ -56,39 +64,65 @@ 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);
-  ranks.value = [];
-  ranks.value.push((rankList.rank || []).slice(0, 3));
-  ranks.value.push((rankList.mvpRank || []).slice(0, 3));
-  ranks.value.push((rankList.ringRank || []).slice(0, 3));
-  updateRank(rankList);
+  console.log("积分榜数据", rankList);
+  scoreRankList.value = getScoreRankData(rankList).slice(0, 10);
 
   if (homeData) {
     console.log("首页数据：", homeData);
     if (homeData.user) {
       updateUser(homeData.user);
-      // if (homeData.user.trio <= 0) {
-      //   showGuide.value = true;
-      //   setTimeout(() => {
-      //     showGuide.value = false;
-      //   }, 3000);
-      // }
+      if ("823,209,293,257".indexOf(homeData.user.id) !== -1) {
+        const show = uni.getStorageSync("show-the-user");
+        if (!show) {
+          uni.setStorageSync("show-the-user", true);
+        }
+      }
+      if (homeData.user.trio <= 0) {
+        showGuide.value = true;
+        setTimeout(() => {
+          showGuide.value = false;
+        }, 3000);
+      }
       const devices = await getMyDevicesAPI();
       if (devices.bindings && devices.bindings.length) {
         updateDevice(
-          devices.bindings[0].deviceId,
-          devices.bindings[0].deviceName
+            devices.bindings[0].deviceId,
+            devices.bindings[0].deviceName
         );
         const data = await getDeviceBatteryAPI();
         updateOnline(data.online);
@@ -105,293 +139,352 @@ onMounted(async () => {
 
 onShareAppMessage(() => {
   return {
-    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！",
-    path: "/pages/index",
+    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
+    path: "/pages/index", // 用户点击分享卡片后跳转的页面路径
     imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png",
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
   };
 });
 onShareTimeline(() => {
   return {
-    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！",
-    query: "from=timeline",
+    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享到朋友圈的标题
+    query: "from=timeline", // 用户通过朋友圈点击后，在页面 onShow 的 options 中可以获取到的参数
     imageUrl:
-      "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png",
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
   };
 });
 </script>
 
 <template>
-  <view
-    class="container"
-    :style="{
-      paddingTop: capsuleHeight + 'px',
-      height: 'calc(100vh - ' + capsuleHeight + 'px)',
-    }"
-  >
-    <view :style="{ flex: 1, overflow: 'hidden' }">
-      <image
-        src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmg11wd20o1bagd4k.png"
-        mode="widthFix"
-        class="top-bg"
-      />
-      <view class="header">
+  <Container :isHome="true" :showBackToGame="true">
+    <view class="container">
+      <view class="top-theme">
         <image
-          src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmf4cjlds7oxd0tqd.png"
-          mode="widthFix"
+            src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
+            mode="widthFix"
         />
       </view>
-      <scroll-view
-        class="body"
-        scroll-y
-        :show-scrollbar="false"
-        :enhanced="true"
-        :bounces="false"
-      >
-        <view class="main-btns" :style="{ marginBottom: '10rpx' }">
-          <view @click="() => toPage('/pages/my-device')">
+      <UserHeader showRank :onSignin="() => (showModal = true)"/>
+      <view :style="{ padding: '12px 10px' }">
+        <view class="feature-grid">
+          <view class="bow-card">
             <image
-              src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmgwjhsjc19tl0t7c.png"
-              mode="widthFix"
+                v-if="online"
+                src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
             />
-            <view v-if="user.id" class="device-info">
+            <image
+                v-else
+                src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
+            />
+            <block v-if="user.id">
               <text v-if="!device.deviceId">绑定我的智能弓</text>
               <text v-else-if="!online">设备离线</text>
               <text v-else-if="online">设备在线</text>
-            </view>
-          </view>
-          <view class="main-sub-btns">
-            <view @click="() => toPage('/pages/first-try')">
-              <image
-                src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmgwjhren1tfefi7k.png"
+            </block>
+            <image
+                src="../static/first-try.png"
                 mode="widthFix"
-              />
-            </view>
+                @click="() => toPage('/pages/first-try')"
+            />
+            <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '47%' }">
+              <text>新人必刷！</text>
+              <text>快来报到吧~</text>
+            </BubbleTip>
+          </view>
+          <view class="play-card">
             <view @click="() => toPage('/pages/practise')">
-              <image
-                src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmgwjht6q8l8zcduq.png"
-                mode="widthFix"
-              />
+              <image src="../static/my-practise.png" mode="widthFix"/>
+            </view>
+            <view @click="() => toPage('/pages/friend-battle')">
+              <image src="../static/friend-battle.png" mode="widthFix"/>
             </view>
           </view>
         </view>
-        <view class="main-btns">
-          <view @click="() => toPage('/pages/ranking')">
-            <image
-              src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmgwjhsi4s5qa7hch.png"
-              mode="widthFix"
-            />
-          </view>
-          <view @click="() => toPage('/pages/friend-battle')">
-            <image
-              src="https://static.shelingxingqiu.com/attachment/2026-01-12/dfmgwjht17th6vl9a6.png"
-              mode="widthFix"
-            />
-          </view>
-        </view>
-        <!-- <NoticeBar /> -->
-        <view class="rank-info">
+        <view class="ranking-section">
           <image
-            src="../static/trophy-bg.png"
-            mode="widthFix"
-            class="trophy-bg"
+              src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
+              mode="widthFix"
           />
-          <view class="rank-info-header">
-            <view>
-              <image src="../static/rank-title.png" mode="widthFix" />
-              <text>星球榜</text>
-            </view>
-            <button hover-class="none" @click="toRankListPage">
-              <text>更多榜单</text>
-              <image src="../static/enter.png" mode="widthFix" />
-            </button>
-          </view>
-          <view class="rank-info-body">
-            <view :style="{ width: '45%' }">
-              <TopRank :data="ranks" />
-            </view>
-            <view :style="{ width: '55%' }">
-              <MyRank />
-            </view>
-          </view>
-        </view>
-        <!-- <view class="live-bar">
           <button
-            hover-class="none"
-            v-for="(item, index) in Object.keys(liveTypes)"
-            :key="index"
-            @click="liveType = index"
-            :style="{
-              color: liveType === index ? '#fff' : '#fff9',
-              background:
-                liveType === index
-                  ? 'linear-gradient( 133deg, #FFD19A 0%, #A17636 100%)'
-                  : '#252831',
-            }"
-          >
-            <image :src="liveTypes[item]" mode="widthFix" />
-            <text>{{ item }}</text>
-          </button>
+              class="into-btn"
+              @click="() => toPage('/pages/ranking')"
+              hover-class="none"
+          ></button>
+          <view class="ranking-players" @click="toRankListPage">
+            <img src="../static/juezhanbang.png" mode="widthFix"/>
+            <view class="divide-line"></view>
+            <view class="player-avatars">
+              <view
+                  v-for="i in 6"
+                  :key="i"
+                  class="player-avatar"
+                  :style="{
+                  zIndex: 8 - i,
+                  borderColor: scoreRankList[i - 1]
+                    ? topThreeColors[i - 1] || '#000'
+                    : '#000',
+                }"
+              >
+                <image v-if="i === 1" src="../static/champ1.png"/>
+                <image v-if="i === 2" src="../static/champ2.png"/>
+                <image v-if="i === 3" src="../static/champ3.png"/>
+                <view v-if="i > 3">{{ i }}</view>
+                <image
+                    :src="
+                    scoreRankList[i - 1]
+                      ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
+                      : '../static/user-icon-dark.png'
+                  "
+                    mode="aspectFill"
+                />
+              </view>
+              <view class="more-players">
+                <text>{{ scoreRankList.length }}</text>
+              </view>
+            </view>
+          </view>
+          <view class="my-data">
+            <view @click="() => toPage('/pages/my-growth')">
+              <image src="../static/my-growth.png" mode="widthFix"/>
+            </view>
+            <view @click="() => toPage('/pages/ranking')">
+              <view>
+                <text>段位</text>
+                <text>{{
+                    user.lvlName || "暂无"
+                  }}
+                </text>
+              </view>
+              <view>
+                <text>赛季平均环数</text>
+                <text>{{ user.avg_ring ? user.avg_ring + "环" : "暂无" }}</text>
+              </view>
+              <view>
+                <text>赛季胜率</text>
+                <text>{{
+                    user.avg_win
+                        ? Number((user.avg_win * 100).toFixed(2)) + "%"
+                        : "暂无"
+                  }}
+                </text>
+              </view>
+            </view>
+          </view>
         </view>
-        <swiper
-          :current="liveType"
-          @change="(e) => (liveType = e.detail.current)"
-        >
-          <swiper-item>
-            <LiveItem />
-          </swiper-item>
-          <swiper-item>
-            <LiveItem />
-          </swiper-item>
-          <swiper-item>
-            <LiveItem />
-          </swiper-item>
-        </swiper> -->
-      </scroll-view>
-      <Signin :show="showModal" :onClose="() => (showModal = false)" />
+      </view>
+      <Signin :show="showModal" :onClose="() => (showModal = false)"/>
     </view>
-    <AppFooter
-      :selected="selected"
-      :onChange="(index) => (selected = index)"
-      :onSignin="() => (showModal = true)"
-    />
-  </view>
+    <AppFooter/>
+  </Container>
 </template>
 
-<style scoped lang="scss">
+<style scoped>
 .container {
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: calc(100% - 120px);
+}
+
+.feature-grid {
+  width: 100%;
+  display: flex;
+  margin-bottom: 5px;
+}
+
+.feature-grid > view {
+  position: relative;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  background-color: #000;
 }
-.top-bg {
+
+.bow-card {
+  width: 50%;
+  border-radius: 25rpx;
+  overflow: hidden;
+}
+
+.feature-grid > view > image {
   width: 100%;
-  position: fixed;
+}
+
+.bow-card > text {
+  position: absolute;
+  top: 66%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  white-space: nowrap;
+  font-size: 13px;
+  color: #b3b3b3;
+}
+
+.bow-card > image:nth-child(3) {
+  transform: translateY(-1px);
+}
+
+.play-card {
+  width: 48%;
+  margin-left: 2%;
+}
+
+.play-card > view > image {
+  width: 100%;
+}
+
+.ranking-section {
+  border-radius: 15px;
+  padding: 15px;
+  position: relative;
+}
+
+.ranking-section > image {
+  position: absolute;
   top: 0;
   left: 0;
-}
-.header {
-  height: 50px;
-  position: relative;
-  display: flex;
-  align-items: center;
-  padding-left: 30rpx;
-}
-.header > image {
-  width: 200rpx;
-  height: 50rpx;
-}
-.body {
-  width: calc(100vw - 50rpx);
-  height: calc(100% - 25rpx);
-  padding: 0 25rpx;
-  position: relative;
-  margin-bottom: 25rpx;
-}
-.main-btns {
   width: 100%;
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 20rpx;
+  z-index: -1;
 }
-.main-btns > view {
-  position: relative;
-}
-.main-btns image {
-  width: 100%;
-}
-.main-sub-btns {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.device-info {
+
+.into-btn {
   position: absolute;
-  width: 100%;
-  bottom: 50rpx;
-  font-size: 24rpx;
-  color: #fff9;
-  display: flex;
-  justify-content: center;
+  top: 40px;
+  left: calc(50% - 100px);
+  width: 200px;
+  height: 100px;
 }
-.rank-info {
-  margin-top: 10rpx;
-  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
-  border-radius: 20rpx;
+
+.ranking-players {
+  display: flex;
+  align-items: center;
+  padding-bottom: 20px;
+  margin-top: 42%;
+  border-bottom: 1rpx solid rgba(255, 255, 255, 0.2);
+}
+
+.ranking-players > image:first-child {
+  width: 28%;
+  transform: translateX(-10px) translateY(-8px);
+}
+
+.player-avatars {
+  display: flex;
+  align-items: center;
+}
+
+.divide-line {
+  width: 1px;
+  height: 35px;
+  background-color: #80808033;
+  margin-right: 8px;
+}
+
+.player-avatar,
+.more-players {
+  width: 82rpx;
+  height: 82rpx;
+  border-radius: 50%;
+  margin-right: -20rpx;
+  border: 1rpx solid #312f35;
   position: relative;
-  padding: 20rpx;
-  display: flex;
-  flex-direction: column;
-  margin-top: 20rpx;
-}
-.trophy-bg {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 188rpx;
-  height: 192rpx;
-}
-.rank-info-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 30rpx;
-}
-.rank-info-header > view {
-  width: 186rpx;
-  height: 56rpx;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #ffffff;
-}
-.rank-info-header > view > image {
-  width: 100%;
-  height: 100%;
-}
-.rank-info-header > view > text {
-  line-height: 56rpx;
-  display: block;
-  transform: translate(75rpx, -65rpx);
-}
-.rank-info-header > button {
-  font-size: 20rpx;
-  color: #999999;
-  display: flex;
-  align-items: center;
-}
-.rank-info-header > button > image {
-  width: 30rpx;
-  height: 30rpx;
-}
-.rank-info-body {
-  display: flex;
-  align-items: center;
-}
-.rank-info-body > view:first-child {
-  border-right: 1rpx solid #e8e8e81a;
   box-sizing: border-box;
 }
-.live-bar {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 20rpx;
-  margin: 20rpx 0;
+
+.player-avatar > image:first-child,
+.player-avatar > view:first-child {
+  position: absolute;
+  top: -24rpx;
+  left: 22rpx;
+  width: 32rpx;
+  height: 32rpx;
 }
-.live-bar > button {
+
+.player-avatar > view:first-child {
+  border-radius: 50%;
+  background: #777777;
+  text-align: center;
+  font-size: 10px;
+  line-height: 18px;
+  width: 18px;
+  height: 18px;
+  color: #fff;
+}
+
+.player-avatar > image:last-child {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.more-players {
+  background: #3c445a;
+  font-size: 9px;
+  line-height: 80rpx;
+  text-align: center;
+  z-index: 1;
+}
+
+.more-players > text {
+  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;
+  color: #fff6;
+  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;
+  background: linear-gradient(180deg, #303b4c 30%, #2c384a 100%);
+  display: flex;
+  flex-direction: column;
+  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;
   align-items: center;
   justify-content: center;
-  height: 68rpx;
-  border-radius: 34rpx;
-  font-weight: 600;
-  font-size: 28rpx;
+  width: 100%;
+  height: 60px;
+  z-index: -1;
 }
-.live-bar > button > image {
-  width: 46rpx;
-  height: 40rpx;
-  margin-right: 15rpx;
+
+.top-theme > image {
+  width: 300rpx;
+  transform: translate(-4%, -14%);
 }
 </style>

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);
-    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;
+  if (!options.battleId) return;
+  battleId.value = options.battleId || "60510101693403136";
+  const result = await getBattleAPI(battleId.value);
+  data.value = result;
+  if (result.mode > 3) {
+    players.value = result.resultList.map((item, index) => {
+      const plist = result.teams[0] ? result.teams[0].players : [];
+      const 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;
+          });
         }
-        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,
-        });
-      });
-    }
+      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
+        v-if="data.mode <= 3"
+        v-for="(round, index) in data.rounds"
+        :key="index"
+        :style="{ marginBottom: '5px' }"
+      >
         <view class="score-header">
-          <text>决金箭轮（环数）</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"
+                :src="p.avatar || '../static/user-icon.png'"
                 :key="index"
                 mode="widthFix"
               />
             </view>
-            <text v-for="(arrow, index) in round.blue.arrows" :key="index">
-              {{ 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>
-          <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 :style="{ color: team == 1 ? '#64BAFF' : '#FF6767' }">
+              {{ round.shoots[team].reduce((acc, cur) => acc + cur.ring, 0) }}环
             </text>
+            <text>得分 {{ round.scores[team].score }}</text>
           </view>
-          <image
-            v-if="round.winner === 0"
-            src="../static/winner-badge.png"
-            mode="widthFix"
-          />
         </view>
-      </block>
-      <view
-        v-for="(round, index) in roundsData"
-        :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>查看靶纸</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 || '../static/user-icon.png'"
-                  :key="index"
-                  mode="widthFix"
-                />
-              </view>
-              <text v-for="(arrow, index2) in round.blue.arrows" :key="index2">
-                {{ arrow.ring }}环
-              </text>
-            </view>
-            <view>
-              <text :style="{ color: '#64BAFF' }">
-                {{ round.blue.totalRing }}环
-              </text>
-              <text>得分 {{ round.blue.totalScore }}</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,33 +14,28 @@ 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,
-            ]);
-          }
-          uni.removeStorageSync("current-battle");
-          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`,
-            });
-          }
-        };
-      }
+async function cancelMatch() {
+  if (gameType.value && teamSize.value) {
+    await matchGameAPI(false, gameType.value, teamSize.value);
+  }
+  uni.navigateBack()
+}
+
+async function onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.MatchSuccess) {
+    onComplete.value = () => {}
+  }
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
+    if (gameType.value == 1) {
+      uni.redirectTo({
+        url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
+      });
+    } else if (gameType.value == 2) {
+      uni.redirectTo({
+        url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
+      });
     }
-  });
+  }
 }
 
 onLoad(async (options) => {
@@ -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,220 @@
+<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("");
+/** 对战模式：1=好友约战 2=排位赛，用于结算页跳转判断 */
+const way = ref(0);
+const currentRound = ref(1);
+const tips = ref("即将开始...");
+const players = ref([]);
+const playersSorted = ref([]);
+const playersScores = ref([]);
+const halfTimeTip = ref(false);
+const halfRest = ref(false);
+
+function recoverData(battleInfo, { force = false } = {}) {
+  if (!battleInfo) return;
+  try {
+    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
+    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
+    // 保存 way 供结算跳转时使用
+    way.value = battleInfo.way ?? 0;
+    
+    // 优先使用接口数据，否则使用缓存
+    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/friend-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) {
-      if (scores.value.length < total) {
-        scores.value.push(msg.target);
-        currentRound.value += 1;
-        if (currentRound.value === 4) {
-          currentRound.value = 1;
-        }
-        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 onReceiveMessage(msg) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    scores.value = msg.details;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    // 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,15 +108,21 @@ onBeforeUnmount(() => {
   });
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
   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="`${
             !start || scores.length === 12
@@ -134,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);
+  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) {
-      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 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="360"
+          :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 selectedIndex = ref(0);
-const currentList = ref([]);
-const myData = ref({});
-const addBg = ref(false);
-
-onMounted(async () => {
-  handleSelect(0);
+const createRankState = () => ({
+  list: [],
+  page: 0,
+  pageSize: PAGE_SIZE,
+  loading: false,
+  noMore: false,
+  loaded: false,
+  scrollTop: 0,
+  myData: null,
+  myDataLoaded: false,
 });
 
-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;
+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 initialTabIndex = ref(0);
+const pageMounted = ref(false);
+const initializedFromRoute = ref(false);
+const addBg = ref(false);
+const currentScrollTop = ref(0);
+const restoreScrollTop = ref(0);
+const tabSwitchAnimating = ref(false);
+const suppressScrollSync = ref(false);
+const suppressLoadMore = ref(false);
+const stickyTabsTop = capsuleHeight + 50;
+const stickyTabsActive = ref(false);
+const tabsStickyThreshold = ref(0);
+const tabsStickyReady = ref(false);
+const tabsHeight = ref(0);
+
+const getTabConfig = (index = selectedIndex.value) => rankTabs[index];
+const getTabKey = (index = selectedIndex.value) => getTabConfig(index).key;
+
+// 统一提取榜单接口返回的列表数据，兼容数组和对象两种返回格式。
+const getRankListFromResponse = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};
+
+// 为当前登录用户构造默认的个人榜单信息，避免接口未返回时底部区域缺数据。
+const buildDefaultMyData = () => ({
+  rank: null,
+  userId: user.value.id,
+  name: user.value.nickName,
+  avatar: user.value.avatar,
+  totalScore: 0,
+  mvpCount: 0,
+  tenRings: 0,
+  totalGames: 0,
+  totalCount: 0,
+  rankName: user.value.lvlName,
+  rankLvl: user.value.rankLvl,
+});
+
+const currentTabKey = computed(() => getTabKey(selectedIndex.value));
+const currentState = computed(() => rankStates.value[currentTabKey.value]);
+const currentList = computed(() => currentState.value.list);
+const currentSubTitle = computed(() => getTabConfig(selectedIndex.value).subTitle);
+const currentMyData = computed(() => {
+  if (!user.value.id) return null;
+  return currentState.value.myData || buildDefaultMyData();
+});
+
+// 统一格式化段位和场次文案，兼容不同接口的字段命名。
+const formatLevelText = (item = {}) => {
+  const levelName = item.rankName || getLvlName(item.rankLvl) || "暂无段位";
+  const totalGames = item.totalGames ?? item.TotalGames ?? 0;
+  return `${levelName}，${totalGames}场`;
+};
+
+// 统一读取榜单项的排名字段，没有后端 rank 时回退到前端序号。
+const getDisplayRank = (item = {}, index = 0) => {
+  return item.rank ?? index + 1;
+};
+
+// 底部个人排名在未上榜时展示占位符，而不是空白。
+const getDisplayMyRank = (item = {}) => {
+  return item.rank ?? "-";
+};
+
+const getScoreValue = (item = {}) => item.totalScore ?? 0;
+const getMvpValue = (item = {}) => item.mvpCount ?? item.totalScore ?? 0;
+const getTenRingValue = (item = {}) =>
+  item.tenRings ?? item.TenRings ?? item.totalScore ?? 0;
+
+// 根据当前选中的榜单类型，读取对应的展示值。
+const getRankValue = (item = {}, index = selectedIndex.value) => {
+  if (index === 0) return getScoreValue(item);
+  if (index === 1) return getMvpValue(item);
+  return getTenRingValue(item);
+};
+
+const getRankUnit = (index = selectedIndex.value) => {
+  if (index === 0) return "分";
+  return "次";
+};
+
+// 统一设置页面当前的视觉滚动状态，避免吸顶和顶部背景不同步。
+const syncScrollVisualState = (scrollTop = 0) => {
+  currentScrollTop.value = scrollTop;
+  addBg.value = scrollTop > 100;
+  if (!tabsStickyReady.value) {
+    stickyTabsActive.value = false;
+    return;
   }
-  if (user.value.id) {
-    currentList.value.some((item) => {
-      if (item.userId === user.value.id) {
-        myData.value = item;
-        return true;
-      }
-      return false;
-    });
-    if (!myData.value.userId) {
-      myData.value = {
-        userId: user.value.id,
-        TotalGames: 0,
-        totalScore: 0,
-        mvpCount: 0,
-        TenRings: 0,
-      };
+  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 onScrollView = (e) => {
-  addBg.value = e.detail.scrollTop > 100;
+// 每个榜单独立请求一次个人排名信息，切回该榜单时直接复用，避免打断浏览上下文。
+const loadMyRankData = async (tabKey) => {
+  if (!user.value.id) return;
+
+  const state = rankStates.value[tabKey];
+  const config = rankTabs.find((item) => item.key === tabKey);
+  if (!config || state.myDataLoaded) return;
+
+  try {
+    const result = await config.myApi();
+    state.myData = {
+      ...buildDefaultMyData(),
+      ...(result || {}),
+    };
+  } catch (error) {
+    state.myData = buildDefaultMyData();
+    console.error("load my rank data error", error);
+  } finally {
+    state.myDataLoaded = true;
+  }
 };
 
-const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
+// 首次进入或切换到未加载过的榜单时，初始化它的分页数据和个人横条数据。
+const ensureTabReady = async (index = selectedIndex.value) => {
+  const tabKey = getTabKey(index);
+  const state = rankStates.value[tabKey];
+
+  if (!state.loaded) {
+    await loadRankPage(tabKey, { reset: true });
+  }
+
+  if (user.value.id && !state.myDataLoaded) {
+    await loadMyRankData(tabKey);
+  }
+
+  await nextTick();
+  return state.scrollTop || 0;
+};
+
+onLoad((options = {}) => {
+  initialTabIndex.value = getTabIndexByRouteParam(options.tab);
+  selectedIndex.value = initialTabIndex.value;
+  if (pageMounted.value && !initializedFromRoute.value) {
+    initializePage();
+  }
+});
+
+// 页面初始化同时兼容 onLoad 和 onMounted 的先后顺序，确保首屏一定落到路由指定的榜单。
+const initializePage = async () => {
+  if (initializedFromRoute.value) return;
+  initializedFromRoute.value = true;
+  const nextScrollTop = await ensureTabReady(selectedIndex.value);
+  await applyScrollPosition(0, nextScrollTop, false);
+  setTimeout(() => {
+    measureTabsMetrics();
+  }, 0);
+};
+
+onMounted(async () => {
+  pageMounted.value = true;
+  await initializePage();
+});
+
+// 切换榜单时保留原榜单的列表和滚动位置，切回来后继续从之前的位置浏览。
+const handleSelect = async (index) => {
+  if (index === selectedIndex.value) return;
+
+  const previousTabKey = currentTabKey.value;
+  rankStates.value[previousTabKey].scrollTop = currentScrollTop.value;
+  const previousScrollTop = currentScrollTop.value;
+
+  suppressScrollSync.value = true;
+  suppressLoadMore.value = true;
+  selectedIndex.value = index;
+  const nextScrollTop = await ensureTabReady(index);
+  await applyScrollPosition(previousScrollTop, nextScrollTop, false);
+  setTimeout(() => {
+    tabSwitchAnimating.value = false;
+    suppressScrollSync.value = false;
+    suppressLoadMore.value = false;
+  }, 220);
+};
+
+// 触底后只加载当前榜单的下一页数据，其他榜单的数据和页码保持不变。
+const loadMore = async () => {
+  if (suppressLoadMore.value) return;
+  await loadRankPage(currentTabKey.value);
+};
+
+// 实时记录当前榜单的滚动位置，切换回来时恢复到上一次浏览位置。
+const onScrollView = (e) => {
+  const scrollTop = e.detail.scrollTop || 0;
+  if (suppressScrollSync.value) return;
+  syncScrollVisualState(scrollTop);
+  rankStates.value[currentTabKey.value].scrollTop = scrollTop;
+};
+
+// 计算 tab 在滚动内容中的真实位置和高度，作为吸顶切换的唯一依据。
+const measureTabsMetrics = () => {
+  const query = uni.createSelectorQuery();
+  query
+    .select("#rank-list-content-start")
+    .boundingClientRect()
+    .select(".rank-tabs-anchor")
+    .boundingClientRect()
+    .exec((res = []) => {
+      const [startRect, rect] = res;
+      if (!startRect || !rect) return;
+      const tabOffset = rect.top - startRect.top;
+      tabsStickyThreshold.value = Math.max(0, tabOffset - 92);
+      tabsHeight.value = rect.height || 0;
+      tabsStickyReady.value = true;
+      syncScrollVisualState(currentScrollTop.value);
+    });
+};
 </script>
 
 <template>
@@ -65,7 +340,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
     >
       <image
         :style="{ opacity: addBg ? 1 : 0 }"
-        src="../static/app-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
         mode="widthFix"
       />
       <navigator open-type="navigateBack">
@@ -75,18 +350,32 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
     </view>
     <scroll-view
       scroll-y
+      :scroll-with-animation="tabSwitchAnimating"
+      :scroll-top="restoreScrollTop"
       @scroll="onScrollView"
-      :style="{ height: myData.userId ? '90vh' : '100vh' }"
+      @scrolltolower="loadMore"
+      :style="{ height: user.id ? '90vh' : '100vh' }"
     >
+      <view id="rank-list-content-start" class="content-start-anchor"></view>
       <image
         src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9b3wcrwnlnghiq.png"
         mode="widthFix"
         class="header-bg"
+        @load="measureTabsMetrics"
       />
-      <view class="rank-tabs">
+      <view
+        v-if="stickyTabsActive"
+        class="rank-tabs-placeholder"
+        :style="{ height: `${tabsHeight}px` }"
+      />
+      <view
+        class="rank-tabs rank-tabs-anchor"
+        :class="{ 'rank-tabs-anchor-fixed': stickyTabsActive }"
+        :style="stickyTabsActive ? { top: `${stickyTabsTop}px` } : {}"
+      >
         <view
-          v-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']"
-          :key="index"
+          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
-            >分
-          </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
-            >次
+            >
+              {{ getRankValue(item) }}
+            </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

@@ -1,10 +1,9 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
-import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import {ref, onMounted, onBeforeUnmount, nextTick} from "vue";
+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";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { user } = storeToRefs(store);
-const start = ref(false);
+const {user} = storeToRefs(store);
+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,336 +36,240 @@ 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);
+/** 对战来源类型（1=好友约战，2=匹配对战），用于结算页分流 */
+const battleWay = ref(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) {
-      setTimeout(() => {
-        uni.$emit("update-timer", 15 - readyRemain);
-      }, 200);
+const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
+  try {
+    battleId.value = battleInfo.matchId;
+    // 存储对战来源，供结算跳转分流使用
+    if (battleInfo.way !== undefined) battleWay.value = battleInfo.way;
+
+    // 优先使用接口返回的队伍数据，如果没有则尝试从缓存读取（应对匹配刚完成接口未就绪的情况）
+    const t1 = battleInfo.teams?.[1] || {};
+    const t2 = battleInfo.teams?.[2] || {};
+
+    if (t1.players) blueTeam.value = [...t1.players];
+    else {
+      const cached = uni.getStorageSync("blue-team");
+      if (cached && cached.length) blueTeam.value = cached;
     }
-  } 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]
-        );
-      if (
-        battleInfo.currentRound > battleInfo.roundResults.length &&
-        hasCurrentRoundData
-      ) {
-        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;
-      });
+
+    if (t2.players) redTeam.value = [...t2.players];
+    else {
+      const cached = uni.getStorageSync("red-team");
+      if (cached && cached.length) redTeam.value = cached;
     }
-    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);
+
+    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;
     }
-    if (battleInfo.firePlayerIndex) {
-      currentShooterId.value = battleInfo.firePlayerIndex;
-      const redPlayer = redTeam.value.find(
-        (item) => item.id === currentShooterId.value
+    if (!arrowOnly) {
+      currentShooterId.value = battleInfo.current.playerId;
+      const redPlayer = battleInfo.teams[2].players.find(
+          (item) => item.id === battleInfo.current.playerId
       );
       let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
-      nextTips += "重回";
-      // if (battleInfo.firePlayerIndex === user.value.id) nextTips += "你";
+      if (force) nextTips += "重回";
+      if (
+          battleInfo.current.playerId === user.value.id &&
+          redTeam.value.length > 1
+      ) {
+        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);
+      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 {
+        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);
+  }
+};
+
+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 (s.indexOf("比赛结束") >= 0) {
+    console.log("比赛结束");
+    onBattleEnd()
+  }
+}
+
+function onBattleEnd() {
+  if (matchStatus.value === 2) {
+    // 全部跳转到新结算页
+    uni.redirectTo({
+      url: `/pages/friend-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;
     }
   }
 }
 
-async function onReceiveMessage(messages = []) {
-  messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      redTeam.value = msg.groupUserStatus.redTeam;
-      blueTeam.value = msg.groupUserStatus.blueTeam;
+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;
+      currentBluePoint.value = 0;
+      currentRedPoint.value = 0;
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 2000);
     }
-    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);
-        } else {
-          uni.$emit("update-ramain", 15);
-        }
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.ShootResult) {
-      if (msg.battleInfo) recoverData(msg.battleInfo);
-    }
-    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) {
-        showRoundTip.value = true;
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      currentShooterId.value = 0;
-      currentBluePoint.value = bluePoints.value;
-      currentRedPoint.value = redPoints.value;
-      if (!isFinalShoot.value) {
-        isFinalShoot.value = true;
-        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);
-      }
-    }
-    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.redirectTo({
+        url: `/pages/friend-battle-result?battleId=${result.matchId}`,
+      });
+    } else {
+      recoverData(result, {force: true});
+    }
   }
 });
-onHide(() => {
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
-  uni.setStorageSync("last-awake-time", Date.now());
-});
 </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"
-          :isRed="false"
-          :currentShooterId="currentShooterId"
+            :team="blueTeam"
+            :isRed="false"
+            :currentShooterId="currentShooterId"
         />
         <ShootProgress2
-          :tips="tips"
-          :currentRound="
+            :tips="tips"
+            :currentRound="
             goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound
           "
         />
-        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId" />
+        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId"/>
       </view>
       <BowTarget
-        v-if="start"
-        mode="team"
-        :scores="scores"
-        :blueScores="blueScores"
+          v-if="start"
+          mode="team"
+          :scores="scores"
+          :blueScores="blueScores"
       />
       <BattleFooter
-        v-if="start"
-        :roundResults="roundResults"
-        :redPoints="redPoints"
-        :bluePoints="bluePoints"
-        :goldenRound="goldenRound"
+          v-if="start"
+          :roundResults="roundResults"
+          :redPoints="redPoints"
+          :bluePoints="bluePoints"
+          :goldenRound="goldenRound"
       />
       <ScreenHint
-        :show="showRoundTip"
-        :onClose="() => (showRoundTip = false)"
-        :mode="isFinalShoot ? 'tall' : 'normal'"
+          :show="showRoundTip"
+          :onClose="() => (showRoundTip = false)"
+          :mode="isFinalShoot ? 'tall' : 'normal'"
       >
         <RoundEndTip
-          v-if="showRoundTip"
-          :isFinal="isFinalShoot"
-          :round="currentRound"
-          :bluePoint="currentBluePoint"
-          :redPoint="currentRedPoint"
-          :roundData="
+            v-if="showRoundTip"
+            :isFinal="isFinalShoot"
+            :round="currentRound"
+            :bluePoint="currentBluePoint"
+            :redPoint="currentRedPoint"
+            :roundData="
             roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
           "
-          :onAutoClose="() => (showRoundTip = false)"
+            :onAutoClose="()=>{ showRoundTip = false}"
         />
       </ScreenHint>
     </view>
@@ -378,6 +281,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"
-    );
-    data.value = result;
-    Object.values(result.bluePlayers).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]);
-      }
-    });
-    if (result.goldenRounds) {
-      result.goldenRounds.forEach(() => {
-        tabs.value.push("决金箭");
-      });
-    }
-    Object.keys(result.roundsData).forEach((key, index) => {
-      if (
-        index <
-        Object.keys(result.roundsData).length - result.goldenRounds.length
-      ) {
-        tabs.value.push(`第${roundsName[key]}轮`);
-      }
-    });
-    onClickTab(0);
-  }
+  if (!options.battleId) return;
+  const result = await getBattleAPI(options.battleId || "57943107462893568");
+  data.value = result;
+  data.value.teams[1].players.forEach((p, index) => {
+    players.value.push(p);
+    players.value.push(data.value.teams[2].players[index]);
+  });
+  Object.values(data.value.rounds).forEach((round, index) => {
+    if (round.ifGold) tabs.value.push(`决金箭`);
+    else tabs.value.push(`第${roundsName[index + 1]}轮`);
+  });
+  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/static/friend-battle-result/rank-one.svg

@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 5">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738459)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738459" x1="0" y1="87" x2="156" y2="87" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7E3627"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>

src/static/friend-battle-result/rank-three.svg

@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 12">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738487)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738487" x1="0" y1="87" x2="156" y2="87" gradientUnits="userSpaceOnUse">
+<stop stop-color="#573E25"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>

src/static/friend-battle-result/rank-two.svg

@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 9">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738473)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738473" x1="0.251953" y1="86.9532" x2="156" y2="86.9532" gradientUnits="userSpaceOnUse">
+<stop stop-color="#25476F"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>