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`

package.json

@@ -23,6 +23,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-4060620250520001",
     "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
+    "@dcloudio/uni-ui": "^1.5.11",
     "pinia": "2.0.36",
     "vue": "^3.4.21",
     "vue-i18n": "^9.1.9"

src/App.vue

@@ -1,221 +1,292 @@
 <script setup>
-import { watch } from "vue";
+	import {
-import { onShow, onHide } from "@dcloudio/uni-app";
+		watch
-import websocket from "@/websocket";
+	} from "vue";
-import useStore from "@/store";
+	import {
-import { storeToRefs } from "pinia";
+		onShow,
-const store = useStore();
+		onHide
-const { user } = storeToRefs(store);
+	} from "@dcloudio/uni-app";
-const { updateUser } = store;
+	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(
+	watch(
-  () => user.value.id,
+		() => user.value.id,
-  (newVal) => {
+		(newVal) => {
-    const token = uni.getStorageSync("token");
+			const token = uni.getStorageSync(
-    if (newVal && token) {
+				`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-      websocket.createWebSocket(token, (content) => {
+			);
-        uni.$emit("socket-inbox", content);
+			if (newVal && token) {
-      });
+				websocket.createWebSocket(token, onShootWsMsg);
-    }
+			}
-    if (!newVal) {
+			if (!newVal) {
-      websocket.closeWebSocket();
+				websocket.closeWebSocket();
-    }
+			}
-  },
+		}, {
-  {
+			deep: false, // 如果 user 是一个对象或数组，建议开启
-    deep: false, // 如果 user 是一个对象或数组，建议开启
+			immediate: false, // 若想在初始化时立即执行一次回调，可开启。
-    immediate: false, // 若想在初始化时立即执行一次回调，可开启。
+		}
-  }
+	);
-);
 
-onShow(() => {
+	function emitUpdateUser(value) {
-  const token = uni.getStorageSync("token");
+		updateUser(value);
-  if (user.value.id && token) {
+	}
-    console.log("回到前台，重新连接 websocket");
-    websocket.createWebSocket(token, (content) => {
-      uni.$emit("socket-inbox", content);
-    });
-  }
-});
 
-onHide(() => {
+	async function emitUpdateOnline() {
-  websocket.closeWebSocket();
+		const data = await getDeviceBatteryAPI();
-});
+		updateOnline(data.online);
+	}
+
+	function onDeviceShoot() {
+		// audioManager.play("射箭声音")
+	}
+
+	function onShootWsMsg(content) {
+		if(content.type === 'shoot-trigger'){
+			onDeviceShoot()
+		}
+		uni.$emit("socket-inbox", content);
+	}
+
+	onShow(() => {
+		uni.$on("update-user", emitUpdateUser);
+		uni.$on("update-online", emitUpdateOnline);
+		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 {
+	page {
-  -webkit-touch-callout: none;
+		-webkit-touch-callout: none;
-  -webkit-user-select: none;
+		-webkit-user-select: none;
-  user-select: none;
+		user-select: none;
-  background-color: #000;
+		background-color: #000;
-}
+	}
 
-button {
+	button {
-  margin: 0;
+		margin: 0;
-  padding: 0;
+		padding: 0;
-  border: none;
+		border: none;
-  background: none;
+		background: none;
-  line-height: 1;
+		line-height: 1;
-  outline: none;
+		outline: none;
-  box-sizing: border-box;
+		box-sizing: border-box;
-}
+	}
 
-button::after {
+	view::-webkit-scrollbar {
-  border: none;
+		width: 0;
-}
+		height: 0;
+		color: transparent;
+	}
 
-.guide-tips {
+	button::after {
-  display: flex;
+		border: none;
-  flex-direction: column;
+	}
-}
-.guide-tips > text:first-child {
-  color: #fed847;
-}
 
-@keyframes fadeInOut {
+	.guide-tips {
-  0% {
+		display: flex;
-    transform: translateY(20px);
+		flex-direction: column;
-    opacity: 0;
+		font-size: 28rpx;
-  }
+	}
-  30% {
-    transform: translateY(0);
-    opacity: 1;
-  }
-  80% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
 
-.fade-in-out {
+	.guide-tips>text:first-child {
-  animation: fadeInOut 1.2s ease forwards;
+		color: #fed847;
-}
+	}
 
-@keyframes fadeOut {
+	.guide-tips>text:nth-child(2) {
-  from {
+		font-size: 24rpx;
-    transform: translateY(0);
+	}
-    opacity: 1;
-  }
-  to {
-    transform: translateY(20px);
-    opacity: 0;
-  }
-}
 
-.fade-out {
+	@keyframes fadeInOut {
-  animation: fadeOut 0.3s ease forwards;
+		0% {
-}
+			transform: translateY(20px);
+			opacity: 0;
+		}
 
-@keyframes scaleIn {
+		30% {
-  from {
+			transform: translateY(0);
-    transform: scale(0);
+			opacity: 1;
-    opacity: 0;
+		}
-  }
-  to {
-    transform: scale(1);
-    opacity: 1;
-  }
-}
 
-.scale-in {
+		80% {
-  animation: scaleIn 0.3s ease-out forwards;
+			opacity: 1;
-  transform-origin: center center;
+		}
-}
 
-@keyframes scaleOut {
+		100% {
-  from {
+			opacity: 0;
-    transform: scale(1);
+		}
-    opacity: 1;
+	}
-  }
-  to {
-    transform: scale(0);
-    opacity: 0;
-  }
-}
 
-.scale-out {
+	.fade-in-out {
-  animation: scaleOut 0.3s ease-out forwards;
+		animation: fadeInOut 1.2s ease forwards;
-  transform-origin: center center;
+	}
-}
 
-@keyframes rotate {
+	@keyframes fadeOut {
-  from {
+		from {
-    transform: rotate(0deg);
+			transform: translateY(0);
-  }
+			opacity: 1;
-  to {
+		}
-    transform: rotate(360deg);
-  }
-}
 
-@keyframes pumpIn {
+		to {
-  from {
+			transform: translateY(20px);
-    transform: scale(2);
+			opacity: 0;
-  }
+		}
-  to {
+	}
-    transform: scale(1);
-  }
-}
 
-.pump-in {
+	.fade-out {
-  animation: pumpIn 0.3s ease-out forwards;
+		animation: fadeOut 0.3s ease forwards;
-  transform-origin: center center;
+	}
-}
 
-.share-canvas {
+	@keyframes scaleIn {
-  width: 300px;
+		from {
-  height: 534px;
+			transform: scale(0);
-  position: absolute;
+			opacity: 0;
-  top: -1000px;
+		}
-  left: 0;
-}
 
-.truncate {
+		to {
-  white-space: nowrap;
+			transform: scale(1);
-  overflow: hidden;
+			opacity: 1;
-  text-overflow: ellipsis;
+		}
-}
+	}
 
-.modal {
+	.scale-in {
-  height: 100%;
+		animation: scaleIn 0.3s ease-out forwards;
-  display: flex;
+		transform-origin: center center;
-  flex-direction: column;
+	}
-  align-items: center;
+
-  justify-content: center;
+	@keyframes scaleOut {
-}
+		from {
-.user-row {
+			transform: scale(1);
-  display: flex;
+			opacity: 1;
-  align-items: center;
+		}
-  justify-content: space-between;
+
-  padding: 0 15px;
+		to {
-  padding-top: 7px;
+			transform: scale(0);
-  position: relative;
+			opacity: 0;
-}
+		}
-.half-time-tip {
+	}
-  width: 100%;
+
-  display: flex;
+	.scale-out {
-  flex-direction: column;
+		animation: scaleOut 0.3s ease-out forwards;
-  justify-content: center;
+		transform-origin: center center;
-  align-items: center;
+	}
-}
+
-.half-time-tip > text:last-child {
+	@keyframes rotate {
-  margin-top: 20px;
+		from {
-  color: #fff9;
+			transform: rotate(0deg);
-}
+		}
-.see-more {
+
-  display: flex;
+		to {
-  align-items: center;
+			transform: rotate(360deg);
-  justify-content: center;
+		}
-  margin-top: 5px;
+	}
-}
+
-.see-more > text {
+	@keyframes pumpIn {
-  color: #39a8ff;
+		from {
-  margin-top: 2px;
+			transform: scale(2);
-  font-size: 13px;
+		}
-}
+
-.see-more > image {
+		to {
-  width: 15px;
+			transform: scale(1);
-  margin-top: 2px;
+		}
-}
+	}
+
+	.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,456 +1,558 @@
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版
 
 try {
-  const accountInfo = uni.getAccountInfoSync();
+    const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+    const envVersion = accountInfo.miniProgram.envVersion;
 
-  switch (envVersion) {
+    switch (envVersion) {
-    case "develop": // 开发版
+        case "develop": // 开发版
-      BASE_URL = "http://192.168.1.242:8000/api/shoot";
+            // BASE_URL = "http://localhost:8000/api/shoot";
-      break;
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-    case "trial": // 体验版
+            break;
-      BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+        case "trial": // 体验版
-      break;
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
-    case "release": // 正式版
+            break;
-      BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
+        case "release": // 正式版
-      break;
+            BASE_URL = "https://api.shelingxingqiu.com/api/shoot";
-    default:
+            break;
-      // 保持默认值
+        default:
-      break;
+            // 保持默认值
-  }
+            break;
+    }
 } catch (e) {
-  console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
 }
 
 function request(method, url, data = {}) {
-  const token = uni.getStorageSync("token");
+    const token = uni.getStorageSync(
-  const header = {};
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  if (token) header.Authorization = `Bearer ${token || ""}`;
+    );
-  return new Promise((resolve, reject) => {
+    const header = {};
-    uni.request({
+    if (token) header.Authorization = `Bearer ${token || ""}`;
-      url: `${BASE_URL}${url}`,
+    return new Promise((resolve, reject) => {
-      method,
+        uni.request({
-      header,
+            url: `${BASE_URL}${url}`,
-      data,
+            method,
-      timeout: 10000,
+            header,
-      success: (res) => {
+            data,
-        if (res.data) {
+            timeout: 10000,
-          const { code, data, message } = res.data;
+            success: (res) => {
-          if (code === 0) resolve(data);
+                if (res.data) {
-          else if (message) {
+                    const {code, data, message} = res.data;
-            if (message.indexOf("登录身份已失效") !== -1) {
+                    if (code === 0) resolve(data);
-              uni.removeStorageSync("token");
+                    else if (message) {
-            }
+                        if (message.indexOf("登录身份已失效") !== -1) {
-            if (message === "ROOM_FULL") {
+                            uni.removeStorageSync(
-              resolve({ full: true });
+                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-              return;
+                            );
-            }
+                            uni.$emit("update-user");
-            if (message === "ERROR_ROOM_GAME_START") {
+                        }
-              resolve({ started: true });
+                        if (message === "ROOM_FULL") {
-              return;
+                            resolve({full: true});
-            }
+                            return;
-            if (url.indexOf("/user/room") !== -1 && method === "GET") {
+                        }
-              resolve({});
+                        if (message === "ERROR_ROOM_GAME_START") {
-              return;
+                            resolve({started: true});
-            }
+                            return;
-            if (message === "ERROR_BATTLE_GAMING") {
+                        }
-              resolve({});
+                        if (url.indexOf("/user/room") !== -1 && method === "GET") {
-              return;
+                            resolve({});
-            }
+                            return;
-            if (message === "BIND_DEVICE") {
+                        }
-              resolve({ binded: true });
+                        if (message === "ERROR_BATTLE_GAMING") {
-              return;
+                            resolve({});
-            }
+                            return;
-            if (message === "ERROR_ORDER_UNPAY") {
+                        }
-              uni.showToast({
+                        if (message === "BIND_DEVICE") {
-                title: "当前有未支付订单",
+                            resolve({binded: true});
-                icon: "none",
+                            return;
-              });
+                        }
-              resolve({});
+                        if (message === "ERROR_ORDER_UNPAY") {
-              return;
+                            uni.showToast({
-            }
+                                title: "当前有未支付订单",
-            uni.showToast({
+                                icon: "none",
-              title: message,
+                            });
-              icon: "none",
+                            resolve({});
-            });
+                            return;
-          }
+                        }
-        }
+                        if (message === "ROOM_EMPTY") {
-      },
+                            return uni.showToast({
-      fail: (err) => {
+                                title: "房间已过期",
-        handleRequestError(err, url);
+                                icon: "none",
-        reject(err);
+                            });
-      },
+                        }
+                        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) {
-    if (err.errMsg.includes("timeout")) {
+        if (err.errMsg.includes("timeout")) {
-      showCustomToast("请求超时，请稍后重试", "timeout");
+            showCustomToast("请求超时，请稍后重试", "timeout");
-    } else if (err.errMsg.includes("fail")) {
+        } else if (err.errMsg.includes("fail")) {
-      // 检查网络状态
+            // 检查网络状态
-      uni.getNetworkType({
+            uni.getNetworkType({
-        success: (res) => {
+                success: (res) => {
-          if (res.networkType === "none") {
+                    if (res.networkType === "none") {
-            showCustomToast("网络连接已断开，请检查网络设置", "network");
+                        showCustomToast("网络连接已断开，请检查网络设置", "network");
-          } else {
+                    } else {
-            showCustomToast("服务器连接失败，请稍后重试", "server");
+                        showCustomToast("服务器连接失败，请稍后重试", "server");
-          }
+                    }
-        },
+                },
-        fail: () => {
+                fail: () => {
-          showCustomToast("网络异常，请检查网络连接", "unknown");
+                    showCustomToast("网络异常，请检查网络连接", "unknown");
-        },
+                },
-      });
+            });
+        } else {
+            showCustomToast("请求失败，请稍后重试", "general");
+        }
     } else {
-      showCustomToast("请求失败，请稍后重试", "general");
+        showCustomToast("网络异常，请稍后重试", "unknown");
     }
-  } else {
-    showCustomToast("网络异常，请稍后重试", "unknown");
-  }
 }
 
 // 自定义提示函数
 function showCustomToast(message, type) {
-  const config = {
+    const config = {
-    title: message,
+        title: message,
-    icon: "none",
+        icon: "none",
-    duration: 3000,
+        duration: 3000,
-  };
+    };
 
-  // 根据错误类型可以添加不同的处理逻辑
+    // 根据错误类型可以添加不同的处理逻辑
-  switch (type) {
+    switch (type) {
-    case "timeout":
+        case "timeout":
-      config.duration = 4000; // 超时提示显示更久
+            config.duration = 4000; // 超时提示显示更久
-      break;
+            break;
-    case "network":
+        case "network":
-      config.duration = 5000; // 网络问题提示显示更久
+            config.duration = 5000; // 网络问题提示显示更久
-      break;
+            break;
-    default:
+        default:
-      break;
+            break;
-  }
+    }
 
-  uni.showToast(config);
+    uni.showToast(config);
 }
 
 // 获取全局配置
 export const getAppConfig = () => {
-  return request("GET", "/index/appConfig");
+    return request("GET", "/index/appConfig");
 };
 
 export const getHomeData = (seasonId) => {
-  return request("GET", `/user/myHome?seasonId=${seasonId}`);
+    return request("GET", `/user/myHome?seasonId=${seasonId}`);
 };
 
 export const getProvinceData = () => {
-  return request("GET", "/index/provinces/list");
+    return request("GET", "/index/provinces/list");
 };
 
-export const loginAPI = async (nickName, avatarData, code) => {
+export const loginAPI = async (phone, nickName, avatarData, code) => {
-  const result = await request("POST", "/index/code", {
+    const result = await request("POST", "/index/code", {
-    appName: "shoot",
+        appName: "shoot",
-    appId: "wxa8f5989dcd45cc23",
+        appId: "wxa8f5989dcd45cc23",
-    nickName,
+        nickName,
-    avatarData,
+        avatarData,
-    code,
+        code,
-  });
+        phone,
-  uni.setStorageSync("token", result.token);
+    });
-  return result;
+    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", {
+    return request("POST", "/user/device/bindDevice", {
-    device,
+        device,
-  });
+    });
+};
+
+export const bindDeviceAPIV2 = (token) => {
+    return request("POST", "/user/device/bindDevice/v2", {
+        token: token,
+    });
 };
 
 export const unbindDeviceAPI = (deviceId) => {
-  return request("POST", "/user/device/unbindDevice", {
+    return request("POST", "/user/device/unbindDevice", {
-    deviceId,
+        deviceId,
-  });
+    });
 };
 
 export const getMyDevicesAPI = () => {
-  // "/user/device/getBinding?deviceId=9ZF9oVXs"
+    // "/user/device/getBinding?deviceId=9ZF9oVXs"
-  return request("GET", "/user/device/getBindings");
+    return request("GET", "/user/device/getBindings");
 };
 
-export const createPractiseAPI = (arrows) => {
+export const createPractiseAPI = (arrows, time, target) => {
-  return request("POST", "/user/practice/create", {
+    return request("POST", "/user/practice/create", {
-    arrows,
+        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}`);
+    return request("GET", `/user/practice/get?id=${id}`);
-  const data = { ...(result.UserPracticeRound || {}) };
-  if (data.arrows) data.arrows = JSON.parse(data.arrows);
-  return data;
 };
 
-export const createRoomAPI = (gameType, teamSize) => {
+export const createRoomAPI = (gameType, teamSize, targetType) => {
-  return request("POST", "/user/createroom", {
+    return request("POST", "/user/createroom", {
-    gameType,
+        gameType,
-    teamSize,
+        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", {
+    return request("POST", "/user/room/destroyRoom", {
-    roomNumber,
+        roomNumber,
-  });
+    });
 };
 
-export const exitRoomAPI = (number) => {
+export const exitRoomAPI = (number, userId) => {
-  return request("POST", "/user/room/exitRoom", {
+    return request("POST", "/user/room/exitRoom", {
-    number,
+        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(
+    const reuslt = await request(
-    "GET",
+        "GET",
-    `/user/practice/list?page=${page}&page_size=${page_size}`
+        `/user/practice/list?page=${page}&page_size=${page_size}`
-  );
+    );
-  return reuslt.list;
+    return reuslt.list;
 };
 
 export const matchGameAPI = (match, gameType, teamSize) => {
-  return request("POST", "/user/game/match", {
+    return request("POST", "/user/game/match", {
-    match,
+        match,
-    gameType,
+        gameType,
-    teamSize,
+        teamSize,
-  });
+        readyTime: 15,
+        targetType: 20,
+    });
 };
 
 export const readyGameAPI = (battleId) => {
-  return request("POST", "/user/game/prepare", {
+    return request("POST", "/user/game/prepare", {
-    battleId,
+        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 = {
-    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.goldenRound =
-      goldenRoundRecords && goldenRoundRecords.length
-        ? goldenRoundRecords[0]
-        : null;
-    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,
-        };
-      });
     });
-    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 = {
+    const data = {
-    device_id,
+        device_id,
-  };
+    };
-  if (x !== undefined && y !== undefined) {
+    if (x !== undefined && y !== undefined) {
-    data.x = x;
+        data.x = x;
-    data.y = y;
+        data.y = y;
-  }
+    }
-  return request("POST", "/index/arrow", data);
+    return request("POST", "/index/arrow", data);
 };
 
 export const getBattleListAPI = async (page, battleType) => {
-  const data = [];
+    const result = await request("POST", "/user/battle/details/list", {
-  const result = await request("POST", "/user/battle/details/list", {
+        page,
-    page,
+        pageSize: 10,
-    battleType,
+        battleType,
-    modeType: 0,
-  });
-  (result.Battles || []).forEach((item) => {
-    let name = "";
-    if (item.battleStats.mode === 1) {
-      name = `${item.playerStats.length / 2}V${item.playerStats.length / 2}`;
-    }
-    if (item.battleStats.mode === 2) {
-      name = `${item.playerStats.length}人大乱斗`;
-    }
-    data.push({
-      name,
-      battleId: item.battleStats.battleId,
-      mode: item.battleStats.mode,
-      createdAt: item.battleStats.createdAt,
-      gameEndAt: item.battleStats.gameEndAt,
-      winner: item.battleStats.winner,
-      players: item.playerStats
-        .map((p) => p.playerBattleStats)
-        .sort((a, b) => b.totalScore - a.totalScore),
-      redPlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 0)
-        .map((p) => p.playerBattleStats),
-      bluePlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 1)
-        .map((p) => p.playerBattleStats),
     });
-  });
+    return result.list;
-  return data;
 };
 
 export const getRankListAPI = () => {
-  return request("GET", "/index/ranklist");
+    return request("GET", "/index/ranklist");
 };
 
 export const createOrderAPI = (vipId) => {
-  return request("POST", "/user/order/create", {
+    return request("POST", "/user/order/create", {
-    vipId,
+        vipId,
-    quanity: 1,
+        quanity: 1,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const payOrderAPI = (id) => {
-  return request("POST", "/user/order/pay", {
+    return request("POST", "/user/order/pay", {
-    id,
+        id,
-    tradeType: "mini",
+        tradeType: "mini",
-    payType: "wxpay",
+        payType: "wxpay",
-  });
+    });
 };
 
 export const getOrderListAPI = async (page) => {
-  const reuslt = await request("GET", `/user/order/list?page=${page}`);
+    const reuslt = await request("GET", `/user/order/list?page=${page}`);
-  return reuslt.items || [];
+    return reuslt.items || [];
 };
 
 export const cancelOrderListAPI = async (id) => {
-  return request("POST", "/user/order/cancelOrder", { id });
+    return request("POST", "/user/order/cancelOrder", {id});
 };
 
-export const isGamingAPI = async () => {
+export const getUserGameState = () => {
-  const result = await request("GET", "/user/isGaming");
+    return request("GET", "/user/state");
-  return result.gaming || false;
-};
-
-export const getCurrentGameAPI = async () => {
-  uni.$emit("update-header-loading", true);
-  const result = await request("GET", "/user/join/battle");
-  return result.currentGame || {};
 };
 
 export const getPointBookConfigAPI = async () => {
-  return request("GET", "/user/score/sheet/option");
+    return request("GET", "/user/score/sheet/option");
 };
 
 export const savePointBookAPI = async (
-  bowType,
-  distance,
-  targetType,
-  groups,
-  arrows,
-  data = []
-) => {
-  return request("POST", "/user/score/sheet/report", {
     bowType,
     distance,
     targetType,
     groups,
     arrows,
-    group_data: data.map((item) =>
+    data = []
-      item.map((i) => ({
+) => {
-        ...i,
+    return request("POST", "/user/score/sheet/report", {
-        ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+        bowType,
-      }))
+        distance,
-    ),
+        targetType,
-  });
+        groups,
+        arrows,
+        group_data: data.map((item) =>
+            item.map((i) => ({
+                ...i,
+                ring: i.ring === "M" ? -1 : i.ring === "X" ? 0 : Number(i.ring),
+            }))
+        ),
+    });
 };
 
 export const getPointBookListAPI = async (
-  page = 1,
+    page = 1,
-  bowType,
+    bowType,
-  distance,
+    distance,
-  targetType
+    targetType
 ) => {
-  let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
+    let url = `/user/score/sheet/list?pageNum=${page}&pageSize=10`;
-  if (bowType) url += `&bowType=${bowType}`;
+    if (bowType) url += `&bowType=${bowType}`;
-  if (distance) url += `&distance=${distance}`;
+    if (distance) url += `&distance=${distance}`;
-  if (targetType) url += `&targetType=${targetType}`;
+    if (targetType) url += `&targetType=${targetType}`;
-  const result = await request("GET", url);
+    const result = await request("GET", url);
-  return result.list || [];
+    return result.list || [];
 };
 
 export const getPointBookDetailAPI = async (id) => {
-  return request("GET", `/user/score/sheet/detail?id=${id}`);
+    return request("GET", `/user/score/sheet/detail?id=${id}`);
 };
 
 export const getPointBookDataAPI = async () => {
-  return request("GET", "/user/score/sheet/statistics");
+    return request("GET", "/user/score/sheet/statistics");
 };
 
 export const getPractiseDataAPI = async () => {
-  return request("GET", "/user/practice/statistics");
+    return request("GET", "/user/practice/statistics");
 };
 
 export const 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");
+};
+
+export const getPointBookStatisticsAPI = async () => {
+    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,
+    });
+};
+
+export const laserAimAPI = async () => {
+    return request("POST", "/user/device/laserAim");
+};
+
+export const laserCloseAPI = async () => {
+    return request("POST", "/user/device/closeAim");
+};
+
+export const getDeviceBatteryAPI = async () => {
+    return request("GET", "/user/device/battery");
+};
+
+export const addNoteAPI = async (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}`);
+};
+
+export const getPhoneNumberAPI = (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`
+    );
+};
+
+export const clickLikeAPI = (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}`
+    );
+};
+
+export const getReadyAPI = (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

@@ -1,91 +1,705 @@
-const audioFils = {
+export const audioFils = {
+  // 激光已校准:
+  //   "https://static.shelingxingqiu.com/attachment/2025-10-29/ddupaur1vdkyhzaqdc.mp3",
+  胜利: "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuo9yjp0kt5msvmvd.mp3",
+  失败: "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuo9yht2sdwhuqygy.mp3",
+  请射箭测试距离:
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuvj8avzqyw4hpq7t.mp3",
+  距离合格:
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3",
+  距离不足:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3",
+  轮到你了:
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrn4lxcpv8aqr.mp3",
   第一轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fl26qrspvy79.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutyyr9a7m1vz2w13.mp3",
   第二轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fehshrpe5ook.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutyyr9ldnfexjxtw.mp3",
   第三轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fgbz3iimk7yy.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutyyr97m4ipxaze4.mp3",
   第四轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fjwf50tlxxbi.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutyyr9x5addohlzf.mp3",
   第五轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fg63lqrslhm7.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutyyr9d7lw2gebpv.mp3",
   决金箭轮:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fhjycwubbwil.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrd9zs4oi2kujv.mp3",
-  请蓝方射击:
+  请蓝方射箭:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fr0zpluiabph.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrxcbe5ll46as.mp3",
-  请红方射击:
+  请红方射箭:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fu169yerpwey.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl3re3dhlfjd.mp3",
   中场休息:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblu6fug8faqrbtwd.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrd9zdk1xyolst.mp3",
   比赛结束:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblsdl717ilr0b3o0.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutya59b6pu0ur4um.mp3",
   比赛开始:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbblsdl7qlkqgvthfr.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuu5z3a3lumkutske.mp3",
   请开始射击:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbljrfx5guqt5oulk.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3",
+  射击无效:
+    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutya55ufiiw8oo55.mp3",
   未上靶:
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbkxm60bul0khcoqq.mp3",
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
   "1环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklufj59qmdo96ha.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/1.mp3",
   "2环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklufogy49ousbv4.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/2.mp3",
   "3环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklufl3hhijeasck.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/3.mp3",
   "4环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklufo8vo7k6jxdz.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/4.mp3",
   "5环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklkzq7lrbfpr6ij.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/5.mp3",
   "6环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbkll0fw7hbmmhxkl.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/6.mp3",
   "7环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbkll0fkirkanghmf.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/7.mp3",
   "8环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbkll0cly2noykieg.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/8.mp3",
   "9环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbkll0gsuumekhpkn.mp3",
+    "https://static.shelingxingqiu.com/shootaudio/v3/9.mp3",
   "10环":
-    "https://static.shelingxingqiu.com/attachment/2025-07-14/dbbklgw2dk22ek7qha.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",
+  向右上调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellf45v88pirarr.mp3",
+  向右调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6elleqnhrenggxsb.mp3",
+  向右下调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6elleo6q16qctf6a.mp3",
+  向下调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellek2mu2cri2n9.mp3",
+  向左下调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellf25yu1pt2k5r.mp3",
+  向左调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellen3zoalxcb06.mp3",
+  向左上调整:
+    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6ellf37a2iw6w4pu.mp3",
+  最后30秒:
+    "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"
 };
 
+// 版本控制日志函数
+function debugLog(...args) {
+  // 获取当前环境信息
+  const accountInfo = uni.getAccountInfoSync();
+  const envVersion = accountInfo.miniProgram.envVersion;
+
+  // 只在体验版打印日志，正式版(release)和开发版(develop)不打印
+  if (envVersion === "trial") {
+    console.log(...args);
+  }
+}
+
 class AudioManager {
   constructor() {
     this.audioMap = new Map();
-    Object.keys(audioFils).forEach((key) => {
+    this.currentPlayingKey = null;
-      const audio = uni.createInnerAudioContext();
+    this.maxRetries = 3;
-      audio.src = audioFils[key];
+    // 多轮统一重试：最多重试的轮次与每轮间隔
-      audio.autoplay = false;
+    this.maxRetryRounds = 10;
+    this.retryRoundIntervalMs = 1500;
+    // 显式授权播放标记，防止 iOS 在设置 src 后误播
+    this.allowPlayMap = new Map();
 
-      // 监听加载状态
+    // 串行加载相关属性
-      audio.onCanplay(() => {
+    this.audioKeys = [];
-        // console.log(`音频 ${key} 已加载完成`);
+    this.currentLoadingIndex = 0;
-      });
+    this.isLoading = false;
+    this.loadingPromise = null;
 
-      audio.onError((res) => {
+    // 连续播放队列相关属性
-        console.log(`音频 ${key} 加载失败：`, res.errMsg);
+    this.sequenceQueue = [];
-      });
+    this.sequenceIndex = 0;
+    this.isSequenceRunning = false;
 
-      this.audioMap.set(key, audio);
+    // 防重复播放保护
+    this.lastPlayKey = null;
+    this.lastPlayAt = 0;
+
+    // 静音开关
+    this.isMuted = false;
+    this.pendingPlayKey = null;
+    // 新增：就绪状态映射
+    this.readyMap = new Map();
+    // 新增：首轮失败的音频集合与重试阶段标识
+    this.failedLoadKeys = new Set();
+    // 加载代数，用于 reloadAll 时作废旧的加载循环
+    this.loadGeneration = 0;
+    // 本地路径缓存 Map: { url: localPath }
+    this.localFileCache = uni.getStorageSync("audio_local_files") || {};
+    // 启动时自动清理过期的缓存文件（URL 已不在 audioFils 中的文件）
+    this.cleanObsoleteCache();
+
+    this.initAudios();
+  }
+
+  // 清理不再使用的缓存文件
+  cleanObsoleteCache() {
+    const activeUrls = new Set(Object.values(audioFils));
+    const cachedUrls = Object.keys(this.localFileCache);
+    let hasChanges = false;
+
+    for (const url of cachedUrls) {
+      if (!activeUrls.has(url)) {
+        debugLog(`发现废弃音频缓存，正在清理: ${url}`);
+        const path = this.localFileCache[url];
+        // 移除物理文件
+        uni.removeSavedFile({
+          filePath: path,
+          complete: () => {
+            // 忽略移除结果，直接移除记录
+          },
+        });
+        // 移除记录
+        delete this.localFileCache[url];
+        hasChanges = true;
+      }
+    }
+
+    if (hasChanges) {
+      uni.setStorageSync("audio_local_files", this.localFileCache);
+      debugLog("废弃缓存清理完成");
+    }
+  }
+
+  // 初始化音频（两阶段：首轮串行加载全部，次轮仅串行加载失败项一次）
+  initAudios() {
+    if (this.isLoading) {
+      debugLog("音频正在加载中，跳过重复初始化");
+      return this.loadingPromise;
+    }
+    debugLog("开始串行加载音频...");
+    this.isLoading = true;
+    this.audioKeys = Object.keys(audioFils);
+    this.currentLoadingIndex = 0;
+    this.failedLoadKeys.clear();
+
+    // 增加代数，使得旧的加载循环失效
+    this.loadGeneration = (this.loadGeneration || 0) + 1;
+    const currentGen = this.loadGeneration;
+
+    this.loadingPromise = new Promise((resolve) => {
+      const finalize = () => {
+        if (currentGen !== this.loadGeneration) return;
+        const runRounds = (round) => {
+          if (currentGen !== this.loadGeneration) return;
+          // 达到最大轮次或没有失败项，收尾
+          if (this.failedLoadKeys.size === 0 || round > this.maxRetryRounds) {
+            this.isLoading = false;
+            resolve();
+            return;
+          }
+
+          const retryKeys = Array.from(this.failedLoadKeys);
+          this.failedLoadKeys.clear();
+          debugLog(`开始第 ${round} 轮串行加载，共 ${retryKeys.length} 个`);
+
+          this.loadKeysSequentially(
+            retryKeys,
+            () => {
+              if (currentGen !== this.loadGeneration) return;
+              // 如仍有失败项，继续下一轮；否则结束
+              if (this.failedLoadKeys.size > 0 && round < this.maxRetryRounds) {
+                setTimeout(
+                  () => runRounds(round + 1),
+                  this.retryRoundIntervalMs
+                );
+              } else {
+                this.isLoading = false;
+                resolve();
+              }
+            },
+            currentGen
+          );
+        };
+
+        // 启动第 1 轮重试（如有失败项）
+        runRounds(1);
+      };
+      this.loadNextAudio(finalize, currentGen);
+    });
+    return this.loadingPromise;
+  }
+
+  // 按自定义列表串行加载音频（避免并发过多）
+  loadKeysSequentially(keys, onComplete, gen) {
+    if (gen !== undefined && gen !== this.loadGeneration) return;
+    let idx = 0;
+    const list = Array.from(keys);
+    const next = () => {
+      if (gen !== undefined && gen !== this.loadGeneration) return;
+      if (idx >= list.length) {
+        if (onComplete) onComplete();
+        return;
+      }
+      const k = list[idx++];
+
+      // 已就绪的音频不再重载，避免把 ready 状态重置为 false
+      if (this.readyMap.get(k)) {
+        setTimeout(next, 50);
+        return;
+      }
+
+      // 未就绪：已存在则重载；不存在则创建
+      if (this.audioMap.has(k)) {
+        this.retryLoadAudio(k);
+        setTimeout(next, 100);
+      } else {
+        this.createAudio(k, () => {
+          setTimeout(next, 100);
+        });
+        return; // createAudio 内部会触发 next
+      }
+    };
+    next();
+  }
+
+  // 串行加载下一个音频（首轮）
+  loadNextAudio(onComplete, gen) {
+    if (gen !== undefined && gen !== this.loadGeneration) return;
+    if (this.currentLoadingIndex >= this.audioKeys.length) {
+      debugLog("首轮加载遍历完成", this.currentLoadingIndex);
+      if (onComplete) onComplete();
+      return;
+    }
+    const key = this.audioKeys[this.currentLoadingIndex];
+    debugLog(
+      `开始加载音频 ${this.currentLoadingIndex + 1}/${
+        this.audioKeys.length
+      }: ${key}`
+    );
+    this.createAudio(key, () => {
+      setTimeout(() => {
+        this.loadNextAudio(onComplete, gen);
+      }, 100);
     });
   }
 
-  // 播放指定音频
+  // 创建单个音频实例（支持本地缓存）
-  play(key) {
+  createAudio(key, callback) {
+    this.currentLoadingIndex++;
+    const src = audioFils[key];
+
+    const setupAudio = (realSrc) => {
+      const audio = uni.createInnerAudioContext();
+      audio.autoplay = false;
+      audio.src = realSrc;
+      try {
+        if (typeof audio.volume === "number") {
+          audio.volume = this.isMuted ? 0 : 1;
+        } else if (typeof audio.muted !== "undefined") {
+          audio.muted = this.isMuted;
+        }
+      } catch (_) {}
+      this.allowPlayMap.set(key, false);
+      audio.onPlay(() => {
+        if (!this.allowPlayMap.get(key)) {
+          try {
+            audio.stop();
+          } catch (_) {}
+        }
+      });
+
+      const loadTimeout = setTimeout(() => {
+        debugLog(`音频 ${key} 加载超时`);
+        this.recordLoadFailure(key);
+        try {
+          audio.destroy();
+        } catch (_) {}
+        if (callback) callback();
+      }, 10000);
+
+      audio.onCanplay(() => {
+        if (!this.allowPlayMap.get(key)) {
+          try {
+            audio.pause();
+          } catch (_) {}
+        }
+        clearTimeout(loadTimeout);
+        this.readyMap.set(key, true);
+        this.failedLoadKeys.delete(key);
+        // debugLog(`音频 ${key} 已加载完成`, this.getLoadProgress());
+        uni.$emit("audioLoaded", key);
+        const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
+        loadedAudioKeys[key] = true;
+        uni.setStorageSync("loadedAudioKeys", loadedAudioKeys);
+        if (callback) callback();
+      });
+
+      audio.onError((res) => {
+        clearTimeout(loadTimeout);
+        debugLog(`音频 ${key} 加载失败：`, res.errMsg);
+        // 如果是本地文件加载失败，可能是文件损坏，清除缓存以便下次重新下载
+        if (realSrc !== src && this.localFileCache[src] === realSrc) {
+          debugLog(`本地缓存失效，移除记录: ${key}`);
+          delete this.localFileCache[src];
+          uni.setStorageSync("audio_local_files", this.localFileCache);
+          // 移除文件
+          uni.removeSavedFile({ filePath: realSrc });
+        }
+        this.recordLoadFailure(key);
+        this.audioMap.delete(key);
+        audio.destroy();
+        if (this.readyMap.get(key)) {
+          // 这里不要去除，不然检查进度的时候由于没有重新加载而进度卡住，等播放失败的时候会重新加载
+          // this.readyMap.set(key, false);
+        } else {
+          if (callback) callback();
+        }
+      });
+
+      audio.onEnded(() => {
+        if (this.currentPlayingKey === key) {
+          this.currentPlayingKey = null;
+        }
+        this.allowPlayMap.set(key, false);
+        this.onAudioEnded(key);
+        uni.$emit('audioEnded', key);
+      });
+
+      audio.onStop(() => {
+        if (this.currentPlayingKey === key) {
+          this.currentPlayingKey = null;
+        }
+        this.allowPlayMap.set(key, false);
+      });
+
+      this.audioMap.set(key, audio);
+    };
+
+    // 检查是否有可用的本地缓存
+    this.checkLocalFile(src).then((localPath) => {
+      if (localPath) {
+        debugLog(`命中本地缓存: ${key}`);
+        setupAudio(localPath);
+      } else {
+        // 下载并尝试保存
+        uni.downloadFile({
+          url: src,
+          timeout: 20000,
+          success: (res) => {
+            if (res.tempFilePath) {
+              // 尝试保存文件到本地存储（持久化）
+              uni.getFileSystemManager().saveFile({
+                tempFilePath: res.tempFilePath,
+                success: (saveRes) => {
+                  const savedPath = saveRes.savedFilePath;
+                  this.localFileCache[src] = savedPath;
+                  uni.setStorageSync("audio_local_files", this.localFileCache);
+                  debugLog(`音频已缓存到本地: ${key}`);
+                  setupAudio(savedPath);
+                },
+                fail: (err) => {
+                  debugLog(
+                    `保存音频失败(可能空间不足)，使用临时文件: ${key}`,
+                    err
+                  );
+                  setupAudio(res.tempFilePath);
+                },
+              });
+            } else {
+              this.recordLoadFailure(key);
+              if (callback) callback();
+            }
+          },
+          fail: () => {
+            this.recordLoadFailure(key);
+            if (callback) callback();
+          },
+        });
+      }
+    });
+  }
+
+  // 检查本地文件是否有效
+  checkLocalFile(url) {
+    return new Promise((resolve) => {
+      const path = this.localFileCache[url];
+      if (!path) {
+        resolve(null);
+        return;
+      }
+      // 检查文件是否存在
+      uni.getFileSystemManager().getFileInfo({
+        filePath: path,
+        success: () => {
+          resolve(path);
+        },
+        fail: () => {
+          // 文件不存在，清理记录
+          delete this.localFileCache[url];
+          uni.setStorageSync("audio_local_files", this.localFileCache);
+          resolve(null);
+        },
+      });
+    });
+  }
+
+  // 新增：记录失败（首轮与次轮都会用到）
+  recordLoadFailure(key) {
+    this.failedLoadKeys.add(key);
+  }
+
+  // 重新加载音频
+  retryLoadAudio(key) {
+    const oldAudio = this.audioMap.get(key);
+    if (oldAudio) oldAudio.destroy();
+    this.createAudio(key);
+  }
+
+  // 播放指定音频或音频数组（数组则按顺序连续播放）
+  play(input, interrupt = true) {
+    // 统一规范化为队列
+    let queue = [];
+    if (Array.isArray(input)) {
+      queue = input.filter((k) => !!audioFils[k]);
+    } else if (typeof input === "string") {
+      queue = !!audioFils[input] ? [input] : [];
+    } else {
+      debugLog("play 参数类型无效，仅支持字符串或字符串数组");
+      return;
+    }
+
+    if (queue.length === 0) {
+      debugLog("连续播放队列为空或无效");
+      return;
+    }
+
+    if (interrupt) {
+      // 立即打断并启动新的播放序列
+      this.stopAll();
+      this.isSequenceRunning = false;
+      this.sequenceQueue = [];
+      this.sequenceIndex = 0;
+
+      this.sequenceQueue = queue;
+      this.sequenceIndex = 0;
+      this.isSequenceRunning = true;
+      this._playSingle(queue[0], false);
+      return;
+    }
+
+    // 不打断当前播放：把新的队列加入到序列中，等待当前播放结束后衔接
+    if (this.currentPlayingKey) {
+      if (this.isSequenceRunning) {
+        // 已有序列在跑：直接追加
+        this.sequenceQueue = this.sequenceQueue.concat(queue);
+      } else {
+        // 没有序列但当前有正在播放的：以当前为序列的起点
+        this.isSequenceRunning = true;
+        this.sequenceQueue = [this.currentPlayingKey].concat(queue);
+        this.sequenceIndex = 0;
+        // 不触发 _playSingle，等待当前音频自然结束后由 onAudioEnded 接管
+      }
+    } else {
+      // 当前没有播放：直接启动新的序列
+      this.sequenceQueue = queue;
+      this.sequenceIndex = 0;
+      this.isSequenceRunning = true;
+      this._playSingle(queue[0], false);
+    }
+  }
+
+  // 内部方法：播放单个 key
+  _playSingle(key, forceStopAll = false) {
+    // 200ms 内的同 key 重复播放直接忽略，避免“比比赛开始”这类重复首音
+    const now = Date.now();
+    if (this.lastPlayKey === key && now - this.lastPlayAt < 250) {
+      debugLog(`忽略快速重复播放: ${key}`);
+      return;
+    }
+
+    if (forceStopAll) {
+      this.stopAll();
+    } else if (this.currentPlayingKey && this.currentPlayingKey !== key) {
+      this.stop(this.currentPlayingKey);
+    } else if (this.currentPlayingKey === key) {
+      // 同一音频正在播放：不重启，避免听到重复开头
+      return;
+    }
+
     const audio = this.audioMap.get(key);
-    if (audio) audio.play();
+    if (audio) {
+      // 播放前确保遵循当前静音状态
+      try {
+        if (typeof audio.volume === "number") {
+          audio.volume = this.isMuted ? 0 : 1;
+        } else if (typeof audio.muted !== "undefined") {
+          audio.muted = this.isMuted;
+        }
+      } catch (_) {}
+      // 同一音频：避免 stop() 触发 onStop 清除授权，使用 pause()+seek(0)
+      try {
+        audio.pause();
+      } catch (_) {}
+      try {
+        if (typeof audio.seek === "function") {
+          audio.seek(0);
+        } else {
+          audio.startTime = 0;
+        }
+      } catch (_) {
+        audio.startTime = 0;
+      }
+
+      // 显式授权播放并立即播放
+      this.allowPlayMap.set(key, true);
+
+      audio.play();
+      this.currentPlayingKey = key;
+      this.lastPlayKey = key;
+      this.lastPlayAt = Date.now();
+    } else {
+      debugLog(`音频 ${key} 不存在，尝试重新加载...`);
+      this.retryLoadAudio(key);
+      const handler = (loadedKey) => {
+        if (loadedKey === key) {
+          try {
+            uni.$off("audioLoaded", handler);
+          } catch (_) {}
+          // 再次校验是否存在且就绪
+          const a = this.audioMap.get(key);
+          if (a && this.readyMap.get(key)) {
+            this._playSingle(key, false);
+          }
+        }
+      };
+      try {
+        uni.$on("audioLoaded", handler);
+      } catch (_) {}
+    }
+  }
+
+  // 连续播放：在某个音频结束后，若处于队列播放状态则继续下一个
+  onAudioEnded(key) {
+    if (!this.isSequenceRunning) return;
+    const currentKey = this.sequenceQueue[this.sequenceIndex];
+    if (currentKey !== key) return;
+
+    const nextIndex = this.sequenceIndex + 1;
+    if (nextIndex < this.sequenceQueue.length) {
+      this.sequenceIndex = nextIndex;
+      const nextKey = this.sequenceQueue[nextIndex];
+      this._playSingle(nextKey, false);
+    } else {
+      // 队列播放完成
+      this.isSequenceRunning = false;
+      this.sequenceQueue = [];
+      this.sequenceIndex = 0;
+    }
   }
 
   // 停止指定音频
   stop(key) {
     const audio = this.audioMap.get(key);
-    if (audio) audio.stop();
+    if (audio) {
+      audio.stop();
+      this.allowPlayMap.set(key, false);
+      if (this.currentPlayingKey === key) {
+        this.currentPlayingKey = null;
+      }
+    }
   }
 
-  // 销毁所有音频实例
+  // 停止所有音频
-  destroyAll() {
+  stopAll() {
-    this.audioMap.forEach((audio) => {
+    for (const [k, audio] of this.audioMap.entries()) {
-      audio.destroy();
+      try {
-    });
+        audio.stop();
+      } catch (_) {}
+      this.allowPlayMap.set(k, false);
+    }
+    this.currentPlayingKey = null;
+  }
+
+  // 设置静音开关：true 静音，false 取消静音
+  setMuted(muted) {
+    this.isMuted = !!muted;
+    for (const audio of this.audioMap.values()) {
+      try {
+        if (typeof audio.volume === "number") {
+          audio.volume = this.isMuted ? 0 : 1;
+        } else if (typeof audio.muted !== "undefined") {
+          audio.muted = this.isMuted;
+        }
+      } catch (_) {}
+    }
+    debugLog(`静音状态已设置为: ${this.isMuted}`);
+  }
+
+  // 新增：返回音频加载进度（0~1）
+  getLoadProgress() {
+    const keys = Object.keys(audioFils);
+    const total = keys.length;
+    if (total === 0) return 0;
+    let loaded = 0;
+    for (const k of keys) {
+      if (this.readyMap.get(k)) loaded++;
+    }
+    return Number((loaded / total).toFixed(2));
+  }
+
+  // 清理本地音频缓存文件
+  clearCache() {
+    debugLog("开始清理本地音频缓存...");
+    const cache = uni.getStorageSync("audio_local_files") || {};
+    const paths = Object.values(cache);
+    for (const path of paths) {
+      uni.removeSavedFile({
+        filePath: path,
+        complete: (res) => {
+          // 无论成功失败都继续
+        },
+      });
+    }
+    uni.removeStorageSync("audio_local_files");
+    this.localFileCache = {};
+    debugLog("本地音频缓存清理完成");
+  }
+
+  // 手动重置并重新加载所有音频（用于卡住时恢复）
+  reloadAll() {
+    debugLog("执行 reloadAll: 重置所有状态并重新加载");
+
+    // 1. 停止所有播放
+    this.stopAll();
+
+    // 2. 销毁现有音频实例
+    for (const audio of this.audioMap.values()) {
+      try {
+        audio.destroy();
+      } catch (_) {}
+    }
     this.audioMap.clear();
+
+    // 3. 重置状态
+    this.readyMap.clear();
+    this.failedLoadKeys.clear();
+    this.allowPlayMap.clear();
+    this.currentPlayingKey = null;
+    this.sequenceQueue = [];
+    this.sequenceIndex = 0;
+    this.isSequenceRunning = false;
+
+    // 清理一下可能损坏的缓存（可选，如果用户因为缓存坏了卡住，这一步很有用）
+    // 这里选择不自动全清，而是依赖 onError 里的单点清除。如果需要彻底重置，可取消注释：
+    // this.clearCache();
+
+    // 4. 强制重置加载锁
+    this.isLoading = false;
+    this.loadingPromise = null;
+    this.currentLoadingIndex = 0;
+
+    // 5. 重新初始化 (initAudios 会自增 loadGeneration，从而终止之前的任何异步循环)
+    return this.initAudios();
   }
 }
 

src/components/AppBackground.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { capsuleHeight } from "@/util";
+
 const props = defineProps({
   type: {
     type: Number,
@@ -10,11 +11,6 @@ const props = defineProps({
     default: "#050b19",
   },
 });
-const capsuleHeight = ref(0);
-onMounted(() => {
-  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
-  capsuleHeight.value = menuBtnInfo.top + 50 - 9;
-});
 </script>
 
 <template>
@@ -22,27 +18,45 @@ onMounted(() => {
     <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 + 'px' }"
+      :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="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 5"
+      src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
+      mode="widthFix"
+    />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
     <view class="bg-overlay" v-if="type === 0"></view>
   </view>
 </template>
@@ -59,7 +73,7 @@ onMounted(() => {
 
 .bg-image {
   width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }
 
 .bg-overlay {

src/components/AppFooter.vue

@@ -1,16 +1,4 @@
 <script setup>
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-
-const props = defineProps({
-  signin: {
-    type: Function,
-    default: () => {},
-  },
-});
-
 const tabs = [
   { image: "../static/tab-vip.png" },
   { image: "../static/tab-point-book.png" },
@@ -18,7 +6,6 @@ const tabs = [
 ];
 
 function handleTabClick(index) {
-  if (index === 1 && !user.value.id) return props.signin();
   if (index === 0) {
     uni.navigateTo({
       url: "/pages/be-vip",
@@ -26,7 +13,7 @@ function handleTabClick(index) {
   }
   if (index === 1) {
     uni.navigateTo({
-      url: "/pages/point-book-create",
+      url: "/pages/point-book",
     });
   }
   if (index === 2) {
@@ -46,7 +33,7 @@ function handleTabClick(index) {
       class="tab-item"
       @click="handleTabClick(index)"
       :style="{
-        width: index === 1 ? '36%' : '10%',
+        width: index === 1 ? '36%' : '20%',
       }"
     >
       <image :src="tab.image" mode="widthFix" />
@@ -62,7 +49,7 @@ function handleTabClick(index) {
   display: flex;
   justify-content: space-around;
   align-items: center;
-  overflow-x: hidden;
+  overflow: hidden;
 }
 .footer-bg {
   width: 100%;
@@ -72,17 +59,25 @@ function handleTabClick(index) {
 }
 .tab-item {
   z-index: 1;
+  display: flex;
+  justify-content: center;
 }
 .tab-item > image {
-  width: 86%;
+  width: 65rpx;
+}
+.tab-item:last-child > image {
+  width: 85rpx;
 }
 .tab-item:nth-child(2) {
-  transform: translate(25%, 20%);
+  transform: translate(10%, 40%);
 }
 .tab-item:nth-child(3) {
-  transform: translate(6%, -10%);
+  margin-bottom: 25rpx;
+}
+.tab-item:nth-child(3) > image {
+  width: 140rpx;
 }
 .tab-item:nth-child(4) {
-  transform: translate(-25%, 20%);
+  transform: translate(-10%, 44%);
 }
 </style>

src/components/BackToGame.vue

@@ -1,64 +1,99 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 import { onShow } from "@dcloudio/uni-app";
-import { isGamingAPI, getCurrentGameAPI } from "@/apis";
+
+import { getBattleAPI, getUserGameState } from "@/apis";
 import { debounce } from "@/util";
+
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, game } = storeToRefs(store);
+const { updateGame } = store;
+
 const props = defineProps({
   signin: {
     type: Function,
     default: () => {},
   },
 });
-const show = ref(false);
+const loading = ref(false);
+
 onShow(async () => {
   if (user.value.id) {
-    const isGaming = await isGamingAPI();
+    setTimeout(async () => {
-    show.value = isGaming;
+      const state = await getUserGameState();
+      updateGame(state.gaming, state.roomId);
+    }, 1000);
   }
 });
+
 watch(
   () => user.value,
   async (value) => {
     if (!value.id) {
-      show.value = false;
+      updateGame(false, "");
     } else {
-      const isGaming = await isGamingAPI();
+      const state = await getUserGameState();
-      show.value = isGaming;
+      updateGame(state.gaming, state.roomId);
     }
   }
 );
+
 const onClick = debounce(async () => {
-  const isGaming = await isGamingAPI();
+  if (loading.value) return;
-  show.value = isGaming;
+  try {
-  if (isGaming) {
+    loading.value = true;
-    const result = await getCurrentGameAPI();
+    const result = await getBattleAPI();
-  } else {
+    if (result && result.matchId) {
-    uni.showToast({
+      await uni.$checkAudio();
-      title: "比赛已结束",
+      if (result.mode <= 3) {
-      icon: "none",
+        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,
+      });
+    } else {
+      updateGame(false, "");
+    }
+  } finally {
+    loading.value = false;
   }
 });
 const gameOver = () => {
-  show.value = false;
+  updateGame(false, "");
 };
 onMounted(() => {
   uni.$on("game-over", gameOver);
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.$off("game-over", gameOver);
 });
 </script>
 
 <template>
-  <view v-if="show" class="back-to-game" @click="onClick">
+  <view
+    v-if="game.inBattle || game.roomID"
+    class="back-to-game"
+    @click="onClick"
+  >
     <image src="../static/back-to-game-bg.png" mode="widthFix" />
-    <image src="../static/pk-icon.png" mode="widthFix" />
+    <block v-if="game.inBattle">
-    <text>返回进行中的对局</text>
+      <image src="../static/pk-icon.png" mode="widthFix" />
+      <text>返回进行中的对局</text>
+    </block>
+    <block v-else-if="game.roomID">
+      <text>返回房间</text>
+    </block>
     <image src="../static/back.png" mode="widthFix" />
   </view>
 </template>
@@ -78,16 +113,18 @@ onUnmounted(() => {
 .back-to-game > image:first-child {
   position: absolute;
   width: 100%;
+  height: 100rpx;
 }
 .back-to-game > image:nth-child(2) {
   position: relative;
   width: 60px;
+  height: 60px;
 }
-.back-to-game > text:nth-child(3) {
+.back-to-game > text {
   position: relative;
   font-size: 14px;
 }
-.back-to-game > image:nth-child(4) {
+.back-to-game > image:last-child {
   position: relative;
   width: 15px;
   margin-left: 5px;

src/components/BattleFooter.vue

@@ -1,8 +1,9 @@
 =
 <script setup>
+import { computed } from "vue";
 import BowPower from "@/components/BowPower.vue";
 import { RoundImages } from "@/constants";
-defineProps({
+const props = defineProps({
   roundResults: {
     type: Array,
     default: () => [],
@@ -15,11 +16,16 @@ defineProps({
     type: Number,
     default: 0,
   },
-  power: {
+  goldenRound: {
     type: Number,
     default: 0,
   },
 });
+
+const normalRounds = computed(() => {
+  const count = props.roundResults.findIndex((item) => !!item.ifGold);
+  return count > 0 ? count : props.roundResults.length;
+});
 </script>
 
 <template>
@@ -32,7 +38,7 @@ defineProps({
           transform: 'scale(0.8) translateX(10px)',
         }"
       >
-        <BowPower :power="power" />
+        <BowPower />
       </view>
     </view>
     <view>
@@ -43,11 +49,19 @@ defineProps({
     <view class="players">
       <view>
         <view v-for="(result, index) in roundResults" :key="index">
-          <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          <block v-if="index + 1 > normalRounds">
+            <image
+              :src="RoundImages[`gold${index + 1 - normalRounds}`]"
+              mode="widthFix"
+            />
+          </block>
+          <block v-else>
+            <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          </block>
           <view>
             <text>{{
-              result.blueArrows.length
+              result.shoots[1] && result.shoots[1].length
-                ? result.blueArrows
+                ? result.shoots[1]
                     .map((item) => item.ring)
                     .reduce((last, next) => last + next, 0)
                 : ""
@@ -70,11 +84,19 @@ defineProps({
       </view>
       <view>
         <view v-for="(result, index) in roundResults" :key="index">
-          <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          <block v-if="index + 1 > normalRounds">
+            <image
+              :src="RoundImages[`gold${index + 1 - normalRounds}`]"
+              mode="widthFix"
+            />
+          </block>
+          <block v-else>
+            <image :src="RoundImages[`round${index + 1}`]" mode="widthFix" />
+          </block>
           <view>
             <text>{{
-              result.redArrows.length
+              result.shoots[2] && result.shoots[2].length
-                ? result.redArrows
+                ? result.shoots[2]
                     .map((item) => item.ring)
                     .reduce((last, next) => last + next, 0)
                 : ""
@@ -103,7 +125,7 @@ defineProps({
 .container {
   width: 100%;
   overflow: hidden;
-  margin-top: -40px;
+  margin-top: -100rpx;
 }
 .container > view:nth-child(2) {
   position: relative;
@@ -120,6 +142,11 @@ defineProps({
 .container > view:nth-child(2) > text {
   z-index: 1;
   margin-top: 2px;
+  color: #8a323e;
+  font-weight: 500;
+}
+.container > view:nth-child(2) > text:nth-child(2) {
+  color: #004ac1;
 }
 .players {
   display: flex;
@@ -134,13 +161,13 @@ defineProps({
   padding-top: 5px;
 }
 .players > view:first-child > view {
-  background: linear-gradient(270deg, #172a86 0%, #0006 100%);
+  background: linear-gradient(270deg, #172a86 0%, #0000 100%);
 }
 .players > view:last-child > view {
-  background: linear-gradient(270deg, #0006 0%, #6a1212 100%);
+  background: linear-gradient(270deg, #0000 0%, #6a1212 100%);
 }
 .players > view > view {
-  min-height: 25px;
+  min-height: 52rpx;
   width: calc(100% - 40px);
   padding: 2px 20px;
   margin-bottom: 5px;
@@ -149,7 +176,8 @@ defineProps({
   align-items: center;
 }
 .players > view > view > image:first-child {
-  width: 72px;
+  width: 135rpx;
+  height: 20px;
 }
 .players > view > view > view:last-child {
   font-size: 10px;
@@ -158,6 +186,7 @@ defineProps({
   font-size: 16px;
   color: #fed847;
   margin-right: 5px;
+  font-weight: 500;
 }
 .guide-row {
   display: flex;
@@ -169,6 +198,6 @@ defineProps({
   position: relative;
 }
 .guide-row > image {
-  width: 18%;
+  width: 140rpx;
 }
 </style>

src/components/BattleHeader.vue

@@ -45,30 +45,38 @@ defineProps({
         <view
           v-for="(player, index) in blueTeam"
           :key="index"
-          :style="{ margin: blueTeam.length === 2 ? '0 12px' : '0 6px' }"
+          :style="{
+            margin: blueTeam.length === 2 ? '0 -5px' : '0 6px',
+            width: `${100 / blueTeam.length - blueTeam.length * 3}%`,
+          }"
         >
-          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" />
+          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" :size="40" />
           <text class="player-name">{{ player.name }}</text>
         </view>
         <image
           v-if="winner === 1"
           src="../static/winner-badge.png"
           mode="widthFix"
+          class="left-winner-badge"
         />
       </view>
       <view>
         <view
           v-for="(player, index) in redTeam"
           :key="index"
-          :style="{ margin: redTeam.length === 2 ? '0 12px' : '0 6px' }"
+          :style="{
+            margin: redTeam.length === 2 ? '0 -5px' : '0 6px',
+            width: `${100 / redTeam.length - redTeam.length * 3}%`,
+          }"
         >
-          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" />
+          <Avatar :src="player.avatar" :rankLvl="player.rankLvl" :size="40" />
           <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"
         />
       </view>
     </view>
@@ -87,7 +95,7 @@ defineProps({
       >
         <Avatar
           :src="player.avatar"
-          :rankLvl="player.rankLvl"
+          :rankLvl="showRank ? undefined : player.rankLvl"
           :size="40"
           :rank="showRank ? index + 1 : 0"
         />
@@ -114,12 +122,12 @@ defineProps({
 }
 .players > view {
   width: 50%;
-  height: 80px;
+  height: 75px;
   color: #fff9;
   font-size: 12px;
   overflow: hidden;
   position: relative;
-  padding-top: 7px;
+  padding-top: 5px;
   display: flex;
   justify-content: center;
 }
@@ -129,12 +137,6 @@ defineProps({
 .players > view:last-child {
   background-color: #692735;
 }
-.players > view > image:last-child {
-  position: absolute;
-  width: 40px;
-  top: 0;
-  left: 0;
-}
 .players > view > view {
   display: flex;
   flex-direction: column;
@@ -163,11 +165,25 @@ defineProps({
   flex: 0 0 auto;
 }
 .player-name {
-  margin-top: 5px;
+  margin-top: 3px;
-  width: 80%;
+  width: 100%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   text-align: center;
 }
+.left-winner-badge {
+  position: absolute;
+  width: 50px;
+  top: -12%;
+  left: -5%;
+  transform: rotate(-12deg);
+}
+.right-winner-badge {
+  position: absolute;
+  width: 50px;
+  top: -12%;
+  right: -5%;
+  transform: rotate(36deg);
+}
 </style>

src/components/BowData.vue

@@ -21,6 +21,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  total: {
+    type: Number,
+    default: 0,
+  },
 });
 </script>
 
@@ -45,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="arrows.length"
+      :total="total"
-      :scores="arrows.map((a) => a.ring)"
+      :arrows="arrows"
-      :margin="arrows.length === 12 ? 4 : 1"
+      :margin="total === 12 ? 4 : 1"
-      :fontSize="arrows.length === 12 ? 25 : 22"
+      :fontSize="total === 12 ? 25 : 22"
     />
   </view>
 </template>

src/components/BowPower.vue

@@ -1,16 +1,28 @@
 <script setup>
-defineProps({
+import { ref, onMounted, onBeforeUnmount } from "vue";
-  power: {
+import { getDeviceBatteryAPI } from "@/apis";
-    type: Number,
+
-    default: 0,
+const power = ref(0);
-  },
+const timer = ref(null);
+
+onMounted(async () => {
+  const data = await getDeviceBatteryAPI();
+  power.value = data.battery;
+  timer.value = setInterval(async () => {
+    const data = await getDeviceBatteryAPI();
+    power.value = data.battery;
+  }, 1000 * 10);
+});
+
+onBeforeUnmount(() => {
+  clearInterval(timer.value);
 });
 </script>
 
 <template>
-  <view class="container" :style="{ opacity: power > 0 ? 1 : 0 }">
+  <view class="container">
     <image src="../static/b-power.png" mode="widthFix" />
-    <view>电量{{ power }}%</view>
+    <view>电量{{ power || 1 }}%</view>
   </view>
 </template>
 

src/components/BowTarget.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { ref, watch, onMounted } from "vue";
+import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
-import BowPower from "@/components/BowPower.vue";
+import PointSwitcher from "@/components/PointSwitcher.vue";
-import StartCountdown from "@/components/StartCountdown.vue";
+
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import { simulShootAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -17,14 +18,6 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  avatar: {
-    type: String,
-    default: "",
-  },
-  power: {
-    type: Number,
-    default: 0,
-  },
   scores: {
     type: Array,
     default: () => [],
@@ -37,32 +30,21 @@ const props = defineProps({
     type: String,
     default: "solo", // solo 单排，team 双排
   },
-  // start: {
-  //   type: Boolean,
-  //   default: false,
-  // },
   stop: {
     type: Boolean,
     default: false,
   },
 });
 
-const showsimul = ref(false);
+const pMode = ref(true);
 const latestOne = ref(null);
+const bluelatestOne = ref(null);
 const prevScores = ref([]);
 const prevBlueScores = ref([]);
-// const startCount = ref(false);
 const timer = ref(null);
-
+const dirTimer = ref(null);
-// watch(
+const angle = ref(null);
-//   () => props.start,
+const circleColor = ref("");
-//   (newVal) => {
-//     startCount.value = newVal;
-//   },
-//   {
-//     immediate: true,
-//   }
-// );
 
 watch(
   () => props.scores,
@@ -85,10 +67,10 @@ watch(
   () => props.blueScores,
   (newVal) => {
     if (newVal.length - prevBlueScores.value.length === 1) {
-      latestOne.value = newVal[newVal.length - 1];
+      bluelatestOne.value = newVal[newVal.length - 1];
       if (timer.value) clearTimeout(timer.value);
       timer.value = setTimeout(() => {
-        latestOne.value = null;
+        bluelatestOne.value = null;
       }, 1000);
     }
     prevBlueScores.value = [...newVal];
@@ -98,46 +80,98 @@ watch(
   }
 );
 
-function calcRealX(num, offset = 12) {
+function calcRealX(num, offset = 3.4) {
   const len = 20.4 + num;
-  return `calc(${(len / 40.8) * 100}% - ${offset / 2}px)`;
+  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
 }
-function calcRealY(num, offset = 12) {
+function calcRealY(num, offset = 3.4) {
   const len = num < 0 ? Math.abs(num) + 20.4 : 20.4 - num;
-  return `calc(${(len / 40.8) * 100}% - ${offset / 2}px)`;
+  return `calc(${(len / 40.8) * 100 - offset / 2}%)`;
 }
 const simulShoot = async () => {
   if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
 };
 const simulShoot2 = async () => {
-  if (device.value.deviceId) 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);
+  }
 };
 
-onMounted(() => {
+const env = computed(() => {
   const accountInfo = uni.getAccountInfoSync();
-  const envVersion = accountInfo.miniProgram.envVersion;
+  return accountInfo.miniProgram.envVersion;
-  if (envVersion !== "release") showsimul.value = true;
+});
+
+const arrowStyle = computed(() => {
+  return {
+    transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
+      360 - angle.value
+    }deg) translateY(105%)`,
+  };
+});
+
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) return;
+  if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
+    if (
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
+    ) {
+      angle.value = null;
+      setTimeout(() => {
+        if (props.scores[0]) {
+          circleColor.value =
+            message.shootData.playerId === props.scores[0].playerId
+              ? "#ff4444"
+              : "#1840FF";
+        }
+        angle.value = message.shootData.angle;
+      }, 200);
+    }
+  }
+}
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+});
+
+onBeforeUnmount(() => {
+  if (timer.value) {
+    clearTimeout(timer.value);
+    timer.value = null;
+  }
+  if (dirTimer.value) {
+    clearTimeout(dirTimer.value);
+    dirTimer.value = null;
+  }
+  uni.$off("socket-inbox", onReceiveMessage);
 });
 </script>
 
 <template>
   <view class="container">
-    <view class="header" v-if="totalRound > 0 || power">
+    <view class="header" v-if="totalRound > 0">
       <text v-if="totalRound > 0" class="round-count">{{
         (currentRound > totalRound ? totalRound : currentRound) +
         "/" +
         totalRound
       }}</text>
-      <BowPower :power="power" />
     </view>
     <view class="target">
+      <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
+        <view :style="{ background: circleColor }">
+          <image src="../static/dot-circle.png" mode="widthFix" />
+        </view>
+      </view>
       <view v-if="stop" class="stop-sign">中场休息</view>
       <view
-        v-if="latestOne && user.id === latestOne.playerId"
+        v-if="latestOne && latestOne.ring && user.id === latestOne.playerId"
         class="e-value fade-in-out"
         :style="{
-          left: calcRealX(latestOne.ring ? latestOne.x : 0, 66),
+          left: calcRealX(latestOne.ring ? latestOne.x : 0, 20),
-          top: calcRealY(latestOne.ring ? latestOne.y : 0, 150),
+          top: calcRealY(latestOne.ring ? latestOne.y : 0, 40),
         }"
       >
         经验 +1
@@ -146,77 +180,96 @@ onMounted(() => {
         v-if="latestOne"
         class="round-tip fade-in-out"
         :style="{
-          left: calcRealX(latestOne.ring ? latestOne.x : 0, 100),
+          left: calcRealX(latestOne.ring ? latestOne.x : 0, 28),
-          top: calcRealY(latestOne.ring ? latestOne.y : 0, 100),
+          top: calcRealY(latestOne.ring ? latestOne.y : 0, 28),
         }"
-        >{{ latestOne.ring || "未上靶"
+        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
-        }}<text v-if="latestOne.ring">环</text></view
+        }}<text v-if="latestOne.ring">环</text>
+      </view>
+      <view
+        v-if="
+          bluelatestOne &&
+          bluelatestOne.ring &&
+          user.id === bluelatestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="{
+          left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 20),
+          top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 40),
+        }"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="bluelatestOne"
+        class="round-tip fade-in-out"
+        :style="{
+          left: calcRealX(bluelatestOne.ring ? bluelatestOne.x : 0, 28),
+          top: calcRealY(bluelatestOne.ring ? bluelatestOne.y : 0, 28),
+        }"
+        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
+        }}<text v-if="bluelatestOne.ring">环</text></view
       >
       <block v-for="(bow, index) in scores" :key="index">
         <view
           v-if="bow.ring > 0"
-          :class="`hit ${
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
             index === scores.length - 1 && latestOne ? 'pump-in' : ''
           }`"
           :style="{
-            left: calcRealX(bow.x),
+            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
-            top: calcRealY(bow.y),
+            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
-            backgroundColor:
+            backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
-              index === scores.length - 1 &&
-              !blueScores.length &&
-              latestOne &&
-              mode !== 'team'
-                ? 'green'
-                : '#ff4444',
           }"
-          ><text>{{ index + 1 }}</text></view
+          ><text v-if="pMode">{{ index + 1 }}</text></view
         >
       </block>
       <block v-for="(bow, index) in blueScores" :key="index">
         <view
           v-if="bow.ring > 0"
-          :class="`hit ${
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
-            index === blueScores.length - 1 && latestOne ? 'pump-in' : ''
+            index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
           }`"
           :style="{
-            left: calcRealX(bow.x),
+            left: calcRealX(bow.x, pMode ? '3.4' : '2'),
-            top: calcRealY(bow.y),
+            top: calcRealY(bow.y, pMode ? '3.4' : '2'),
-            backgroundColor: 'blue',
+            backgroundColor: '#1840FF',
           }"
         >
-          <text>{{ index + 1 }}</text>
+          <text v-if="pMode">{{ index + 1 }}</text>
         </view>
       </block>
       <image src="../static/bow-target.png" mode="widthFix" />
     </view>
-    <view v-if="avatar" class="footer">
+    <view class="footer">
-      <image :src="avatar" mode="widthFix" />
+      <PointSwitcher
+        :onChange="(val) => (pMode = val)"
+        :style="{ zIndex: 999 }"
+      />
     </view>
-    <view class="simul" v-if="showsimul">
+    <view class="simul" v-if="env !== 'release'">
       <button @click="simulShoot">模拟</button>
       <button @click="simulShoot2">射箭</button>
     </view>
-    <!-- <text :style="{ color: '#fff', wordBreak: 'break-all' }">{{
-      scores.length ? scores[scores.length - 1] : ""
-    }}</text> -->
-    <!-- <StartCountdown :start="startCount" /> -->
   </view>
 </template>
 
 <style scoped>
 .container {
-  width: calc(100% - 30px);
+  width: calc(100vw - 30px);
+  height: calc(100vw - 30px);
   padding: 0px 15px;
   position: relative;
 }
 .target {
   position: relative;
   margin: 10px;
+  width: calc(100% - 20px);
+  height: calc(100% - 20px);
+  z-index: -1;
 }
 .e-value {
   position: absolute;
-  /* top: 30%;
-  left: 60%; */
   background-color: #0006;
   color: #fff;
   font-size: 12px;
@@ -228,8 +281,6 @@ onMounted(() => {
 }
 .round-tip {
   position: absolute;
-  /* top: 38%; */
-  /* left: 60%; */
   color: #fff;
   font-size: 30px;
   font-weight: bold;
@@ -243,25 +294,43 @@ onMounted(() => {
 }
 .target > image:last-child {
   width: 100%;
+  height: 100%;
 }
 .hit {
   position: absolute;
-  width: 12px;
-  height: 12px;
   border-radius: 50%;
-  border: 1px solid #fff;
   z-index: 1;
   color: #fff;
-  font-size: 8px;
+  transition: all 0.3s ease;
-  text-align: center;
-  line-height: 10px;
-  box-sizing: border-box;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
 }
-.hit > text {
+.s-point {
-  transform: scaleX(0.7);
+  width: 4px;
-  display: block;
+  height: 4px;
-  font-weight: bold;
+  min-width: 4px;
+  min-height: 4px;
+}
+.b-point {
+  width: 10px;
+  height: 10px;
+  min-width: 10px;
+  min-height: 10px;
+  border: 1px solid #fff;
+  z-index: 1;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.b-point > text {
+  font-size: 16rpx;
+  color: #fff;
+  font-family: "DINCondensed";
+  /* text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);*/
+  margin-top: 2rpx;
 }
 .header {
   width: 100%;
@@ -285,6 +354,7 @@ onMounted(() => {
   padding: 0 10px;
   display: flex;
   margin-top: -40px;
+  justify-content: flex-end;
 }
 .footer > image {
   width: 40px;
@@ -295,9 +365,10 @@ onMounted(() => {
 }
 .simul {
   position: absolute;
-  bottom: 40px;
+  top: 0;
   right: 20px;
   margin-left: 20px;
+  z-index: 999;
 }
 .simul > button {
   color: #fff;
@@ -314,4 +385,72 @@ onMounted(() => {
   z-index: 99;
   font-weight: bold;
 }
+.arrow-dir {
+  position: absolute;
+  width: 100%;
+  height: 52%;
+  left: 50%;
+  bottom: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.arrow-dir > view {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+}
+.arrow-dir > view > image {
+  width: 100rpx;
+  height: 100rpx;
+  transform: translate(-30%, -30%);
+}
+@keyframes spring-in {
+  0% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  15% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  30% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  45% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  60% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  75% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
+@keyframes disappear {
+  0% {
+    opacity: 1;
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.arrow-dir > view {
+  animation: disappear 3s ease forwards;
+}
+.arrow-dir > view > image {
+  animation: spring-in 3s ease forwards;
+  width: 100%;
+}
 </style>

src/components/BowTarget/HalfRingTarget.vue

@@ -0,0 +1,111 @@
+<script setup>
+import { ref, computed } from "vue";
+
+const props = defineProps({
+  diameter: {
+    type: Number,
+    default: 90,
+  },
+});
+
+const side = computed(() => {
+  return props.diameter / 10;
+});
+
+const rings = ["X", "10", "9", "8", "7", "6"];
+</script>
+
+<template>
+  <view
+    class="container circle"
+    :style="{
+      width: diameter + 'vw',
+      height: diameter + 'vw',
+      background: '#00BAE9',
+    }"
+  >
+    <view
+      class="circle"
+      :style="{
+        background: '#FF5665',
+        width: side * 8 + 'vw',
+        height: side * 8 + 'vw',
+      }"
+    >
+      <view class="rings" :style="{ transform: `translateX(-${side}vw)` }">
+        <text
+          v-for="(ring, index) in rings"
+          :key="ring"
+          :style="{
+            width: side + 'vw',
+            transform: `translateX(${
+              index === 0 ? side / 2 : index === 1 ? side / 4.5 : 0
+            }vw)`,
+          }"
+          >{{ ring }}</text
+        >
+      </view>
+      <view
+        class="circle"
+        :style="{
+          background: '#FF5665',
+          width: side * 6 + 'vw',
+          height: side * 6 + 'vw',
+        }"
+      >
+        <view
+          class="circle"
+          :style="{
+            background: '#FDDC61',
+            width: side * 4 + 'vw',
+            height: side * 4 + 'vw',
+          }"
+        >
+          <view
+            class="circle"
+            :style="{
+              background: '#FDDC61',
+              width: side * 2 + 'vw',
+              height: side * 2 + 'vw',
+            }"
+          >
+            <view
+              class="circle"
+              :style="{
+                background: '#FDDC61',
+                width: side + 'vw',
+                height: side + 'vw',
+              }"
+            >
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  position: relative;
+}
+.rings {
+  position: absolute;
+  display: flex;
+  align-items: center;
+  left: 50%;
+}
+.rings > text {
+  font-size: 24rpx;
+  color: #333;
+  text-align: center;
+}
+.circle {
+  border: 1rpx solid #3e3e3e66;
+  box-sizing: border-box;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>

src/components/BowTargetEdit.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
-import { getElementRect, calcRing } from "@/util";
+import { getElementRect, calcRing, capsuleHeight } from "@/util";
 
 const props = defineProps({
   id: {
@@ -25,10 +25,9 @@ const rect = ref({});
 const arrow = ref(null);
 const isDragging = ref(false);
 const dragStartPos = ref({ x: 0, y: 0 });
-const capsuleHeight = ref(0);
 const scale = ref(1);
-const zoomPos = ref({ x: 0, y: 0 });
+const scrollTop = ref(0);
-const targetPos = ref({ x: 0, y: 0 });
+const selected = ref(null);
 let lastMoveTime = 0;
 
 // 点击靶纸创建新的点
@@ -40,27 +39,34 @@ const onClick = async (e) => {
   ) {
     return;
   }
-
+  if (props.id === 7 || props.id === 9) {
+    if (
+      e.detail.x < rect.value.width * 0.2 ||
+      e.detail.x > rect.value.width * 0.8
+    )
+      return;
+    // 放大并通过滚动将点击位置置于视窗中心
+    scale.value = 1.4;
+    const viewportH = rect.value.width; // 容器高度等于宽度（100vw）
+    const contentH = scale.value * rect.value.width; // 内容高度
+    const clickYInContainer = e.detail.y - rect.value.top;
+    let target = clickYInContainer * scale.value - viewportH / 2;
+    target = Math.max(0, Math.min(contentH - viewportH, target));
+    setTimeout(() => {
+      scrollTop.value = target > 180 ? target + 10 : target;
+    }, 200);
+  }
   const newArrow = {
-    x: e.detail.x - zoomPos.value.x - 6 / scale.value,
+    x: (e.detail.x - 6) * scale.value,
-    y:
+    y: (e.detail.y - rect.value.top - capsuleHeight - 6) * scale.value,
-      e.detail.y -
-      rect.value.top -
-      capsuleHeight.value -
-      zoomPos.value.y -
-      6 / scale.value,
   };
 
-  targetPos.value = {
-    x: zoomPos.value.x,
-    y: zoomPos.value.y,
-  };
   const side = rect.value.width;
   newArrow.ring = calcRing(
     props.id,
-    newArrow.x / scale.value - rect.value.width * 0.05,
+    newArrow.x / scale.value - side * 0.05,
-    newArrow.y / scale.value - rect.value.width * 0.05,
+    newArrow.y / scale.value - side * 0.05,
-    rect.value.width * 0.9
+    side * 0.9
   );
   arrow.value = {
     ...newArrow,
@@ -72,10 +78,6 @@ const onClick = async (e) => {
 // 确认添加箭矢
 const confirmAdd = () => {
   if (props.onChange) {
-    targetPos.value = {
-      x: zoomPos.value.x,
-      y: zoomPos.value.y,
-    };
     props.onChange({
       x: arrow.value.x / scale.value,
       y: arrow.value.y / scale.value,
@@ -83,15 +85,15 @@ const confirmAdd = () => {
     });
   }
   arrow.value = null;
+  scale.value = 1;
+  scrollTop.value = 0;
 };
 
 // 删除箭矢
 const deleteArrow = () => {
   arrow.value = null;
-  targetPos.value = {
+  scale.value = 1;
-    x: zoomPos.value.x,
+  scrollTop.value = 0;
-    y: zoomPos.value.y,
-  };
 };
 
 // 开始拖拽 - 同样修复坐标获取
@@ -126,9 +128,9 @@ const onDrag = async (e) => {
   );
   arrow.value.ring = calcRing(
     props.id,
-    arrow.value.x / scale.value - rect.value.width * 0.05,
+    arrow.value.x / scale.value - side * 0.05,
-    arrow.value.y / scale.value - rect.value.width * 0.05,
+    arrow.value.y / scale.value - side * 0.05,
-    rect.value.width * 0.9
+    side * 0.9
   );
 
   arrow.value.x = arrow.value.x / side;
@@ -142,101 +144,128 @@ const onDrag = async (e) => {
 const endDrag = (e) => {
   isDragging.value = false;
 };
-const onScale = (e) => {
+
-  lastMoveTime = Date.now();
+const getNewPos = () => {
-  const lastScale = scale.value;
+  if (props.id === 7 || props.id === 9) {
-  scale.value = e.detail.scale;
+    if (arrow.value.y >= 1.33)
-  zoomPos.value = { x: e.detail.x, y: e.detail.y };
+      return { left: "-12px", bottom: "calc(50% - 12px)" };
-  if (arrow.value) {
+  } else {
-    arrow.value.x = arrow.value.x * (scale.value / lastScale);
+    if (arrow.value.y > 0.88) {
-    arrow.value.y = arrow.value.y * (scale.value / lastScale);
+      if (arrow.value.x < 0.05) {
+        return { left: "calc(100% - 12px)", bottom: "calc(100% - 12px)" };
+      }
+      return { left: "-12px", bottom: "calc(50% - 12px)" };
+    }
   }
+  return { left: "calc(50% - 12px)", bottom: "-12px" };
 };
 
-const onMove = (e) => {
+const setEditArrow = (data) => {
-  if (e.detail.source) {
+  selected.value = data;
-    zoomPos.value = { x: e.detail.x, y: e.detail.y };
+  // if (data === null) {
-  }
+  //   arrow.value = null;
+  //   scale.value = 1;
+  //   scrollTop.value = 0;
+  //   return;
+  // }
+  // if (props.id === 7 || props.id === 9) {
+  //   scale.value = 1.4;
+  //   const viewportH = rect.value.width; // 容器高度等于宽度（100vw）
+  //   const contentH = scale.value * rect.value.width; // 内容高度
+  //   const clickYInContainer = contentH * data.y - rect.value.top;
+  //   let target = clickYInContainer * scale.value - viewportH / 2;
+  //   target = Math.max(0, Math.min(contentH - viewportH, target));
+  //   setTimeout(() => {
+  //     scrollTop.value = target > 180 ? target + 10 : target;
+  //   }, 200);
+  // }
+  // arrow.value = {
+  //   ...data,
+  //   x: data.x * scale.value,
+  //   y: data.y * scale.value,
+  // };
 };
 
 onMounted(async () => {
-  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
-  capsuleHeight.value = menuBtnInfo.top - 9;
   const result = await getElementRect(".container");
   rect.value = result;
+  uni.$on("set-edit-arrow", setEditArrow);
+});
+
+onBeforeUnmount(() => {
+  uni.$off("set-edit-arrow", setEditArrow);
 });
 </script>
 
 <template>
-  <view
+  <scroll-view
+    :scroll-y="scale > 1"
+    scroll-with-animation
+    :scroll-top="scrollTop"
+    :show-scrollbar="false"
+    :enhanced="true"
     class="container"
     @tap="onClick"
     @touchmove="onDrag"
     @touchend="endDrag"
   >
-    <movable-area class="move-area" scale-area>
+    <movable-area
-      <movable-view
+      class="move-area"
-        class="move-view"
+      :style="{
-        direction="all"
+        width: scale * 100 + 'vw',
-        scale
+        height: scale * 100 + 'vw',
-        :x="targetPos.x"
+        transform: `translateX(${(100 - scale * 100) / 2}vw)`,
-        :y="targetPos.y"
+      }"
-        :scale-min="1"
+    >
-        :scale-max="2"
+      <image :src="src" mode="widthFix" />
-        :scale-value="scale"
+      <view
-        :animation="false"
+        v-for="(arrow, index) in arrows"
-        @scale="onScale"
+        :key="index"
-        @change="onMove"
+        :class="`arrow-point ${
-        :out-of-bounds="true"
+          selected !== null && index === selected ? 'selected-arrow-point' : ''
+        }`"
+        :style="{
+          left: (arrow.x !== undefined ? arrow.x : 0) * 100 + '%',
+          top: (arrow.y !== undefined ? arrow.y : 0) * 100 + '%',
+        }"
       >
-        <image :src="src" mode="widthFix" />
         <view
-          v-for="(arrow, index) in arrows"
+          v-if="arrow.x !== undefined && arrow.y !== undefined"
-          :key="index"
+          class="point"
-          class="arrow-point"
-          :style="{
-            left: (arrow.x !== undefined ? arrow.x : 0) * 100 + '%',
-            top: (arrow.y !== undefined ? arrow.y : 0) * 100 + '%',
-          }"
         >
-          <view
+          <text>{{ index + 1 }}</text>
-            v-if="arrow.x !== undefined && arrow.y !== undefined"
-            class="point"
-          >
-            <text>{{ index + 1 }}</text>
-          </view>
         </view>
-        <movable-view
+      </view>
-          v-if="arrow"
+      <movable-view
-          class="arrow-point"
+        v-if="arrow"
-          direction="all"
+        class="arrow-point"
-          :animation="false"
+        direction="all"
-          :out-of-bounds="true"
+        :animation="false"
-          :x="arrow ? (rect.width * arrow.x) / scale : 0"
+        :out-of-bounds="true"
-          :y="arrow ? (rect.width * arrow.y) / scale : 0"
+        :x="arrow ? rect.width * arrow.x : 0"
+        :y="arrow ? rect.width * arrow.y : 0"
+      >
+        <view
+          class="point"
+          :style="{ minWidth: 10 * scale + 'px', minHeight: 10 * scale + 'px' }"
         >
-          <view class="point"> </view>
+          <view v-if="arrow" class="edit-buttons" @touchstart.stop>
-          <view
-            v-if="arrow"
-            class="edit-buttons"
-            @touchstart.stop
-            :style="{ transform: `scale(${1 / scale})` }"
-          >
             <view class="edit-btn-text">
-              <!-- <text v-if="arrow.ring === 0" :style="{ width: '100%' }"
-                >未上靶</text
-              > -->
               <text>{{ arrow.ring === 0 ? "M" : arrow.ring }}</text>
-              <!-- <text
+              <text
                 v-if="arrow.ring > 0"
                 :style="{
                   fontSize: '16px',
                   marginLeft: '2px',
                 }"
                 >环</text
-              > -->
+              >
             </view>
-            <view class="edit-btn confirm-btn" @touchstart.stop="confirmAdd">
+            <view
+              class="edit-btn confirm-btn"
+              @touchstart.stop="confirmAdd"
+              :style="{ ...getNewPos() }"
+            >
               <image src="../static/arrow-edit-save.png" mode="widthFix" />
             </view>
             <view class="edit-btn delete-btn" @touchstart.stop="deleteArrow">
@@ -249,24 +278,35 @@ onMounted(async () => {
               <image src="../static/arrow-edit-move.png" mode="widthFix" />
             </view>
           </view>
-        </movable-view>
+        </view>
       </movable-view>
+      <!-- <view class="test-view"></view> -->
     </movable-area>
-  </view>
+  </scroll-view>
 </template>
 
 <style scoped>
 .container {
   width: 100vw;
   height: 100vw;
-  overflow: hidden;
+  overflow-x: hidden;
-  transform: translateY(-10px);
+}
+.container::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
 }
 
 .move-area {
   width: 100%;
   height: 100%;
-  position: relative;
+  transition: all 0.3s ease;
+}
+
+.move-area > image {
+  width: 90%;
+  height: 90%;
+  margin: 5%;
 }
 
 .move-view {
@@ -282,30 +322,35 @@ onMounted(async () => {
 
 .arrow-point {
   position: absolute;
-  display: flex;
-  justify-content: center;
-  align-items: center;
 }
 
 .point {
-  min-width: 12px;
+  min-width: 10px;
-  min-height: 12px;
+  min-height: 10px;
   border-radius: 50%;
   border: 1px solid #fff;
   color: #fff;
-  font-size: 8px;
   text-align: center;
   line-height: 10px;
   box-sizing: border-box;
-  background-color: #ff4444;
+  background-color: #00bf04;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   transition: all 0.1s linear;
+  position: relative;
+  transform: translate(-50%, -50%);
 }
 
 .point > text {
-  transform: scaleX(0.7);
   display: block;
-  font-weight: bold;
+  font-size: 16rpx;
+  line-height: 10px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  font-family: "DINCondensed", "PingFang SC", "Helvetica Neue", Arial,
+    sans-serif;
+  transform: translate(-50%, -50%);
+  margin-top: 1px;
 }
 
 .edit-buttons {
@@ -323,8 +368,7 @@ onMounted(async () => {
 .edit-btn-text {
   width: 100%;
   display: flex;
-  /* justify-content: center; */
+  justify-content: center;
-  margin-left: 10px;
 }
 
 .edit-btn-text > text {
@@ -350,8 +394,7 @@ onMounted(async () => {
 }
 
 .confirm-btn {
-  left: calc(50% - 12px);
+  transition: all 0.3s ease;
-  bottom: -12px;
 }
 
 .delete-btn {
@@ -363,4 +406,31 @@ onMounted(async () => {
   right: -12px;
   bottom: -12px;
 }
+.test-view {
+  position: absolute;
+  top: 29px;
+  left: 138px;
+  width: 115px;
+  height: 115px;
+  background-color: #ff000055;
+}
+.selected-arrow-point .point {
+  background: linear-gradient(180deg, #ffdaa6 0%, #e9a333 100%) !important;
+  box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.18);
+  animation: duang 0.35s ease-out;
+}
+@keyframes duang {
+  0% {
+    transform: translate(-50%, -50%) scale(0.7);
+  }
+  45% {
+    transform: translate(-50%, -50%) scale(1.4);
+  }
+  70% {
+    transform: translate(-50%, -50%) scale(0.9);
+  }
+  100% {
+    transform: translate(-50%, -50%) scale(1);
+  }
+}
 </style>

src/components/BubbleTip.vue

@@ -26,14 +26,14 @@ const props = defineProps({
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
-  font-size: 13px;
+  font-size: 24rpx;
 }
 .normal {
   background-image: url("../static/bubble-tip.png");
-  width: 190rpx;
+  width: 157rpx;
   height: 105rpx;
-  padding-top: 5px;
+  padding-top: 10px;
-  padding-left: 49rpx;
+  padding-left: 30rpx;
 }
 .normal2 {
   background-image: url("../static/bubble-tip4.png");

src/components/Container.vue

@@ -1,12 +1,13 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 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 } from "@/apis";
+import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
-import { debounce } from "@/util";
+import { capsuleHeight, debounce } from "@/util";
+import AudioManager from "@/audioManager";
 const props = defineProps({
   title: {
     type: String,
@@ -20,9 +21,9 @@ const props = defineProps({
     type: Function,
     default: null,
   },
-  overflow: {
+  scroll: {
-    type: String,
+    type: Boolean,
-    default: "auto",
+    default: true,
   },
   isHome: {
     type: Boolean,
@@ -40,37 +41,110 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  showBottom: {
+    type: Boolean,
+    default: true,
+  },
 });
+const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
 const hintType = ref(0);
-const capsuleHeight = ref(0);
+const isLoading = ref(false);
+const audioInitProgress = ref(1);
+const audioProgress = ref(0);
+const audioTimer = ref(null);
+
 const showGlobalHint = (type) => {
   hintType.value = type;
   showHint.value = true;
 };
+
 const hideGlobalHint = () => {
   showHint.value = false;
 };
-onMounted(() => {
+
-  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
+const restart = () => {
-  capsuleHeight.value = menuBtnInfo.top - 9;
+  uni.restartMiniProgram({
+    path: "/pages/index",
+  });
+};
+
+const checkAudioProgress = async () => {
+  return new Promise((resolve, reject) => {
+    try {
+      audioInitProgress.value = AudioManager.getLoadProgress();
+      if (audioInitProgress.value === 1) return resolve();
+      audioTimer.value = setInterval(() => {
+        audioProgress.value = AudioManager.getLoadProgress();
+        if (audioProgress.value === 1) {
+          setTimeout(() => {
+            audioInitProgress.value = 1;
+          }, 200);
+          clearInterval(audioTimer.value);
+          resolve();
+        }
+      }, 200);
+    } catch (err) {
+      reject(err);
+    }
+  });
+};
+
+const audioFinalProgress = computed(() => {
+  const left = 1 - audioInitProgress.value;
+  return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
 });
-onUnmounted(() => {
+
-  // const pages = getCurrentPages();
+onBeforeUnmount(() => {
-  // const currentPage = pages[pages.length - 1];
+  if (audioTimer.value) clearInterval(audioTimer.value);
-  // uni.setStorageSync("last-route", currentPage.route);
 });
+
 onShow(() => {
   uni.$showHint = showGlobalHint;
   uni.$hideHint = hideGlobalHint;
+  uni.$checkAudio = checkAudioProgress;
   showHint.value = false;
 });
+
 const backToGame = debounce(async () => {
-  const result = await getCurrentGameAPI();
+  if (isLoading.value) return; // 防止重复点击
+
+  try {
+    isLoading.value = true;
+    const result = await getBattleAPI();
+    if (result && result.matchId) {
+      await checkAudioProgress();
+      if (result.mode <= 3) {
+        uni.navigateTo({
+          url: `/pages/team-battle?battleId=${result.matchId}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: `/pages/melee-battle?battleId=${result.matchId}`,
+        });
+      }
+    }
+  } catch (error) {
+    console.error("获取当前游戏失败:", error);
+  } finally {
+    isLoading.value = false;
+  }
 });
+
 const goBack = () => {
   uni.navigateBack();
 };
+
+const cancelMatching = async () => {
+  uni.$emit("cancelMatching");
+}
+
+const goCalibration = async () => {
+  await laserAimAPI();
+  uni.navigateTo({
+    url: "/pages/calibration",
+  });
+};
 </script>
 
 <template>
@@ -83,14 +157,25 @@ const goBack = () => {
       :whiteBackArrow="whiteBackArrow"
     />
     <BackToGame v-if="showBackToGame" />
-    <view
+    <scroll-view
-      class="content"
+      :scroll-y="scroll"
+      :enhanced="true"
+      :bounces="false"
+      :show-scrollbar="false"
       :style="{
-        height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px)`,
+        height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${
-        overflow,
+          $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
+        })`,
       }"
     >
       <slot></slot>
+    </scroll-view>
+    <view
+      class="bottom-part"
+      v-if="$slots.bottom && showBottom"
+      :style="{ height: isIOS ? '65px' : '55px', paddingTop: '10px' }"
+    >
+      <slot name="bottom"></slot>
     </view>
     <ScreenHint :show="showHint">
       <view v-if="hintType === 1" class="tip-content">
@@ -100,7 +185,9 @@ const goBack = () => {
           <button hover-class="none" @click="() => (showHint = false)">
             不进入
           </button>
-          <button hover-class="none" @click="backToGame">进入</button>
+          <button hover-class="none" @click="backToGame" :disabled="isLoading">
+            {{ isLoading ? "加载中..." : "进入" }}
+          </button>
         </view>
       </view>
       <view v-if="hintType === 2" class="tip-content">
@@ -119,24 +206,41 @@ const goBack = () => {
           <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">
+        <text>完成智能弓校准，即可解锁全部功能</text>
+        <view>
+          <button hover-class="none" @click="() => (showHint = false)">
+            取消
+          </button>
+          <button hover-class="none" @click="goCalibration">去校准</button>
         </view>
       </view>
     </ScreenHint>
+    <view v-if="audioInitProgress < 1" class="audio-progress">
+      <image
+        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
+        mode="widthFix"
+      />
+      <view>
+        <view :style="{ width: `${audioFinalProgress * 100}%` }">
+          <!-- <image
+            src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
+            mode="widthFix"
+          /> -->
+        </view>
+      </view>
+      <view>
+        <text>若加载时间过长，请</text>
+        <button hover-class="none" @click="restart">点击这里重启</button>
+      </view>
+    </view>
   </view>
 </template>
 
 <style scoped>
-.content {
-  width: 100vw;
-  height: 100vh;
-  overflow-x: hidden;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  overflow-x: hidden;
-}
 .tip-content {
   flex-direction: column;
   display: flex;
@@ -168,4 +272,68 @@ const goBack = () => {
   background-color: #fed847;
   color: #000;
 }
+
+.tip-content > view > button:disabled {
+  background-color: #ccc;
+  color: #666;
+  opacity: 0.6;
+}
+.audio-progress {
+  z-index: 999;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: rgb(0 0 0 / 0.8);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.audio-progress > image:nth-child(1) {
+  width: 140rpx;
+  height: 150rpx;
+  margin-bottom: 20rpx;
+}
+.audio-progress > view:nth-child(2) {
+  width: 380rpx;
+  height: 6rpx;
+  background: #595959;
+  border-radius: 4rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+.audio-progress > view:nth-child(2) > view {
+  background: #ffe431;
+  min-height: 6rpx;
+  border-radius: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  transition: width 0.5s ease;
+}
+.audio-progress > view:nth-child(2) > view > image {
+  width: 46rpx;
+  height: 26rpx;
+}
+.audio-progress > view:nth-child(3) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.audio-progress > view:nth-child(3) > text {
+  font-size: 22rpx;
+  color: #a2a2a2;
+  text-align: center;
+  line-height: 32rpx;
+}
+.audio-progress > view:nth-child(3) > button {
+  font-size: 22rpx;
+  color: #ffe431;
+  line-height: 32rpx;
+  padding: 20rpx 0;
+}
 </style>

src/components/CreateRoom.vue

@@ -1,7 +1,14 @@
 <script setup>
 import { ref } from "vue";
 import SButton from "@/components/SButton.vue";
-import { joinRoomAPI, createRoomAPI, isGamingAPI } from "@/apis";
+
+import { joinRoomAPI, createRoomAPI } from "@/apis";
+import { debounce } from "@/util";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, game } = storeToRefs(store);
 
 const props = defineProps({
   onConfirm: {
@@ -11,13 +18,12 @@ const props = defineProps({
 });
 
 const battleMode = ref(1);
-const step = ref(1);
+const targetMode = ref(1);
 const loading = ref(false);
 const roomNumber = ref("");
 
-const createRoom = async () => {
+const createRoom = debounce(async () => {
-  const isGaming = await isGamingAPI();
+  if (game.value.inBattle) {
-  if (isGaming) {
     uni.$showHint(1);
     return;
   }
@@ -27,76 +33,79 @@ const createRoom = 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, size);
+  try {
-  if (result.number) roomNumber.value = result.number;
+    const result = await createRoomAPI(
-  step.value = 2;
+      battleMode.value === 2 ? 2 : 1,
-  loading.value = false;
+      battleMode.value === 2 ? 10 : size,
-};
+        targetMode.value*20,
-const enterRoom = async () => {
+    );
-  step.value = 1;
+    if (result.number) {
-  props.onConfirm();
+      props.onConfirm();
-  await joinRoomAPI(roomNumber.value);
+      await joinRoomAPI(result.number);
-  uni.navigateTo({
+      uni.navigateTo({
-    url: `/pages/battle-room?roomNumber=${roomNumber.value}`,
+        url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value,
-  });
+      });
-};
+    }
-
+  } catch (error) {
-const setClipboardData = () => {
+    console.log(error);
-  uni.setClipboardData({
+  } finally {
-    data: roomNumber.value,
+    loading.value = false;
-    success() {
+  }
-      uni.showToast({ title: "复制成功" });
+});
-    },
-  });
-};
 </script>
 <template>
   <view class="container">
-    <image
+    <view class="target-options-header">
-      v-if="step === 1"
+      <view class="target-options-header-line-left"></view>
-      src="../static/choose-battle-mode.png"
+      <image class="target-options-header-title-img" src="../static/choose-battle-mode.png" mode="widthFix" />
-      mode="widthFix"
+      <view class="target-options-header-line-right"></view>
-    />
+    </view>
-    <view v-if="step === 1" class="create-options">
+    <view class="create-options">
       <view
         :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 1 }"
         @click="() => (battleMode = 1)"
       >
         <text>对抗模式（1V1）</text>
       </view>
-      <view
-        :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }"
-        @click="() => (battleMode = 2)"
-      >
-        <text>乱斗模式（3-10人）</text>
-      </view>
       <view
         :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 3 }"
         @click="() => (battleMode = 3)"
       >
         <text>对抗模式（2V2）</text>
-        <!-- <text>敬请期待</text> -->
       </view>
       <view
         :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 4 }"
         @click="() => (battleMode = 4)"
       >
         <text>对抗模式（3V3）</text>
-        <!-- <text>敬请期待</text> -->
       </view>
-    </view>
+      <view
-    <SButton v-if="step === 1" :onClick="createRoom">下一步</SButton>
+        :class="{ 'battle-btn': true, 'battle-choosen': battleMode === 2 }"
-    <view v-if="step === 2" class="room-info">
+        @click="() => (battleMode = 2)"
-      <view>
-        <text>房间号：</text>
-        <text>{{ roomNumber }}</text>
-      </view>
-      <view class="copy-room-number" @click="setClipboardData"
-        >复制房间信息邀请朋友进入</view
       >
-      <SButton width="70vw" :onClick="enterRoom">进入房间</SButton>
+        <text>乱斗模式（3-10人）</text>
-      <text>30分钟无人进入则房间无效</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>
 
@@ -107,6 +116,7 @@ const setClipboardData = () => {
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-top: 44rpx;
 }
 .container > image:first-child {
   width: 45%;
@@ -121,6 +131,50 @@ const setClipboardData = () => {
   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;
@@ -139,42 +193,4 @@ const setClipboardData = () => {
   border: 4rpx solid #fff3;
   border-color: #fed847;
 }
-/* .battle-close {
-  background-color: #8889;
-  color: #b3b3b3;
-}
-.battle-close > text:last-child {
-  font-size: 12px;
-} */
-.room-info {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-  padding-top: 40px;
-}
-.room-info > view:first-child {
-  font-size: 22px;
-  color: #fff;
-  margin-bottom: 20px;
-}
-.room-info > text {
-  color: #888686;
-  font-size: 14px;
-  margin: 10px 0;
-}
-.room-info > view:last-child {
-  color: #287fff;
-  margin: 20px 0;
-  font-size: 14px;
-}
-.copy-room-number {
-  width: calc(70vw - 20px);
-  color: #fed847;
-  border: 1px solid #fed847;
-  padding: 10px;
-  text-align: center;
-  border-radius: 10px;
-  margin-bottom: 20px;
-}
 </style>

src/components/EditOption.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+import { ref, watch, onMounted, computed } from "vue";
 import { getPointBookConfigAPI } from "@/apis";
 const props = defineProps({
   itemIndex: {
@@ -34,6 +34,11 @@ const groupArrows = [3, 6, 12, 18];
 const data = ref([]);
 const selectedIndex = ref(-1);
 const secondSelectIndex = ref(-1);
+
+const meter = ref("");
+const sets = ref("");
+const arrowAmount = ref("");
+
 const onSelectItem = (index) => {
   selectedIndex.value = index;
   if (props.itemIndex === 0) {
@@ -42,11 +47,13 @@ const onSelectItem = (index) => {
     props.onSelect(props.itemIndex, distances[index]);
   } else if (props.itemIndex === 2) {
     props.onSelect(props.itemIndex, data.value[index]);
-  } else if (props.itemIndex === 3 && secondSelectIndex.value !== -1) {
+  } else if (props.itemIndex === 3) {
-    props.onSelect(
+    if (secondSelectIndex.value !== -1) {
-      props.itemIndex,
+      props.onSelect(
-      `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+        props.itemIndex,
-    );
+        `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+      );
+    }
   }
 };
 const onSelectSecondItem = (index) => {
@@ -54,15 +61,44 @@ const onSelectSecondItem = (index) => {
   if (selectedIndex.value !== -1) {
     props.onSelect(
       props.itemIndex,
-      `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+      `${selectedIndex.value < 5 ? selectedIndex.value : sets.value}/${
+        groupArrows[secondSelectIndex.value]
+      }`
     );
   }
 };
-const meter = ref("");
 const onMeterChange = (e) => {
   meter.value = e.detail.value;
   props.onSelect(props.itemIndex, e.detail.value);
 };
+const onSetsChange = (e) => {
+  if (!e.detail.value) return;
+  sets.value = Math.min(30, Math.max(1, Number(e.detail.value)));
+  if (!sets.value) return;
+  if (secondSelectIndex.value !== -1) {
+    props.onSelect(
+      props.itemIndex,
+      `${sets.value}/${
+        secondSelectIndex.value === 99
+          ? arrowAmount.value
+          : groupArrows[secondSelectIndex.value]
+      }`
+    );
+  }
+};
+const onArrowAmountChange = (e) => {
+  if (!e.detail.value) return;
+  arrowAmount.value = Math.min(60, Math.max(1, Number(e.detail.value)));
+  if (!arrowAmount.value) return;
+  if (selectedIndex.value !== -1) {
+    props.onSelect(
+      props.itemIndex,
+      `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}/${
+        arrowAmount.value
+      }`
+    );
+  }
+};
 watch(
   () => props.value,
   (newValue) => {
@@ -114,6 +150,19 @@ const loadConfig = () => {
     }
   }
 };
+const formatSetAndAmount = computed(() => {
+  if (selectedIndex.value === -1 || secondSelectIndex.value === -1)
+    return itemTexts[props.itemIndex];
+  if (selectedIndex.value === 99 && !sets.value)
+    return itemTexts[props.itemIndex];
+  if (secondSelectIndex.value === 99 && !arrowAmount.value)
+    return itemTexts[props.itemIndex];
+  return `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}组/${
+    secondSelectIndex.value === 99
+      ? arrowAmount.value
+      : groupArrows[secondSelectIndex.value]
+  }箭`;
+});
 onMounted(async () => {
   const config = uni.getStorageSync("point-book-config");
   if (config) {
@@ -135,24 +184,21 @@ onMounted(async () => {
     }"
   >
     <view @click="() => onExpand(itemIndex, !expand)">
-      <text :style="{ opacity: expand ? 1 : 0 }">{{
+      <view></view>
-        itemIndex !== 3 ? itemTexts[itemIndex] : "选择组"
-      }}</text>
       <block>
-        <text :style="{ opacity: expand ? 0 : 1 }" v-if="itemIndex === 0">{{
+        <text v-if="expand" :style="{ color: '#999', fontWeight: 'normal' }">{{
+          itemIndex !== 3 ? itemTexts[itemIndex] : "选择组"
+        }}</text>
+        <text v-if="!expand && itemIndex === 0">{{
           value || itemTexts[itemIndex]
         }}</text>
-        <text :style="{ opacity: expand ? 0 : 1 }" v-if="itemIndex === 1">{{
+        <text v-if="!expand && itemIndex === 1">{{
           value && value > 0 ? value + "米" : itemTexts[itemIndex]
         }}</text>
-        <text :style="{ opacity: expand ? 0 : 1 }" v-if="itemIndex === 2">{{
+        <text v-if="!expand && itemIndex === 2">{{
           value || itemTexts[itemIndex]
         }}</text>
-        <text :style="{ opacity: expand ? 0 : 1 }" v-if="itemIndex === 3">{{
+        <text v-if="!expand && itemIndex === 3">{{ formatSetAndAmount }}</text>
-          selectedIndex !== -1 && secondSelectIndex !== -1
-            ? `${selectedIndex + 1}组/${groupArrows[secondSelectIndex]}箭`
-            : itemTexts[itemIndex]
-        }}</text>
       </block>
       <button hover-class="none">
         <image
@@ -195,10 +241,11 @@ onMounted(async () => {
       >
         <input
           v-model="meter"
+          type="number"
           placeholder="自定义"
           placeholder-style="color: #DDDDDD"
           @focus="() => (selectedIndex = 9)"
-          @change="onMeterChange"
+          @blur="onMeterChange"
         />
         <text>米</text>
       </view>
@@ -219,7 +266,7 @@ onMounted(async () => {
     <view v-if="itemIndex === 3">
       <view class="amount-items">
         <view
-          v-for="i in 12"
+          v-for="i in 4"
           :key="i"
           :style="{
             borderColor: selectedIndex === i ? '#fed847' : '#eeeeee',
@@ -229,9 +276,29 @@ onMounted(async () => {
           <text>{{ i }}</text>
           <text>组</text>
         </view>
+        <view
+          :style="{
+            borderColor: selectedIndex === 99 ? '#fed847' : '#eeeeee',
+          }"
+        >
+          <input
+            placeholder="1 ~ 30"
+            type="number"
+            placeholder-style="color: #DDDDDD"
+            v-model="sets"
+            @focus="() => (selectedIndex = 99)"
+            @blur="onSetsChange"
+          />
+          <text>组</text>
+        </view>
       </view>
       <view
-        :style="{ marginTop: '5px', marginBottom: '10px', color: '#999999' }"
+        :style="{
+          marginTop: '5px',
+          marginBottom: '10px',
+          color: '#999999',
+          textAlign: 'center',
+        }"
         >选择每组的箭数</view
       >
       <view class="amount-items">
@@ -246,6 +313,22 @@ onMounted(async () => {
           <text>{{ item }}</text>
           <text>箭</text>
         </view>
+        <view
+          :style="{
+            borderColor: secondSelectIndex === 99 ? '#fed847' : '#eeeeee',
+          }"
+        >
+          <input
+            placeholder="1 ~ 60"
+            type="number"
+            placeholder-style="color: #DDDDDD"
+            v-model="arrowAmount"
+            maxlength="99"
+            @focus="() => (secondSelectIndex = 99)"
+            @blur="onArrowAmountChange"
+          />
+          <text>箭</text>
+        </view>
       </view>
     </view>
   </view>
@@ -269,9 +352,8 @@ onMounted(async () => {
   justify-content: space-between;
   height: 50px;
 }
-.container > view:first-child > text:first-child {
+.container > view:first-child > view:first-child {
   width: 85px;
-  color: #999999;
 }
 .container > view:first-child > text:nth-child(2) {
   font-weight: 500;
@@ -352,4 +434,12 @@ onMounted(async () => {
   width: 100%;
   text-align: center;
 }
+.amount-items > view:last-child {
+  grid-column: 1 / -1;
+  width: 100%;
+}
+.amount-items > view:last-child > input {
+  width: 85%;
+  text-align: center;
+}
 </style>

src/components/Guide.vue

@@ -23,7 +23,7 @@ const bubbleTypes = [
       <image
         v-if="!noBg"
         :src="bubbleTypes[type]"
-        :style="{ top: type === 2 ? '-6%' : '-12%' }"
+        :style="{ top: type === 2 ? '-6%' : '-13%' }"
         mode="widthFix"
       />
       <slot />
@@ -55,6 +55,6 @@ const bubbleTypes = [
 }
 .container > view {
   color: #fff;
-  font-size: 14px;
+  font-size: 28rpx;
 }
 </style>

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

@@ -1,6 +1,17 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import HeaderProgress from "@/components/HeaderProgress.vue";
+import Avatar from "@/components/Avatar.vue";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, game } = storeToRefs(store);
+
+const currentPage = computed(() => {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1].route;
+});
 
 const props = defineProps({
   title: {
@@ -18,38 +29,83 @@ const props = defineProps({
 });
 
 const onClick = () => {
-  if (props.onBack) props.onBack();
+  if (props.onBack) {
-  else uni.navigateBack();
+    props.onBack();
+  } else {
+    const pages = getCurrentPages();
+    if (pages.length > 1) {
+      uni.navigateBack();
+    } else {
+      uni.redirectTo({
+        url: "/pages/index",
+      });
+    }
+  }
+};
+
+const toUserPage = () => {
+  uni.navigateTo({
+    url: "/pages/user",
+  });
+};
+
+const signin = () => {
+  if (!user.value.id) {
+    uni.$emit("point-book-signin");
+  }
 };
 
 const loading = ref(false);
-const 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;
 };
 
+const updateHot = (value) => {
+  heat.value = value;
+};
+
 onMounted(() => {
   const pages = getCurrentPages();
   const currentPage = pages[pages.length - 1];
-  if (currentPage.route === "pages/point-book-edit") {
-    pointBook.value = uni.getStorageSync("point-book");
-  }
   if (
-    currentPage.route === "pages/battle-room" ||
+    currentPage.route === "pages/point-book-edit" ||
-    currentPage.route === "pages/team-battle" ||
+    currentPage.route === "pages/point-book-detail"
-    currentPage.route === "pages/melee-match"
   ) {
-    showLoader.value = true;
+    pointBook.value = uni.getStorageSync("point-book");
+    if (!pointBook.value) {
+      pointBook.value = uni.getStorageSync("last-point-book");
+    }
   }
-  uni.$on("update-header-loading", updateLoading);
   if (currentPage.route === "pages/team-battle") {
     showProgress.value = true;
   }
+  // 仅在对战房间页获取胶囊位置，按钮用 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);
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
-  uni.$off("update-header-loading", updateLoading);
+  uni.$off("update-hot", updateHot);
 });
 </script>
 
@@ -64,6 +120,30 @@ onUnmounted(() => {
       />
     </view>
     <view :style="{ color: whiteBackArrow ? '#fff' : '#000' }">
+      <view
+        v-if="currentPage === 'pages/point-book'"
+        class="user-header"
+        @click="signin"
+      >
+        <block v-if="user.id">
+          <Avatar
+            :src="user.avatar"
+            :onClick="toUserPage"
+            :size="40"
+            borderColor="#333"
+          />
+          <text class="truncate">{{ user.nickName }}</text>
+          <image
+            v-if="heat"
+            :src="`../static/hot${heat}.png`"
+            mode="widthFix"
+          />
+        </block>
+        <block v-else>
+          <image src="../static/user-icon.png" mode="widthFix" />
+          <text>新来的弓箭手你好呀~</text>
+        </block>
+      </view>
       <block
         v-if="
           '-凹造型-感知距离-小试牛刀'.indexOf(title) === -1 ||
@@ -92,12 +172,6 @@ onUnmounted(() => {
         </view>
       </block>
     </view>
-    <image
-      :style="{ opacity: showLoader && loading ? 1 : 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>
@@ -118,6 +192,17 @@ onUnmounted(() => {
     <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>
 
@@ -161,14 +246,6 @@ onUnmounted(() => {
   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;
@@ -191,4 +268,59 @@ onUnmounted(() => {
   display: flex;
   justify-content: center;
 }
+.user-header {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.user-header > image:first-child {
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+  border: 2rpx solid #333;
+}
+.user-header > image:last-child {
+  width: 36rpx;
+  height: 36rpx;
+}
+.user-header > text:nth-child(2) {
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #333333;
+  margin: 0 20rpx;
+  max-width: 300rpx;
+}
+/* 对战房间：整个胶囊作为分享按钮，fixed 定位脱离 flex 流，紧贴系统胶囊左侧 */
+.battle-room-number {
+  position: fixed;
+  /* 兜底定位（JS 获取胶囊位置失败时生效）：约 28vw 对应胶囊区域左边缘 */
+  right: calc(28vw + 4px);
+  top: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 240rpx;
+  height: 64rpx;
+  background: rgba(0, 0, 0, 0.15);
+  border-radius: 96rpx;
+  border: 1rpx solid #5b5758;
+  padding: 0;
+}
+/* 重置 button 默认边框 */
+.battle-room-number::after {
+  border: none;
+}
+.battle-room-number__text {
+  width: 156rpx;
+  height: 28rpx;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #ffffff;
+  text-align: center;
+  line-height: 28rpx;
+}
+.battle-room-number__icon {
+  width: 25rpx;
+  height: 26rpx;
+}
 </style>

src/components/HeaderProgress.vue

@@ -1,7 +1,9 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+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";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -9,87 +11,80 @@ const { user } = storeToRefs(store);
 
 const tips = ref("");
 const melee = ref(false);
-const battleId = ref("");
 const timer = ref(null);
 const sound = ref(true);
-const currentSound = ref("");
+const currentRound = ref(0);
-const currentRound = ref(1);
-const totalRound = ref(1);
 const currentRoundEnded = ref(false);
 const ended = ref(false);
 const halfTime = ref(false);
+const currentShot = ref(0);
+const totalShot = ref(0);
 
 watch(
   () => tips.value,
   (newVal) => {
-    let key = "";
+    let key = [];
-    if (newVal.includes("红队")) key = "请红方射击";
+    if (newVal.includes("重回")) return;
-    if (newVal.includes("蓝队")) key = "请蓝方射击";
+    if (currentRoundEnded.value) {
-    if (key && sound.value) {
+      // 播放当前轮次语音
-      if (currentRoundEnded.value) {
+      key.push(`第${["一", "二", "三", "四", "五"][currentRound.value]}轮`);
-        currentRoundEnded.value = false;
-        if (currentRound.value === 1) audioManager.play("第一轮");
-        if (currentRound.value === 2) audioManager.play("第二轮");
-        if (currentRound.value === 3) audioManager.play("第三轮");
-        if (currentRound.value === 4) audioManager.play("第四轮");
-        if (currentRound.value === 5) audioManager.play("第五轮");
-        setTimeout(() => {
-          audioManager.play(key);
-        }, 1000);
-      } else {
-        audioManager.play(key);
-      }
     }
+    key.push(
+      newVal.includes("你")
+        ? "轮到你了"
+        : newVal.includes("红队")
+        ? "请红方射箭"
+        : "请蓝方射箭"
+    );
+    audioManager.play(key, false);
+    currentRoundEnded.value = false;
   }
 );
 
 const updateSound = () => {
   sound.value = !sound.value;
-  if (!sound.value) audioManager.stop(currentSound.value);
+  audioManager.setMuted(!sound.value);
 };
 
-async function onReceiveMessage(messages = []) {
+async function onReceiveMessage(message) {
-  if (!sound.value || ended.value) return;
+  if (ended.value) return;
-  messages.forEach((msg) => {
+  if (Array.isArray(message)) return;
-    if (battleId.value && msg.constructor === MESSAGETYPES.ShootResult) {
+  const { type, mode, current, shootData } = message;
-      if (melee.value && msg.userId !== user.value.id) return;
+  if (type === MESSAGETYPESV2.BattleStart) {
-      if (!halfTime.value && msg.target) {
+    melee.value = Boolean(mode > 3);
-        currentSound.value = msg.target.ring
+    totalShot.value = mode === 1 ? 3 : 2;
-          ? `${msg.target.ring}环`
+    currentRoundEnded.value = true;
-          : "未上靶";
+    audioManager.play("比赛开始");
-        audioManager.play(currentSound.value);
+  } else if (type === MESSAGETYPESV2.BattleEnd) {
-      }
+    audioManager.play("比赛结束", false);
-    } else if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
+  } else if (type === MESSAGETYPESV2.ShootResult) {
-      battleId.value = msg.id;
+    if (melee.value && current.playerId !== user.value.id) return;
-    } else if (msg.constructor === MESSAGETYPES.AllReady) {
+    if (current.playerId === user.value.id) currentShot.value++;
-      currentRoundEnded.value = true;
+    if (message.shootData) {
-      audioManager.play("比赛开始");
+      let key = [];
-    } else if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
+      key.push(
-      melee.value = true;
+        shootData.ring
-      halfTime.value = false;
+          ? `${shootData.ringX ? "X" : shootData.ring}环`
-      audioManager.play("比赛开始");
+          : "未上靶"
-    } else if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
+      );
-      if (msg.preRoundResult && msg.preRoundResult.currentRound) {
+      if (shootData.angle !== null)
-        currentRound.value = msg.preRoundResult.currentRound + 1;
+        key.push(`向${getDirectionText(shootData.angle)}调整`);
-        currentRoundEnded.value = true;
+      audioManager.play(key, false);
-      }
-    } 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) {
-      audioManager.play("决金箭轮");
-    } else if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
-      ended.value = true;
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      ended.value = true;
     }
-  });
+  } 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) => {
-  currentSound.value = key;
   audioManager.play(key);
 };
 
@@ -97,14 +92,20 @@ const onUpdateTips = (newVal) => {
   tips.value = newVal;
 };
 
+const onUpdateTotalShot = (newVal) => {
+  currentShot.value = newVal.currentShot;
+  totalShot.value = newVal.totalShot;
+};
+
 onMounted(() => {
+  uni.$on("update-shot", onUpdateTotalShot);
   uni.$on("update-tips", onUpdateTips);
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("play-sound", playSound);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
-  uni.$off("update-tips", onUpdateTips);
+  uni.$off("update-shot", onUpdateTotalShot);
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("play-sound", playSound);
   if (timer.value) clearInterval(timer.value);
@@ -113,8 +114,8 @@ onUnmounted(() => {
 
 <template>
   <view class="container">
-    <text>{{ tips }}</text>
+    <text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
-    <!-- <text> ({{ currentRound }}/{{ totalRound }}) </text> -->
+    <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
     <button v-if="!!tips" hover-class="none" @click="updateSound">
       <image
         :src="`../static/sound${sound ? '' : '-off'}-yellow.png`"
@@ -131,6 +132,7 @@ onUnmounted(() => {
   display: flex;
   align-items: center;
   justify-content: center;
+  font-weight: 500;
 }
 .container > button:last-child {
   width: 36px;

src/components/Matching.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch } from "vue";
 const props = defineProps({
   stopMatch: {
     type: Function,
@@ -11,91 +11,94 @@ const props = defineProps({
   },
 });
 const playerNames = [
-  "彭妮·希利",
+  "乐正青山",
-  "埃琳娜·奥西波娃",
+  "宇文玉兰",
-  "凯西·考夫霍尔德",
+  "岑思宇",
+  "邬梓瑜",
+  "范子衿",
   "旗鼓相当的对手",
-  "马乌罗·内斯波利",
+  "乐子睿",
-  "埃琳娜·奥西波娃",
+  "时春晓",
-  "凯西·考夫霍尔德",
+  "柏孤鸿",
+  "东宫锦瑟",
+  "段干流云",
+];
+const textStyles = [
+  {
+    color: "#fff9",
+    fontSize: "18px",
+  },
+  {
+    color: "#fff",
+    fontSize: "22px",
+  },
+  {
+    color: "#fed847",
+    fontSize: "30px",
+  },
 ];
 
-const totalTop = ref(0);
+const rowHeight = 100 / 7;
-const timer = ref(null);
+const totalHeight = (playerNames.length / 7) * 100 + 7;
-const textStyles = ref([]);
 
-const getTextStyle = (top) => {
+const currentTop = ref(-totalHeight + rowHeight * 0);
-  const styles = [
+const timer = ref(null);
-    {
+
-      color: "#fff9",
+const getTextStyle = (top, index) => {
-      fontSize: "20px",
+  const count = Math.floor(
-    },
+    ((totalHeight + (top + rowHeight / 3)) / rowHeight).toFixed(1)
-    {
+  );
-      color: "#fff",
+  if (index === 12 - count) return textStyles[0];
-      fontSize: "24px",
+  else if (index === 13 - count) return textStyles[1];
-    },
+  else if (index === 14 - count) return textStyles[2];
-    {
+  else if (index === 15 - count) return textStyles[1];
-      color: "#fed847",
+  else if (index === 16 - count) return textStyles[0];
-      fontSize: "30px",
+  return {
-    },
-  ];
-  const data = new Array(14).fill({
     color: "#fff6",
-    fontSize: "16px",
+    fontSize: "14px",
-  });
+  };
-  const unitHeight = 100 / 7;
-  let style = {};
-  if (top >= 100 - unitHeight / 2) {
-    for (let j = 0; j < 5; j++) {
-      data[j + 1] = styles[j > 2 ? 4 - j : j];
-    }
-  } else {
-    new Array(7).fill(1).some((_, i) => {
-      if (
-        top >= unitHeight * i - unitHeight / 2 &&
-        top < unitHeight * (i + 1) - unitHeight / 2
-      ) {
-        for (let j = 0; j < 5; j++) {
-          data[7 + j + 1 - i] = styles[j > 2 ? 4 - j : j];
-        }
-        return true;
-      }
-      return false;
-    });
-  }
-  return data;
 };
 watch(
   () => props.onComplete,
-  (newVal, oldVal) => {
+  (newVal) => {
-    if (newVal && !oldVal) {
+    if (timer.value) {
-      if (timer.value) clearInterval(timer.value);
+      clearInterval(timer.value);
-      timer.value = setInterval(() => {
+      timer.value = null;
-        if (totalTop.value === 100) {
-          clearInterval(timer.value);
-          setTimeout(() => {
-            newVal();
-          }, 1500);
-        } else {
-          totalTop.value += 0.5;
-        }
-        textStyles.value = getTextStyle(totalTop.value);
-      }, 10);
     }
+    timer.value = setInterval(() => {
+      const count = Math.round(
+        (
+          (totalHeight + (currentTop.value + rowHeight / 3)) /
+          rowHeight
+        ).toFixed(1)
+      );
+      if (count === 10) {
+        clearInterval(timer.value);
+        timer.value = null;
+        setTimeout(newVal, 1500);
+        return;
+      }
+      // 这里不重置，如果运行超13秒，就不会循环了
+      if (currentTop.value >= -4) {
+        currentTop.value = -totalHeight;
+      } else {
+        currentTop.value += 2;
+      }
+    }, 40);
   }
 );
 onMounted(() => {
   timer.value = setInterval(() => {
-    if (totalTop.value === 100) {
+    if (currentTop.value >= -4) {
-      totalTop.value = 0;
+      currentTop.value = -totalHeight;
     } else {
-      totalTop.value += 2;
+      currentTop.value += 2;
     }
-    textStyles.value = getTextStyle(totalTop.value);
   }, 40);
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (timer.value) clearInterval(timer.value);
+  timer.value = null;
 });
 </script>
 
@@ -107,30 +110,13 @@ onUnmounted(() => {
       class="matching-bg"
     />
     <view>
-      <view
+      <view class="player-names" :style="{ top: `${currentTop}%` }">
-        class="player-names"
-        :style="{
-          top: `${totalTop - 100}%`,
-        }"
-      >
         <text
-          v-for="(name, index) in playerNames"
+          v-for="(name, index) in [...playerNames, ...playerNames]"
           :key="index"
           :style="{
-            lineHeight: `${95 / 7}vw`,
+            lineHeight: `${rowHeight}vw`,
-            ...(textStyles[index] || {}),
+            ...getTextStyle(currentTop, index),
-          }"
-        >
-          {{ name }}
-        </text>
-      </view>
-      <view class="player-names" :style="{ top: `${totalTop}%` }">
-        <text
-          v-for="(name, index) in playerNames"
-          :key="index"
-          :style="{
-            lineHeight: `${95 / 7}vw`,
-            ...(textStyles[index + 7] || {}),
           }"
         >
           {{ name }}
@@ -156,7 +142,7 @@ onUnmounted(() => {
   height: 95vw;
   overflow: hidden;
   position: absolute;
-  top: 30.5vw;
+  top: 30vw;
 }
 .matching-bg {
   position: absolute;
@@ -176,7 +162,6 @@ onUnmounted(() => {
 }
 .player-names {
   width: 100%;
-  height: 95vw;
   display: flex;
   flex-direction: column;
   position: absolute;

src/components/MeleeResult.vue

@@ -1,209 +0,0 @@
-<script setup>
-import { ref, watch } from "vue";
-import BowTarget from "@/components/BowTarget.vue";
-import Avatar from "@/components/Avatar.vue";
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-const scores = ref([]);
-const currentUser = ref({});
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-  onClose: {
-    type: Function,
-    default: () => {},
-  },
-  data: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-watch(
-  () => props.data,
-  (value) => {
-    const mine = value.players.find((p) => p.playerId === user.value.id);
-    currentUser.value = mine;
-    if (mine && mine.arrowHistory) {
-      scores.value = mine.arrowHistory;
-    }
-  },
-  { deep: true, immediate: true }
-);
-const onSelect = (userId) => {
-  const user = props.data.players.find((p) => p.playerId === userId);
-  currentUser.value = user;
-  if (user && user.arrowHistory) {
-    scores.value = user.arrowHistory;
-  }
-};
-</script>
-
-<template>
-  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
-    <view>
-      <text>5人大乱斗</text>
-      <view @click="onClose">
-        <image src="../static/close-white.png" mode="widthFix" />
-      </view>
-    </view>
-    <view class="rank-rows">
-      <view
-        v-for="(player, index) in data.players"
-        :key="index"
-        @click="() => onSelect(player.playerId)"
-      >
-        <image v-if="index === 0" src="../static/champ1.png" mode="widthFix" />
-        <image v-if="index === 1" src="../static/champ2.png" mode="widthFix" />
-        <image v-if="index === 2" src="../static/champ3.png" mode="widthFix" />
-        <view v-if="index > 2" class="rank-view">{{ index + 1 }}</view>
-        <Avatar :src="player.avatar" :size="24" />
-        <text
-          >积分
-          {{
-            player.totalScore > 0 ? "+" + player.totalScore : player.totalScore
-          }}分</text
-        >
-        <text>{{ player.totalRings }}环</text>
-        <text v-for="(arrow, index2) in player.arrowHistory" :key="index2">
-          {{ arrow.ring }}环
-        </text>
-      </view>
-    </view>
-    <view :style="{ width: '95%' }">
-      <BowTarget
-        :scores="scores"
-        :avatar="currentUser ? currentUser.avatar : ''"
-      />
-    </view>
-    <view class="score-text"
-      ><text :style="{ color: '#fed847' }">{{ scores.length }}</text
-      >支箭，共<text :style="{ color: '#fed847' }">{{
-        scores.reduce((last, next) => last + next.ring, 0)
-      }}</text
-      >环</view
-    >
-    <view class="score-row">
-      <view
-        v-for="(score, index) in scores"
-        :key="index"
-        class="score-item"
-        :style="{ width: '13vw', height: '13vw' }"
-      >
-        {{ score.ring }}
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.container {
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background-color: #232323;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  z-index: 10;
-}
-.container > view:first-child {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20px 0;
-  color: #fff;
-  position: relative;
-  font-size: 20px;
-}
-.container > view:first-child > view:last-child {
-  position: absolute;
-  left: 5px;
-  top: 25px;
-}
-.container > view:first-child > view:last-child > image {
-  width: 40px;
-}
-.score-text {
-  width: 100%;
-  color: #fff;
-  text-align: center;
-  font-size: 16px;
-  margin-bottom: 6px;
-}
-.score-row {
-  margin: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-wrap: wrap;
-}
-.score-item {
-  background-image: url("../static/score-bg.png");
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-  color: #fed847;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 24px;
-  margin: 3px;
-}
-.rank-rows {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  border-top: 1px solid #fff3;
-}
-.rank-rows > view {
-  width: clac(100% - 20px);
-  color: #fff9;
-  border-bottom: 1px solid #fff3;
-  padding: 7px 10px;
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  overflow-x: auto;
-}
-.rank-rows > view::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
-}
-.rank-rows > view > image:first-child,
-.rank-rows > view > view:first-child {
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  text-align: center;
-  font-size: 12px;
-  margin-right: 10px;
-  flex: 0 0 auto;
-}
-.rank-rows > view > view:first-child {
-  background-color: #6d6d6d;
-  border-radius: 50%;
-}
-.rank-rows > view > text {
-  margin-left: 10px;
-  flex: 0 0 auto;
-  display: block;
-  width: 25px;
-}
-.rank-rows > view > text:nth-child(3) {
-  width: 80px;
-}
-.rank-rows > view > text:nth-child(4) {
-  color: #fed847;
-  padding-right: 10px;
-  border-right: 1px solid #fff3;
-  width: 32px;
-}
-</style>

src/components/PlayerScore.vue

@@ -1,47 +1,58 @@
 <script setup>
-defineProps({
+import useStore from "@/store";
-  avatar: {
+import { storeToRefs } from "pinia";
-    type: String,
+const { user } = storeToRefs(useStore());
-    default: "",
+
-  },
+const props = defineProps({
-  name: {
+  player: {
-    type: String,
+    type: Object,
-    default: "",
+    default: () => ({}),
   },
   scores: {
     type: Array,
     default: () => [],
   },
 });
+
 const rowCount = new Array(6).fill(0);
 </script>
 
 <template>
-  <view class="container">
+  <view
+    class="container"
+    :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"
     />
-    <image :src="avatar || '../static/user-icon.png'" mode="widthFix" />
+    <image :src="player.avatar || '../static/user-icon.png'" mode="widthFix" />
-    <text>{{ name }}</text>
+    <text>{{ player.name }}</text>
     <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>
@@ -104,5 +115,6 @@ const rowCount = new Array(6).fill(0);
 .container > text:nth-child(5) {
   width: 40px;
   text-align: right;
+  word-break: keep-all;
 }
 </style>

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
+      <view v-if="players[index] && players[index].name" class="avatar">
-        v-if="players[index] && players[index].name"
+        <Avatar
-        :src="players[index].avatar || '../static/user-icon.png'"
+          :src="players[index].avatar || '../static/user-icon.png'"
-        mode="widthFix"
+          :size="40"
-      />
+        />
+        <text
+          :style="{ opacity: players[index] && !!players[index].state ? 1 : 0 }"
+          >已准备</text
+        >
+      </view>
       <view v-else class="player-unknow">
         <image src="../static/question-mark.png" mode="widthFix" />
       </view>
@@ -28,47 +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>
+      <view v-if="index === 0" class="founder">管理员</view>
-      <image
+      <!-- <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;
+  display: grid;
-  flex-wrap: wrap;
+  grid-template-columns: repeat(2, 1fr);
-  justify-content: flex-start;
+  row-gap: 20rpx;
-  -moz-column-gap: 20px;
+  column-gap: 25rpx;
-  column-gap: 14px;
   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) {
+.avatar {
-  width: 40px;
+  display: flex;
-  height: 40px;
+  flex-direction: column;
-  margin: 0 10px;
+  align-items: center;
-  border: 1px solid #fff;
+  padding: 0 24rpx;
-  border-radius: 50%;
+  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;
@@ -79,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;
+  width: 84rpx;
-  height: 40px;
+  height: 84rpx;
-  margin: 0 10px;
+  margin: 0 24rpx;
-  border: 1px solid #fff3;
+  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/PointRankItem.vue

@@ -0,0 +1,159 @@
+<script setup>
+import { ref, watch } from "vue";
+import Avatar from "@/components/Avatar.vue";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const { user, device, online } = storeToRefs(useStore());
+
+import { clickLikeAPI } from "@/apis";
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => {},
+  },
+  borderWidth: {
+    type: Number,
+    default: 1,
+  },
+});
+
+const like = ref(props.data.ifLike);
+const likeCount = ref(props.data.likeTotal || 0);
+
+watch(
+  () => props.data,
+  (newVal) => {
+    like.value = newVal.ifLike;
+    likeCount.value = newVal.likeTotal || 0;
+  }
+);
+
+const onClick = async () => {
+  if (!user.value.id) return;
+  if (user.value.id === props.data.id) {
+    return uni.navigateTo({
+      url: "/pages/my-like-list",
+    });
+  }
+  like.value = !like.value;
+  await clickLikeAPI(props.data.id, like.value);
+  if (like.value) likeCount.value++;
+  else likeCount.value--;
+};
+</script>
+
+<template>
+  <view class="rank-item" :style="{ borderWidth: borderWidth + 'rpx' }">
+    <image v-if="data.rank === 1" src="../static/point-no1.png" />
+    <image v-else-if="data.rank === 2" src="../static/point-no2.png" />
+    <image v-else-if="data.rank === 3" src="../static/point-no3.png" />
+    <text v-else>{{ data.rank || "" }}</text>
+    <view>
+      <Avatar :src="data.avatar || '../static/user-icon.png'" :size="36" />
+      <view>
+        <text class="truncate">{{ data.name }}</text>
+        <view>
+          <text>{{ data.totalDay }}天</text>
+          <view />
+          <text>平均{{ Number(data.averageRing.toFixed(1)) }}环</text>
+        </view>
+      </view>
+    </view>
+    <view class="item-info">
+      <text>{{ data.weekArrow }}</text>
+      <text>箭</text>
+    </view>
+    <view class="item-info">
+      <text>{{ Math.round(data.weekArrow * 1.6) }}</text>
+      <text>千卡</text>
+    </view>
+    <button hover-class="none" @click="onClick">
+      <text>{{ likeCount }}</text>
+      <image
+        :src="`../static/like-${like ? 'on' : 'off'}.png`"
+        mode="widthFix"
+      />
+    </button>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.rank-item {
+  margin: 0 20rpx;
+  border-bottom: $uni-border;
+  display: flex;
+  align-items: center;
+  background: $uni-white;
+  height: 120rpx;
+}
+.rank-item > text:nth-child(1) {
+  width: 52rpx;
+  font-size: 28rpx;
+  color: #333333;
+  text-align: center;
+}
+.rank-item > image:nth-child(1) {
+  width: 52rpx;
+  height: 56rpx;
+}
+.rank-item > view:nth-child(2) {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  margin-left: 20rpx;
+}
+.rank-item > view:nth-child(2) > view:last-child {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  font-size: 22rpx;
+  color: #aaaaaa;
+  margin-left: 20rpx;
+}
+.rank-item > view:nth-child(2) > view:last-child > text:first-child {
+  width: 200rpx;
+  font-size: 28rpx;
+  color: #333333;
+  margin-bottom: 5rpx;
+}
+.rank-item > view:nth-child(2) > view:last-child > view {
+  display: flex;
+  align-items: center;
+}
+.rank-item > view:nth-child(2) > view:last-child > view > view {
+  height: 20rpx;
+  width: 1rpx;
+  margin: 0 10rpx;
+  background-color: #b3b3b3;
+}
+.item-info {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  font-size: 20rpx;
+  color: #777777;
+  width: 20%;
+}
+.item-info > text:first-child {
+  font-size: 28rpx;
+  color: #333333;
+  margin-right: 5rpx;
+}
+.rank-item > button:nth-child(5) {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-size: 22rpx;
+  color: #777777;
+  padding-left: 20rpx;
+  padding-right: 10rpx;
+}
+.rank-item > button:nth-child(5) > image {
+  width: 24rpx;
+  height: 22rpx;
+  margin-top: 10rpx;
+}
+</style>

src/components/PointRecord.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, computed } from "vue";
 
 const props = defineProps({
   data: {
@@ -10,6 +10,25 @@ const props = defineProps({
 const bowOptions = ref({});
 const targetOptions = ref({});
 
+const toDetailPage = () => {
+  const config = uni.getStorageSync("point-book-config");
+  const bowType = config.bowOption.find(
+    (item) => item.id === props.data.bowType
+  );
+  const bowtargetType = config.targetOption.find(
+    (item) => item.id === props.data.targetType
+  );
+  uni.setStorageSync("point-book", {
+    bowType,
+    bowtargetType,
+    distance: props.data.distance,
+    amountGroup: props.data.groups,
+  });
+  uni.navigateTo({
+    url: `/pages/point-book-detail?id=${props.data.id}`,
+  });
+};
+
 onMounted(() => {
   const result = uni.getStorageSync("point-book-config");
   (result.bowOption || []).forEach((item) => {
@@ -22,9 +41,10 @@ onMounted(() => {
 </script>
 
 <template>
-  <view class="container">
+  <view class="container" @click="toDetailPage">
-    <view>
+    <view class="left-part">
       <view class="labels">
+        <view></view>
         <text>{{
           bowOptions[data.bowType] ? bowOptions[data.bowType].name : ""
         }}</text>
@@ -38,13 +58,18 @@ onMounted(() => {
       <view>
         <text>{{ data.createAt }}</text>
       </view>
+      <view>
+        <text>黄心率：{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
+        <text>10环数：{{ data.tenRings }}</text>
+        <text>平均：{{ data.averageRing }}</text>
+      </view>
     </view>
-    <view>
+    <view class="right-part">
       <image src="../static/bow-target.png" mode="widthFix" />
-      <view class="aroow-amount">
+      <view class="arrow-amount">
-        <text>共</text>
+        <text>{{ data.actualTotalRing }}</text>
-        <text>{{ data.arrows * data.groups }}</text>
+        <text>/</text>
-        <text>箭</text>
+        <text>{{ data.totalRing }}</text>
       </view>
     </view>
   </view>
@@ -53,60 +78,75 @@ onMounted(() => {
 <style scoped>
 .container {
   background-color: #fff;
-  border-radius: 15px;
   display: flex;
-  margin-bottom: 15px;
+  align-items: center;
-  height: 24vw;
+  border-radius: 25rpx;
+  height: 200rpx;
+  border: 2rpx solid #fed848;
+  padding-left: 30rpx;
+  padding-right: 10rpx;
 }
 .container > view {
   position: relative;
-  margin-left: 15px;
 }
-.container > view:first-child {
+.left-part {
-  width: calc(100% - 5vw);
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: calc(100% - 50rpx);
+  color: #333333;
 }
-.container > view:first-child > view {
+.left-part > view {
   width: 100%;
-  height: 50%;
+  display: flex;
+  position: relative;
+}
+.left-part > view:nth-child(3) {
   display: flex;
   align-items: center;
+  font-size: 20rpx;
+  color: #666;
 }
-.container > view:first-child > view:last-child {
+.left-part > view:nth-child(3) > text {
-  font-weight: 500;
+  margin-right: 10rpx;
+}
+.right-part > image {
+  width: 180rpx;
+  height: 180rpx;
 }
 .labels {
   align-items: flex-end !important;
 }
+.labels > view:first-child {
+  position: absolute;
+  bottom: 0;
+  height: 10rpx;
+  background: #fee947;
+  border-radius: 5rpx;
+  width: 300rpx;
+}
 .labels > text {
-  font-size: 12px;
+  font-size: 26rpx;
-  color: #333333;
-  border: 1px solid #eee;
   margin-right: 10px;
-  border-radius: 10px;
+  position: relative;
-  padding: 5px 10px;
+  color: #333;
 }
-.container > view:last-child {
+.arrow-amount {
-  margin-right: 1vw;
-}
-.container > view:last-child > image {
-  width: 24vw;
-}
-.aroow-amount {
   position: absolute;
   background-color: #0009;
-  border-radius: 10px;
+  border-radius: 12px;
   color: #fffc;
-  font-size: 12px;
+  font-size: 24rpx;
-  line-height: 22px;
+  line-height: 26px;
-  width: 60px;
+  width: 64px;
   display: flex;
   justify-content: center;
-  top: calc(50% - 11px);
+  top: calc(50% - 15px);
-  left: calc(50% - 30px);
+  left: calc(50% - 32px);
 }
-.aroow-amount > text:nth-child(2) {
+.arrow-amount > text:nth-child(1) {
+  font-size: 30rpx;
   color: #fff;
-  font-size: 14px;
-  margin: 0 3px;
 }
 </style>

src/components/PointSwitcher.vue

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

src/components/RewardUs.vue

@@ -0,0 +1,246 @@
+<script setup>
+import { ref, reactive, watch, onMounted } from "vue";
+import { getAppConfig, donateAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { config } = storeToRefs(store);
+const { updateConfig } = store;
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: null,
+  },
+});
+const amounts = ref([]);
+const selected = ref(null);
+const checked = ref(false);
+
+const formData = reactive({
+  name: "",
+  account: "",
+  organization: "",
+  suggestion: "",
+});
+
+const onPay = async (index) => {
+  selected.value = index;
+  const result = await donateAPI(
+    amounts.value[index],
+    formData.name,
+    formData.account,
+    formData.organization,
+    formData.suggestion
+  );
+  const params = result.order.jsApi.params;
+  if (params) {
+    wx.requestPayment({
+      timeStamp: params.timeStamp,
+      nonceStr: params.nonceStr,
+      package: params.package,
+      paySign: params.paySign,
+      signType: "RSA",
+      async success(res) {
+        uni.showToast({
+          title: "感谢您的支持！",
+          icon: "none",
+        });
+        props.onClose();
+      },
+      fail(res) {
+        console.log("pay error", res);
+        uni.showToast({
+          title: "取消支付",
+          icon: "none",
+        });
+        props.onClose();
+      },
+    });
+  }
+};
+
+watch(
+  () => config.value.donateAmount,
+  (value) => {
+    amounts.value = value || [];
+  },
+  { immediate: true }
+);
+
+watch(
+  () => props.show,
+  () => {
+    selected.value = null;
+    formData.name = "";
+    formData.account = "";
+    formData.organization = "";
+    formData.suggestion = "";
+  }
+);
+
+onMounted(async () => {
+  if (!config.value.donateAmount) {
+    const config = await getAppConfig();
+    updateConfig(config);
+  }
+});
+</script>
+
+<template>
+  <view class="container">
+    <image src="../static/donate.png" mode="widthFix" />
+    <text>感谢您对我们公益项目的支持！</text>
+    <view class="amounts">
+      <button
+        v-for="(item, index) in amounts"
+        :key="index"
+        hover-class="none"
+        @click="onPay(index)"
+        :style="{
+          background: selected === index ? '#fed848' : 'white',
+        }"
+      >
+        <text>￥</text>
+        <text>{{ item }}</text>
+      </button>
+    </view>
+    <view
+      @click="checked = !checked"
+      :style="{ marginBottom: !checked ? '20rpx' : '0' }"
+    >
+      <image v-if="checked" src="../static/checked.png" mode="widthFix" />
+      <view v-else></view>
+      <text>我想给建议(选填）</text>
+    </view>
+    <view v-if="checked">
+      <view>
+        <text>您的姓名</text>
+        <input v-model="formData.name" />
+      </view>
+      <view>
+        <text>手机/微信号</text>
+        <input v-model="formData.account" />
+      </view>
+      <view>
+        <text>所在机构</text>
+        <input v-model="formData.organization" />
+      </view>
+      <view>
+        <text>建议</text>
+        <textarea v-model="formData.suggestion" />
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  transition: all 0.3s ease-in-out;
+}
+.container > image:first-child {
+  width: 200rpx;
+  position: absolute;
+  top: -112rpx;
+}
+.container > text:nth-child(2) {
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #333333;
+  margin: 40rpx 0;
+}
+.amounts {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  row-gap: 20rpx;
+  column-gap: 20rpx;
+}
+.amounts > button {
+  width: 150rpx;
+  height: 88rpx;
+  background-color: #ffffff;
+  border-radius: 20rpx;
+  border: 1rpx solid #fed848;
+  color: #333;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.amounts > button > text:first-child {
+  font-size: 20rpx;
+  margin-right: 3rpx;
+}
+.amounts > button > text:last-child {
+  font-size: 34rpx;
+}
+.container > view:nth-child(4) {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  margin-top: 20rpx;
+}
+.container > view:nth-child(4) > view {
+  width: 32rpx;
+  height: 32rpx;
+  margin: 0 10rpx;
+  border: 1rpx solid #e3e3e3;
+  border-radius: 50%;
+}
+.container > view:nth-child(4) > image {
+  width: 32rpx;
+  height: 32rpx;
+  margin: 0 10rpx;
+}
+.container > view:nth-child(4) > text {
+  font-size: 24rpx;
+  color: #333333;
+  margin: 20rpx 0;
+}
+.container > view:nth-child(5) {
+  margin-bottom: 25rpx;
+}
+.container > view:nth-child(5) > view {
+  width: 100%;
+  display: flex;
+  justify-content: flex-start;
+  margin-bottom: 20rpx;
+}
+.container > view:nth-child(5) > view > text {
+  font-size: 24rpx;
+  color: #333333;
+  width: 30%;
+  text-align: right;
+  padding-right: 20rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+}
+.container > view:nth-child(5) > view > input {
+  border-radius: 12rpx;
+  border: 1rpx solid #fed848;
+  height: 40rpx;
+  line-height: 40rpx;
+  padding: 10rpx 20rpx;
+  font-size: 30rpx;
+  margin-right: 10rpx;
+  width: 55%;
+}
+.container > view:nth-child(5) > view > textarea {
+  width: 55%;
+  border-radius: 12rpx;
+  border: 1rpx solid #fed848;
+  height: 100rpx;
+  line-height: 40rpx;
+  padding: 10rpx 20rpx;
+  font-size: 30rpx;
+  margin-right: 10rpx;
+}
+</style>

src/components/RingBarChart.vue

@@ -0,0 +1,111 @@
+<script setup>
+import { ref, computed, onMounted } from "vue";
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const barColor = (rate) => {
+  if (rate >= 0.4) return "#FDC540";
+  if (rate >= 0.2) return "#FED847";
+  return "#ffe88f";
+};
+
+const bars = computed(() => {
+  const newList = new Array(12).fill({ ring: 0, rate: 0 }).map((_, index) => {
+    let ring = index;
+    if (ring === 11) ring = "M";
+    if (ring === 0) ring = "X";
+    return {
+      ring: ring,
+      rate: props.data[index] || 0,
+    };
+  });
+  [newList[0], newList[11]] = [newList[11], newList[0]];
+  return newList.reverse();
+});
+
+const ringText = (ring) => {
+  if (ring === 11) return "X";
+  if (ring === 0) return "M";
+  return ring;
+};
+</script>
+
+<template>
+  <view class="container">
+    <view>
+      <view v-for="(b, index) in bars" :key="index">
+        <text v-if="b && b.rate">
+          {{ `${Number((b.rate * 100).toFixed(1))}%` }}
+        </text>
+        <view
+          :style="{
+            background: barColor(b.rate),
+            height: (b.rate === 1 ? 150 : b.rate * 240) + 'rpx',
+          }"
+        >
+        </view>
+      </view>
+    </view>
+    <view>
+      <text v-for="(b, index) in bars" :key="index">
+        {{ b && b.ring !== undefined ? b.ring : "" }}
+      </text>
+    </view>
+    <text>环值</text>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  position: relative;
+}
+.container > text {
+  position: absolute;
+  bottom: 2rpx;
+  left: 0;
+  font-size: 18rpx;
+  color: #999999;
+}
+.container > view {
+  padding-left: 40rpx;
+  padding-right: 10rpx;
+}
+.container > view:first-child {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-around;
+  min-height: 50rpx;
+}
+.container > view:first-child > view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 18rpx;
+  color: #333;
+  width: 5vw;
+}
+.container > view:first-child > view > view {
+  width: 100%;
+  transition: all 0.3s ease;
+  height: 0;
+}
+.container > view:nth-child(2) {
+  display: grid;
+  grid-template-columns: repeat(12, 1fr);
+  border-top: 1rpx solid #333;
+  font-size: 22rpx;
+  color: #333333;
+  padding-top: 2rpx;
+}
+.container > view:nth-child(2) > text {
+  text-align: center;
+}
+</style>

src/components/RoundEndTip.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 const props = defineProps({
   isFinal: {
     type: Boolean,
@@ -26,7 +26,7 @@ const props = defineProps({
     default: () => {},
   },
 });
-const count = ref(3);
+const count = ref(props.isFinal ? 10 : 3);
 const tiemr = ref(null);
 function startCount() {
   if (tiemr.value) clearInterval(tiemr.value);
@@ -37,36 +37,29 @@ function startCount() {
     } else count.value -= 1;
   }, 1000);
 }
-watch(
-  () => [props.isFinal, props.roundData],
-  ([n_isFinal, n_roundData]) => {
-    count.value = n_isFinal ? 10 : 3;
-    startCount();
-  }
-);
 onMounted(() => {
   startCount();
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (tiemr.value) clearInterval(tiemr.value);
 });
 </script>
 
 <template>
   <view class="round-end-tip">
-    <text>第{{ round }}轮射击结束</text>
+    <text>第{{ round }}轮射箭结束</text>
     <block v-if="!isFinal">
       <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
           )
@@ -101,9 +94,9 @@ onUnmounted(() => {
     <block v-if="isFinal">
       <view class="point-view2">
         <text>蓝队</text>
-        <text>5</text>
+        <text>{{ bluePoint }}</text>
         <text>分，红队</text>
-        <text>5</text>
+        <text>{{ redPoint }}</text>
         <text>分</text>
       </view>
       <text>同分僵局！最后一箭定江山</text>
@@ -124,10 +117,10 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   align-items: center;
-  font-size: 16px;
+  font-size: 32rpx;
 }
 .round-end-tip > text:first-child {
-  font-size: 18px;
+  font-size: 36rpx;
   color: #fff;
 }
 .point-view1 {
@@ -144,7 +137,7 @@ onUnmounted(() => {
 }
 .point-view2 {
   margin: 12px 0;
-  font-size: 24px;
+  font-size: 48rpx;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -162,7 +155,8 @@ onUnmounted(() => {
   align-items: center;
   justify-content: center;
   margin-top: 10px;
-  font-size: 14px;
+  font-size: 28rpx;
+  word-break: keep-all;
 }
 .final-shoot > text:nth-child(1) {
   width: 20px;
@@ -170,7 +164,7 @@ onUnmounted(() => {
 }
 .final-shoot > text:nth-child(1),
 .final-shoot > text:nth-child(3) {
-  font-size: 18px;
+  font-size: 32rpx;
   color: #fed847;
   margin-left: 10px;
   margin-right: 5px;

src/components/SModal.vue

@@ -5,6 +5,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  height: {
+    type: String,
+    default: "650rpx",
+  },
   onClose: {
     type: Function,
     default: () => {},
@@ -46,16 +50,16 @@ watch(
       class="modal-content"
       :style="{
         transform: `translateY(${showContent ? '0%' : '100%'})`,
-        height: !noBg ? '260px' : 'auto',
+        height,
       }"
       @click.stop=""
     >
       <image
         v-if="!noBg"
-        src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png"
+        src="https://static.shelingxingqiu.com/attachment/2025-12-04/dep11770wzxg6o2alo.png"
         mode="widthFix"
       />
-      <view class="close-btn" @click="onClose">
+      <view class="close-btn" @click="onClose" v-if="!noBg">
         <image src="../static/close-yellow.png" mode="widthFix" />
       </view>
       <slot></slot>
@@ -77,13 +81,14 @@ watch(
   align-items: center;
   opacity: 0;
   transition: all 0.3s ease;
-  z-index: 99;
+  z-index: 999;
 }
 .modal-content {
   width: 100%;
   transform: translateY(100%);
   transition: all 0.3s ease;
   position: relative;
+  background-color: #372E1D;
 }
 .modal-content > image:first-child {
   width: 100%;

src/components/ScorePanel.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 const props = defineProps({
   rowCount: {
     type: Number,
@@ -9,7 +9,7 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -42,7 +42,7 @@ onMounted(() => {
     bgIndex.value = bgIndex.value === 0 ? 1 : 0;
   }, 200);
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (timer.value) {
     clearInterval(timer.value);
   }
@@ -51,7 +51,7 @@ onUnmounted(() => {
 <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="{
@@ -78,7 +78,12 @@ onUnmounted(() => {
       }"
     >
       <image src="../static/score-bg.png" mode="widthFix" />
-      <text>{{ scores[index] }}</text>
+      <text
+        :style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
+        >{{
+          !arrows[index] ? "-" : arrows[index].ringX ? "X" : arrows[index].ring
+        }}</text
+      >
     </view>
   </view>
 </template>
@@ -111,7 +116,6 @@ onUnmounted(() => {
 }
 .score-item > text {
   position: relative;
-  font-weight: bold;
   margin-top: 2px;
 }
 .complete-light {

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>{{
+      <text>{{ getShowText(arrows[index * 3 + 0]) }}</text>
-        scores[index * 3 + 0] ? scores[index * 3 + 0] + "环" : "-"
+      <text>{{ getShowText(arrows[index * 3 + 1]) }}</text>
-      }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 2]) }}</text>
-      <text>{{
-        scores[index * 3 + 1] ? scores[index * 3 + 1] + "环" : "-"
-      }}</text>
-      <text>{{
-        scores[index * 3 + 2] ? scores[index * 3 + 2] + "环" : "-"
-      }}</text>
       <text :style="{ width: '40%', transform: 'translateX(20%)' }">{{
         getSum(
-          scores[index * 3 + 0],
+          arrows[index * 3 + 0],
-          scores[index * 3 + 1],
+          arrows[index * 3 + 1],
-          scores[index * 3 + 2]
+          arrows[index * 3 + 2]
         )
       }}</text>
     </view>

src/components/ScoreResult.vue

@@ -1,11 +1,10 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, computed } from "vue";
 import IconButton from "@/components/IconButton.vue";
 import SButton from "@/components/SButton.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import BowData from "@/components/BowData.vue";
 import UserUpgrade from "@/components/UserUpgrade.vue";
-import { wxShare } from "@/util";
 import { directionAdjusts } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -37,7 +36,6 @@ const showPanel = ref(true);
 const showComment = ref(false);
 const showBowData = ref(false);
 const showUpgrade = ref(false);
-const finished = ref(false);
 const totalRing = ref(0);
 const closePanel = () => {
   showPanel.value = false;
@@ -45,22 +43,33 @@ const closePanel = () => {
     props.onClose();
   }, 300);
 };
+function onClickShare() {
+  uni.$emit("share-image");
+}
 onMounted(() => {
   if (props.result.lvl > user.value.lvl) {
     showUpgrade.value = true;
   }
-  if (props.result.arrows) {
+  totalRing.value = (props.result.details || []).reduce(
-    totalRing.value = props.result.arrows.reduce(
+    (last, next) => last + next.ring,
-      (last, next) => last + next.ring,
+    0
-      0
+  );
-    );
-  }
-  finished.value =
-    props.result.arrows && props.result.arrows.length === props.total;
 });
-// setTimeout(() => {
+
-//   showPanel.value = true;
+const getRing = (arrow) => {
-// }, 300);
+  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 validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
 </script>
 
 <template>
@@ -69,8 +78,8 @@ onMounted(() => {
       <image :src="tipSrc" mode="widthFix" />
       <image src="../static/finish-frame.png" mode="widthFix" />
       <text
-        >完成<text class="gold-text">{{ result.arrows.length }}</text
+        >完成<text class="gold-text">{{ validArrows }}</text
-        >箭，获得<text class="gold-text">{{ result.arrows.length }}</text
+        >箭，获得<text class="gold-text">{{ validArrows }}</text
         >点经验</text
       >
     </view>
@@ -91,16 +100,16 @@ onMounted(() => {
       </view>
       <view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }">
         <view v-for="(_, index) in new Array(total).fill(0)" :key="index">
-          {{ result.arrows[index] ? result.arrows[index].ring : 0
+          {{ getRing(arrows[index])
-          }}<text>环</text>
+          }}<text v-if="getRing(arrows[index]) !== '-'">环</text>
         </view>
       </view>
       <view>
-        <block v-if="finished">
+        <block v-if="validArrows === total">
           <IconButton
             name="分享"
             src="../static/share.png"
-            :onClick="wxShare"
+            :onClick="onClickShare"
           />
           <IconButton
             name="教练点评"
@@ -109,10 +118,10 @@ onMounted(() => {
           />
         </block>
         <SButton
-          :width="finished ? '70vw' : 'calc(100vw - 20px)'"
+          :width="validArrows === total ? '70vw' : 'calc(100vw - 20px)'"
           :rounded="30"
           :onClick="closePanel"
-          >{{ finished ? "完成" : "重新挑战" }}</SButton
+          >{{ validArrows === total ? "完成" : "返回" }}</SButton
         >
       </view>
     </view>
@@ -128,28 +137,35 @@ onMounted(() => {
           }}</text
           >环的成绩，所有箭支上靶后的平均点间距为<text
             :style="{ color: '#fed847' }"
-            >{{ Number(result.average_distance.toFixed(2)) }}</text
+            >{{ Number((result.average_distance || 0).toFixed(2)) }}</text
           >，{{
             result.spreadEvaluation === "Dispersed"
-              ? "还需要持续改进。"
+              ? "还需要持续改进哦~"
               : "成绩优秀。"
           }}
         </text>
-        <text :style="{ marginTop: '12px' }"
+        <view>
-          >针对您本次的练习，{{
+          <image
-            result.spreadEvaluation === "Dispersed"
+            src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
-              ? "我们建议您充分练习推弓、靠位以及撒放动作一致性，以持续提高成绩。"
+            mode="widthFix"
-              : totalRing >= 100
+          />
-              ? "我们建议您继续保持即可。"
+          <text :style="{ marginTop: '12px' }"
-              : `我们建议您将设备的瞄准器${
+            >针对您本次的练习，{{
-                  directionAdjusts[result.adjustmentHint]
+              result.spreadEvaluation === "Dispersed"
-                }调整。`
+                ? "我们建议您充分练习推弓、靠位以及撒放动作一致性。"
-          }}</text
+                : totalRing >= 100
-        >
+                ? "我们建议您继续保持即可。"
+                : `我们建议您将设备的瞄准器${
+                    directionAdjusts[result.adjustmentHint]
+                  }调整。`
+            }}</text
+          >
+        </view>
       </view>
     </ScreenHint>
     <BowData
-      :arrows="result.arrows"
+      :total="arrows.length"
+      :arrows="result.details"
       :show="showBowData"
       :onClose="() => (showBowData = false)"
     />
@@ -169,7 +185,7 @@ onMounted(() => {
   top: 0;
   left: 0;
   background-color: rgba(0, 0, 0, 0.8);
-  z-index: 5;
+  z-index: 999;
 }
 .container-header {
   margin-top: 20vh;
@@ -226,11 +242,12 @@ onMounted(() => {
   text-align: center;
   line-height: 27px;
   color: #333333;
+  font-size: 28rpx;
 }
 .container-content > view:nth-child(2) > view > text {
-  font-size: 12px;
+  font-size: 20rpx;
   color: #666666;
-  margin-left: 3px;
+  margin-left: 5rpx;
 }
 .container-content > view:nth-child(3) {
   width: 100%;
@@ -246,6 +263,13 @@ onMounted(() => {
   display: flex;
   flex-direction: column;
   font-size: 14px;
-  margin-top: -20px;
+}
+.coach-comment > view {
+  display: flex;
+}
+.coach-comment > view > image {
+  width: 420rpx;
+  height: 420rpx;
+  margin-right: 20rpx;
 }
 </style>

src/components/ScreenHint2.vue

@@ -53,8 +53,7 @@ const props = defineProps({
   position: relative;
   width: 75vw;
   margin-bottom: 15px;
-  border-radius: 20px;
+  border-radius: 30rpx;
-  overflow: hidden;
   background: #fff;
 }
 .container > view:first-child > image {
@@ -62,5 +61,7 @@ const props = defineProps({
   width: 100%;
   z-index: -1;
   top: 0;
+  border-top-left-radius: 30rpx;
+  border-top-right-radius: 30rpx;
 }
 </style>

src/components/ScrollList.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, watch } from "vue";
+import { ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
 const props = defineProps({
   show: {
     type: Boolean,
@@ -14,9 +15,10 @@ const props = defineProps({
     default: 10,
   },
 });
-const refreshing = ref(false);
+const refreshing = ref(true);
 const loading = ref(false);
 const noMore = ref(false);
+const count = ref(0);
 const page = ref(1);
 const refresherrefresh = async () => {
   if (refreshing.value) return;
@@ -24,6 +26,7 @@ const refresherrefresh = async () => {
     refreshing.value = true;
     page.value = 1;
     const length = await props.onLoading(page.value);
+    count.value = length;
     if (length < props.pageSize) noMore.value = true;
   } finally {
     refreshing.value = false;
@@ -35,20 +38,21 @@ const scrolltolower = async () => {
     loading.value = true;
     page.value += 1;
     const length = await props.onLoading(page.value);
+    count.value += length;
     if (length < props.pageSize) noMore.value = true;
   } finally {
     loading.value = false;
   }
 };
-watch(
+onShow(async () => {
-  () => props.show,
+  try {
-  async (newVal) => {
+    const length = await props.onLoading(page.value);
-    if (newVal) await props.onLoading(1);
+    count.value = length;
-  },
+    if (length < props.pageSize) noMore.value = true;
-  {
+  } finally {
-    immediate: true,
+    refreshing.value = false;
   }
-);
+});
 </script>
 
 <template>
@@ -56,7 +60,7 @@ watch(
     class="scroll-list"
     scroll-y
     :show-scrollbar="false"
-    enhanced="true"
+    :enhanced="true"
     :bounces="false"
     refresher-default-style="white"
     :refresher-enabled="true"
@@ -68,8 +72,10 @@ watch(
     }"
   >
     <slot></slot>
-    <text class="tips" v-if="loading">加载中...</text>
+    <view class="tips">
-    <text class="tips" v-if="noMore">我是有底线的</text>
+      <text v-if="loading">加载中...</text>
+      <text v-if="noMore">{{ count === 0 ? "暂无数据" : "没有更多了" }}</text>
+    </view>
   </scroll-view>
 </template>
 
@@ -79,7 +85,10 @@ watch(
   height: 100%;
 }
 .tips {
-  color: #fff9;
+  height: 50rpx;
+}
+.tips > text {
+  color: #d0d0d0;
   display: block;
   text-align: center;
   font-size: 12px;

src/components/ShootProgress.vue

@@ -1,11 +1,14 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+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";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+
 const props = defineProps({
   show: {
     type: Boolean,
@@ -35,25 +38,30 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  onStop: {
+    type: Function,
+    default: () => {},
+  },
 });
 
 const barColor = ref("#fed847");
 const remain = ref(props.total);
 const timer = ref(null);
 const sound = ref(true);
-const currentSound = ref("");
 const currentRound = ref(props.currentRound);
 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,
   (newVal) => {
     let key = "";
-    if (newVal.includes("红队")) key = "请红方射击";
+    if (newVal.includes("红队")) key = "请红方射箭";
-    if (newVal.includes("蓝队")) key = "请蓝方射击";
+    if (newVal.includes("蓝队")) key = "请蓝方射箭";
-    if (key && sound.value) {
+    if (key) {
       if (currentRoundEnded.value) {
         currentRound.value += 1;
         currentRoundEnded.value = false;
@@ -72,104 +80,103 @@ watch(
   }
 );
 
-watch(
+const resetTimer = (count) => {
-  () => props.tips,
-  (newVal) => {
-    if (newVal.includes("红队")) barColor.value = "#FF6060";
-    if (newVal.includes("蓝队")) barColor.value = "#5FADFF";
-    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,
-  }
-);
-
-watch(
-  () => props.start,
-  (newVal) => {
-    if (timer.value) clearInterval(timer.value);
-    if (newVal) {
-      remain.value = props.total;
-      timer.value = setInterval(() => {
-        if (remain.value > 0) remain.value--;
-      }, 1000);
-    }
-  },
-  {
-    immediate: true,
-  }
-);
-
-const updateRemain = (value) => {
   if (timer.value) clearInterval(timer.value);
-  remain.value = Math.round(value);
+  const newVal = Math.round(count);
+  
+  // 如果剩余时间增加（如重置），瞬间变化无动画
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+  
   if (remain.value > 0) {
     timer.value = setInterval(() => {
+      if (remain.value === 0) {
+        clearInterval(timer.value);
+        props.onStop();
+      }
       if (remain.value > 0) remain.value--;
     }, 1000);
   }
 };
 
+watch(
+  () => props.start,
+  (newVal) => {
+    if (newVal) {
+      resetTimer(props.total);
+    } else {
+      remain.value = 0;
+      clearInterval(timer.value);
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+const tipContent = computed(() => {
+  if (halfTime.value) {
+    return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`;
+  }
+  return props.start && remain.value === 0 ? "时间到！" : props.tips;
+});
+
 const updateSound = () => {
   sound.value = !sound.value;
-  if (!sound.value) audioManager.stop(currentSound.value);
+  audioManager.setMuted(!sound.value);
 };
 
-async function onReceiveMessage(messages = []) {
+async function onReceiveMessage(msg) {
-  if (!sound.value || ended.value) return;
+  if (Array.isArray(msg)) return;
-  messages.forEach((msg) => {
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
-    if (
+    halfTime.value = false;
-      (props.battleId && msg.constructor === MESSAGETYPES.ShootResult) ||
+    audioManager.play("比赛开始");
-      (!props.battleId && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID)
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    ) {
+    audioManager.play("比赛结束", false);
-      if (props.melee && msg.userId !== user.value.id) return;
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
-      if (!halfTime.value && msg.target) {
+    let arrow = {};
-        currentSound.value = msg.target.ring
+    if (msg.details && Array.isArray(msg.details)) {
-          ? `${msg.target.ring}环`
+      arrow = msg.details[msg.details.length - 1];
-          : "未上靶";
+    } else {
-        audioManager.play(currentSound.value);
+      if (msg.shootData.playerId !== user.value.id) return;
-      }
+      if (msg.shootData) arrow = msg.shootData;
-    } 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) {
-      halfTime.value = true;
-      audioManager.play("中场休息");
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      audioManager.play("比赛结束");
-    } else if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      audioManager.play("决金箭轮");
-    } else if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
-      ended.value = true;
-    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-      ended.value = true;
     }
-  });
+    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) => {
-  currentSound.value = key;
   audioManager.play(key);
 };
 
 onMounted(() => {
-  uni.$on("update-ramain", updateRemain);
+  uni.$on("update-remain", resetTimer);
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("play-sound", playSound);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
-  uni.$off("update-ramain", updateRemain);
+  uni.$off("update-remain", resetTimer);
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("play-sound", playSound);
   if (timer.value) clearInterval(timer.value);
@@ -180,7 +187,7 @@ onUnmounted(() => {
   <view class="container" :style="{ display: show ? 'block' : 'none' }">
     <view>
       <image src="../static/shooter.png" mode="widthFix" />
-      <text>{{ start && remain === 0 ? "时间到！" : tips }}</text>
+      <text>{{ tipContent }}</text>
       <button hover-class="none" @click="updateSound">
         <image
           :src="`../static/sound${sound ? '' : '-off'}-yellow.png`"
@@ -194,6 +201,7 @@ onUnmounted(() => {
           width: `${(remain / total) * 100}%`,
           backgroundColor: barColor,
           right: tips.includes('红队') ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
       <text>剩余{{ remain }}秒</text>
@@ -248,7 +256,6 @@ onUnmounted(() => {
   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, onUnmounted } from "vue";
+import {ref, watch, onMounted, onBeforeUnmount} from "vue";
-import { RoundGoldImages } from "@/constants";
+import {RoundGoldImages} from "@/constants";
+
 const props = defineProps({
   tips: {
     type: String,
@@ -19,57 +20,81 @@ const props = defineProps({
 const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
-
+const loading = ref(false);
-watch(
+const transitionStyle = ref("all 1s linear");
-  () => props.tips,
+const currentTeam = ref(null);
-  (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("红队") || newVal.includes("蓝队")) {
-      if (timer.value) clearInterval(timer.value);
-      remain.value = props.total;
-      timer.value = setInterval(() => {
-        if (remain.value > 0) remain.value--;
-      }, 1000);
-    }
-  },
-  {
-    immediate: true,
-  }
-);
 
 const updateRemain = (value) => {
-  if (timer.value) clearInterval(timer.value);
+  if (value.stop) {
-  remain.value = Math.round(value);
+    if (timer.value) clearInterval(timer.value);
+    return
+  }
+  loading.value = false;
+  currentTeam.value = value.team
+  if (value.team === 'red')
+    barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+  if (value.team === 'blue')
+    barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+  if (value.reset) {
+    remain.value = value.value;
+    return;
+  }
+  const newVal = Math.round(value.value);
+  // 如果剩余时间增加（如轮次切换重置），瞬间变化无动画；否则保持动画
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+
   timer.value = setInterval(() => {
+    loading.value = remain.value === 0;
     if (remain.value > 0) remain.value--;
   }, 1000);
 };
 
+watch(
+    () => props.tips,
+    (newVal) => {
+
+    },
+    {
+      immediate: true,
+    }
+);
+
 onMounted(() => {
-  uni.$on("update-ramain", updateRemain);
+  uni.$on("update-remain", updateRemain);
 });
 
-onUnmounted(() => {
+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>
+    <view
-      <view
         :style="{
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
+      }"
+    >
+      <view
+          :style="{
           width: `${(remain / total) * 100}%`,
           background: barColor,
-          right: tips.includes('红队') ? 0 : 'unset',
+          right: currentTeam==='red' ? 0 : 'unset',
+          transition: transitionStyle,
         }"
       />
-      <text>剩余{{ remain }}秒</text>
+      <text v-if="!loading">剩余{{ remain }}秒</text>
+      <text v-else>···</text>
     </view>
   </view>
 </template>
@@ -80,33 +105,37 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-bottom: 12vw;
 }
+
 .container > image {
-  width: 100%;
+  width: 380rpx;
-  transform: translateY(7px);
+  height: 80rpx;
+  transform: translateY(18rpx);
 }
+
 .container > view:last-child {
   width: 100%;
   text-align: center;
   background-color: #444444;
   border-radius: 20px;
-  font-size: 12px;
+  height: 24rpx;
-  height: 15px;
-  line-height: 15px;
   position: relative;
   overflow: hidden;
+  display: flex;
+  align-items: center;
 }
+
 .container > view:last-child > view {
-  position: absolute;
+  height: 24rpx;
-  height: 15px;
   border-radius: 15px;
-  transition: all 1s linear;
 }
+
 .container > view:last-child > text {
-  font-size: 10px;
+  font-size: 18rpx;
-  line-height: 15px;
   color: #fff;
-  position: relative;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
 </style>

src/components/Signin.vue

@@ -1,19 +1,39 @@
 <script setup>
 import { ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
+import SModal from "@/components/SModal.vue";
 import Avatar from "@/components/Avatar.vue";
 import SButton from "@/components/SButton.vue";
-import { getMyDevicesAPI, loginAPI, getHomeData } from "@/apis";
+
+import { wxLogin } from "@/util";
+import {
+  getMyDevicesAPI,
+  loginAPI,
+  getHomeData,
+  getPhoneNumberAPI,
+  getDeviceBatteryAPI,
+} from "@/apis";
+
 import useStore from "@/store";
 const store = useStore();
-const { updateUser, updateDevice } = store;
+const { updateUser, updateDevice, updateOnline } = store;
+
 const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  noBg: {
+    type: Boolean,
+    default: false,
+  },
   onClose: {
     type: Function,
     default: () => {},
   },
 });
 const agree = ref(false);
+const phone = ref("");
 const avatarUrl = ref("");
 const nickName = ref("");
 const loading = ref(false);
@@ -21,6 +41,17 @@ const handleAgree = () => {
   agree.value = !agree.value;
 };
 
+async function getphonenumber(e) {
+  if (e.detail.code) {
+    const wxResult = await wxLogin();
+    const result = await getPhoneNumberAPI({
+      ...e.detail,
+      code: wxResult.code,
+    });
+    if (result.phone) phone.value = result.phone;
+  }
+}
+
 function onChooseAvatar(e) {
   avatarUrl.value = e.detail.avatarUrl;
 }
@@ -29,8 +60,14 @@ function onNicknameChange(e) {
   nickName.value = e.detail.value;
 }
 
-const handleLogin = () => {
+const handleLogin = async () => {
   if (loading.value) return;
+  if (!phone.value) {
+    return uni.showToast({
+      title: "请获取手机号",
+      icon: "none",
+    });
+  }
   if (!avatarUrl.value) {
     return uni.showToast({
       title: "请选择头像",
@@ -49,93 +86,150 @@ const handleLogin = () => {
       icon: "none",
     });
   }
+  await doLogin();
+};
+
+async function doLogin() {
   loading.value = true;
-  uni.login({
+  try {
-    provider: "weixin",
+    const wxResult = await wxLogin();
-    success: async (loginRes) => {
+    const fileManager = uni.getFileSystemManager();
-      const { code } = loginRes;
+    const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
-      const fileManager = uni.getFileSystemManager();
+    const base64Url = `data:image/png;base64,${avatarBase64}`;
-      const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
+    await loginAPI(phone.value, nickName.value, base64Url, wxResult.code);
-      const base64Url = `data:image/png;base64,${avatarBase64}`;
+    const data = await getHomeData();
-      const result = await loginAPI(nickName.value, base64Url, code);
+    if (data.user) updateUser(data.user);
-      const data = await getHomeData();
+    const devices = await getMyDevicesAPI();
-      if (data.user) updateUser(data.user);
+    if (devices.bindings && devices.bindings.length) {
-      const devices = await getMyDevicesAPI();
+      updateDevice(
-      if (devices.bindings && devices.bindings.length) {
+        devices.bindings[0].deviceId,
-        updateDevice(
+        devices.bindings[0].deviceName
-          devices.bindings[0].deviceId,
+      );
-          devices.bindings[0].deviceName
+      const data = await getDeviceBatteryAPI();
-        );
+      updateOnline(data.online);
-      }
+    }
-      props.onClose();
+    props.onClose();
-    },
+  } catch (error) {
-    fail: (err) => {
+    console.log("login error", error);
-      loading.value = false;
+  } finally {
-      uni.showToast({
+    loading.value = false;
-        title: "登录失败",
+  }
-        icon: "none",
+};
-      });
+
-      console.error("登录失败：", err);
+const openServiceLink = () => {
-    },
+  uni.navigateTo({
+    url:
+      "/pages/webview?url=" +
+      encodeURIComponent(
+        "https://static.shelingxingqiu.com/shootServiceAgreement.html"
+      ),
   });
 };
+
+const openPrivacyLink = () => {
+  uni.navigateTo({
+    url:
+      "/pages/webview?url=" +
+      encodeURIComponent(
+        "https://static.shelingxingqiu.com/shootPrivacyPolicy.html"
+      ),
+  });
+};
+
 onShow(() => {
   loading.value = false;
+  agree.value = false;
+  phone.value = "";
+  avatarUrl.value = "";
+  nickName.value = "";
 });
 </script>
 
 <template>
-  <view class="container">
+  <SModal :show="show" :onClose="onClose" :noBg="noBg">
-    <view class="avatar">
+    <view class="container" :style="{ background: noBg ? '#fff' : 'none' }">
-      <text>头像:</text>
+      <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
-      <button
+        <text :style="{ color: noBg ? '#666' : '#fff' }">手机:</text>
-        open-type="chooseAvatar"
+        <button
-        @chooseavatar="onChooseAvatar"
+          :open-type="!phone ? 'getPhoneNumber' : ''"
-        class="login-btn"
+          @getphonenumber="getphonenumber"
-        hover-class="none"
+          class="login-btn"
+          hover-class="none"
+        >
+          <text v-if="phone" :style="{ color: noBg ? '#333' : '#fff' }">{{
+            phone
+          }}</text>
+          <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
+            >点击获取</text
+          >
+          <image src="../static/enter.png" mode="widthFix" />
+        </button>
+      </view>
+      <view class="avatar" :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }">
+        <text :style="{ color: noBg ? '#666' : '#fff' }">头像:</text>
+        <button
+          open-type="chooseAvatar"
+          @chooseavatar="onChooseAvatar"
+          class="login-btn"
+          hover-class="none"
+        >
+          <Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" />
+          <text v-else :style="{ color: noBg ? '#666' : '#fff9' }"
+            >点击获取</text
+          >
+          <image src="../static/enter.png" mode="widthFix" />
+        </button>
+      </view>
+      <view
+        class="nickname"
+        :style="{ borderColor: noBg ? '#E3E3E3' : '#fff3' }"
       >
-        <Avatar v-if="avatarUrl" :src="avatarUrl" :size="30" />
+        <text :style="{ color: noBg ? '#666' : '#fff' }">昵称:</text>
-        <text v-else>点击获取</text>
+        <input
-      </button>
+          type="nickname"
-    </view>
+          placeholder="请输入昵称"
-    <view class="nickname">
+          :placeholder-style="`color: ${noBg ? '#666' : '#fff9'} `"
-      <text>昵称:</text>
+          @change="onNicknameChange"
-      <input
+          @blur="onNicknameBlur"
-        type="nickname"
+          :style="{ color: noBg ? '#333' : '#fff' }"
-        placeholder="请输入昵称"
-        placeholder-style="color: #fff9"
-        @change="onNicknameChange"
-        @blur="onNicknameBlur"
-      />
-    </view>
-    <SButton :rounded="20" width="80vw" :onClick="handleLogin">
-      <block v-if="!loading">
-        <image
-          src="../static/wechat-icon.png"
-          mode="widthFix"
-          class="wechat-icon"
         />
-        <text :style="{ color: '#000' }">登录/注册</text>
+      </view>
-      </block>
+      <SButton :rounded="20" width="80vw" :onClick="handleLogin">
-      <block v-else>
+        <block v-if="!loading">
-        <image
+          <text :style="{ color: '#000' }">手机号快捷登录</text>
-          src="../static/btn-loading.png"
+        </block>
-          mode="widthFix"
+        <block v-else>
-          class="loading"
+          <image
+            src="../static/btn-loading.png"
+            mode="widthFix"
+            class="loading"
+          />
+        </block>
+      </SButton>
+      <view class="protocol" @click="handleAgree">
+        <view
+          v-if="!agree"
+          :style="{ borderColor: noBg ? '#E3E3E3' : '#fff' }"
         />
-      </block>
+        <image v-if="agree" src="../static/checked.png" mode="widthFix" />
-    </SButton>
+        <view>
-    <view class="protocol" @click="handleAgree">
+          <text>已同意并阅读</text>
-      <view v-if="!agree" />
+          <view
-      <image v-if="agree" src="../static/checked.png" mode="widthFix" />
+            @click.stop="openServiceLink"
-      <text
+            :style="{ color: noBg ? '#333' : '#ffffff99' }"
-        >已同意并阅读<text :style="{ color: '#fff' }">《用户协议》</text>及<text
+            >《用户协议》</view
-          :style="{ color: '#fff' }"
+          >
-          >《隐私协议》</text
+          <text>及</text>
-        >内容</text
+          <view
-      >
+            @click.stop="openPrivacyLink"
+            :style="{ color: noBg ? '#333' : '#ffffff99' }"
+            >《隐私协议》</view
+          >
+          <text>内容</text>
+        </view>
+      </view>
     </view>
-  </view>
+  </SModal>
 </template>
 
 <style scoped>
@@ -146,6 +240,8 @@ onShow(() => {
   flex-direction: column;
   justify-content: center;
   align-items: center;
+  border-top-left-radius: 24rpx;
+  border-top-right-radius: 24rpx;
 }
 .avatar,
 .nickname {
@@ -153,7 +249,7 @@ onShow(() => {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
-  border-bottom: 1px solid #fff3;
+  border-bottom: 1rpx solid #ffffff1a;
 }
 .avatar {
   margin: 0;
@@ -161,9 +257,8 @@ onShow(() => {
 .avatar > text,
 .nickname > text {
   width: 20%;
-  color: #fff9;
   font-size: 14px;
-  line-height: 55px;
+  line-height: 120rpx;
 }
 .avatar > button > text {
   color: #fff9;
@@ -172,8 +267,7 @@ onShow(() => {
 .nickname > input {
   flex: 1;
   font-size: 14px;
-  color: #fff;
+  line-height: 120rpx;
-  line-height: 55px;
 }
 .wechat-icon {
   width: 24px;
@@ -184,8 +278,8 @@ onShow(() => {
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 13px;
+  font-size: 22rpx;
-  margin-top: 15px;
+  margin: 30rpx 0;
   color: #8a8a8a;
 }
 .protocol > image {
@@ -200,10 +294,20 @@ onShow(() => {
   margin-right: 10px;
   border: 1px solid #fff;
 }
+.protocol > view:last-child {
+  display: flex;
+  align-items: center;
+}
 .login-btn {
   line-height: 55px;
   width: 80%;
   display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.login-btn > image {
+  width: 28rpx;
+  height: 28rpx;
 }
 .loading {
   width: 25px;

src/components/StartCountdown.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
-const props = defineProps({
-  start: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const count = ref(4);
-const timer = ref(null);
-const isIos = ref(true);
-watch(
-  () => props.start,
-  (newVal) => {
-    if (newVal) {
-      if (timer.value) clearInterval(timer.value);
-      count.value = 4;
-      timer.value = setInterval(() => {
-        if (count.value <= 1) {
-          clearInterval(timer.value);
-        }
-        count.value -= 1;
-      }, 1000);
-    }
-  },
-  {
-    immediate: true,
-  }
-);
-onMounted(() => {
-  const deviceInfo = uni.getDeviceInfo();
-  isIos.value = deviceInfo.osName === "ios";
-});
-onUnmounted(() => {
-  if (timer.value) clearInterval(timer.value);
-});
-</script>
-
-<template>
-  <view class="container" :style="{ top: `calc(50% - ${isIos ? 56 : 64}px)` }">
-    <view class="number pump-in" v-if="count === 3">3</view>
-    <view class="number pump-in" v-if="count === 2">2</view>
-    <view class="number pump-in" v-if="count === 1">1</view>
-  </view>
-</template>
-
-<style scoped>
-.container {
-  position: absolute;
-  top: calc(50% - 64px);
-  left: calc(50% - 30px);
-}
-.number {
-  color: #fff9;
-  font-size: 88px;
-  width: 60px;
-  text-align: center;
-}
-</style>

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

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

src/components/TeamResult.vue

@@ -1,214 +0,0 @@
-<script setup>
-import { ref, watch } from "vue";
-import BowTarget from "@/components/BowTarget.vue";
-import Avatar from "@/components/Avatar.vue";
-import { roundsName } from "@/constants";
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-  onClose: {
-    type: Function,
-    default: () => {},
-  },
-  data: {
-    type: Object,
-    default: () => ({}),
-  },
-});
-const selected = ref(0);
-const redScores = ref([]);
-const blueScores = ref([]);
-const tabs = ref(["所有轮次"]);
-const players = ref([]);
-const allRoundsScore = ref({});
-const onClickTab = (index) => {
-  selected.value = index;
-  redScores.value = [];
-  blueScores.value = [];
-  const { bluePlayers, redPlayers, roundsData } = props.data;
-  if (index === 0) {
-    Object.keys(bluePlayers).forEach((p) => {
-      allRoundsScore.value[p] = [];
-      Object.values(roundsData).forEach((round) => {
-        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) => {
-        allRoundsScore.value[p].push(
-          round[p].reduce((last, next) => last + next.ring, 0)
-        );
-        round[p].forEach((arrow) => {
-          redScores.value.push(arrow);
-        });
-      });
-    });
-  } else {
-    Object.keys(bluePlayers).forEach((p) => {
-      roundsData[index][p].forEach((arrow) => {
-        blueScores.value.push(arrow);
-      });
-    });
-    Object.keys(redPlayers).forEach((p) => {
-      roundsData[index][p].forEach((arrow) => {
-        redScores.value.push(arrow);
-      });
-    });
-  }
-};
-watch(
-  () => props.data,
-  (value) => {
-    if (value.winner === 0) {
-      players.value = [
-        ...Object.values(value.redPlayers),
-        ...Object.values(value.bluePlayers),
-      ];
-    } else if (value.winner === 1) {
-      players.value = [
-        ...Object.values(value.bluePlayers),
-        ...Object.values(value.redPlayers),
-      ];
-    }
-    Object.keys(value.roundsData).forEach((key) => {
-      tabs.value.push(`第${roundsName[key]}轮`);
-    });
-    onClickTab(0);
-  },
-  { deep: true, immediate: true }
-);
-</script>
-
-<template>
-  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
-    <view>
-      <text>1v1排位赛</text>
-      <view @click="onClose">
-        <image src="../static/close-white.png" mode="widthFix" />
-      </view>
-    </view>
-    <view>
-      <view
-        v-for="(tab, index) in tabs"
-        :key="index"
-        @click="() => onClickTab(index)"
-        :class="selected === index ? 'selected-tab' : ''"
-      >
-        {{ tab }}
-      </view>
-    </view>
-    <view :style="{ width: '95%' }">
-      <BowTarget :scores="redScores" :blueScores="blueScores" />
-    </view>
-    <view class="score-row" v-for="(player, index) in players" :key="index">
-      <Avatar
-        :src="player.avatar"
-        :borderColor="data.bluePlayers[player.playerId] ? 1 : 2"
-      />
-      <view
-        v-if="selected === 0"
-        v-for="(ring, index) in allRoundsScore[player.playerId]"
-        :key="index"
-        class="score-item"
-        :style="{ width: '13vw', height: '13vw' }"
-      >
-        {{ ring }}
-      </view>
-      <view
-        v-if="selected > 0"
-        v-for="(score, index) in data.roundsData[selected][player.playerId]"
-        :key="index"
-        class="score-item"
-        :style="{ width: '13vw', height: '13vw' }"
-      >
-        {{ score.ring }}
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.container {
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background-color: #232323;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  z-index: 10;
-}
-.container > view:first-child {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 40px 0;
-  color: #fff;
-  position: relative;
-  font-size: 20px;
-}
-.container > view:first-child > view:last-child {
-  position: absolute;
-  right: 5px;
-  top: 32px;
-}
-.container > view:first-child > view:last-child > image {
-  width: 40px;
-}
-.container > view:nth-child(2) {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  width: calc(100% - 20px);
-  color: #fff9;
-  padding: 0 10px;
-  overflow-x: auto;
-}
-.container > view:nth-child(2)::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
-}
-.container > view:nth-child(2) > view {
-  border: 1px solid #fff9;
-  border-radius: 20px;
-  padding: 7px 10px;
-  margin: 0 5px;
-  font-size: 14px;
-  flex: 0 0 auto;
-}
-.selected-tab {
-  background-color: #fed847;
-  border-color: #fed847 !important;
-  color: #000;
-}
-.score-row {
-  margin: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-.score-item {
-  background-image: url("../static/score-bg.png");
-  background-size: cover;
-  background-repeat: no-repeat;
-  background-position: center;
-  color: #fed847;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 24px;
-  margin-left: 10px;
-}
-</style>

src/components/TestDistance.vue

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

src/components/Timer.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onUnmounted } from "vue";
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 const props = defineProps({
   countdown: {
     type: Number,
@@ -26,7 +26,7 @@ onMounted(() => {
   }, 300);
   uni.$on("update-timer", updateTimer);
 });
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (timer.value) clearInterval(timer.value);
   uni.$off("update-timer", updateTimer);
 });

src/components/UserHeader.vue

@@ -36,6 +36,7 @@ const toRankListPage = () => {
     url: "/pages/rank-list",
   });
 };
+
 watch(
   () => [config.value, user.value],
   ([n_config, n_user]) => {
@@ -66,7 +67,7 @@ watch(
         :onClick="toUserPage"
         :size="42"
       />
-      <view class="user-details" :onClick="toUserPage">
+      <view class="user-details" @click="toUserPage">
         <view class="user-name">
           <text>{{ user.nickName }}</text>
           <image
@@ -77,7 +78,6 @@ watch(
         </view>
         <view class="user-stats">
           <text class="level-tag level-tag-first">段位积分</text>
-          <!-- <text class="level-tag level-tag-second">LV{{ user.lvl }}</text> -->
           <view class="rank-tag">
             <view
               class="rank-tag-progress"
@@ -112,12 +112,12 @@ watch(
       </view>
     </block>
     <block v-else>
-      <view class="signin">
+      <view class="signin" @click="onSignin">
         <image src="../static/user-icon.png" mode="widthFix" />
-        <view @click="() => (showModal = true)">
+        <view>
           <text>新来的弓箭手你好呀~</text>
-          <view @click="onSignin">
+          <view>
-            <text>微信登录</text>
+            <text>登录</text>
             <image src="../static/enter-arrow-blue.png" mode="widthFix" />
           </view>
         </view>
@@ -158,7 +158,8 @@ watch(
 
 .user-name-image {
   margin-left: 5px;
-  width: 20px;
+  width: 40rpx;
+  height: 40rpx;
 }
 
 .user-stats {
@@ -172,13 +173,9 @@ watch(
 }
 
 .level-tag-first {
-  width: 50px;
+  padding: 0 10rpx;
   background: #5f51ff;
-}
+  word-break: keep-all;
-
-.level-tag-second {
-  width: 60rpx;
-  background: #09c504;
 }
 
 .level-tag,
@@ -190,14 +187,17 @@ watch(
 .rank-tag {
   position: relative;
   background-color: #00000038;
-  width: 150rpx;
+  width: 140rpx;
   overflow: hidden;
+  word-break: keep-all;
 }
 
 .rank-tag-progress {
   background: #ffa711;
   height: 100%;
   border-radius: 12px;
+  width: 0;
+  transition: width 0.3s ease;
 }
 
 .rank-tag-text {
@@ -210,24 +210,26 @@ watch(
 }
 
 .rank-info {
-  width: 70px;
+  width: 95px;
-  text-align: left;
+  height: 50px;
-  font-size: 12px;
+  font-size: 24rpx;
   position: relative;
   color: #b3b3b3;
-  padding-left: 8px;
+  padding-left: 12px;
-  margin-left: 15rpx;
   display: flex;
   flex-direction: column;
+  justify-content: center;
 }
 .rank-info-image {
   position: absolute;
-  top: -6px;
+  top: 0;
-  left: -9px;
+  left: 0;
-  width: 90px;
+  width: 95px;
 }
 .rank-info > text {
   text-align: center;
+  word-break: keep-all;
+  width: 83px;
 }
 .rank-number {
   display: block;

src/components/UserUpgrade.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -44,7 +44,7 @@ onMounted(async () => {
   }, 1000);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (timer.value) clearTimeout(timer.value);
 });
 </script>

src/constants.js

@@ -23,17 +23,36 @@ export const MESSAGETYPES = {
   RankUpdate: 1121669910,
   LvlUpdate: 3958625354,
   TeamUpdate: 4168086616,
+  InvalidShot: 4168086617,
+  Calibration: 4168086625,
+  DeviceOnline: 4168086626,
+  DeviceOffline: 4168086627,
+  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) {
+    if (MESSAGETYPES[key] === id) return key;
-      return key;
-    }
   }
-  return null;
+  for (let key in MESSAGETYPESV2) {
+    if (MESSAGETYPESV2[key] === id) return key;
+  }
+  return id;
 };
 
 export const roundsName = {
@@ -99,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",
@@ -121,7 +140,7 @@ export const getBattleResultTips = (
         ];
         return tests[getRandomIndex(3)];
       }
-    } else if (mode === 2) {
+    } else {
       if (rank <= 3) {
         const tests = [
           "好成绩!全国排位赛等着你!",
@@ -133,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",
@@ -155,7 +174,7 @@ export const getBattleResultTips = (
         ];
         return tests[getRandomIndex(3)];
       }
-    } else if (mode === 2) {
+    } else {
       if (score > 0) {
         const tests = [
           "王者一定属于你!",
@@ -177,23 +196,39 @@ export const getBattleResultTips = (
 };
 
 export const RoundImages = {
-  "round1":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggifbnw9snvs.png",
+  round1:
-  "round2":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgf0swue5xzpd.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggifbnw9snvs.png",
-  "round3":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slglkylhmq8beb.png",
+  round2:
-  "round4":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggc88nasmxf5.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgf0swue5xzpd.png",
-  "round5":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgeloitb8mixf.png",
+  round3:
-  "round6":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgsjbyyuu1des.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slglkylhmq8beb.png",
-  "round7":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgdysd1wqulj5.png",
+  round4:
-  "round8":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgm82ny3qjd8m.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggc88nasmxf5.png",
-}
+  round5:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgeloitb8mixf.png",
+  gold1:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgsjbyyuu1des.png",
+  gold2:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgdysd1wqulj5.png",
+  gold3:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgm82ny3qjd8m.png",
+};
 
 export const RoundGoldImages = {
-  "round1":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slg7kfzzwwiwcb.png",
+  round1:
-  "round2":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgs5htghfh3a9.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slg7kfzzwwiwcb.png",
-  "round3":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgc9ge3paqkba.png",
+  round2:
-  "round4":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgehduk96yurp.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgs5htghfh3a9.png",
-  "round5":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgefz3hdmwbnz.png",
+  round3:
-  "round6":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgeyb4cqwezgc.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgc9ge3paqkba.png",
-  "round7":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggu3tlh97v5p.png",
+  round4:
-  "round8":"https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgszmdtmaotch.png",
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgehduk96yurp.png",
-}
+  round5:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgefz3hdmwbnz.png",
+  gold1:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgeyb4cqwezgc.png",
+  gold2:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slggu3tlh97v5p.png",
+  gold3:
+    "https://static.shelingxingqiu.com/attachment/2025-08-13/dc12slgszmdtmaotch.png",
+};

src/heatmap.js

@@ -0,0 +1,105 @@
+/**
+ * 在 uni-app 小程序里画弓箭热力图
+ * @param {String} canvasId   画布 id
+ * @param {Number} width      画布宽（px）
+ * @param {Number} height     画布高（px）
+ * @param {Array}  arrowData  [{x, y, count}, ...]
+ */
+export function generateHeatmapImage(canvasId, width, height, arrowData) {
+  return new Promise((resolve, reject) => {
+    // 1. 创建绘图上下文
+    const ctx = uni.createCanvasContext(canvasId);
+
+    // 3. 计算最大 count，用于归一化
+    const maxCount = Math.max(...arrowData.map((p) => p.count), 1);
+    // 4. 热点半径：可按实际靶子大小调，这里取画布短边的 6%
+    const radius = Math.min(width, height) * 0.12;
+
+    // 5. 按count从小到大排序，count越大越后面
+    arrowData.sort((a, b) => a.count - b.count);
+
+    // 6. 画每个点
+    arrowData.forEach((item) => {
+      const intensity = item.count / maxCount; // 0-1
+      // console.log(item.count, maxCount, intensity);
+      const r = radius * (1.2 - intensity * 0.8);
+      // 创建径向渐变
+      const grd = ctx.createCircularGradient(
+        item.x * width,
+        item.y * height,
+        r
+      );
+      grd.addColorStop(0, heatColor(intensity, 1));
+      grd.addColorStop(0.5, heatColor(intensity, 0.6));
+      grd.addColorStop(1, "rgba(0,0,0,0)");
+
+      ctx.save();
+      ctx.fillStyle = grd;
+      ctx.globalCompositeOperation = "screen"; // 叠加变亮
+      ctx.beginPath();
+      ctx.arc(item.x * width, item.y * height, r, 0, Math.PI * 2);
+      ctx.fill();
+      ctx.restore();
+    });
+
+    // 6. 可选：整体蒙版，让非热点区域暗下去
+    // ctx.save()
+    // ctx.fillStyle = 'rgba(0,0,0,0.35)'
+    // ctx.fillRect(0, 0, width, height)
+    // ctx.restore()
+
+    // 7. 把指令一次性推送到 canvas
+    ctx.draw(false, () => {
+      // Canvas绘制完成后生成图片
+      uni.canvasToTempFilePath({
+        canvasId: "heatMapCanvas",
+        width: width,
+        height: height,
+        destWidth: width * 2, // 提高图片质量
+        destHeight: height * 2,
+        success: (res) => {
+          console.log("热力图图片生成成功:", res.tempFilePath);
+          resolve(res.tempFilePath);
+        },
+        fail: (error) => {
+          console.error("热力图图片生成失败:", error);
+          reject(error);
+        },
+      });
+    });
+  });
+}
+
+/**
+ * 把强度 0-1 映射成红-黄-绿渐变，返回 rgba 字符串
+ * @param {Number} v 0-1
+ * @param {Number} a 透明度 0-1
+ */
+function heatColor(v, a) {
+  // v 从 0→1，重新映射：极低值绿色，低值黄色，中到高值红色
+  let red, green;
+
+  if (v < 0.2) {
+    // 极低值：纯绿色
+    red = 0;
+    green = 200; // 柔和的绿
+  } else if (v < 0.4) {
+    // 低值：绿色到黄色
+    const t = (v - 0.2) / 0.2;
+    red = Math.round(255 * t);
+    green = 255;
+  } else if (v < 0.6) {
+    // 中低值：黄色到橙色
+    const t = (v - 0.4) / 0.2;
+    red = 255;
+    green = Math.round(255 * (1 - t * 0.5));
+  } else {
+    // 中到高值：橙色到红色
+    const t = (v - 0.6) / 0.4;
+    red = 255;
+    green = Math.round(128 * (1 - t));
+  }
+
+  const blue = 0;
+  return `rgba(${red}, ${green}, ${blue}, ${a})`;
+}

src/kde-heatmap.js

@@ -0,0 +1,277 @@
+/**
+ * 基于小程序Canvas API的核密度估计热力图
+ * 实现类似test.html中的效果，但适配uni-app小程序环境
+ */
+
+/**
+ * Epanechnikov核函数
+ * @param {Number} bandwidth 带宽参数
+ * @returns {Function} 核函数
+ */
+function kernelEpanechnikov(bandwidth) {
+  return function (v) {
+    const r = Math.sqrt(v[0] * v[0] + v[1] * v[1]);
+    return r <= bandwidth
+      ? (3 / (Math.PI * bandwidth * bandwidth)) *
+          (1 - (r * r) / (bandwidth * bandwidth))
+      : 0;
+  };
+}
+
+/**
+ * 核密度估计器
+ * @param {Function} kernel 核函数
+ * @param {Array} range 范围[xmin, xmax]
+ * @param {Number} samples 采样点数
+ * @returns {Function} 密度估计函数
+ */
+function kernelDensityEstimator(kernel, range, samples) {
+  return function (data) {
+    const gridSize = (range[1] - range[0]) / samples;
+    const densityData = [];
+
+    for (let x = range[0]; x <= range[1]; x += gridSize) {
+      for (let y = range[0]; y <= range[1]; y += gridSize) {
+        let sum = 0;
+        for (const point of data) {
+          sum += kernel([x - point[0], y - point[1]]);
+        }
+        densityData.push([x, y, sum / data.length]);
+      }
+    }
+
+    // 归一化
+    const maxDensity = Math.max(...densityData.map((d) => d[2]));
+    densityData.forEach((d) => {
+      if (maxDensity > 0) d[2] /= maxDensity;
+    });
+
+    return densityData;
+  };
+}
+
+/**
+ * 生成随机射箭数据点
+ * @param {Number} centerCount 中心点数量
+ * @param {Number} pointsPerCenter 每个中心点的箭数
+ * @returns {Array} 箭矢坐标数组
+ */
+export function generateArcheryPoints(centerCount = 2, pointsPerCenter = 100) {
+  const points = [];
+  const range = 8; // 坐标范围 -4 到 4
+  const spread = 3; // 分散度
+
+  for (let i = 0; i < centerCount; i++) {
+    const centerX = Math.random() * range - range / 2;
+    const centerY = Math.random() * range - range / 2;
+
+    for (let j = 0; j < pointsPerCenter; j++) {
+      points.push([
+        centerX + (Math.random() - 0.5) * spread,
+        centerY + (Math.random() - 0.5) * spread,
+      ]);
+    }
+  }
+
+  return points;
+}
+
+/**
+ * 颜色映射函数 - 将密度值映射到颜色
+ * @param {Number} density 密度值 0-1
+ * @returns {String} RGBA颜色字符串
+ */
+function getHeatColor(density) {
+  // 绿色系热力图：从浅绿到深绿
+  if (density < 0.1) return "rgba(0, 255, 0, 0)";
+
+  const alpha = Math.min(density * 1.2, 1); // 增强透明度
+  const intensity = density;
+
+  if (intensity < 0.5) {
+    // 低密度：浅绿色
+    const green = Math.round(200 + 55 * intensity);
+    const blue = Math.round(50 + 100 * intensity);
+    return `rgba(${Math.round(50 * intensity)}, ${green}, ${blue}, ${
+      alpha * 0.7
+    })`;
+  } else {
+    // 高密度：深绿色
+    const red = Math.round(50 * (intensity - 0.5) * 2);
+    const green = Math.round(180 + 75 * (1 - intensity));
+    const blue = Math.round(30 * (1 - intensity));
+    return `rgba(${red}, ${green}, ${blue}, ${alpha * 0.7})`;
+  }
+}
+
+/**
+ * 基于小程序Canvas API绘制核密度估计热力图
+ * @param {String} canvasId 画布ID
+ * @param {Number} width 画布宽度
+ * @param {Number} height 画布高度
+ * @param {Array} points 箭矢坐标数组 [[x, y], ...]
+ * @param {Object} options 可选参数
+ * @returns {Promise} 绘制完成的Promise
+ */
+export function drawKDEHeatmap(canvasId, width, height, points, options = {}) {
+  const {
+    bandwidth = 0.8,
+    gridSize = 100,
+    range = [-4, 4],
+    showPoints = true,
+    pointColor = "rgba(255, 255, 255, 0.9)",
+  } = options;
+
+  // 微信小程序使用 Canvas 2D
+  return new Promise((resolve, reject) => {
+    try {
+      wx.createSelectorQuery()
+        .select(`#${canvasId}`)
+        .fields({ node: true, size: true })
+        .exec((res) => {
+          try {
+            const { node: canvas, width: w, height: h } = res[0] || {};
+            if (!canvas) return resolve();
+
+            // 设置画布尺寸
+            const cw = width || w || 300;
+            const ch = height || h || 300;
+            canvas.width = cw;
+            canvas.height = ch;
+
+            const ctx = canvas.getContext("2d");
+            ctx.clearRect(0, 0, cw, ch);
+
+            if (!points || points.length === 0) return resolve();
+
+            // 计算核密度估计
+            const kernel = kernelEpanechnikov(bandwidth);
+            const kde = kernelDensityEstimator(kernel, range, gridSize);
+            const densityData = kde(points);
+
+            // 计算网格大小
+            const cellWidth = cw / gridSize;
+            const cellHeight = ch / gridSize;
+            const xRange = range[1] - range[0];
+            const yRange = range[1] - range[0];
+
+            // 绘制热力图网格
+            densityData.forEach(([x, y, density]) => {
+              const normalizedX = (x - range[0]) / xRange;
+              const normalizedY = (y - range[0]) / yRange;
+              const canvasX = normalizedX * cw;
+              const canvasY = normalizedY * ch;
+
+              const color = getHeatColor(density);
+              ctx.fillStyle = color;
+              ctx.beginPath();
+              ctx.arc(
+                canvasX,
+                canvasY,
+                Math.min(cellWidth, cellHeight) * 0.6,
+                0,
+                2 * Math.PI
+              );
+              ctx.fill();
+            });
+
+            // 绘制原始数据点
+            if (showPoints) {
+              ctx.fillStyle = pointColor;
+              points.forEach(([x, y]) => {
+                const normalizedX = (x - range[0]) / xRange;
+                const normalizedY = (y - range[0]) / yRange;
+                const canvasX = normalizedX * cw;
+                const canvasY = normalizedY * ch;
+                ctx.beginPath();
+                ctx.arc(canvasX, canvasY, 2.5, 0, 2 * Math.PI);
+                ctx.fill();
+              });
+            }
+
+            resolve();
+          } catch (err) {
+            reject(err);
+          }
+        });
+    } catch (error) {
+      reject(error);
+    }
+  });
+}
+
+/**
+ * 生成热力图图片（类似原有的generateHeatmapImage函数）
+ * 但使用核密度估计算法
+ */
+export function generateKDEHeatmapImage(
+  canvasId,
+  width,
+  height,
+  points,
+  options = {}
+) {
+  // Canvas 2D 导出（传入 canvas 对象）
+  return new Promise((resolve, reject) => {
+    drawKDEHeatmap(canvasId, width, height, points, options)
+      .then(() => {
+        try {
+          wx.createSelectorQuery()
+            .select(`#${canvasId}`)
+            .fields({ node: true, size: true })
+            .exec((res) => {
+              const { node: canvas, width: w, height: h } = res[0] || {};
+              if (!canvas) return reject(new Error("canvas 为空"));
+              const cw = width || w || 300;
+              const ch = height || h || 300;
+              uni.canvasToTempFilePath({
+                canvas,
+                width: cw,
+                height: ch,
+                destWidth: cw * 3,
+                destHeight: ch * 3,
+                success: (r) => resolve(r.tempFilePath),
+                fail: reject,
+              });
+            });
+        } catch (e) {
+          reject(e);
+        }
+      })
+      .catch(reject);
+  });
+}
+
+export const generateHeatMapData = (width, height, amount = 100) => {
+  const data = [];
+  const centerX = 0.5; // 中心点X坐标
+  const centerY = 0.5; // 中心点Y坐标
+
+  for (let i = 0; i < amount; i++) {
+    let x, y;
+
+    // 30%的数据集中在中心区域（高斯分布）
+    if (Math.random() < 0.3) {
+      // 使用正态分布生成中心区域的数据
+      const angle = Math.random() * 2 * Math.PI;
+      const radius = Math.sqrt(-2 * Math.log(Math.random())) * 0.15; // 标准差0.15
+      x = centerX + radius * Math.cos(angle);
+      y = centerY + radius * Math.sin(angle);
+    } else {
+      x = Math.random() * 0.8 + 0.1; // 0.1-0.9范围
+      y = Math.random() * 0.8 + 0.1;
+    }
+
+    // 确保坐标在0-1范围内
+    x = Math.max(0.05, Math.min(0.95, x));
+    y = Math.max(0.05, Math.min(0.95, y));
+
+    data.push({
+      x: parseFloat(x.toFixed(3)),
+      y: parseFloat(y.toFixed(3)),
+      ring: Math.floor(Math.random() * 5) + 6, // 6-10环
+    });
+  }
+
+  return data;
+};

src/manifest.json

@@ -1,68 +1,70 @@
 {
-  "name": "shoot-miniprograms",
+    "name" : "shoot-miniprograms",
-  "appid": "",
+    "appid" : "__UNI__B03E251",
-  "description": "",
+    "description" : "",
-  "versionName": "1.0.0",
+    "versionName" : "1.0.0",
-  "versionCode": "100",
+    "versionCode" : "100",
-  "transformPx": false,
+    "transformPx" : false,
-  "uniStatistics": {
+    "uniStatistics" : {
-    "enable": false
+        "enable" : false
-  },
-  "app-plus": {
-    "bounce": "none",
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "splashscreen": {
-      "alwaysShowBeforeRender": true,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
     },
-    "modules": {},
+    "app-plus" : {
-    "distribute": {
+        "bounce" : "none",
-      "android": {
+        "usingComponents" : true,
-        "permissions": [
+        "nvueStyleCompiler" : "uni-app",
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+        "compilerVersion" : 3,
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+        "splashscreen" : {
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+            "alwaysShowBeforeRender" : true,
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+            "waiting" : true,
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+            "autoclose" : true,
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+            "delay" : 0
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+        },
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+        "modules" : {},
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+        "distribute" : {
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+            "android" : {
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                "permissions" : [
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-        ]
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-      },
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-      "ios": {},
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-      "sdkConfigs": {}
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {}
+        }
+    },
+    "h5" : {
+        "darkmode" : true,
+        "themeLocation" : "theme.json"
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxa8f5989dcd45cc23",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : true,
+            "uglifyFileName" : true,
+            "useCompilerModule" : true,
+            "useIsolateContext" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true,
+        "darkmode" : true,
+        "themeLocation" : "theme.json",
+        "permission" : {},
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     }
-  },
-  "h5": {
-    "darkmode": true,
-    "themeLocation": "theme.json"
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "wxa8f5989dcd45cc23",
-    "setting": {
-      "urlCheck": false,
-      "minified": true,
-      "uglifyFileName": true,
-      "useCompilerModule": true,
-      "useIsolateContext": true
-    },
-    "lazyCodeLoading": "requiredComponents",
-    "usingComponents": true,
-    "darkmode": true,
-    "themeLocation": "theme.json",
-    "permission": {},
-    "requiredPrivateInfos": ["getLocation", "chooseLocation"]
-  }
 }

src/pages.json

@@ -4,11 +4,44 @@
       "path": "pages/index"
     },
     {
-      "path": "pages/battle-result"
+      "path": "pages/friend-battle"
+    },
+    {
+      "path": "pages/point-book"
+    },
+    {
+      "path": "pages/point-book-rank"
+    },
+    {
+      "path": "pages/my-like-list"
+    },
+    {
+      "path": "pages/audio-test"
+    },
+    {
+      "path": "pages/calibration"
+    },
+    {
+      "path": "pages/about-us"
+    },
+    {
+      "path": "pages/webview",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
       "path": "pages/team-battle"
     },
+    {
+      "path": "pages/melee-battle"
+    },
+    {
+      "path": "pages/battle-result"
+    },
+    {
+      "path": "pages/friend-battle-result"
+    },
     {
       "path": "pages/point-book-edit"
     },
@@ -22,10 +55,10 @@
       "path": "pages/point-book-detail"
     },
     {
-      "path": "pages/match-page"
+      "path": "pages/point-book-detail-share"
     },
     {
-      "path": "pages/image-share"
+      "path": "pages/match-page"
     },
     {
       "path": "pages/my-device"
@@ -67,28 +100,13 @@
       "path": "pages/practise-two"
     },
     {
-      "path": "pages/friend-battle"
+      "path": "pages/battle-room"
-    },
-    {
-      "path": "pages/battle-room",
-      "style": {
-        "disableSwipeBack": true
-      }
     },
     {
       "path": "pages/ranking"
     },
     {
-      "path": "pages/rank-list",
+      "path": "pages/rank-list"
-      "style": {
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/team-match"
-    },
-    {
-      "path": "pages/melee-match"
     },
     {
       "path": "pages/match-detail"
@@ -111,7 +129,14 @@
     "navigationBarBackgroundColor": "#000000",
     "navigationBarTextStyle": "@navTxtStyle",
     "navigationBarTitleText": "Uni Creator",
-    "navigationStyle": "custom"
+    "navigationStyle": "custom",
+    "enablePullDownRefresh": false
+  },
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
+    }
   },
   "subPackages": []
 }

src/pages/about-us.vue

@@ -0,0 +1,69 @@
+<script setup>
+import Container from "@/components/Container.vue";
+
+const isIOS = uni.getDeviceInfo().osName === "ios";
+</script>
+
+<template>
+  <Container title="关于我们">
+    <view class="container">
+      <view class="text">
+        《射灵星球》是以智能和物联网技术驱动的全球射箭专业选手及射箭爱好者互动交流平台，由广州光点飞舞网络有限公司研发并提供线上服务。
+      </view>
+
+      <view class="text">
+        我们专注于智能射箭技术的探索和应用，通过物联网技术、激光系统、人工智能、嵌入式AI及射箭在线互娱模式的创新与研发，提供专业的智能体育设备和有趣的在线物联游戏，以此推动射箭运动及更多专业体育运动走入大众家庭。
+      </view>
+
+      <view
+        class="copyright"
+        :style="{ paddingBottom: isIOS ? '40rpx' : '20rpx' }"
+      >
+        <text>粤ICP备2025421150号-2X</text>
+      </view>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.container {
+  width: calc(100% - 50rpx);
+  height: calc(100% - 50rpx);
+  padding: 25rpx;
+  background-color: #ffffff;
+  position: relative;
+}
+
+.intro-text {
+  font-size: 14px;
+  color: #333333;
+  line-height: 1.6;
+  margin-bottom: 20px;
+}
+
+.title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 10px;
+}
+
+.text {
+  font-size: 14px;
+  color: #666666;
+  line-height: 1.6;
+  margin-bottom: 10px;
+  text-align: justify;
+}
+
+.copyright {
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  width: calc(100% - 50rpx);
+  align-items: center;
+  font-size: 24rpx;
+  color: #afafaf;
+}
+</style>

src/pages/audio-test.vue

@@ -0,0 +1,68 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import Container from "@/components/Container.vue";
+import audioManager, { audioFils } from "@/audioManager";
+
+const loaded = ref({});
+
+const playAudio = (key) => {
+  audioManager.play(key);
+};
+
+onMounted(() => {
+  const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
+  loaded.value = loadedAudioKeys;
+
+  uni.$on("audioLoaded", (key) => {
+    loaded.value[key] = true;
+  });
+});
+
+onBeforeUnmount(() => {
+  uni.$off("audioLoaded");
+});
+</script>
+
+<template>
+  <Container title="音频测试">
+    <view class="container">
+      <view>
+        <text>连续播放1</text>
+        <button hover-class="none" @click="playAudio(['第一轮', '请蓝方射箭'])">
+          播放
+        </button>
+      </view>
+      <view>
+        <text>连续播放2</text>
+        <button hover-class="none" @click="playAudio(['第二轮', '请红方射箭'])">
+          播放
+        </button>
+      </view>
+      <view v-for="key in Object.keys(audioFils)" :key="key">
+        <text>{{ key }}</text>
+        <text v-if="!loaded[key]">未加载</text>
+        <button v-else hover-class="none" @click="playAudio(key)">播放</button>
+      </view>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+.container > view {
+  width: calc(100% - 50rpx);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 25rpx;
+  color: #fff;
+  border-bottom: 1rpx solid #fff9;
+}
+.container > view > button {
+  color: #fff;
+}
+</style>

src/pages/battle-result.vue

@@ -1,10 +1,11 @@
 <script setup>
-import { ref, onMounted, onUnmounted } 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";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -15,138 +16,138 @@ const ifWin = ref(false);
 const data = ref({});
 const totalPoints = ref(0);
 const rank = ref(0);
+const players = ref([]);
 
 function exit() {
-  uni.navigateBack();
+  if (data.value.roomId) {
+    uni.redirectTo({
+      url: `/pages/battle-room?roomNumber=${data.value.roomId}`,
+    });
+  } else {
+    uni.navigateBack();
+  }
 }
 
 onLoad(async (options) => {
+  if (!options.battleId) return;
   const myId = user.value.id;
-  if (options.battleId) {
+  const result = await getBattleAPI(options.battleId || "60049406950510592");
-    const result = await getGameAPI(
+  data.value = result;
-      options.battleId || "BATTLE-1755230224461209000-539"
+  if (result.winTeam) {
+    ifWin.value = result.teams[result.winTeam].players.some(
+      (p) => p.id === myId
     );
-    data.value = {
+  }
-      ...result,
+  if (result.mode <= 3) {
-      battleMode: result.gameMode,
+    audioManager.play(ifWin.value ? "胜利" : "失败");
-    };
-    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");
+    players.value = result.resultList.map((item, index) => {
-    if (!battleInfo) return;
+      const plist = result.teams[0] ? result.teams[0].players : [];
-    data.value = {
+      const p = plist.find((p) => p.id === item.userId);
-      mvps: [],
+      if (p.id === user.value.id) {
-      ...battleInfo,
+        totalPoints.value = p.score;
-    };
+        rank.value = index + 1;
-    if (battleInfo.mode === 1) {
+      }
-      battleInfo.playerStats.forEach((p) => {
+      return {
-        if (p.team === 1) data.value.bluePlayers = [p];
+        ...item,
-        if (p.team === 0) data.value.redPlayers = [p];
+        rank: index + 1,
-        if (p.mvp) data.value.mvps.push(p);
+        name: p.name,
-      });
+        avatar: p.avatar || "",
-      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) {
+    if (rank.value <= players.value * 0.3) {
-      data.value.myTeam = mine.team;
+      audioManager.play("胜利");
-      totalPoints.value = mine.totalScore;
+    } else {
-      ifWin.value = battleInfo.mode === 1 && mine.team === battleInfo.winner;
+      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.winTeam === 1
-                ? data.bluePlayers[0].avatar
+                ? data.teams[1].players[0].avatar
-                : data.redPlayers[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>
+        <view
-          <view v-if="data.mvps && data.mvps[0].totalRings">
+          :style="{
+            transform: `translateY(50px) rotate(-${
+              5 + (data.mvp || []).length
+            }deg)`,
+          }"
+        >
+          <view v-if="data.mvp && data.mvp.totalRings">
             <image src="../static/title-mvp.png" mode="widthFix" />
             <text
               >斩获<text
-                :style="{ color: '#fed847', fontSize: '18px', margin: '0 2px' }"
+                :style="{
-                >{{ data.mvps[0].totalRings }}</text
+                  color: '#fed847',
+                  fontSize: '18px',
+                  margin: '0 3px',
+                  fontWeight: '600',
+                }"
+                >{{ data.mvp.totalRings }}</text
               >环</text
             >
           </view>
-          <view v-if="data.mvps && data.mvps.length">
+          <view v-if="data.mvp && data.mvp.length">
-            <view v-for="(player, index) in data.mvps" :key="index">
+            <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
                 >
               </view>
-              <text>{{ player.name }}</text>
+              <text class="truncate">{{ player.name }}</text>
             </view>
           </view>
         </view>
@@ -160,7 +161,7 @@ const checkBowData = () => {
         />
         <image
           :src="
-            getBattleResultTips(data.battleMode, data.mode, {
+            getBattleResultTips(data.way, data.mode, {
               win: ifWin,
             })
           "
@@ -169,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" />
@@ -178,53 +179,55 @@ 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',
           }"
         >
           <image
-            v-if="index === 0"
+            v-if="player.rank === 1"
             class="player-bg"
             src="../static/melee-player-bg1.png"
             mode="aspectFill"
           />
           <image
-            v-if="index === 1"
+            v-if="player.rank === 2"
             class="player-bg"
             src="../static/melee-player-bg2.png"
             mode="aspectFill"
           />
           <image
-            v-if="index === 2"
+            v-if="player.rank === 3"
             class="player-bg"
             src="../static/melee-player-bg3.png"
             mode="aspectFill"
           />
           <image
-            v-if="index === 0"
+            v-if="player.rank === 1"
             class="player-crown"
             src="../static/champ1.png"
             mode="widthFix"
           />
           <image
-            v-if="index === 1"
+            v-if="player.rank === 2"
             class="player-crown"
             src="../static/champ2.png"
             mode="widthFix"
           />
           <image
-            v-if="index === 2"
+            v-if="player.rank === 3"
             class="player-crown"
             src="../static/champ3.png"
             mode="widthFix"
           />
-          <view v-if="index > 2" class="view-crown">{{ index + 1 }}</view>
+          <view v-if="player.rank > 3" class="view-crown">{{
+            player.rank
+          }}</view>
           <Avatar
             :src="player.avatar"
             :size="36"
@@ -232,10 +235,10 @@ const checkBowData = () => {
           />
           <view class="player-title">
             <text class="truncate">{{ player.name }}</text>
-            <text>{{ getLvlName(player.totalScore) }}</text>
+            <text>{{ getLvlName(player.rank_lvl) }}</text>
           </view>
           <text
-            ><text :style="{ color: '#fff' }">{{ player.totalRings }}</text>
+            ><text :style="{ color: '#fff' }">{{ player.totalRing }}</text>
             环</text
           >
         </view>
@@ -243,32 +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.myTeam === 1"
+        <text
+          :style="{ backgroundColor: '#5fadff' }"
+          v-if="data.mode <= 3 && myTeam === 1"
           >蓝队</text
         >
-        <text :style="{ backgroundColor: '#ff6060' }" v-if="data.myTeam === 0"
+        <text
+          :style="{ backgroundColor: '#ff6060' }"
+          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,
@@ -277,7 +284,7 @@ const checkBowData = () => {
     </text>
     <view class="op-btn">
       <view @click="checkBowData">查看成绩</view>
-      <view @click="exit">退出</view>
+      <view @click="exit">返回</view>
     </view>
     <UserUpgrade />
   </view>
@@ -387,6 +394,7 @@ const checkBowData = () => {
   border-radius: 20px;
   padding: 10px 0;
   text-align: center;
+  color: #000;
 }
 .op-btn > view:last-child {
   color: #fff;
@@ -438,6 +446,7 @@ const checkBowData = () => {
 .player-crown {
   position: relative;
   width: 27px;
+  height: 27px;
   margin: 0 15px;
 }
 .view-crown {
@@ -495,13 +504,11 @@ const checkBowData = () => {
 .header-mvp > view {
   display: flex;
   justify-content: center;
-  transform: translateY(55px);
 }
 .header-mvp > view > view:first-child {
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-right: 5vw;
 }
 .header-mvp > view > view:first-child > image {
   width: 24vw;
@@ -509,23 +516,24 @@ const checkBowData = () => {
 .header-mvp > view > view:first-child > text {
   color: #fff;
   font-size: 14px;
-  transform: translateY(-4px) skewY(-6deg);
+  transform: skewX(-10deg);
 }
 .header-mvp > view > view:last-child {
   display: flex;
   align-items: center;
   color: #fff;
-  font-size: 8px;
+  font-size: 9px;
   text-align: center;
-  transform: translateY(-16px) skewY(-6deg);
+  transform: translateY(-4px);
-  min-width: 40%;
 }
 .header-mvp > view > view:last-child > view {
-  margin-right: 4vw;
+  margin-left: 4vw;
   display: flex;
   flex-direction: column;
 }
 .header-mvp > view > view:last-child > view > text {
   margin-top: 4px;
+  width: 40px;
+  transform: skewX(-10deg) translateX(-3px);
 }
 </style>

src/pages/be-vip.vue

@@ -1,12 +1,11 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
 import SButton from "@/components/SButton.vue";
-import SModal from "@/components/SModal.vue";
 import Signin from "@/components/Signin.vue";
 import UserHeader from "@/components/UserHeader.vue";
-import { createOrderAPI, getHomeData } from "@/apis";
+import { createOrderAPI, getHomeData, getVIPDescAPI } from "@/apis";
 import { formatTimestamp } from "@/util";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -19,6 +18,7 @@ const showModal = ref(false);
 const lastDate = ref(user.value.expiredAt);
 const refreshing = ref(false);
 const timer = ref(null);
+const richContent = ref("");
 
 const onPay = async () => {
   if (!user.value.id) {
@@ -61,99 +61,91 @@ const onPay = async () => {
   }
 };
 
+onMounted(async () => {
+  const result = await getVIPDescAPI();
+  richContent.value = result.describe;
+});
+
 const toOrderPage = () => {
   uni.navigateTo({
     url: "/pages/orders",
   });
 };
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   if (timer.value) clearInterval(timer.value);
 });
 </script>
 
 <template>
   <Container title="会员说明">
-    <view :style="{ width: '100%', height: '100%' }">
+    <view v-if="user.id" class="header">
-      <view v-if="user.id" class="header">
+      <view>
-        <view>
+        <Avatar :src="user.avatar" :size="35" />
-          <Avatar :src="user.avatar" :size="35" />
+        <text class="truncate">{{ user.nickName }}</text>
-          <text class="truncate">{{ user.nickName }}</text>
+        <image
-          <image
+          class="user-name-image"
-            class="user-name-image"
+          src="../static/vip1.png"
-            src="../static/vip1.png"
+          mode="widthFix"
-            mode="widthFix"
+        />
-          />
-        </view>
-        <block v-if="refreshing">
-          <image
-            src="../static/btn-loading.png"
-            mode="widthFix"
-            class="loading"
-          />
-        </block>
-        <block v-else>
-          <text v-if="user.expiredAt">
-            {{ formatTimestamp(user.expiredAt) }}到期
-          </text>
-        </block>
       </view>
-      <view
+      <block v-if="refreshing">
-        class="container"
+        <image
-        :style="{ height: !user.id ? '100%' : 'calc(100% - 62px)' }"
+          src="../static/btn-loading.png"
-      >
+          mode="widthFix"
-        <view class="content vip-content">
+          class="loading"
-          <view class="title-bar">
+        />
-            <view />
+      </block>
-            <text>VIP 介绍</text>
+      <block v-else>
-          </view>
+        <text v-if="user.expiredAt">
-          <view>
+          {{ formatTimestamp(user.expiredAt) }} 到期
-            <text
+        </text>
-              >射灵星球VIP服务，为全球弓箭手提供约战、段位评级、实时排位赛、智能教练点评等专属特权。会员可在酷帅的真实射箭运动中，同步享受在线竞技的乐趣，还能找到志同道合的伙伴，并获得新鲜的功能体验和持续升级的系统。
+      </block>
-            </text>
+    </view>
-            <text
+    <view
-              >所有新注册用户，我们都会默认赠送6个月超长会员。到期之后可续费，单月10元，年度VIP100元。我们鼓励每一位弓箭手长期坚持练习这项运动，在对战的世界中尽情驰骋，不断挑战自我，创造属于自己的辉煌战绩。
+      class="container"
-            </text>
+      :style="{ height: !user.id ? 'calc(100% - 10px)' : 'calc(100% - 62px)' }"
-            <text
+    >
-              >VIP会员还将获得专属客服支持。当您在游戏中遇到任何问题，无论是技术故障、规则疑问还是其他需要帮助的情况，都可联系我们的VIP专属客服团队。他们将提供全年不间断的优质服务，确保您的对战体验不受影响。
+      <view class="content vip-content">
-            </text>
+        <view class="title-bar">
-            <text>期待您的加入！</text>
+          <view />
-          </view>
+          <text>VIP 介绍</text>
         </view>
-        <view class="content">
+        <view :style="{ marginTop: '10rpx' }">
-          <view class="title-bar">
+          <rich-text :nodes="richContent" />
-            <view />
-            <text>会员续费</text>
-          </view>
-          <view class="vip-items">
-            <view
-              v-for="(item, index) in config.vipMenus || []"
-              :key="index"
-              :style="{
-                color: selectedVIP === index ? '#fff' : '#333333',
-                borderColor: selectedVIP === index ? '#FF7D57' : '#eee',
-                background:
-                  selectedVIP === index
-                    ? '#FF7D57'
-                    : 'linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%)',
-              }"
-              @click="() => (selectedVIP = index)"
-            >
-              {{ item.name }}
-            </view>
-          </view>
         </view>
-        <SButton :onClick="onPay">支付</SButton>
+      </view>
-        <SModal :show="showModal" :onClose="() => (showModal = false)">
+      <view class="content">
-          <Signin :onClose="() => (showModal = false)" />
+        <view class="title-bar">
-        </SModal>
+          <view />
-        <view class="my-orders" v-if="user.id">
+          <text>会员续费</text>
-          <view @click="toOrderPage">
+        </view>
-            <text>我的订单</text>
+        <view class="vip-items">
-            <image src="../static/enter-arrow-blue.png" mode="widthFix" />
+          <view
+            v-for="(item, index) in config.vipMenus || []"
+            :key="index"
+            :style="{
+              color: selectedVIP === index ? '#fff' : '#333333',
+              borderColor: selectedVIP === index ? '#FF7D57' : '#eee',
+              background:
+                selectedVIP === index
+                  ? '#FF7D57'
+                  : 'linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%)',
+            }"
+            @click="() => (selectedVIP = index)"
+          >
+            {{ item.name }}
           </view>
         </view>
       </view>
+      <SButton :onClick="onPay">支付</SButton>
+      <view class="my-orders" v-if="user.id">
+        <view @click="toOrderPage">
+          <text>我的订单</text>
+          <image src="../static/enter-arrow-blue.png" mode="widthFix" />
+        </view>
+      </view>
+      <Signin :show="showModal" :onClose="() => (showModal = false)" />
     </view>
   </Container>
 </template>
@@ -202,6 +194,7 @@ onUnmounted(() => {
   width: 100%;
   display: flex;
   align-items: center;
+  color: #000;
 }
 .title-bar > view:first-child {
   width: 5px;
@@ -214,11 +207,6 @@ onUnmounted(() => {
   font-size: 14px;
   color: #333;
 }
-.content > view:nth-child(2) > text {
-  display: block;
-  margin-top: 10px;
-  color: #333;
-}
 .vip-items {
   width: 100%;
   display: grid;
@@ -232,6 +220,7 @@ onUnmounted(() => {
   padding: 12px 0;
   border-radius: 10px;
   text-align: center;
+  font-size: 27rpx;
 }
 .vip-content {
   max-height: 62%;

src/pages/calibration.vue

@@ -0,0 +1,116 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import Container from "@/components/Container.vue";
+import SButton from "@/components/SButton.vue";
+
+import { laserAimAPI, laserCloseAPI } from "@/apis";
+import { MESSAGETYPES } from "@/constants";
+// import audioManager from "@/audioManager";
+
+const guides = [
+  {
+    title: "箭头面向靶子",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5wscg7hrfo.png",
+  },
+  {
+    title: "摆出拉弓姿势",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-30/ddv9p5fk5b7ljrhx3o.png",
+  },
+  {
+    title: "调整瞄准器",
+    src: "https://static.shelingxingqiu.com/attachment/2025-10-29/dduexjgrcxf9wjaiv4.png",
+  },
+];
+
+const done = ref(true);
+
+const onComplete = async () => {
+  await laserCloseAPI();
+  uni.navigateBack();
+};
+
+function onReceiveMessage(messages = []) {
+  messages.forEach((msg) => {
+    if (msg.constructor === MESSAGETYPES.Calibration) {
+      done.value = true;
+      uni.setStorageSync("calibration", true);
+      // audioManager.play("激光已校准");
+    }
+  });
+}
+
+onMounted(async () => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  await laserAimAPI();
+});
+
+onBeforeUnmount(async () => {
+  uni.$off("socket-inbox", onReceiveMessage);
+  await laserCloseAPI();
+});
+</script>
+
+<template>
+  <Container title="校准智能弓">
+    <view class="container">
+      <view v-for="(guide, index) in guides" :key="guide.title" class="guide">
+        <view>
+          <text>{{ index + 1 }}</text>
+          <text>{{ guide.title }}</text>
+        </view>
+        <image :src="guide.src" mode="widthFix" />
+      </view>
+      <text>请完成以上步骤校准智能弓</text>
+      <SButton
+        :onClick="onComplete"
+        width="60vw"
+        :rounded="40"
+        :disabled="!done"
+      >
+        我已校准
+      </SButton>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.guide {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 26rpx;
+  color: #ffffff;
+  margin-bottom: 15rpx;
+}
+.guide > view {
+  width: 100%;
+  margin: 25rpx 0;
+  display: flex;
+  align-items: center;
+}
+.guide > view > text:first-child {
+  font-size: 24rpx;
+  background: #e89024;
+  border-radius: 50%;
+  width: 32rpx;
+  height: 32rpx;
+  line-height: 32rpx;
+  display: block;
+  text-align: center;
+  margin-right: 15rpx;
+}
+.guide > image {
+  width: 630rpx;
+  height: 250rpx;
+}
+.container > text {
+  font-size: 24rpx;
+  color: #fff9;
+  margin: 30rpx;
+}
+</style>

src/pages/device-intro.vue

@@ -1,46 +1,108 @@
 <script setup>
-import Container from "@/components/Container.vue";
+import { ref, onMounted } from "vue";
 import SButton from "@/components/SButton.vue";
+
+import { capsuleHeight } from "@/util";
+
+const images = [
+  "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);
+
+const onScrollView = (e) => {
+  addBg.value = e.detail.scrollTop > 100;
+};
 </script>
 
 <template>
-  <Container title="智能弓箭">
+  <view class="container">
-    <view class="container">
+    <view
+      class="header"
+      :style="{
+        paddingTop: capsuleHeight + 'px',
+      }"
+    >
       <image
-        src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbw5tq93d6n7xgtgvp.png"
+        :style="{ opacity: addBg ? 1 : 0 }"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
         mode="widthFix"
       />
-      <text>商品形象图及配图标题</text>
+      <navigator open-type="navigateBack">
+        <image class="header-back" src="../static/back.png" mode="widthFix" />
+      </navigator>
       <text
-        >在射灵世界中，等级是衡量您射箭技能的重要指标，而点数则是您提升等级的关键。具体的要求如下
+        :style="{ opacity: addBg ? 1 : 0, color: '#fff', fontWeight: 'bold' }"
-        每射出一支箭并上靶：无论您射出的箭命中哪个环数，只要箭成功上靶，您将获得1点基础点数。这是您积累点数的基本方式，每一次射击都是您向更高目标迈进的一步。
-        射出的箭命中7-9环：当您的箭命中7环、8环或9环时，除了获得1点基础点数外，还将额外获得0.5点基础点数；
-        射出的箭命中10环：命中10环是射箭中的最高成就，因此，当您的箭命中10环时，除了获得1点基础点数外，还将额外获得1点基础点数.即每次命中10环将总共获得？</text
       >
-      <SButton>加官方企业微信订购（有优惠）</SButton>
+      </text>
     </view>
-  </Container>
+    <scroll-view scroll-y @scroll="onScrollView" :style="{ height: '100vh' }">
+      <view class="images">
+        <image
+          v-for="src in images"
+          :key="src"
+          :src="src"
+          mode="widthFix"
+          show-menu-by-longpress
+        />
+      </view>
+    </scroll-view>
+  </view>
 </template>
 
 <style scoped>
 .container {
+  width: 100%;
+}
+.header-bg {
+  width: 100%;
+}
+.header {
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  position: fixed;
+  top: 0;
+  z-index: 10;
+  overflow: hidden;
+}
+.header-back {
+  width: 22px;
+  height: 22px;
+  margin: 0px 15px;
+  margin-top: 5px;
+  position: relative;
+}
+.header > image:first-child {
+  width: 100vw;
+  height: 100vh;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transition: all 0.5s ease;
+}
+.header > text {
+  color: #fff;
+  font-weight: bold;
+  transition: all 0.5s ease;
+  position: relative;
+}
+.images {
   display: flex;
   flex-direction: column;
   align-items: center;
+  justify-content: flex-start;
 }
-.container > image {
+.images > image {
-  width: 85%;
+  width: 100vw;
-  border-radius: 10px;
-  margin-top: 10px;
-}
-.container > text {
-  color: #fff;
-  margin: 20px 0;
-}
-.container > text:nth-child(3) {
-  font-size: 14px;
-  color: #fff9;
-  margin-top: 0;
-  padding: 0 15px;
 }
 </style>

src/pages/first-try.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Guide from "@/components/Guide.vue";
 import SButton from "@/components/SButton.vue";
 import Swiper from "@/components/Swiper.vue";
@@ -12,9 +12,16 @@ import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
-import { createPractiseAPI } from "@/apis";
+import audioManager from "@/audioManager";
-import { generateCanvasImage } from "@/util";
+import {
-import { MESSAGETYPES } from "@/constants";
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
+import { sharePractiseData } from "@/canvas";
+import { wxShare, debounce } from "@/util";
+import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -33,20 +40,18 @@ const stepButtonTexts = [
 const title = ref("新手试炼场");
 const start = ref(false);
 const practiseResult = ref({});
-const power = ref(0);
 const btnDisabled = ref(false);
 const practiseId = ref("");
 const showGuide = ref(false);
 
 const guideImages = [
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68bs7z5elwvw7.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wwdpgwt9e6du.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68qmi7grgreen.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wvv9sw4zioqk.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68hgrw1ip4wae.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0ww3khaycallu.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x684x8zmfrmbla.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wtkcvaxxv0s8.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x67sding7fodnk.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wry5tw7ltmxr.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68mpug7cac4yt.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wu3kcdrwzwpd.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68my783mlmgxv.png",
+  "https://static.shelingxingqiu.com/attachment/2026-02-08/dg9ev0wwr6hfjhyfn5.png",
-  "https://static.shelingxingqiu.com/attachment/2025-07-09/db77x68p48ylzirtb0.png",
 ];
 
 const onSwiperIndexChange = (index) => {
@@ -56,55 +61,63 @@ const onSwiperIndexChange = (index) => {
 };
 
 const createPractise = async (arrows) => {
-  const result = await createPractiseAPI(arrows);
+  const result = await createPractiseAPI(arrows, 1);
   if (result) practiseId.value = result.id;
 };
 
-async function onReceiveMessage(messages = []) {
+const onOver = async () => {
-  messages.forEach((msg) => {
+  practiseResult.value = await getPractiseAPI(practiseId.value);
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+  start.value = false;
-      if (scores.value.length < total) {
+};
-        scores.value.push(msg.target);
+
-      }
+async function onReceiveMessage(msg) {
-      power.value = msg.target.battery;
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
-      // if (step.value === 2 && msg.target.dst / 100 >= 5) {
+    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("距离不足");
-    }
+  }
-    if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
+  // messages.forEach((msg) => {
-      if (practiseId.value && practiseId.value === msg.practice.id) {
+  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
-        setTimeout(() => {
+  //     if (step.value === 2 && msg.target.dst / 100 >= 5) {
-          start.value = false;
+  //       btnDisabled.value = false;
-          practiseResult.value = {
+  //       showGuide.value = true;
-            ...msg.practice,
+  //     } else if (scores.value.length < total) {
-            arrows: JSON.parse(msg.practice.arrows),
+  //       scores.value.push(msg.target);
-            lvl: msg.lvl,
+  //     }
-          };
+  //     if (scores.value.length === total) {
-          generateCanvasImage(
+  //       setTimeout(onOver, 1500);
-            "shareCanvas",
+  //     }
-            1,
+  //   }
-            user.value,
+  // });
-            practiseResult.value
-          );
-        }, 1500);
-      }
-    }
-  });
 }
 
+const onClickShare = debounce(async () => {
+  await sharePractiseData("shareCanvas", 1, user.value, practiseResult.value);
+  await wxShare("shareCanvas");
+});
+
 onMounted(() => {
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("share-image", onClickShare);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("share-image", onClickShare);
+  audioManager.stopAll();
+  endPractiseAPI();
 });
 
 const nextStep = async () => {
@@ -116,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;
@@ -136,11 +151,11 @@ const nextStep = async () => {
   }
 };
 
-const onClose = () => {
+const onClose = async () => {
-  if (
+  const validArrows = (practiseResult.value.details || []).filter(
-    practiseResult.value.arrows &&
+    (a) => a.x !== -30 && a.y !== -30
-    practiseResult.value.arrows.length === total
+  );
-  ) {
+  if (validArrows.length === total) {
     setTimeout(() => {
       practiseResult.value = {};
       showGuide.value = false;
@@ -151,12 +166,14 @@ const onClose = () => {
     start.value = false;
     scores.value = [];
     step.value = 3;
+    const result = await createPractiseAPI(total, 120);
+    if (result) practiseId.value = result.id;
   }
 };
 </script>
 
 <template>
-  <Container :bgType="1" :title="title">
+  <Container :bgType="1" :title="title" :showBottom="step !== 4">
     <view class="container">
       <Guide
         v-if="step !== 4"
@@ -168,37 +185,40 @@ const onClose = () => {
             : 0
         "
       >
-        <text v-if="step === 0">
+        <text
+          v-if="step === 0"
+          :style="{
+            fontSize: '28rpx',
+            marginTop: user.nickName.length > 6 ? '-10rpx' : '0',
+          }"
+        >
           hi，<text :style="{ color: '#fed847' }">{{ user.nickName }}</text>
           ，这是新人必刷小任务，0基础小白也能快速掌握弓箭技巧和游戏规则哦~：）
         </text>
-        <text v-if="step === 1"
+        <text v-if="step === 1" :style="{ fontSize: '28rpx' }"
           >这是我们人帅技高的高教练。首先，请按教练示范，尝试自己去做这些动作和手势吧。</text
         >
-        <view v-if="step === 2">
+        <view
-          <view :style="{ display: 'flex', flexDirection: 'column' }">
+          class="guide-tips"
-            <text :style="{ color: '#fed847' }">你知道5米射程有多远吗？</text>
+          :style="{ marginTop: '8rpx' }"
-            <text>
+          v-if="step === 2"
-              在我们的排位赛中，射程小于5米的成绩无效、哦！建议平时练习距离至少5米。现在，来边射箭边调整你的站位点吧！
+        >
-            </text>
+          <text>你知道5米射程有多远吗？</text>
-          </view>
+          <text>
+            在我们的排位赛中，射程小于5米的成绩无效、哦！建议平时练习距离至少5米。现在，来边射箭边调整你的站位点吧！
+          </text>
         </view>
-        <view v-if="step === 3">
+        <view class="guide-tips" v-if="step === 3">
-          <view :style="{ display: 'flex', flexDirection: 'column' }">
+          <text>一切准备就绪</text>
-            <text :style="{ color: '#fed847' }">一切准备就绪</text>
+          <text :style="{ fontSize: '28rpx' }"
-            <text>试着完成一个真正的弓箭手任务吧！</text>
+            >试着完成一个真正的弓箭手任务吧！</text
-          </view>
+          >
-        </view>
+        </view>
-        <view v-if="step === 5">
+        <view class="guide-tips" v-if="step === 5">
-          <view
+          <text>新手试炼场通关啦，优秀！</text>
-            :style="{ display: 'flex', flexDirection: 'column', marginTop: 20 }"
+          <text :style="{ fontSize: '28rpx' }"
+            >反曲弓运动基本知识和射灵世界系统规则你已Get，是不是挺容易呀：）</text
           >
-            <text :style="{ color: '#fed847' }">新手试炼场通关啦，优秀！</text>
-            <text
-              >反曲弓运动基本知识和射灵世界系统规则你已Get，是不是挺容易呀：）</text
-            >
-            <text :style="{ opacity: 0 }">新手试炼场通关啦，优秀！</text>
-          </view>
         </view>
       </Guide>
       <image
@@ -208,7 +228,7 @@ const onClose = () => {
         v-if="step === 0"
       />
       <image
-        src="https://static.shelingxingqiu.com/attachment/2025-07-01/db0ehpzl8hfzeswfrf.png"
+        src="https://static.shelingxingqiu.com/attachment/2025-11-17/deas80ef1sf9td0leq.png"
         class="try-tip"
         mode="widthFix"
         v-if="step === 3"
@@ -230,7 +250,7 @@ const onClose = () => {
         :style="{ marginBottom: step === 2 ? '40px' : '0' }"
       >
         <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
+        <BowPower />
       </view>
       <BowTarget
         v-if="step === 4"
@@ -242,22 +262,26 @@ 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.length < total ? 'un' : ''
+          practiseResult.details.filter(
+            (arrow) => arrow.x !== -30 && arrow.y !== -30
+          ).length < total
+            ? 'un'
+            : ''
         }finish-tip.png`"
       />
-      <canvas class="share-canvas" canvas-id="shareCanvas"></canvas>
+      <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
     </view>
-    <view :style="{ marginBottom: '20px' }">
+    <template #bottom>
-      <SButton v-if="step !== 4" :onClick="nextStep" :disabled="btnDisabled">
+      <SButton :onClick="nextStep" :disabled="btnDisabled">
         <BubbleTip v-if="showGuide" :type="step === 1 ? 'long' : 'short'">
           <text :style="{ transform: 'translateY(-18rpx)' }">{{
             step === 1 ? "学会了，我摆得比教练还帅" : "我找到合适的点位了"
@@ -265,7 +289,7 @@ const onClose = () => {
         </BubbleTip>
         {{ stepButtonTexts[step] }}
       </SButton>
-    </view>
+    </template>
   </Container>
 </template>
 

src/pages/friend-battle.vue

@@ -1,86 +1,111 @@
 <script setup>
 import { ref } from "vue";
-import { onShow } from "@dcloudio/uni-app";
+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";
 import CreateRoom from "@/components/CreateRoom.vue";
 import Avatar from "@/components/Avatar.vue";
-import { getRoomAPI, joinRoomAPI, isGamingAPI, getBattleDataAPI } from "@/apis";
+
+import { getRoomAPI, joinRoomAPI, getBattleDataAPI } from "@/apis";
+import { debounce, canEenter } from "@/util";
+
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, device, online, game } = storeToRefs(store);
-import { debounce } from "@/util";
 
 const showModal = ref(false);
+const showSignin = ref(false);
 const warnning = ref("");
 const roomNumber = ref("");
 const data = ref({});
+const roomID = ref("");
+const loading = ref(false);
 
-const enterRoom = debounce(async () => {
+const enterRoom = debounce(async (number) => {
-  const isGaming = await isGamingAPI();
+  if (loading.value) return;
-  if (isGaming) {
+  if (!canEenter(user.value, device.value, online.value)) return;
+  if (game.value.inBattle) {
     uni.$showHint(1);
     return;
   }
-  if (!roomNumber.value) {
+  if (!number) {
     warnning.value = "请输入房间号";
     showModal.value = true;
-  } else {
+    return;
-    const room = await getRoomAPI(roomNumber.value);
+  }
-    if (room.number) {
+  try {
-      const alreadyIn = room.members.find(
+    const room = await getRoomAPI(number);
-        (item) => item.userInfo.id === user.value.id
+    if (!room.number) {
-      );
-      if (!alreadyIn) {
-        const result = await joinRoomAPI(roomNumber.value);
-        if (result.full) {
-          warnning.value = "房间已满员";
-          showModal.value = true;
-          return;
-        }
-      }
-      roomNumber.value = "";
-      showModal.value = false;
-      uni.navigateTo({
-        url: `/pages/battle-room?roomNumber=${room.number}`,
-      });
-    } else {
       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 () => {
-  const isGaming = await isGamingAPI();
+  if (!canEenter(user.value, device.value, online.value)) return;
-  if (isGaming) {
-    uni.$showHint(1);
-    return;
-  }
   warnning.value = "";
   showModal.value = true;
 };
+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 () => {
-  const result = await getBattleDataAPI();
+  if (user.value.id) {
-  data.value = result;
+    const result = await getBattleDataAPI();
+    data.value = result;
+  }
+});
+onLoad(async (options) => {
+  if (options.roomID) {
+    roomID.value = options.roomID;
+    if (user.value.id) enterRoom(options.roomID);
+    else showSignin.value = true;
+  }
 });
 </script>
 
 <template>
   <Container title="好友约战" :showBackToGame="true">
-    <view :style="{ width: '100%' }">
+    <view :style="{ width: '100%', height: '100%' }">
-      <Guide>
+      <GuideTwo>
-        <view class="guide-tips">
+        <text :style="{color: 'rgba(255,217,71,0.8)'}">约上朋友开几局，欢乐多，不寂寞</text>
-          <text>约上朋友开几局，欢乐多，不寂寞</text>
+        <text>一起练升级更快，早日加入全国排位赛！</text>
-          <text>一起练升级更快，早日加入全国排位赛！</text>
+      </GuideTwo>
-        </view>
-      </Guide>
       <view class="my-data">
         <view>
           <Avatar :rankLvl="user.rankLvl" :src="user.avatar" :size="30" />
-          <text>{{ user.nickName }}</text>
+          <text class="truncate">{{ user.nickName }}</text>
+          <text class="my-record-btn" @click="goMyRecord">我的战绩</text>
         </view>
         <view>
           <view>
@@ -100,16 +125,9 @@ onShow(async () => {
           <view>
             <view class="stars">
               <block v-for="i in 5" :key="i">
-                <image
+                <image v-if="data.totalWinningRate >= i * 0.2" src="../static/star-full.png" mode="widthFix" />
-                  v-if="data.totalWinningRate >= i * 0.2"
+                <image v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1" src="../static/star-half.png"
-                  src="../static/star-full.png"
+                  mode="widthFix" />
-                  mode="widthFix"
-                />
-                <image
-                  v-else-if="data.totalWinningRate >= (i - 1) * 0.2 + 0.1"
-                  src="../static/star-half.png"
-                  mode="widthFix"
-                />
                 <image v-else src="../static/star-empty.png" mode="widthFix" />
               </block>
             </view>
@@ -120,19 +138,12 @@ onShow(async () => {
       <view class="founded-room">
         <image src="../static/founded-room.png" mode="widthFix" />
         <view>
-          <input
+          <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
-            placeholder="输入房间号"
+          <view @click="enterRoom(roomNumber)">进入房间</view>
-            v-model="roomNumber"
-            placeholder-style="color: #ccc"
-          />
-          <view @click="enterRoom">进入房间</view>
         </view>
       </view>
       <view class="create-room">
-        <image
+        <image src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png" mode="widthFix" />
-          src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png"
-          mode="widthFix"
-        />
         <image src="../static/room-notfound-title.png" mode="widthFix" />
         <view>
           <image :src="user.avatar" mode="widthFix" />
@@ -147,12 +158,13 @@ onShow(async () => {
           </SButton>
         </view>
       </view>
-      <SModal :show="showModal" :onClose="() => (showModal = false)">
+      <SModal :show="showModal" :onClose="() => (showModal = false)" height="716rpx">
         <view v-if="warnning" class="warnning">
           {{ warnning }}
         </view>
         <CreateRoom v-if="!warnning" :onConfirm="() => (showModal = false)" />
       </SModal>
+      <Signin :show="showSignin" :onClose="onSignin" />
     </view>
   </Container>
 </template>
@@ -168,10 +180,12 @@ onShow(async () => {
   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;
@@ -181,13 +195,16 @@ onShow(async () => {
   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;
@@ -198,38 +215,45 @@ onShow(async () => {
   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;
@@ -240,10 +264,12 @@ onShow(async () => {
   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%;
@@ -252,6 +278,7 @@ onShow(async () => {
   align-items: center;
   color: #fff9;
 }
+
 .my-data {
   width: calc(100% - 30px);
   margin: 15px;
@@ -261,12 +288,14 @@ onShow(async () => {
   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;
@@ -274,15 +303,29 @@ onShow(async () => {
   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;
@@ -290,26 +333,32 @@ onShow(async () => {
   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;
 }
 </style>

src/pages/grade-intro.vue

@@ -28,34 +28,28 @@ const { user } = storeToRefs(store);
       </view>
 
       <!-- 说明文本 -->
-      <view class="content">
+      <view class="body">
         <view class="intro-text">
-          在射灵世界中，等级是衡量您射箭技能的重要指标，而点数则是您提升等级的关键。具体的要求如下：
+          在射灵世界中，等级是衡量您射箭技能的重要指标，而经验则是您提升等级的关键。具体的要求如下：
         </view>
 
         <view class="section">
-          <view class="title">一、点数的获取规则</view>
+          <view class="title">一、经验的获取规则</view>
           <view class="text">
-            每射出一支箭并上靶，无论您射出的箭命中哪个环数，只要箭成功上靶，您将获得1点基础点数。这是您积累点数的基本方式，每一次射击都是您向更高目标迈进的一步。
+            每射出一支箭，无论是否中靶、环数高低，您将获得1点经验。这是您提升射灵等级的基本方式，每一次射箭都是您向更高目标迈进的一步。
-          </view>
-          <view class="text">
-            射出的箭中7-9环：当您的箭中7环、8环或9环时，除了获得1点基础点数外，还将额外获得0.5点基础点数；
-          </view>
-          <view class="text">
-            射出的箭中10环：命中10环是射箭中的最高成就，因此，当您的箭中10环时，除了获得1点基础点数外，还将额外获得1点基础点数。即每次命中10环将总共获得2点基础点数。
           </view>
         </view>
 
         <view class="section">
           <view class="title">二、解锁特权与玩法</view>
           <view class="text">
-            当您等级达到9级时，将解锁"约战模式"。在这个模式中，您可以邀请您的好友进行切磋，与他们展开一场精彩的射箭对决。通过与好友的对抗，您不仅可以收获友谊和欢乐，还能在交流中学习到更多的技巧和经验。
+            当您等级达到9级时，将解锁“约战模式”。在这个模式中，您可以邀请您的好友进行切磋，与他们展开一场精彩的射箭对决。通过与好友的对抗，您不仅可以收获友谊和欢乐，还能在交流中学习到更多的技巧和经验。
           </view>
           <view class="text">
-            当您等级达到16级时，将解锁对战模式，每次对战都是一次难得的学习机会。您可以借此机会提升自己的水平，同时也为您的好友提供帮助和建议。此外，约战模式还为您提供了展示自己技艺的平台，让您在与好友的互动中感受到射箭的乐趣和成就感。
+            当您等级达到16级时，将解锁“对战模式”，每次对战都是一次难得的学习机会。您可以借此机会提升自己的水平，同时也为您的好友提供帮助和建议。此外，约战模式还为您提供了展示自己技艺的平台，让您在与好友的互动中感受到射箭的乐趣和成就感。
           </view>
           <view class="text">
-            当您等级达到22级时，将解锁"押豆模式"。在这个模式中，您可以与相同段位的玩家进行对抗，赢家将收获所有的灵豆。这不仅增加了游戏的趣味性和挑战性，还为您提供了赢取更多灵豆的机会。通过与更多玩家的对战，您可以不断提升自己的技术水平。
+            未来我们将推出“押豆模式”，敬请期待！当您等级达到22级时，您可以与相同段位的玩家进行对抗，赢家将收获所有的灵豆。这不仅增加了游戏的趣味性和挑战性，还为您提供了赢取更多灵豆的机会。通过与更多玩家的对战，您可以不断提升自己的技术水平。
           </view>
         </view>
       </view>
@@ -71,10 +65,11 @@ const { user } = storeToRefs(store);
 
 .level-progress {
   width: 100%;
+  height: 32rpx;
   display: flex;
   justify-content: center;
-  margin-top: 10px;
+  padding-top: 20rpx;
-  margin-bottom: 20px;
+  padding-bottom: 40rpx;
 }
 
 .progress-dot {
@@ -94,10 +89,10 @@ const { user } = storeToRefs(store);
   background-color: #fff9;
 }
 
-.content {
+.body {
-  padding: 0 10px;
+  height: calc(100% - 146rpx);
   background-color: #ffffff;
-  padding: 15px;
+  padding: 30rpx;
 }
 
 .intro-text {

src/pages/image-share.vue

@@ -1,79 +0,0 @@
-<script setup>
-import { ref } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
-import Container from "@/components/Container.vue";
-import { generateCanvasImage } from "@/util";
-import { getPractiseAPI } from "@/apis";
-import { wxShare } from "@/util";
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-
-onLoad(async (options) => {
-  const id = options.id || 461;
-  const data = await getPractiseAPI(id);
-  if (!data.arrows.length) return;
-  generateCanvasImage("shareCanvas", options.type, user.value, data);
-});
-
-const saveImage = () => {
-  uni.canvasToTempFilePath({
-    canvasId: "shareCanvas",
-    success: (res) => {
-      const tempFilePath = res.tempFilePath;
-
-      // 保存图片到相册
-      uni.saveImageToPhotosAlbum({
-        filePath: tempFilePath,
-        success: () => {
-          uni.showToast({ title: "保存成功" });
-        },
-        fail: () => {
-          uni.showToast({ title: "保存失败", icon: "error" });
-        },
-      });
-    },
-  });
-};
-</script>
-
-<template>
-  <Container>
-    <view class="content">
-      <view :style="{ overflow: 'hidden', borderRadius: '10px' }">
-        <canvas
-          :style="{ width: '300px', height: '534px' }"
-          canvas-id="shareCanvas"
-        ></canvas>
-      </view>
-    </view>
-  </Container>
-</template>
-
-<style scoped>
-.content {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 20px;
-}
-.footer {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  margin-top: 50px;
-}
-.footer > button {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  color: #fff;
-  font-size: 12px;
-}
-.footer > button > image {
-  width: 45px;
-  margin-bottom: 10px;
-}
-</style>

src/pages/index.vue

@@ -1,54 +1,60 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import {onMounted, ref} from "vue";
-import { onShow } from "@dcloudio/uni-app";
+import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
-import AppBackground from "@/components/AppBackground.vue";
 import UserHeader from "@/components/UserHeader.vue";
-import SModal from "@/components/SModal.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
+
 import {
+  checkUserBindAPI,
   getAppConfig,
-  getRankListAPI,
+  getDeviceBatteryAPI,
   getHomeData,
   getMyDevicesAPI,
+  getScoreRankList,
+  silentLoginAPI,
 } from "@/apis";
-import { topThreeColors } from "@/constants";
+import {topThreeColors} from "@/constants";
+
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { updateConfig, updateUser, updateDevice, updateRank, getLvlName } =
+const {
-  store;
+  updateConfig,
-// 使用storeToRefs，用于UI里显示，保持响应性
+  updateUser,
-const { user, device, rankData } = storeToRefs(store);
+  updateDevice,
+  getLvlName,
+  getLvlNameByScore,
+  updateOnline,
+} = store;
+const {user, device, online, game} = storeToRefs(store);
+
 const showModal = ref(false);
 const showGuide = ref(false);
+const scoreRankList = ref([]);
 
-const toPage = (path) => {
+// 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
+const getScoreRankData = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};
+
+const toPage = async (path) => {
   if (!user.value.id) {
     showModal.value = true;
     return;
   }
-  if (
+  // if (path === "/pages/first-try") {
-    "/pages/first-try,/pages/practise,/pages/friend-battle".indexOf(path) !== -1
+  // if (canEenter(user.value, device.value, online.value, path)) {
-  ) {
+  //   await uni.$checkAudio();
-    if (!device.value.deviceId) {
+  // }
-      return uni.showToast({
+  // }
-        title: "请先绑定设备",
+  uni.navigateTo({url: path});
-        icon: "none",
-      });
-    }
-    if ("/pages/first-try".indexOf(path) === -1 && !user.value.trio) {
-      return uni.showToast({
-        title: "请先完成新手试炼",
-        icon: "none",
-      });
-    }
-  }
-  uni.navigateTo({
-    url: path,
-  });
 };
 
 const toRankListPage = () => {
@@ -58,14 +64,55 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  const token = uni.getStorageSync("token");
+  const env = uni.getAccountInfoSync().miniProgram.envVersion;
-  if (token) {
+  const token = uni.getStorageSync(`${env}_token`);
-    const result = await getHomeData();
+
-    updateRank(result);
+  if (!user.value.id && !token) {
-    console.log("首页数据：", result);
+    try {
-    if (result.user) {
+      const wxResult = await uni.login({provider: "weixin"});
-      updateUser(result.user);
+      const bindResult = await checkUserBindAPI(wxResult.code);
-      if (result.user.trio <= 0) {
+      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);
+  scoreRankList.value = getScoreRankData(rankList).slice(0, 10);
+
+  if (homeData) {
+    console.log("首页数据：", homeData);
+    if (homeData.user) {
+      updateUser(homeData.user);
+      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;
@@ -74,120 +121,143 @@ onShow(async () => {
       const devices = await getMyDevicesAPI();
       if (devices.bindings && devices.bindings.length) {
         updateDevice(
-          devices.bindings[0].deviceId,
+            devices.bindings[0].deviceId,
-          devices.bindings[0].deviceName
+            devices.bindings[0].deviceName
         );
+        const data = await getDeviceBatteryAPI();
+        updateOnline(data.online);
       }
     }
-  } else {
-    const result = await getRankListAPI();
-    updateRank(result);
   }
 });
 
 onMounted(async () => {
-  uni.removeStorageSync("point-book-config");
   const config = await getAppConfig();
   updateConfig(config);
   console.log("全局配置：", config);
 });
 
-const comingSoon = () => {
+onShareAppMessage(() => {
-  uni.showToast({
+  return {
-    title: "敬请期待",
+    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
-    icon: "none",
+    path: "/pages/index", // 用户点击分享卡片后跳转的页面路径
-  });
+    imageUrl:
-};
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享卡片的配图，可以是本地或网络图片
+  };
+});
+onShareTimeline(() => {
+  return {
+    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享到朋友圈的标题
+    query: "from=timeline", // 用户通过朋友圈点击后，在页面 onShow 的 options 中可以获取到的参数
+    imageUrl:
+        "https://static.shelingxingqiu.com/attachment/2025-09-12/dcqoz26q0268wxmzjg.png", // 分享到朋友圈的配图
+  };
+});
 </script>
 
 <template>
   <Container :isHome="true" :showBackToGame="true">
     <view class="container">
-      <UserHeader showRank :onSignin="() => (showModal = true)" />
+      <view class="top-theme">
+        <image
+            src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrq4xn7e6y2pp.png"
+            mode="widthFix"
+        />
+      </view>
+      <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/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
+                v-if="online"
-              mode="widthFix"
+                src="https://static.shelingxingqiu.com/attachment/2025-08-07/dbvt1o6dvhr2rop3kn.webp"
-              @click="() => toPage('/pages/my-device')"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
             />
-            <text v-if="!user.id">我的弓箭</text>
-            <text v-if="user.id && !device.deviceId">请绑定设备</text>
-            <text
-              v-if="user.id && device.deviceId"
-              class="truncate"
-              :style="{ width: '90%', textAlign: 'center' }"
-              >{{ device.deviceName }}</text
-            >
             <image
-              src="../static/first-try.png"
+                v-else
-              mode="widthFix"
+                src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
-              @click="() => toPage('/pages/first-try')"
+                mode="widthFix"
+                @click="() => toPage('/pages/my-device')"
             />
-            <BubbleTip
+            <block v-if="user.id">
-              v-if="showGuide"
+              <text v-if="!device.deviceId">绑定我的智能弓</text>
-              :location="{ top: '60%', left: '40%', fontSize: '14px' }"
+              <text v-else-if="!online">设备离线</text>
-            >
+              <text v-else-if="online">设备在线</text>
+            </block>
+            <image
+                src="../static/first-try.png"
+                mode="widthFix"
+                @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="../static/my-practise.png" mode="widthFix" />
+              <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
             <view @click="() => toPage('/pages/friend-battle')">
-              <image src="../static/friend-battle.png" mode="widthFix" />
+              <image src="../static/friend-battle.png" mode="widthFix"/>
             </view>
           </view>
         </view>
         <view class="ranking-section">
-          <image src="../static/rank-bg.png" mode="widthFix" />
+          <image
+              src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9ci9v7frcrsxhj.png"
+              mode="widthFix"
+          />
           <button
-            class="into-btn"
+              class="into-btn"
-            @click="() => toPage('/pages/ranking')"
+              @click="() => toPage('/pages/ranking')"
-            hover-class="none"
+              hover-class="none"
           ></button>
           <view class="ranking-players" @click="toRankListPage">
-            <img src="../static/juezhanbang.png" mode="widthFix" />
+            <img src="../static/juezhanbang.png" mode="widthFix"/>
             <view class="divide-line"></view>
             <view class="player-avatars">
-              <block v-for="i in 6" :key="i">
+              <view
-                <block v-if="rankData.rank && rankData.rank[i - 1]">
+                  v-for="i in 6"
-                  <view
+                  :key="i"
-                    class="player-avatar"
+                  class="player-avatar"
-                    :style="{
+                  :style="{
-                      zIndex: 8 - i,
+                  zIndex: 8 - i,
-                      borderColor: topThreeColors[i - 1] || '#000',
+                  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" />
+                <image v-if="i === 1" src="../static/champ1.png"/>
-                    <view v-if="i > 3">{{ i }}</view>
+                <image v-if="i === 2" src="../static/champ2.png"/>
-                    <image
+                <image v-if="i === 3" src="../static/champ3.png"/>
-                      :src="
+                <view v-if="i > 3">{{ i }}</view>
-                        rankData.rank[i - 1].avatar || '../static/user-icon.png'
+                <image
-                      "
+                    :src="
-                      mode="aspectFill"
+                    scoreRankList[i - 1]
-                    />
+                      ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
-                  </view>
+                      : '../static/user-icon-dark.png'
-                </block>
+                  "
-              </block>
+                    mode="aspectFill"
+                />
+              </view>
               <view class="more-players">
-                <text>{{ rankData.rank.length }}</text>
+                <text>{{ scoreRankList.length }}</text>
               </view>
             </view>
           </view>
           <view class="my-data">
             <view @click="() => toPage('/pages/my-growth')">
-              <image src="../static/my-growth.png" mode="widthFix" />
+              <image src="../static/my-growth.png" mode="widthFix"/>
             </view>
-            <view>
+            <view @click="() => toPage('/pages/ranking')">
               <view>
                 <text>段位</text>
-                <text>{{ user.scores ? getLvlName(user.scores) : "暂无" }}</text>
+                <text>{{
+                    user.lvlName || "暂无"
+                  }}
+                </text>
               </view>
               <view>
                 <text>赛季平均环数</text>
@@ -196,79 +266,26 @@ const comingSoon = () => {
               <view>
                 <text>赛季胜率</text>
                 <text>{{
-                  user.avg_win
+                    user.avg_win
-                    ? Number((user.avg_win * 100).toFixed(2)) + "%"
+                        ? Number((user.avg_win * 100).toFixed(2)) + "%"
-                    : "暂无"
+                        : "暂无"
-                }}</text>
+                  }}
+                </text>
               </view>
             </view>
           </view>
-          <!-- <view class="region-stats">
-            <view
-              v-for="(region, index) in [
-                { name: '广东', score: 4291 },
-                { name: '湖南', score: 3095 },
-                { name: '内蒙', score: 2342 },
-                { name: '海南', score: 1812 },
-                { name: '四川', score: 1293 },
-              ]"
-              :key="index"
-              class="region-item"
-              @click="comingSoon"
-            >
-              <image src="../static/region-bg.png" mode="widthFix" />
-              <image
-                v-if="index === 0"
-                src="../static/region-1.png"
-                mode="widthFix"
-              />
-              <image
-                v-if="index === 1"
-                src="../static/region-2.png"
-                mode="widthFix"
-              />
-              <image
-                v-if="index === 2"
-                src="../static/region-3.png"
-                mode="widthFix"
-              />
-              <image
-                v-if="index === 3"
-                src="../static/region-4.png"
-                mode="widthFix"
-              />
-              <image
-                v-if="index === 4"
-                src="../static/region-5.png"
-                mode="widthFix"
-              />
-              <text>{{ region.name }}</text>
-              <view>
-                <text :style="{ color: '#fff', marginRight: '2px' }">{{
-                  region.score
-                }}</text>
-                <text>分</text>
-              </view>
-            </view>
-            <view class="region-more" @click="comingSoon">
-              <image src="../static/region-more.png" mode="widthFix" />
-              <text>...</text>
-              <text>更多</text>
-            </view>
-          </view> -->
         </view>
       </view>
-      <SModal :show="showModal" :onClose="() => (showModal = false)">
+      <Signin :show="showModal" :onClose="() => (showModal = false)"/>
-        <Signin :onClose="() => (showModal = false)" />
-      </SModal>
     </view>
-    <AppFooter :signin="() => (showModal = true)" />
+    <AppFooter/>
   </Container>
 </template>
 
 <style scoped>
 .container {
   width: 100%;
+  height: calc(100% - 120px);
 }
 
 .feature-grid {
@@ -285,6 +302,8 @@ const comingSoon = () => {
 
 .bow-card {
   width: 50%;
+  border-radius: 25rpx;
+  overflow: hidden;
 }
 
 .feature-grid > view > image {
@@ -293,7 +312,7 @@ const comingSoon = () => {
 
 .bow-card > text {
   position: absolute;
-  top: 65%;
+  top: 66%;
   left: 50%;
   transform: translate(-50%, -50%);
   white-space: nowrap;
@@ -341,7 +360,7 @@ const comingSoon = () => {
   align-items: center;
   padding-bottom: 20px;
   margin-top: 42%;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
+  border-bottom: 1rpx solid rgba(255, 255, 255, 0.2);
 }
 
 .ranking-players > image:first-child {
@@ -366,8 +385,8 @@ const comingSoon = () => {
   width: 82rpx;
   height: 82rpx;
   border-radius: 50%;
-  margin-right: -10px;
+  margin-right: -20rpx;
-  border: 1px solid #312F35;
+  border: 1rpx solid #312f35;
   position: relative;
   box-sizing: border-box;
 }
@@ -375,11 +394,12 @@ const comingSoon = () => {
 .player-avatar > image:first-child,
 .player-avatar > view:first-child {
   position: absolute;
-  top: -10px;
+  top: -24rpx;
-  left: 12px;
+  left: 22rpx;
-  width: 16px;
+  width: 32rpx;
-  height: 16px;
+  height: 32rpx;
 }
+
 .player-avatar > view:first-child {
   border-radius: 50%;
   background: #777777;
@@ -390,6 +410,7 @@ const comingSoon = () => {
   height: 18px;
   color: #fff;
 }
+
 .player-avatar > image:last-child {
   width: 100%;
   height: 100%;
@@ -409,71 +430,21 @@ const comingSoon = () => {
   color: #fff;
 }
 
-.region-stats {
-  display: flex;
-  grid-template-columns: repeat(6, 1fr);
-  margin-top: 20px;
-  justify-content: space-between;
-}
-
-.region-item,
-.region-more {
-  border-radius: 10px;
-  text-align: center;
-  position: relative;
-  width: 13vw;
-  height: 13vw;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  color: #c5c5c5;
-  font-size: 12px;
-}
-.region-item > text {
-  margin-top: 10px;
-}
-.region-more {
-  width: 8vw;
-  height: 13vw;
-}
-.region-item > image:first-child,
-.region-more > image:first-child {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  z-index: -1;
-}
-.region-item > image:nth-of-type(2) {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 18px;
-}
-.region-item > view:last-child {
-  display: flex;
-  justify-content: center;
-  font-size: 10px;
-}
-.region-more > text:first-of-type {
-  font-size: 30px;
-  line-height: 20px;
-  margin-bottom: 5px;
-}
 .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;
@@ -481,9 +452,11 @@ const comingSoon = () => {
   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;
@@ -493,9 +466,25 @@ const comingSoon = () => {
   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;
+  width: 100%;
+  height: 60px;
+  z-index: -1;
+}
+
+.top-theme > image {
+  width: 300rpx;
+  transform: translate(-4%, -14%);
+}
 </style>

src/pages/match-detail.vue

@@ -4,73 +4,50 @@ import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import Avatar from "@/components/Avatar.vue";
-// import TeamResult from "@/components/TeamResult.vue";
-// import MeleeResult from "@/components/MeleeResult.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 battleId = ref("");
 const data = ref({
-  players: [],
+  teams: [],
+  rounds: [],
 });
-// const show = ref(false);
+const players = ref([]);
 
 onLoad(async (options) => {
-  if (options.id) {
+  if (!options.battleId) return;
-    battleId.value = options.id || "BATTLE-1751732742024840058-732";
+  battleId.value = options.battleId || "60510101693403136";
-    const result = await getGameAPI(battleId.value);
+  const result = await getBattleAPI(battleId.value);
-    data.value = result;
+  data.value = result;
-    if (result.mode === 1) {
+  if (result.mode > 3) {
-      blueTeam.value = Object.values(result.bluePlayers || {});
+    players.value = result.resultList.map((item, index) => {
-      redTeam.value = Object.values(result.redPlayers || {});
+      const plist = result.teams[0] ? result.teams[0].players : [];
-      Object.values(result.roundsData).forEach((item) => {
+      const p = plist.find((p) => p.id === item.userId);
-        let blueId = Object.keys(item)[0];
+      const arrows = new Array(12);
-        let redId = Object.keys(item)[1];
+      result.rounds.forEach((r, index) => {
-        if (!result.bluePlayers[blueId]) {
+        if (r.shoots[item.userId]) {
-          blueId = Object.keys(item)[1];
+          r.shoots[item.userId].forEach((s, index2) => {
-          redId = Object.keys(item)[0];
+            arrows[index2 + index * 6] = s;
+          });
         }
-        let bluePoint = 1;
-        let redPoint = 1;
-        const blueTotalRings = item[blueId].reduce((a, b) => a + b.ring, 0);
-        const redTotalRings = item[redId].reduce((a, b) => a + b.ring, 0);
-        if (blueTotalRings > redTotalRings) {
-          bluePoint = 2;
-          redPoint = 0;
-        } else if (blueTotalRings < redTotalRings) {
-          bluePoint = 0;
-          redPoint = 2;
-        }
-        roundsData.value.push({
-          blue: {
-            name: result.bluePlayers[blueId].name,
-            avatar: result.bluePlayers[blueId].avatar,
-            arrows: item[blueId],
-            totalRing: blueTotalRings,
-            totalScore: bluePoint,
-          },
-          red: {
-            name: result.redPlayers[redId].name,
-            avatar: result.redPlayers[redId].avatar,
-            arrows: item[redId],
-            totalRing: redTotalRings,
-            totalScore: redPoint,
-          },
-        });
       });
-    }
+      return {
+        ...item,
+        rank: index + 1,
+        name: p.name,
+        avatar: p.avatar || "",
+        arrows,
+      };
+    });
   }
 });
 
-const checkBowData = () => {
+const checkBowData = (selected) => {
-  if (data.value.mode === 1) {
+  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}`,
     });
@@ -82,13 +59,13 @@ const checkBowData = () => {
   <Container title="详情">
     <view class="container">
       <BattleHeader
-        :winner="data.winner"
+        :winner="data.winTeam"
-        :blueTeam="blueTeam"
+        :blueTeam="data.teams[1] ? data.teams[1].players : []"
-        :redTeam="redTeam"
+        :redTeam="data.teams[2] ? data.teams[2].players : []"
-        :players="data.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' }"
       >
@@ -99,122 +76,64 @@ const checkBowData = () => {
         </view>
       </view>
       <PlayerScore2
-        v-if="data.players && data.players.length"
+        v-if="data.mode >= 3"
-        v-for="(player, index) in data.players"
+        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-if="data.goldenRound">
-        <view class="score-header">
-          <text>决金箭轮（环数）</text>
-          <view @click="checkBowData">
-            <text>查看靶纸</text>
-            <image src="../static/back.png" mode="widthFix" />
-          </view>
-        </view>
-        <view class="score-row">
-          <view>
-            <Avatar
-              :src="blueTeam[0].avatar"
-              :size="25"
-              borderColor="#64BAFF"
-            />
-            <text
-              v-if="data.goldenRound.blueTotal"
-              v-for="(arrow, index) in data.goldenRound.arrowHistory.filter(
-                (a) => a.playerId === blueTeam[0].playerId
-              )"
-              :key="index"
-            >
-              {{ arrow.ring }}环
-            </text>
-          </view>
-          <image
-            v-if="data.goldenRound.winner === 1"
-            src="../static/winner-badge.png"
-            mode="widthFix"
-          />
-        </view>
-        <view class="score-row" :style="{ marginBottom: '5px' }">
-          <view>
-            <Avatar :src="redTeam[0].avatar" :size="25" borderColor="#FF6767" />
-            <text
-              v-if="data.goldenRound.redTotal"
-              v-for="(arrow, index) in data.goldenRound.arrowHistory.filter(
-                (a) => a.playerId === redTeam[0].playerId
-              )"
-              :key="index"
-            >
-              {{ arrow.ring }}环
-            </text>
-          </view>
-          <image
-            v-if="data.goldenRound.winner === 0"
-            src="../static/winner-badge.png"
-            mode="widthFix"
-          />
-        </view>
-      </block>
       <view
-        v-for="(round, index) in roundsData"
+        v-if="data.mode <= 3"
+        v-for="(round, index) in data.rounds"
         :key="index"
         :style="{ marginBottom: '5px' }"
       >
         <view class="score-header">
-          <text>第{{ index + 1 }}轮</text>
+          <text>{{ round.ifGold ? "决金箭" : `第${index + 1}轮` }}</text>
-          <view @click="checkBowData">
+          <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>
-            <Avatar :src="round.blue.avatar" :size="25" borderColor="#64BAFF" />
+            <view>
-            <text v-for="(arrow, index2) in round.blue.arrows" :key="index2">
+              <image
-              {{ arrow.ring }}环
+                v-for="(p, index) in data.teams[team].players"
+                :style="{
+                  borderColor: '#64BAFF',
+                  transform: `translateX(-${index * 15}px)`,
+                }"
+                :src="p.avatar || '../static/user-icon.png'"
+                :key="index"
+                mode="widthFix"
+              />
+            </view>
+            <text
+              v-for="(arrow, index2) in round.shoots[team]"
+              :key="index2"
+              :style="{ color: arrow.ringX ? '#fed847' : '#ccc' }"
+            >
+              {{ arrow.ringX ? "X" : `${arrow.ring}环` }}
             </text>
           </view>
           <view>
-            <text :style="{ color: '#64BAFF' }">
+            <text :style="{ color: team == 1 ? '#64BAFF' : '#FF6767' }">
-              {{ round.blue.totalRing }}环
+              {{ round.shoots[team].reduce((acc, cur) => acc + cur.ring, 0) }}环
             </text>
-            <text>得分 {{ round.blue.totalScore }}</text>
+            <text>得分 {{ round.scores[team].score }}</text>
-          </view>
-        </view>
-        <view class="score-row">
-          <view>
-            <Avatar :src="round.red.avatar" :size="25" borderColor="#FF6767" />
-            <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>
       </view>
       <view :style="{ height: '20px' }"></view>
     </view>
-    <!-- <TeamResult
-      v-if="data.mode === 1"
-      :show="show"
-      :onClose="() => (show = false)"
-      :data="data"
-    />
-    <MeleeResult
-      v-if="data.mode === 2"
-      :show="show"
-      :onClose="() => (show = false)"
-      :data="data"
-    /> -->
   </Container>
 </template>
 
@@ -250,20 +169,33 @@ const checkBowData = () => {
 .score-row > view {
   display: flex;
   align-items: center;
+  font-size: 12px;
+}
+.score-row > view:first-child > view:first-child {
+  display: flex;
+  align-items: center;
+  width: 70px;
+}
+.score-row > view:first-child > view:first-child > image {
+  width: 25px;
+  height: 25px;
+  min-width: 25px;
+  min-height: 25px;
+  border: 1px solid;
+  border-radius: 50%;
 }
 .score-row > view:first-child > text {
-  margin-left: 20px;
   color: #fff;
   display: block;
-  width: 30px;
+  width: 35px;
 }
 .score-row > image:last-child {
   width: 40px;
 }
-.score-row > view:last-child {
+.score-row > view:nth-child(2) {
   padding-right: 5px;
 }
-.score-row > view:last-child > text:last-child {
+.score-row > view:nth-child(2) > text:last-child {
   margin-left: 20px;
 }
 </style>

src/pages/match-page.vue

@@ -1,12 +1,10 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+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 = []) {
+async function cancelMatch() {
-  messages.forEach((msg) => {
+  if (gameType.value && teamSize.value) {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
+    await matchGameAPI(false, gameType.value, teamSize.value);
-      if (!onComplete.value) {
+  }
-        onComplete.value = () => {
+  uni.navigateBack()
-          if (msg.groupUserStatus) {
+}
-            uni.setStorageSync("red-team", msg.groupUserStatus.redTeam);
+
-            uni.setStorageSync("blue-team", msg.groupUserStatus.blueTeam);
+async function onReceiveMessage(msg) {
-            uni.setStorageSync("melee-players", [
+  if (msg.type === MESSAGETYPESV2.MatchSuccess) {
-              ...msg.groupUserStatus.redTeam,
+    onComplete.value = () => {}
-              ...msg.groupUserStatus.blueTeam,
+  }
-            ]);
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
-          }
+    if (gameType.value == 1) {
-          uni.removeStorageSync("current-battle");
+      uni.redirectTo({
-          if (gameType.value == 1) {
+        url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
-            uni.redirectTo({
+      });
-              url: `/pages/team-battle?battleId=${msg.id}&gameMode=2`,
+    } else if (gameType.value == 2) {
-            });
+      uni.redirectTo({
-          } else if (gameType.value == 2) {
+        url: `/pages/melee-battle?battleId=${msg.id}&gameMode=2`,
-            uni.redirectTo({
+      });
-              url: `/pages/melee-match?battleId=${msg.id}&gameMode=2`,
-            });
-          }
-        };
-      }
     }
-  });
+  }
 }
 
 onLoad(async (options) => {
@@ -57,16 +50,15 @@ onMounted(() => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("cancelMatching", cancelMatch);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value) {
+  uni.$off("cancelMatching", cancelMatch);
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 
 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(useStore());
-const { user } = storeToRefs(store);
+const currentUser = ref({
-const scores = ref([]);
+  arrows: [],
-const currentUser = ref({});
+});
-const data = ref({});
+const players = 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;
-  }
-};
 onLoad(async (options) => {
-  if (options.battleId) {
+  if (!options.battleId) return;
-    const result = await getGameAPI(options.battleId);
+  const result = await getBattleAPI(options.battleId || "59348111700660224");
-    data.value = result;
+  players.value = result.resultList.map((item, index) => {
-    if (result.players && result.players[0]) {
+    const plist = result.teams[0] ? result.teams[0].players : [];
-      onSelect(result.players[0].playerId);
+    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" />
+      <image
-      <view class="players" v-if="data.players">
+        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`,
+            width: `${Math.max(100 / players.length, 18)}vw`,
-            color: player.playerId === currentUser.playerId ? '#000' : '#fff9',
+            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,246 +0,0 @@
-<script setup>
-import { ref, watch, onMounted, onUnmounted } 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 Timer from "@/components/Timer.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 { getCurrentGameAPI } 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 power = ref(0);
-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);
-    }
-  }
-});
-
-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 });
-        power.value = msg.target.battery;
-      }
-      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);
-    }
-  });
-}
-const onBack = () => {
-  uni.$showHint(2);
-};
-onMounted(() => {
-  uni.setKeepScreenOn({
-    keepScreenOn: true,
-  });
-  uni.$on("socket-inbox", onReceiveMessage);
-});
-onUnmounted(() => {
-  uni.setKeepScreenOn({
-    keepScreenOn: false,
-  });
-  uni.$off("socket-inbox", onReceiveMessage);
-});
-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" :onBack="onBack">
-    <view class="container">
-      <BattleHeader v-if="!start" :players="players" />
-      <TestDistance v-if="!start" :guide="false" />
-      <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 :power="power" />
-      </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"
-          :name="player.name"
-          :avatar="player.avatar"
-          :scores="playersScores[player.id] || []"
-        />
-      </view>
-      <Timer v-if="!start" />
-      <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

@@ -11,12 +11,13 @@ import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
 const arrows = ref([]);
+const total = ref(0);
 
 onLoad(async (options) => {
-  if (options.id) {
+  if (!options.id) return;
-    const result = await getPractiseAPI(options.id);
+  const result = await getPractiseAPI(options.id || 176);
-    arrows.value = result.arrows;
+  arrows.value = result.details;
-  }
+  total.value = result.details.length;
 });
 </script>
 
@@ -43,9 +44,9 @@ onLoad(async (options) => {
       </view>
       <ScorePanel
         :completeEffect="false"
-        :rowCount="arrows.length === 12 ? 6 : 9"
+        :rowCount="total === 12 ? 6 : 9"
-        :total="arrows.length"
+        :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

@@ -1,9 +1,15 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import SButton from "@/components/SButton.vue";
-import { bindDeviceAPI, getMyDevicesAPI, unbindDeviceAPI } from "@/apis";
+import {
+  bindDeviceAPI,
+  getMyDevicesAPI,
+  unbindDeviceAPI,
+  laserAimAPI, bindDeviceAPIV2,
+} from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const showTip = ref(false);
@@ -13,6 +19,8 @@ const store = useStore();
 const { updateDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
+const calibration = ref(false);
+const token = ref(null);
 
 // 扫描二维码方法
 const handleScan = () => {
@@ -23,13 +31,14 @@ const handleScan = () => {
     scanType: ["qrCode"],
     success: async (res) => {
       try {
-        const base64Decode = (str) => {
+        // const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
+        //   // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
+        //   const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
+        // };
-
+        //
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // addDevice.value = JSON.parse(base64Decode(res.result));
+        token.value = res.result;
         confirmBindTip.value = true;
       } catch (err) {
         uni.showToast({
@@ -50,8 +59,8 @@ const handleScan = () => {
 };
 
 const confirmBind = async () => {
-  if (!justBind.value && addDevice.value.id) {
+  if (!justBind.value && token.value) {
-    const result = await bindDeviceAPI(addDevice.value);
+    const result = await bindDeviceAPIV2(token.value);
     confirmBindTip.value = false;
     if (result.binded) {
       return uni.showToast({
@@ -59,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: "绑定成功",
@@ -76,6 +85,7 @@ const toFristTryPage = () => {
 
 const unbindDevice = async () => {
   await unbindDeviceAPI(device.value.deviceId);
+  uni.setStorageSync("calibration", false);
   uni.showToast({
     title: "解绑成功",
     icon: "success",
@@ -92,35 +102,66 @@ const toDeviceIntroPage = () => {
 const backToHome = () => {
   uni.navigateBack();
 };
+
+const copyEmail = () => {
+  uni.setClipboardData({
+    data: "shelingxingqiu@163.com",
+    success: () => {
+      uni.showToast({
+        title: "邮箱已复制",
+        icon: "success",
+      });
+    },
+  });
+};
+
+const goCalibration = async () => {
+  await laserAimAPI();
+  uni.navigateTo({
+    url: "/pages/calibration",
+  });
+};
+
+onShow(() => {
+  calibration.value = uni.getStorageSync("calibration");
+});
 </script>
 
 <template>
   <Container title="弓箭绑定">
     <view v-if="!device.deviceId" class="scan-code">
-      <view @click="handleScan">
+      <button hover-class="none" @click="handleScan">
         <image src="../static/scan.png" mode="widthFix" />
-        <text>扫码绑定弓箭</text>
+      </button>
-      </view>
+      <button hover-class="none" @click="showTip = true">
-      <view>
+        <text>扫</text>
-        <view @click="() => (showTip = true)">找不到我的弓箭？</view>
+        <text :style="{ color: '#fed847' }">射灵弓箭</text>
-        <view @click="toDeviceIntroPage">我还没有弓箭</view>
+        <text>上的二维码</text>
-      </view>
+        <image src="../static/s-question-mark-white.png" mode="widthFix" />
+      </button>
+      <text>射灵智能弓箭，三模传感系统与独创靶环算法，</text>
+      <text>毫秒级在线实时对战，让你拥有全球约战的乐趣！</text>
+      <button hover-class="none" @click="toDeviceIntroPage">
+        <image src="../static/have-no-device.png" mode="widthFix" />
+      </button>
       <ScreenHint
         mode="square"
         :show="showTip"
         :onClose="() => (showTip = false)"
       >
         <view class="scan-tips">
-          <text>找不到我的弓箭 </text>
+          <text>扫码绑定设灵弓箭</text>
-          <text>1.确认弓箭是智能弓箭 </text>
-          <text>2.确认弓箭有电且电源已开启 </text>
-          <text>3.进入弓箭绑定功能，扫描弓箭上的二维码 </text>
           <image
             src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuacrelri7jr3axiy.png"
             mode="widthFix"
           />
-          <text>4.连接成功后</text>
+          <text>【注】已被绑定的弓箭无法再次绑定。</text>
-          <view>联系在线客服</view>
+          <view>
+            <text>如有任何疑问，请随时联系：</text>
+            <button hover-class="none" @click="copyEmail">
+              shelingxingqiu@163.com
+            </button>
+          </view>
         </view>
       </ScreenHint>
       <ScreenHint
@@ -143,10 +184,23 @@ const backToHome = () => {
       </ScreenHint>
     </view>
     <view v-if="justBind" class="just-bind">
-      <view class="device-binded">
+      <view
-        <view @click="toDeviceIntroPage">
+        class="device-binded"
+        :style="{ marginBottom: calibration ? '250rpx' : '100rpx' }"
+      >
+        <view>
           <image src="../static/device-icon.png" mode="widthFix" />
           <text>{{ device.deviceName }}</text>
+          <view class="calibration" v-if="calibration">
+            <button hover-class="none" @click="goCalibration">
+              <text>重新校准</text>
+              <image src="../static/enter-arrow-blue.png" mode="widthFix" />
+            </button>
+            <view>
+              <image src="../static/calibration-tip.png" mode="widthFix" />
+              <text>如有场地/距离变化，需重新校准以保证智能弓射箭精准度</text>
+            </view>
+          </view>
         </view>
         <image src="../static/bind-success.png" mode="widthFix" />
         <view>
@@ -158,23 +212,51 @@ const backToHome = () => {
           <text>{{ user.nickName }}</text>
         </view>
       </view>
-      <view>
+      <block v-if="calibration">
-        <text>恭喜，你的弓箭和账号已成功绑定！</text>
+        <SButton :onClick="toFristTryPage" width="60vw" :rounded="40"
-        <text :style="{ color: '#fed847' }">已赠送6个月射灵世界会员</text>
+          >进入新手试炼</SButton
-        <text>赶快进入新手试炼场体验一下吧！</text>
-      </view>
-      <SButton :onClick="toFristTryPage">进入新手试炼</SButton>
-      <view :style="{ marginTop: '15px' }">
-        <SButton :onClick="backToHome" backgroundColor="#fff3" color="#fff"
-          >返回首页</SButton
         >
-      </view>
+        <view :style="{ marginTop: '15px' }">
+          <SButton
+            :onClick="backToHome"
+            backgroundColor="#fff3"
+            color="#fff"
+            width="60vw"
+            :rounded="40"
+            >返回首页</SButton
+          >
+        </view>
+      </block>
+      <block v-else>
+        <view>
+          <text>恭喜，你的弓箭和账号已成功绑定！</text>
+          <text :style="{ color: '#fed847' }">已赠送6个月射灵世界会员</text>
+        </view>
+        <SButton :onClick="goCalibration" width="60vw" :rounded="40">
+          开启智能弓进行校准
+        </SButton>
+        <text :style="{ marginTop: '20rpx', fontSize: '24rpx', color: '#fff9' }"
+          >校准时弓箭激光将开启，请勿直视激光</text
+        >
+      </block>
     </view>
     <view v-if="device.deviceId && !justBind" class="has-device">
       <view class="device-binded">
-        <view @click="toDeviceIntroPage">
+        <view>
           <image src="../static/device-icon.png" mode="widthFix" />
           <text>{{ device.deviceName }}</text>
+          <view class="calibration">
+            <button hover-class="none" @click="goCalibration">
+              <text>去校准</text>
+              <image src="../static/enter-arrow-blue.png" mode="widthFix" />
+            </button>
+            <view>
+              <image src="../static/calibration-tip.png" mode="widthFix" />
+              <text
+                >首次绑定智能弓或场地/距离变化时，应进行校准以确保射箭精度</text
+              >
+            </view>
+          </view>
         </view>
         <image src="../static/bind.png" mode="widthFix" />
         <view>
@@ -186,7 +268,11 @@ const backToHome = () => {
           <text>{{ user.nickName }}</text>
         </view>
       </view>
-      <SButton :onClick="unbindDevice">解绑</SButton>
+      <view :style="{ marginTop: '240rpx' }">
+        <SButton :onClick="unbindDevice" width="80vw" :rounded="40"
+          >解绑</SButton
+        >
+      </view>
     </view>
   </Container>
 </template>
@@ -202,44 +288,66 @@ const backToHome = () => {
   width: 100%;
   height: 100%;
 }
-.scan-code > view:first-child {
+.scan-code {
+  justify-content: flex-start;
+}
+.scan-code > button:first-child {
+  margin-top: 22%;
+}
+.scan-code > button:first-child > image {
+  width: 300rpx;
+}
+.scan-code > button:nth-child(2) {
   display: flex;
-  flex-direction: column;
   align-items: center;
-  width: 40%;
+  justify-content: center;
-  color: #fff;
+  font-size: 26rpx;
-  font-size: 14px;
+  color: #ffffff;
-  margin: 35% 0;
+  margin: 50rpx;
 }
-.scan-code > view:first-child > image {
+.scan-code > button:nth-child(2) > image {
-  width: 100%;
+  width: 28rpx;
-  margin-bottom: 20px;
+  margin-left: 10rpx;
 }
-.scan-code > view:nth-child(2) {
+.scan-code > text {
-  display: flex;
+  font-size: 24rpx;
-  flex-direction: column;
+  color: #fff9;
-  align-items: center;
 }
-.scan-code > view:nth-child(2) > view {
+.scan-code > button:nth-child(5) {
-  color: #39a8ff;
+  margin-top: 25%;
-  font-size: 14px;
+}
-  margin: 10px;
+.scan-code > button:nth-child(5) > image {
+  width: 380rpx;
 }
 .scan-tips {
   display: flex;
   flex-direction: column;
   font-size: 14px;
+  width: 90%;
+  margin-top: 20%;
 }
 .scan-tips > text {
   margin-bottom: 2px;
+  color: #fff;
+  font-size: 24rpx;
 }
 .scan-tips > text:first-child {
   color: #fed847;
   margin-bottom: 10px;
+  font-size: 32rpx;
+}
+.scan-tips > view {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
 }
 .scan-tips > view:last-child {
-  color: #39a8ff;
   margin-top: 5px;
+  font-size: 26rpx;
+}
+.scan-tips > view:last-child > button {
+  font-size: 30rpx;
+  color: #39a8ff;
 }
 .scan-tips > image {
   width: 100%;
@@ -273,16 +381,18 @@ const backToHome = () => {
   justify-content: center;
   color: #fff;
   font-size: 14px;
-  margin: 100px 0;
+  margin-top: 200rpx;
 }
 .device-binded > view {
   display: flex;
   flex-direction: column;
   align-items: center;
+  position: relative;
+  font-size: 26rpx;
 }
 .device-binded > view > image {
-  width: 24vw;
+  width: 140rpx;
-  height: 24vw;
+  height: 140rpx;
   margin-bottom: 5px;
   border-radius: 10px;
 }
@@ -294,7 +404,7 @@ const backToHome = () => {
   text-align: center;
 }
 .device-binded > image {
-  width: 16vw;
+  width: 100rpx;
   margin: 0 20px;
 }
 .has-device,
@@ -307,11 +417,42 @@ const backToHome = () => {
   display: flex;
   flex-direction: column;
   align-items: center;
-  font-size: 14px;
+  font-size: 28rpx;
-  margin: 75px 0;
+  margin-bottom: 100rpx;
 }
 .has-device > view:nth-child(2) > text,
 .just-bind > view:nth-child(2) > text {
   margin: 5px;
 }
+.calibration {
+  position: absolute;
+  bottom: -145rpx;
+  left: 20rpx;
+}
+.calibration > button {
+  font-size: 26rpx;
+  color: #287fff;
+  display: flex;
+  align-items: center;
+  padding-bottom: 15rpx;
+  padding-left: 50rpx;
+}
+.calibration > button > image {
+  width: 28rpx;
+  height: 28rpx;
+}
+.calibration > view {
+  position: relative;
+  font-size: 22rpx;
+  color: #fff9;
+  padding-top: 34rpx;
+  padding-left: 35rpx;
+  width: 322rpx;
+}
+.calibration > view > image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 370rpx;
+}
 </style>

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,10 +53,25 @@ 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>
-  <Container title="我的成长脚印" overflow="hidden">
+  <Container title="我的成长脚印" :scroll="false">
     <view class="tabs">
       <view
         v-for="(rankType, index) in ['排位赛', '好友约战', '个人练习']"
@@ -70,101 +86,74 @@ const onPractiseLoading = async (page) => {
       </view>
     </view>
     <view class="contents">
-      <ScrollList :show="selectedIndex === 0" :onLoading="onMatchLoading">
+      <swiper
-        <view
+        :current="selectedIndex"
-          v-for="(item, index) in matchList"
+        @change="(e) => (selectedIndex = e.detail.current)"
-          :key="index"
+        :style="{ height: '100%' }"
-          @click="() => toMatchDetail(item.battleId)"
-        >
-          <view class="contest-header">
-            <text>{{ item.name }}</text>
-            <text>{{ item.createdAt }}</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"
-            :showHeader="false"
-          />
-        </view>
-      </ScrollList>
-      <ScrollList :show="selectedIndex === 1" :onLoading="onBattleLoading">
-        <view
-          v-for="(item, index) in battleList"
-          :key="index"
-          @click="() => toMatchDetail(item.battleId)"
-        >
-          <view class="contest-header">
-            <text>{{ item.name }}</text>
-            <text>{{ item.createdAt }}</text>
-            <image src="../static/back.png" mode="widthFix" />
-          </view>
-          <view v-if="item.mode === 1" class="contest-team">
-            <block v-if="item.bluePlayers[0]">
-              <view class="player">
-                <Avatar
-                  :rankLvl="item.bluePlayers[0].rankLvl"
-                  :src="item.bluePlayers[0].avatar"
-                />
-                <text>{{ item.bluePlayers[0].name }}</text>
-                <image
-                  v-if="item.winner === 1"
-                  src="../static/winner-badge.png"
-                  mode="widthFix"
-                />
-              </view>
-            </block>
-            <block v-if="item.redPlayers[0]">
-              <view class="player">
-                <Avatar
-                  :rankLvl="item.redPlayers[0].rankLvl"
-                  :src="item.redPlayers[0].avatar"
-                />
-                <text>{{ item.redPlayers[0].name }}</text>
-                <image
-                  v-if="item.winner === 0"
-                  src="../static/winner-badge.png"
-                  mode="widthFix"
-                />
-              </view>
-            </block>
-          </view>
-          <view v-if="item.mode === 2" class="contest-melee">
-            <view
-              class="player"
-              v-for="(p, index2) in item.players"
-              :key="index2"
-              :style="{
-                width: `${Math.max(100 / item.players.length, 18)}vw`,
-                backgroundColor: meleeAvatarColors[index2],
-              }"
-            >
-              <Avatar :rank="index2 + 1" :src="p.avatar" />
-              <text>{{ p.name }}</text>
-            </view>
-          </view>
-        </view>
-      </ScrollList>
-      <ScrollList
-        :show="selectedIndex === 2"
-        :onLoading="onPractiseLoading"
-        :pageSize="15"
       >
-        <view
+        <swiper-item>
-          v-for="(item, index) in practiseList"
+          <ScrollList :onLoading="onMatchLoading">
-          :key="index"
+            <view
-          class="practice-record"
+              v-for="(item, index) in matchList"
-          @click="() => getPractiseDetail(item.id)"
+              :key="index"
-        >
+              @click="() => toMatchDetail(item.id)"
-          <text
+            >
-            >{{ item.completed_arrows === 36 ? "耐力挑战" : "单组练习" }}
+              <view class="contest-header">
-            {{ item.createdAt }}</text
+                <text>{{ getName(item) }}</text>
-          >
+                <text>{{ item.createTime }}</text>
-          <image src="../static/back.png" mode="widthFix" />
+                <image src="../static/back.png" mode="widthFix" />
-        </view>
+              </view>
-      </ScrollList>
+              <BattleHeader
+                :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>
+          </ScrollList>
+        </swiper-item>
+        <swiper-item>
+          <ScrollList :onLoading="onBattleLoading">
+            <view
+              v-for="(item, index) in battleList"
+              :key="index"
+              @click="() => toMatchDetail(item.id)"
+            >
+              <view class="contest-header">
+                <text>{{ getName(item) }}</text>
+                <text>{{ item.createTime }}</text>
+                <image src="../static/back.png" mode="widthFix" />
+              </view>
+              <BattleHeader
+                :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>
+          </ScrollList>
+        </swiper-item>
+        <swiper-item>
+          <ScrollList :onLoading="onPractiseLoading" :pageSize="15">
+            <view
+              v-for="(item, index) in practiseList"
+              :key="index"
+              class="practice-record"
+              @click="() => getPractiseDetail(item.id)"
+            >
+              <text
+                >{{ item.completed_arrows === 36 ? "耐力挑战" : "单组练习" }}
+                {{ item.createTime }}</text
+              >
+              <image src="../static/back.png" mode="widthFix" />
+            </view>
+          </ScrollList>
+        </swiper-item>
+      </swiper>
     </view>
   </Container>
 </template>

src/pages/my-like-list.vue

@@ -0,0 +1,66 @@
+<script setup>
+import { ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import Avatar from "@/components/Avatar.vue";
+import ScrollList from "@/components/ScrollList.vue";
+import { getMyLikeList } from "@/apis";
+
+const list = ref([]);
+
+const onListLoading = async (page) => {
+  const result = await getMyLikeList(page);
+  if (page === 1) list.value = result.list;
+  else list.value = list.value.concat(result.list);
+  return result.list.length;
+};
+</script>
+
+<template>
+  <Container
+    :bgType="2"
+    bgColor="#F5F5F5"
+    :whiteBackArrow="false"
+    title="赞我的朋友"
+  >
+    <view class="container">
+      <ScrollList :onLoading="onListLoading">
+        <block v-for="item in list" :key="item.id">
+          <view class="like-item">
+            <Avatar :src="item.avatar" mode="widthFix" />
+            <text>{{ item.name }}</text>
+          </view>
+          <view class="like-bottom-line" />
+        </block>
+      </ScrollList>
+    </view>
+  </Container>
+</template>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  height: 100%;
+}
+.like-item {
+  background: $uni-white;
+  height: 140rpx;
+  width: 100%;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #333;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0 25rpx;
+}
+.like-item > text {
+  margin-left: 25rpx;
+}
+.like-bottom-line {
+  width: calc(100% - 50rpx);
+  margin: 0 25rpx;
+  height: 1rpx;
+  background: #e5e5e5;
+}
+</style>

src/pages/order-detail.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Container from "@/components/Container.vue";
 import SButton from "@/components/SButton.vue";
 import { payOrderAPI, cancelOrderListAPI, getHomeData } from "@/apis";
@@ -30,7 +30,7 @@ onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.$off("socket-inbox", onReceiveMessage);
 });
 

src/pages/point-book-create.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import EditOption from "@/components/EditOption.vue";
@@ -7,7 +7,7 @@ import SButton from "@/components/SButton.vue";
 import { getPointBookDataAPI } from "@/apis";
 
 const expandIndex = ref(0);
-const bowType = ref({});
+const bowType = ref("");
 const distance = ref(0);
 const bowtargetType = ref("");
 const amountGroup = ref("");
@@ -43,13 +43,13 @@ const toEditPage = () => {
     bowtargetType.value &&
     amountGroup.value
   ) {
-    uni.setStorageSync("point-book", {
+    uni.setStorageSync("last-point-book", {
       bowType: bowType.value,
       distance: distance.value,
       bowtargetType: bowtargetType.value,
       amountGroup: amountGroup.value,
     });
-    uni.navigateTo({
+    uni.redirectTo({
       url: "/pages/point-book-edit",
     });
   } else {
@@ -59,15 +59,15 @@ const toEditPage = () => {
     });
   }
 };
-onShow(async () => {
+// onShow(async () => {
-  const result = await getPointBookDataAPI();
+//   const result = await getPointBookDataAPI();
-  if (result) {
+//   if (result) {
-    days.value = result.total_day || 0;
+//     days.value = result.total_day || 0;
-    arrows.value = result.total_arrow || 0;
+//     arrows.value = result.total_arrow || 0;
-  }
+//   }
-});
+// });
 onMounted(async () => {
-  const pointBook = uni.getStorageSync("point-book");
+  const pointBook = uni.getStorageSync("last-point-book");
   if (pointBook) {
     bowType.value = pointBook.bowType;
     distance.value = pointBook.distance;
@@ -82,66 +82,40 @@ onMounted(async () => {
     :bgType="2"
     bgColor="#F5F5F5"
     :whiteBackArrow="false"
-    title="计分与技术分析"
+    title="选择参数"
   >
     <view class="container">
-      <view class="header">
+      <EditOption
-        <image
+        :itemIndex="0"
-          src="https://static.shelingxingqiu.com/attachment/2025-08-06/dbv8w5ak76hozbfpy2.png"
+        :expand="expandIndex === 0"
-          mode="widthFix"
+        :onExpand="onExpandChange"
-        />
+        :onSelect="onSelect"
-        <view>
+        :value="bowType.name"
-          <view>
+      />
-            <text>{{ days }}</text>
+      <EditOption
-            <text>天</text>
+        :itemIndex="1"
-          </view>
+        :expand="expandIndex === 1"
-          <text>训练天数</text>
+        :onExpand="onExpandChange"
-        </view>
+        :onSelect="onSelect"
-        <view>
+        :value="distance + ''"
-          <view>
+      />
-            <text>{{ arrows }}</text>
+      <EditOption
-            <text>箭</text>
+        :itemIndex="2"
-          </view>
+        :expand="expandIndex === 2"
-          <text>训练箭数</text>
+        :onExpand="onExpandChange"
-        </view>
+        :onSelect="onSelect"
-      </view>
+        :value="bowtargetType.name"
-      <view>
+      />
-        <EditOption
+      <EditOption
-          :itemIndex="0"
+        :itemIndex="3"
-          :expand="expandIndex === 0"
+        :expand="expandIndex === 3"
-          :onExpand="onExpandChange"
+        :onExpand="onExpandChange"
-          :onSelect="onSelect"
+        :onSelect="onSelect"
-          :value="bowType.name"
+      />
-        />
-        <EditOption
-          :itemIndex="1"
-          :expand="expandIndex === 1"
-          :onExpand="onExpandChange"
-          :onSelect="onSelect"
-          :value="distance + ''"
-        />
-        <EditOption
-          :itemIndex="2"
-          :expand="expandIndex === 2"
-          :onExpand="onExpandChange"
-          :onSelect="onSelect"
-          :value="bowtargetType.name"
-        />
-        <EditOption
-          :itemIndex="3"
-          :expand="expandIndex === 3"
-          :onExpand="onExpandChange"
-          :onSelect="onSelect"
-        />
-      </view>
-    </view>
-    <view :style="{ marginBottom: '20px' }">
-      <SButton :rounded="50" :onClick="toEditPage">开始计分</SButton>
-      <view class="see-more" @click="toListPage">
-        <text>历史计分记录</text>
-        <image src="../static/enter-arrow-blue.png" mode="widthFix" />
-      </view>
     </view>
+    <template #bottom>
+      <SButton :rounded="50" :onClick="toEditPage">下一步</SButton>
+    </template>
   </Container>
 </template>
 

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

@@ -0,0 +1,434 @@
+<script setup>
+import { ref, computed } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import SButton from "@/components/SButton.vue";
+import BowTargetEdit from "@/components/BowTargetEdit.vue";
+import ScreenHint2 from "@/components/ScreenHint2.vue";
+import RingBarChart from "@/components/RingBarChart.vue";
+import { getPointBookDetailAPI, getPointBookConfigAPI } from "@/apis";
+
+const selectedIndex = ref(0);
+const showTip = ref(false);
+const showTip2 = ref(false);
+const data = ref({});
+const targetId = ref(0);
+const targetSrc = ref("");
+const arrows = ref([]);
+const record = ref({
+  groups: [],
+  user: {},
+});
+const bowConfig = ref({});
+
+const paddingTop = computed(() => {
+  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
+  return menuBtnInfo.top - 9 - 9;
+});
+
+const openTip = (index) => {
+  if (index === 1) showTip.value = true;
+  else if (index === 2) showTip2.value = true;
+};
+
+const closeTip = () => {
+  showTip.value = false;
+  showTip2.value = false;
+};
+
+const goBack = () => {
+  const pages = getCurrentPages();
+  if (pages.length > 1) {
+    const currentPage = pages[pages.length - 2];
+    uni.navigateBack({
+      delta: currentPage.route === "pages/point-book" ? 1 : 2,
+    });
+  } else {
+    uni.redirectTo({
+      url: "/pages/index",
+    });
+  }
+};
+
+const goHome = () => {
+  uni.redirectTo({
+    url: "/pages/point-book",
+  });
+};
+
+const ringRates = computed(() => {
+  const rates = new Array(12).fill(0);
+  arrows.value.forEach((item) => {
+    if (item.ring === -1) rates[11] += 1;
+    else rates[item.ring] += 1;
+  });
+  return rates.map((r) => r / arrows.value.length);
+});
+
+onLoad(async (options) => {
+  if (options.id) {
+    const result = await getPointBookDetailAPI(options.id || 183);
+    record.value = result;
+    const config = await getPointBookConfigAPI();
+    bowConfig.value = config;
+    config.targetOption.some((item) => {
+      if (item.id === result.targetType) {
+        targetId.value = item.id;
+        targetSrc.value = item.icon;
+      }
+    });
+    if (result.groups) {
+      data.value = result.groups[0];
+      arrows.value = result.groups[0].list;
+    }
+  }
+});
+
+const bowOptionName = computed(() => {
+  if (bowConfig.value.bowOption && record.value.bowType) {
+    const data = bowConfig.value.bowOption.find(
+      (b) => b.id === record.value.bowType
+    );
+    if (data) return data.name || "";
+  }
+  return "";
+});
+
+const targetTypeName = computed(() => {
+  if (bowConfig.value.targetOption && record.value.targetType) {
+    const data = bowConfig.value.targetOption.find(
+      (b) => b.id === record.value.targetType
+    );
+    if (data) return data.name || "";
+  }
+  return "";
+});
+</script>
+
+<template>
+  <view class="container" :style="{ paddingTop: paddingTop + 'px' }">
+    <image
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
+      class="bg-image"
+      mode="aspectFill"
+      :style="{ height: paddingTop + 60 + 'px' }"
+    />
+    <view class="header">
+      <image
+        :src="record.user.avatar || '../static/user-icon.png'"
+        mode="widthFix"
+        class="avatar"
+      />
+      <view>
+        <text>{{ record.user.name }}</text>
+        <view class="point-book-info">
+          <text v-if="bowOptionName">{{ bowOptionName }}</text>
+          <text>{{ record.distance }} 米</text>
+          <text v-if="targetTypeName">{{ targetTypeName }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="detail-data">
+      <view>
+        <view
+          :style="{ display: 'flex', alignItems: 'center' }"
+          @click="() => openTip(1)"
+        >
+          <text>落点稳定性</text>
+          <image
+            src="../static/s-question-mark.png"
+            mode="widthFix"
+            class="question-mark"
+          />
+        </view>
+        <text>{{ Number((data.stability || 0).toFixed(2)) }}</text>
+      </view>
+      <view>
+        <view>黄心率</view>
+        <text>{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
+      </view>
+      <view>
+        <view>10环数</view>
+        <text>{{ data.tenRings }}</text>
+      </view>
+      <view>
+        <view>平均环数</view>
+        <text>{{ Number((data.averageRing || 0).toFixed(2)) }}</text>
+      </view>
+      <view>
+        <view>总环数</view>
+        <text>{{ data.userTotalRing }}/{{ data.totalRing }}</text>
+      </view>
+    </view>
+    <view class="title-bar">
+      <view />
+      <text>落点分布</text>
+      <!-- <button hover-class="none" @click="() => openTip(2)">
+          <image
+            src="../static/s-question-mark.png"
+            mode="widthFix"
+            class="question-mark"
+          />
+        </button> -->
+    </view>
+    <view :style="{ transform: 'translateY(-45rpx)' }">
+      <BowTargetEdit
+        :id="targetId"
+        :src="targetSrc"
+        :arrows="arrows.filter((item) => item.x && item.y)"
+      />
+    </view>
+    <view :style="{ transform: 'translateY(-60rpx)' }">
+      <!-- <view class="title-bar">
+          <view />
+          <text>环值分布</text>
+        </view> -->
+      <view :style="{ padding: '0 30rpx' }">
+        <RingBarChart :data="ringRates" />
+      </view>
+      <!-- <view class="title-bar" :style="{ marginTop: '30rpx' }">
+          <view />
+          <text>{{
+            selectedIndex === 0 ? "每组环数" : `第${selectedIndex}组环数`
+          }}</text>
+        </view> -->
+      <view class="ring-text-groups">
+        <view v-for="(item, index) in record.groups" :key="index">
+          <view v-if="selectedIndex === 0 && index !== 0">
+            <text>{{ index }}：</text>
+            <text>{{ item.list.reduce((acc, cur) => acc + cur.ring, 0) }}</text>
+            <text>环</text>
+          </view>
+          <view
+            v-if="
+              (selectedIndex === 0 && index !== 0) ||
+              (selectedIndex !== 0 && index === selectedIndex)
+            "
+            :style="{
+              marginLeft: selectedIndex === 0 && index !== 0 ? '20rpx' : '0',
+            }"
+          >
+            <text
+              v-for="(arrow, index2) in item.list"
+              :key="index2"
+              :style="{
+                color:
+                  arrow.ring === 0 || arrow.ring === 10 ? '#FFA118' : '#666',
+              }"
+            >
+              {{
+                arrow.ring === 0 ? "X" : arrow.ring === -1 ? "M" : arrow.ring
+              }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <SButton :onClick="goHome" :rounded="40">开启我的弓箭记录</SButton>
+    </view>
+    <ScreenHint2 :show="showTip || showTip2" :onClose="closeTip">
+      <view class="tip-content">
+        <block v-if="showTip">
+          <text>落点稳定性说明</text>
+          <text
+            >通过计算每支箭与其他箭的平均距离衡量射箭的稳定性，数字越小则说明射箭越稳定。该数据只能在用户标记落点的情况下生成。</text
+          >
+        </block>
+        <block v-if="showTip2">
+          <text>落点分布说明</text>
+          <text>展示用户某次练习中射箭的点位</text>
+        </block>
+      </view>
+    </ScreenHint2>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  background: #f5f5f5;
+  position: relative;
+  overflow: auto;
+}
+.header {
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.header > image {
+  border-radius: 50%;
+  width: 90rpx;
+  height: 90rpx;
+  border: 2rpx solid #000;
+  margin: 0 25rpx;
+}
+.header > view {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.header > view > text {
+  color: #000;
+  margin-bottom: 7rpx;
+}
+.bg-image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+.header {
+  width: 100%;
+  height: 60px;
+}
+.detail-data {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  column-gap: 3vw;
+  margin: 10rpx 30rpx;
+  margin-top: 20rpx;
+}
+.detail-data > view,
+.detail-data > button {
+  border-radius: 10px;
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  padding: 15rpx 24rpx;
+}
+.detail-data > view > view {
+  font-size: 13px;
+  color: #999;
+  margin-bottom: 6rpx;
+}
+.detail-data > view > view > text {
+  word-break: keep-all;
+}
+.detail-data > view > text {
+  font-weight: 500;
+  color: #000;
+}
+.detail-data > button {
+  display: flex;
+  align-items: center;
+  font-size: 26rpx;
+  color: #999999;
+}
+.detail-data > button > image {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 10rpx;
+  margin-left: 20rpx;
+}
+.question-mark {
+  width: 28rpx;
+  height: 28rpx;
+  margin-left: 3px;
+}
+.title-bar {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+  color: #999;
+  position: relative;
+  z-index: 10;
+}
+.title-bar > view:first-child {
+  width: 8rpx;
+  height: 28rpx;
+  border-radius: 10px;
+  background-color: #fed847;
+  margin-right: 7px;
+  margin-left: 15px;
+}
+.title-bar > button {
+  height: 34rpx;
+}
+.tip-content {
+  width: 100%;
+  padding: 50rpx 44rpx;
+  display: flex;
+  flex-direction: column;
+  color: #000;
+}
+.tip-content > text {
+  width: 100%;
+}
+.tip-content > text:first-child {
+  text-align: center;
+}
+.tip-content > text:last-child {
+  font-size: 13px;
+  margin-top: 20px;
+  opacity: 0.8;
+}
+.ring-text-groups {
+  display: flex;
+  flex-direction: column;
+  padding: 20rpx;
+  padding-top: 40rpx;
+  font-size: 24rpx;
+  color: #999999;
+}
+.ring-text-groups > view {
+  display: flex;
+  justify-content: center;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) {
+  margin-top: 10rpx;
+  margin-left: 30rpx;
+  width: 90rpx;
+  text-align: center;
+  justify-content: flex-end;
+  font-size: 20rpx;
+  display: flex;
+  color: #999;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) > text {
+  line-height: 30rpx;
+}
+.ring-text-groups
+  > view
+  > view:first-child:nth-last-child(2)
+  > text:nth-child(2) {
+  font-size: 40rpx;
+  /* min-width: 45rpx; */
+  color: #666;
+  margin-right: 6rpx;
+  margin-top: -5rpx;
+}
+.ring-text-groups > view > view:last-child {
+  width: 80%;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 30rpx;
+  transform: translateX(20rpx);
+}
+.ring-text-groups > view > view:last-child > text {
+  width: 16.6%;
+  text-align: center;
+  margin-bottom: 10rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.notes-input {
+  width: calc(100% - 40rpx);
+  margin: 25rpx 0;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  color: #000;
+  padding: 20rpx;
+}
+.point-book-info {
+  color: #333;
+  display: flex;
+  justify-content: center;
+}
+.point-book-info > text {
+  border-radius: 6px;
+  background-color: #fff;
+  font-size: 10px;
+  padding: 5px 10px;
+  margin-right: 5px;
+}
+</style>

src/pages/point-book-detail.vue

@@ -1,63 +1,165 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, computed } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTargetEdit from "@/components/BowTargetEdit.vue";
 import ScreenHint2 from "@/components/ScreenHint2.vue";
-import SButton from "@/components/SButton.vue";
+import RingBarChart from "@/components/RingBarChart.vue";
 
-import { getPointBookDetailAPI } from "@/apis";
+import { getPointBookDetailAPI, addNoteAPI } from "@/apis";
+import { wxShare } from "@/util";
+import { generateShareImage, generateShareCard } from "@/canvas";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
 
 const selectedIndex = ref(0);
 const showTip = ref(false);
 const showTip2 = ref(false);
-const groups = ref([]);
+const showTip3 = ref(false);
 const data = ref({});
+const targetId = ref(0);
 const targetSrc = ref("");
 const arrows = ref([]);
+const notes = ref("");
+const hasPoint = ref(false);
+const record = ref({
+  groups: [],
+  user: {},
+});
+const shareType = ref(1);
 
 const openTip = (index) => {
   if (index === 1) showTip.value = true;
   else if (index === 2) showTip2.value = true;
+  else if (index === 3) showTip3.value = true;
 };
 
 const closeTip = () => {
   showTip.value = false;
   showTip2.value = false;
+  showTip3.value = false;
+};
+
+const saveNote = async () => {
+  if (record.value.id && notes.value) {
+    if (record.value.remark !== notes.value) {
+      await addNoteAPI(record.value.id, notes.value);
+    }
+    showTip3.value = false;
+  }
 };
 
 const onSelect = (index) => {
   selectedIndex.value = index;
-  data.value = groups.value[index];
+  data.value = record.value.groups[index];
-  arrows.value = groups.value[index].list.filter((item) => item.x && item.y);
+  arrows.value = record.value.groups[index].list.filter(
+    (item) => item.x && item.y
+  );
 };
 
 const goBack = () => {
-  uni.navigateBack();
+  const pages = getCurrentPages();
+  const lastPage = pages[pages.length - 2];
+  uni.navigateBack({
+    delta: lastPage.route === "pages/point-book-edit" ? 2 : 1,
+  });
+};
+
+const ringRates = computed(() => {
+  const rates = new Array(12).fill(0);
+  arrows.value.forEach((item) => {
+    if (item.ring === -1) rates[11] += 1;
+    else rates[item.ring] += 1;
+  });
+  return rates.map((r) => r / arrows.value.length);
+});
+
+const loading = ref(false);
+const shareImage = async () => {
+  if (loading.value) return;
+  loading.value = true;
+  await generateShareImage("shareImageCanvas", record.value);
+  await wxShare("shareImageCanvas");
+  loading.value = false;
 };
 
 onLoad(async (options) => {
   if (options.id) {
-    const result = await getPointBookDetailAPI(options.id);
+    const result = await getPointBookDetailAPI(options.id || 247);
+    record.value = result;
     const config = uni.getStorageSync("point-book-config");
+    const bowType = config.bowOption.find(
+      (item) => item.id === record.value.bowType
+    );
+    const bowtargetType = config.targetOption.find(
+      (item) => item.id === record.value.targetType
+    );
+    uni.setStorageSync("point-book", {
+      bowType,
+      bowtargetType,
+      distance: result.distance,
+      amountGroup: result.groups,
+    });
+    const arrowData =
+      record.value.groups && record.value.groups[0]
+        ? record.value.groups[0]
+        : {};
+    hasPoint.value = (arrowData.list || []).some((arrow) => arrow.x && arrow.y);
+    notes.value = result.remark || "";
     config.targetOption.some((item) => {
       if (item.id === result.targetType) {
+        targetId.value = item.id;
         targetSrc.value = item.icon;
       }
     });
     if (result.groups) {
-      groups.value = result.groups;
       data.value = result.groups[0];
-      arrows.value = result.groups[0].list.filter((item) => item.x && item.y);
+      arrows.value = result.groups[0].list;
     }
   }
 });
+
+onShareAppMessage(async () => {
+  const imageUrl = await generateShareCard(
+    "shareCardCanvas",
+    record.value.recordDate,
+    data.value.userTotalRing,
+    data.value.totalRing
+  );
+  return {
+    title: "射箭打卡，今日又精进了一些～",
+    path: "/pages/point-book-detail-share?id=" + record.value.id,
+    imageUrl,
+  };
+});
+onShareTimeline(async () => {
+  const imageUrl = await generateShareCard(
+    "shareCardCanvas",
+    record.value.recordDate,
+    data.value.userTotalRing,
+    data.value.totalRing
+  );
+  return {
+    title: "射箭打卡，今日又精进了一些～",
+    query: "id=" + record.value.id,
+    imageUrl,
+  };
+});
 </script>
 
 <template>
-  <Container :bgType="2" bgColor="#F5F5F5" :whiteBackArrow="false" title="分析">
+  <Container
+    :bgType="2"
+    bgColor="#F5F5F5"
+    :whiteBackArrow="false"
+    title=""
+    :onBack="goBack"
+  >
     <view class="container">
-      <view class="tab-bar">
+      <!-- <view class="tab-bar">
         <view
           v-for="(_, index) in groups"
           :key="index"
@@ -72,13 +174,19 @@ onLoad(async (options) => {
             }"
             >{{ index === 0 ? "全部" : `第${index}组` }}</text
           >
-          <!-- <image
-            src="../static/s-triangle.png"
-            mode="widthFix"
-            :style="{ bottom: selectedIndex !== index ? '0' : '-5px' }"
-          /> -->
         </view>
-      </view>
+      </view> -->
+      <canvas
+        class="share-canvas"
+        canvas-id="shareCardCanvas"
+        style="width: 375px; height: 300px"
+      ></canvas>
+      <canvas
+        class="share-canvas"
+        id="shareImageCanvas"
+        type="2d"
+        :style="`width: 375px; height: ${hasPoint ? 800 : 440}px`"
+      ></canvas>
       <view class="detail-data">
         <view>
           <view
@@ -110,33 +218,130 @@ onLoad(async (options) => {
           <view>总环数</view>
           <text>{{ data.userTotalRing }}/{{ data.totalRing }}</text>
         </view>
+        <button
+          hover-class="none"
+          @click="() => openTip(3)"
+          v-if="user.id === record.user.id"
+        >
+          <image
+            :src="`../static/${notes ? 'has' : 'add'}-note.png`"
+            mode="widthFix"
+          />
+          <text>{{ notes ? "我的备注" : "添加备注" }}</text>
+        </button>
       </view>
-      <view class="title-bar">
+      <view class="title-bar" v-if="hasPoint">
         <view />
         <text>落点分布</text>
-        <button hover-class="none" @click="() => openTip(2)">
+        <!-- <button hover-class="none" @click="() => openTip(2)">
           <image
             src="../static/s-question-mark.png"
             mode="widthFix"
             class="question-mark"
           />
-        </button>
+        </button> -->
       </view>
-      <BowTargetEdit :src="targetSrc" :arrows="arrows" />
+      <view
-      <view :style="{ marginTop: '20px' }">
+        :style="{ transform: 'translateY(-64rpx) scale(0.9)' }"
-        <SButton :onClick="goBack" :rounded="50">关闭</SButton>
+        v-if="hasPoint"
+      >
+        <BowTargetEdit
+          :id="targetId"
+          :src="targetSrc"
+          :arrows="arrows.filter((item) => item.x && item.y)"
+        />
       </view>
-      <ScreenHint2 :show="showTip || showTip2" :onClose="closeTip">
+      <view :style="{ transform: hasPoint ? 'translateY(-100rpx)' : 'none' }">
+        <!-- <view class="title-bar">
+          <view />
+          <text>环值分布</text>
+        </view> -->
+        <view :style="{ padding: '0 30rpx' }">
+          <RingBarChart :data="ringRates" />
+        </view>
+        <!-- <view class="title-bar" :style="{ marginTop: '30rpx' }">
+          <view />
+          <text>{{
+            selectedIndex === 0 ? "每组环数" : `第${selectedIndex}组环数`
+          }}</text>
+        </view> -->
+        <view class="ring-text-groups">
+          <view v-for="(item, index) in record.groups" :key="index">
+            <view v-if="selectedIndex === 0 && index !== 0">
+              <text>{{ index }}：</text>
+              <text>{{ item.userTotalRing }}</text>
+              <text>环</text>
+            </view>
+            <view
+              v-if="
+                (selectedIndex === 0 && index !== 0) ||
+                (selectedIndex !== 0 && index === selectedIndex)
+              "
+            >
+              <text
+                v-for="(arrow, index2) in item.list"
+                :key="index2"
+                :style="{
+                  color:
+                    arrow.ring === 0 || arrow.ring === 10 ? '#FFA118' : '#666',
+                }"
+              >
+                {{
+                  arrow.ring === 0 ? "X" : arrow.ring === -1 ? "M" : arrow.ring
+                }}
+              </text>
+            </view>
+          </view>
+        </view>
+        <view
+          class="btns"
+          :style="{
+            gridTemplateColumns: `repeat(${
+              user.id === record.user.id ? 2 : 1
+            }, 1fr)`,
+          }"
+        >
+          <button hover-class="none" @click="goBack">关闭</button>
+          <button
+            hover-class="none"
+            @click="shareImage"
+            v-if="user.id === record.user.id"
+          >
+            分享
+          </button>
+        </view>
+      </view>
+      <ScreenHint2 :show="showTip || showTip2 || showTip3" :onClose="closeTip">
         <view class="tip-content">
           <block v-if="showTip">
             <text>落点稳定性说明</text>
             <text
-              >通过计算每支箭与其他箭的平均距离衡一量射击的稳定性，数字越小则说明射击越稳定。该数据只能在用户标记落点的情况下生成。</text
+              >通过计算每支箭与其他箭的平均距离衡量射箭的稳定性，数字越小则说明射箭越稳定。该数据只能在用户标记落点的情况下生成。</text
             >
           </block>
           <block v-if="showTip2">
             <text>落点分布说明</text>
-            <text>展示用户某次练习中射击的点位</text>
+            <text>展示用户某次练习中射箭的点位</text>
+          </block>
+          <block v-if="showTip3">
+            <text>备注</text>
+            <textarea
+              v-model="notes"
+              maxlength="300"
+              rows="3"
+              class="notes-input"
+              placeholder="写下本次射箭的补充信息与心得"
+              placeholder-style="color: #ccc;"
+            />
+            <view>
+              <button
+                hover-class="none"
+                @click="saveNote"
+                :class="notes ? '' : 'button-disabled'"
+              >
+                保存备注
+              </button>
+            </view>
           </block>
         </view>
       </ScreenHint2>
@@ -166,8 +371,7 @@ onLoad(async (options) => {
   border-radius: 10px;
   background-color: #fff;
   width: 24vw;
-  height: 13vw;
+  height: 80rpx;
-  line-height: 13vw;
   text-align: center;
   margin: 5px;
   margin-top: 0;
@@ -176,6 +380,7 @@ onLoad(async (options) => {
   position: relative;
 }
 .tab-bar > view > text {
+  line-height: 80rpx;
   transition: all 0.2s ease;
 }
 .tab-bar > view > image {
@@ -189,25 +394,43 @@ onLoad(async (options) => {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
   column-gap: 3vw;
-  margin: 10px 15px;
+  margin: 10rpx 30rpx;
+  margin-top: 20rpx;
 }
-.detail-data > view {
+.detail-data > view,
+.detail-data > button {
   border-radius: 10px;
   background-color: #fff;
-  margin-bottom: 10px;
+  margin-bottom: 20rpx;
-  padding: 12px;
+  padding: 15rpx 24rpx;
 }
 .detail-data > view > view {
   font-size: 13px;
   color: #999;
-  margin-bottom: 8px;
+  margin-bottom: 6rpx;
+}
+.detail-data > view > view > text {
+  word-break: keep-all;
 }
 .detail-data > view > text {
   font-weight: 500;
+  color: #000;
+}
+.detail-data > button {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 24rpx;
+  color: #333333;
+}
+.detail-data > button > image {
+  width: 44rpx;
+  height: 44rpx;
 }
 .question-mark {
-  width: 15px;
+  width: 28rpx;
-  height: 15px;
+  height: 28rpx;
   margin-left: 3px;
 }
 .title-bar {
@@ -216,23 +439,27 @@ onLoad(async (options) => {
   align-items: center;
   font-size: 13px;
   color: #999;
+  position: relative;
+  z-index: 10;
 }
 .title-bar > view:first-child {
-  width: 5px;
+  width: 8rpx;
-  height: 15px;
+  height: 28rpx;
   border-radius: 10px;
   background-color: #fed847;
   margin-right: 7px;
   margin-left: 15px;
 }
-.title-bar > text {
+.title-bar > button {
-  margin-bottom: 2px;
+  height: 34rpx;
 }
 .tip-content {
   width: 100%;
-  padding: 25px;
+  padding: 50rpx 44rpx;
   display: flex;
   flex-direction: column;
+  color: #000;
+  overflow: hidden;
 }
 .tip-content > text {
   width: 100%;
@@ -245,4 +472,111 @@ onLoad(async (options) => {
   margin-top: 20px;
   opacity: 0.8;
 }
+.tip-content > view {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.tip-content > view > input {
+  width: 80%;
+  height: 44px;
+  border-radius: 22px;
+  border: 1px solid #eeeeee;
+  padding: 0 12px;
+  font-size: 14px;
+  color: #000;
+}
+.tip-content > view > button {
+  width: 48%;
+  border-radius: 44rpx;
+  padding: 12px 0;
+  font-size: 14px;
+  color: #000;
+  background: #fed847;
+}
+.button-disabled {
+  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%) !important;
+  color: #ccc !important;
+}
+.ring-text-groups {
+  display: flex;
+  flex-direction: column;
+  padding: 20rpx;
+  padding-top: 50rpx;
+  font-size: 24rpx;
+  color: #999999;
+}
+.ring-text-groups > view {
+  display: flex;
+  justify-content: center;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) {
+  margin-top: 10rpx;
+  width: 115rpx;
+  text-align: center;
+  justify-content: flex-start;
+  font-size: 20rpx;
+  display: flex;
+  color: #999;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) > text {
+  line-height: 30rpx;
+}
+.ring-text-groups
+  > view
+  > view:first-child:nth-last-child(2)
+  > text:nth-child(2) {
+  font-size: 28rpx;
+  color: #666;
+  margin-right: 6rpx;
+  margin-top: -5rpx;
+  font-weight: 500;
+}
+.ring-text-groups > view > view:last-child {
+  width: 80%;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 30rpx;
+}
+.ring-text-groups > view > view:last-child > text {
+  width: 16.6%;
+  text-align: center;
+  margin-bottom: 10rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+}
+.notes-input {
+  width: calc(100% - 40rpx);
+  min-width: calc(100% - 40rpx);
+  margin: 25rpx 0;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  padding: 5px;
+  color: #000;
+  padding: 20rpx;
+}
+.btns {
+  margin-bottom: 40rpx;
+  display: grid;
+  align-items: center;
+  justify-content: center;
+  column-gap: 20rpx;
+  padding: 0 20rpx;
+}
+.btns > button {
+  height: 84rpx;
+  line-height: 84rpx;
+  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%), #ffffff;
+  border-radius: 44rpx;
+  border: 2rpx solid #eeeeee;
+  box-sizing: border-box;
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #000000;
+}
+.btns > button:nth-child(2) {
+  background: #fed847;
+  border: none;
+}
 </style>

src/pages/point-book-edit.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { ref, onMounted } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ScreenHint2 from "@/components/ScreenHint2.vue";
 import SButton from "@/components/SButton.vue";
@@ -44,7 +45,7 @@ const onSubmit = async () => {
     currentGroup.value++;
     currentArrow.value = 0;
   } else {
-    const pointBook = uni.getStorageSync("point-book");
+    const pointBook = uni.getStorageSync("last-point-book");
     const res = await savePointBookAPI(
       pointBook.bowType.id,
       pointBook.distance,
@@ -54,6 +55,7 @@ const onSubmit = async () => {
       Object.values(arrowGroups.value)
     );
     if (res.record_id) {
+      uni.removeStorageSync("last-point-record");
       uni.redirectTo({
         url: `/pages/point-book-detail?id=${res.record_id}`,
       });
@@ -64,18 +66,36 @@ const onClickRing = (ring) => {
   if (arrowGroups.value[currentGroup.value]) {
     arrowGroups.value[currentGroup.value][currentArrow.value] = { ring };
     if (currentArrow.value < amount.value - 1) currentArrow.value++;
+    uni.setStorageSync("last-point-record", arrowGroups.value);
   }
 };
 const deleteArrow = () => {
-  arrowGroups.value[currentGroup.value][currentArrow.value] = {};
+  const arrow = arrowGroups.value[currentGroup.value][currentArrow.value];
+  if (JSON.stringify(arrow) === "{}") {
+    currentArrow.value -= 1;
+  } else {
+    arrowGroups.value[currentGroup.value][currentArrow.value] = {};
+  }
+  uni.$emit("set-edit-arrow", null);
+  uni.setStorageSync("last-point-record", arrowGroups.value);
 };
 const onEditDone = (arrow) => {
   arrowGroups.value[currentGroup.value][currentArrow.value] = arrow;
   if (currentArrow.value < amount.value - 1) currentArrow.value++;
+  uni.setStorageSync("last-point-record", arrowGroups.value);
+};
+const onSelectArrow = (index) => {
+  currentArrow.value = index;
+  const arrow = arrowGroups.value[currentGroup.value][currentArrow.value];
+  if (arrow && arrow.x && arrow.y) {
+    uni.$emit("set-edit-arrow", index);
+  } else {
+    uni.$emit("set-edit-arrow", null);
+  }
 };
 
-onMounted(() => {
+onLoad((options) => {
-  const pointBook = uni.getStorageSync("point-book");
+  const pointBook = uni.getStorageSync("last-point-book");
   if (pointBook.bowtargetType) {
     bowtarget.value = pointBook.bowtargetType;
     if (bowtarget.value.id > 3) {
@@ -92,16 +112,27 @@ onMounted(() => {
       arrowGroups.value[i] = new Array(amount.value).fill({});
     }
   }
+  if (options.withDraft) {
+    const draft = uni.getStorageSync("last-point-record");
+    if (draft) {
+      Object.values(draft).some((arrows, index1) =>
+        arrows.some((arrow, index2) => {
+          currentArrow.value = index2;
+          currentGroup.value = index1 + 1;
+          return JSON.stringify(arrow) === "{}";
+        })
+      );
+      arrowGroups.value = draft;
+    }
+  }
+  // uni.enableAlertBeforeUnload({
+  //   message: "现在离开会导致未提交的数据丢失，是否继续？",
+  // });
 });
 </script>
 
 <template>
-  <Container
+  <Container :bgType="2" bgColor="#F5F5F5" :whiteBackArrow="false">
-    :bgType="2"
-    bgColor="#F5F5F5"
-    :whiteBackArrow="false"
-    :onBack="() => (showTip = true)"
-  >
     <view class="container">
       <BowTargetEdit
         :onChange="onEditDone"
@@ -124,7 +155,7 @@ onMounted(() => {
           v-if="arrowGroups[currentGroup]"
           v-for="(arrow, index) in arrowGroups[currentGroup]"
           :key="index"
-          @click="currentArrow = index"
+          @click="onSelectArrow(index)"
           :style="{
             borderColor: currentArrow === index ? '#FED847' : '#eeeeee',
             borderWidth: currentArrow === index ? '2px' : '1px',
@@ -135,8 +166,8 @@ onMounted(() => {
               : arrow.ring
               ? arrow.ring + " 环"
               : ""
-          }}</view
+          }}
-        >
+        </view>
       </view>
       <text>推荐在靶纸上落点计分，这样可获得稳定性分析</text>
       <view class="bow-rings">
@@ -166,11 +197,11 @@ onMounted(() => {
         </view>
       </ScreenHint2>
     </view>
-    <view :style="{ marginBottom: '20px' }">
+    <template #bottom>
       <SButton :rounded="50" :onClick="onSubmit">
-        {{ currentGroup === groups ? "记完了，提交看分析" : "下一组" }}
+        {{ currentGroup === groups ? "保存并查看分析" : "下一组" }}
       </SButton>
-    </view>
+    </template>
   </Container>
 </template>
 
@@ -218,6 +249,7 @@ onMounted(() => {
   padding: 25px;
   display: flex;
   flex-direction: column;
+  color: #000;
 }
 .tip-content > text {
   width: 100%;
@@ -237,6 +269,7 @@ onMounted(() => {
   border: 1px solid #eeeeee;
   padding: 12px 0;
   font-size: 14px;
+  color: #000;
 }
 .tip-content > view > button:last-child {
   background: #fed847;

src/pages/point-book-list.vue

@@ -1,18 +1,23 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import SModal from "@/components/SModal.vue";
 import EditOption from "@/components/EditOption.vue";
 import PointRecord from "@/components/PointRecord.vue";
 import ScrollList from "@/components/ScrollList.vue";
-import { getPointBookListAPI } from "@/apis";
+import ScreenHint2 from "@/components/ScreenHint2.vue";
+import { getPointBookListAPI, removePointRecord } from "@/apis";
 
+const showTip = ref(false);
 const bowType = ref({});
 const distance = ref(0);
 const bowtargetType = ref({});
 const showModal = ref(false);
 const selectorIndex = ref(0);
 const list = ref([]);
+const removeId = ref("");
+const pointDraft = ref(null);
 
 const onListLoading = async (page) => {
   const result = await getPointBookListAPI(
@@ -34,6 +39,22 @@ const openSelector = (index) => {
   showModal.value = true;
 };
 
+const onRemoveRecord = (item) => {
+  removeId.value = item.id;
+  showTip.value = true;
+};
+
+const confirmRemove = async () => {
+  try {
+    showTip.value = false;
+    await removePointRecord(removeId.value);
+    list.value = list.value.filter((it) => it.id !== removeId.value);
+    uni.showToast({ title: "已删除", icon: "none" });
+  } catch (e) {
+    uni.showToast({ title: "删除失败，请重试", icon: "none" });
+  }
+};
+
 const onSelectOption = (itemIndex, value) => {
   if (itemIndex === 0) {
     bowType.value = value.name === bowType.value.name ? {} : value;
@@ -45,11 +66,22 @@ const onSelectOption = (itemIndex, value) => {
   showModal.value = false;
   onListLoading(1);
 };
-const toDetailPage = (id) => {
+
+const onRemoveDraft = () => {
+  pointDraft.value = null;
+  uni.removeStorageSync("last-point-record");
+};
+
+const toEditPage = () => {
   uni.navigateTo({
-    url: `/pages/point-book-detail?id=${id}`,
+    url: "/pages/point-book-edit?withDraft=true",
   });
 };
+
+onShow(() => {
+  const draft = uni.getStorageSync("last-point-record");
+  pointDraft.value = draft ? uni.getStorageSync("last-point-book") : null;
+});
 </script>
 
 <template>
@@ -82,19 +114,60 @@ const toDetailPage = (id) => {
       </view>
       <view class="point-records">
         <ScrollList :onLoading="onListLoading">
-          <view
+          <uni-swipe-action>
-            v-for="(item, index) in list"
+            <block v-if="pointDraft">
-            :key="index"
+              <uni-swipe-action-item>
-            @click="() => toDetailPage(item.id)"
+                <template v-slot:right>
-          >
+                  <view class="swipe-right" @click="onRemoveDraft">
-            <PointRecord :data="item" />
+                    <image
-          </view>
+                      class="swipe-icon"
+                      src="../static/delete-white.png"
+                      mode="widthFix"
+                    />
+                  </view>
+                </template>
+                <view class="point-draft" v-if="pointDraft" @click="toEditPage">
+                  <text>{{ pointDraft.bowType.name }}</text>
+                  <text>{{ pointDraft.distance }}米</text>
+                  <text>{{ pointDraft.bowtargetType.name }}</text>
+                  <view>
+                    <image src="../static/draft-icon.png" mode="widthFix" />
+                    <text>本地草稿</text>
+                    <view>
+                      <text>计分待完成</text>
+                      <image src="../static/back.png" mode="widthFix" />
+                    </view>
+                  </view>
+                </view>
+              </uni-swipe-action-item>
+              <view :style="{ height: '25rpx' }" />
+            </block>
+            <block v-for="(item, index) in list" :key="item.id">
+              <uni-swipe-action-item>
+                <template v-slot:right>
+                  <view class="swipe-right" @click="onRemoveRecord(item)">
+                    <image
+                      class="swipe-icon"
+                      src="../static/delete-white.png"
+                      mode="widthFix"
+                    />
+                  </view>
+                </template>
+                <PointRecord :data="item" />
+              </uni-swipe-action-item>
+              <view
+                v-if="index < list.length - 1"
+                :style="{ height: '25rpx' }"
+              />
+            </block>
+          </uni-swipe-action>
           <view class="no-data" v-if="list.length === 0">暂无数据</view>
         </ScrollList>
       </view>
       <SModal
         :show="showModal"
         :noBg="true"
+        height="auto"
         :onClose="() => (showModal = false)"
       >
         <view class="selector">
@@ -127,6 +200,15 @@ const toDetailPage = (id) => {
           />
         </view>
       </SModal>
+      <ScreenHint2 :show="showTip">
+        <view class="tip-content">
+          <text>确认删除该记录吗?</text>
+          <view>
+            <button hover-class="none" @click="showTip = false">取消</button>
+            <button hover-class="none" @click="confirmRemove">确认</button>
+          </view>
+        </view>
+      </ScreenHint2>
     </view>
   </Container>
 </template>
@@ -194,4 +276,97 @@ const toDetailPage = (id) => {
   color: #999999;
   font-size: 14px;
 }
+.tip-content {
+  width: 100%;
+  padding: 25px;
+  display: flex;
+  flex-direction: column;
+  color: #000;
+}
+.tip-content > text {
+  width: 100%;
+  text-align: center;
+  font-size: 14px;
+  margin-top: 5px;
+}
+.tip-content > view {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+}
+.tip-content > view > button {
+  width: 48%;
+  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%);
+  border-radius: 22px;
+  border: 1px solid #eeeeee;
+  padding: 12px 0;
+  font-size: 14px;
+  color: #000;
+}
+.tip-content > view > button:last-child {
+  background: #fed847;
+}
+/* 右侧滑动按钮（自定义宽度与图标） */
+.swipe-right {
+  width: 120rpx; /* 这里可按需调整按钮宽度 */
+  height: 100%;
+  background-color: #ff7c7c;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.swipe-icon {
+  width: 44rpx;
+  height: 44rpx;
+}
+.point-draft {
+  height: 200rpx;
+  border-radius: 25rpx;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+}
+.point-draft > text {
+  font-weight: 500;
+  font-size: 40rpx;
+  color: #333333;
+  margin: 0 20rpx;
+}
+.point-draft > view:last-child {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: #000000b3;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.point-draft > view:last-child > image {
+  width: 46rpx;
+  height: 38rpx;
+  margin-bottom: 10rpx;
+}
+.point-draft > view:last-child > text {
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #ffffff;
+}
+.point-draft > view:last-child > view {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 22rpx;
+  color: #ffffff;
+  transform: translateX(8rpx);
+}
+.point-draft > view:last-child > view > image {
+  width: 30rpx;
+  height: 30rpx;
+  transform: rotate(180deg);
+}
 </style>

src/pages/point-book-rank.vue

@@ -0,0 +1,152 @@
+<script setup>
+import { ref, onMounted } from "vue";
+import Container from "@/components/Container.vue";
+import PointRankItem from "@/components/PointRankItem.vue";
+import { getPointBookRankListAPI } from "@/apis";
+import { capsuleHeight } from "@/util";
+import { wxShare, debounce } from "@/util";
+import { sharePointData } from "@/canvas";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const { user } = storeToRefs(useStore());
+
+const list = ref([]);
+const mine = ref({
+  averageRing: 0,
+});
+
+const shareImage = async () => {
+  if (!mine.value.id) return;
+  await sharePointData("shareCanvas", mine.value);
+  await wxShare("shareCanvas");
+};
+
+onMounted(async () => {
+  const result = await getPointBookRankListAPI();
+  mine.value = result.my;
+  list.value = result.list;
+});
+</script>
+
+<template>
+  <Container :bgType="5" bgColor="#F5F5F5" :whiteBackArrow="false">
+    <view class="top-part">
+      <view>
+        <image src="../static/point-champion.png" mode="widthFix" />
+        <image
+          :src="list[0] && list[0].avatar ? list[0].avatar : ''"
+          mode="widthFix"
+        />
+      </view>
+      <block v-if="list[0]">
+        <text>{{ list[0].name }}占领了封面</text>
+        <text>整整消耗了{{ Math.round(list[0].weekArrow * 1.6) }}大卡!</text>
+      </block>
+    </view>
+    <view class="rank-title-bar">
+      <text>排行</text>
+      <text>用户</text>
+      <text>本周箭数</text>
+      <text>消耗</text>
+    </view>
+    <view
+      class="data-list"
+      :style="{ marginBottom: '20rpx' }"
+      v-if="user.id && mine"
+    >
+      <PointRankItem :data="mine" :borderWidth="0" />
+    </view>
+    <view class="data-list">
+      <PointRankItem v-for="item in list" :key="item.id" :data="item" />
+    </view>
+    <view :style="{ height: '30rpx' }"></view>
+    <button
+      hover-class="none"
+      class="share-btn"
+      @click="shareImage"
+      v-if="user.id"
+    >
+      <image src="../static/share-icon.png" mode="widthFix" />
+    </button>
+    <canvas
+      class="share-canvas"
+      id="shareCanvas"
+      type="2d"
+      style="width: 375px; height: 460px"
+    ></canvas>
+  </Container>
+</template>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+}
+.top-part {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  font-size: 26rpx;
+  color: #333333;
+  height: 450rpx;
+}
+.top-part > view:first-child {
+  width: 310rpx;
+  height: 310rpx;
+  position: relative;
+}
+.top-part > view:first-child > image:first-child {
+  width: 100%;
+}
+.top-part > view:first-child > image:nth-child(2) {
+  position: absolute;
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 50%;
+  top: calc(50% - 70rpx);
+  left: calc(50% - 70rpx);
+}
+.top-part > text {
+  margin-bottom: 15rpx;
+}
+.rank-title-bar {
+  font-size: 24rpx;
+  color: #777777;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  width: calc(100% - 80rpx);
+  line-height: 80rpx;
+  padding: 0 40rpx;
+}
+.rank-title-bar > text:nth-child(1) {
+  width: 60rpx;
+}
+.rank-title-bar > text:nth-child(2) {
+  flex: 1;
+}
+.rank-title-bar > text:nth-child(3) {
+  width: 18%;
+}
+.rank-title-bar > text:nth-child(4) {
+  width: 24%;
+}
+.data-list {
+  background: $uni-white;
+  border-radius: 25rpx;
+  margin: 0 25rpx;
+}
+.share-btn {
+  position: fixed;
+  right: 25rpx;
+  bottom: 25rpx;
+}
+.share-btn > image {
+  width: 116rpx;
+  height: 116rpx;
+}
+</style>

src/pages/point-book.vue

@@ -0,0 +1,679 @@
+<script setup>
+import { ref, computed, onMounted, onBeforeUnmount, watch } from "vue";
+import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import PointRecord from "@/components/PointRecord.vue";
+import RingBarChart from "@/components/RingBarChart.vue";
+import Signin from "@/components/Signin.vue";
+import ScreenHint2 from "@/components/ScreenHint2.vue";
+import RewardUs from "@/components/RewardUs.vue";
+import PointRankItem from "@/components/PointRankItem.vue";
+
+import {
+  getHomeData,
+  getPointBookConfigAPI,
+  getPointBookRankListAPI,
+  getPointBookStatisticsAPI,
+} from "@/apis";
+
+import { getElementRect } from "@/util";
+
+import { generateKDEHeatmapImage } from "@/kde-heatmap";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { updateUser } = store;
+const { user } = storeToRefs(store);
+
+const isIOS = uni.getDeviceInfo().osName === "ios";
+
+const loadImage = ref(false);
+const showModal = ref(false);
+const showTip = ref(false);
+const showTip2 = ref(false);
+const data = ref({
+  weeksCheckIn: [],
+});
+
+const list = ref([]);
+const bowTargetSrc = ref("");
+const heatMapImageSrc = ref(""); // 存储热力图图片地址
+const canvasVisible = ref(false); // 控制canvas显示状态
+const strength = ref(0);
+
+const toRecordPage = () => {
+  if (user.value.id) {
+    uni.navigateTo({
+      url: "/pages/point-book-list",
+    });
+  } else {
+    showModal.value = true;
+  }
+};
+
+const toRankPage = () => {
+  uni.navigateTo({
+    url: "/pages/point-book-rank",
+  });
+};
+
+const onSignin = () => {
+  showModal.value = true;
+};
+
+const startScoring = () => {
+  if (user.value.id) {
+    const draft = uni.getStorageSync("last-point-record");
+    if (draft) {
+      showTip2.value = true;
+      return;
+    }
+    toScorePage();
+  } else {
+    showModal.value = true;
+  }
+};
+
+const toScorePage = (withDraft) => {
+  showTip2.value = false;
+  if (withDraft) {
+    return uni.navigateTo({
+      url: "/pages/point-book-edit?withDraft=true",
+    });
+  }
+  uni.removeStorageSync("last-point-record");
+  return uni.navigateTo({
+    url: "/pages/point-book-create",
+  });
+};
+
+const closeHint = () => {
+  showTip.value = false;
+  showTip2.value = false;
+};
+
+const loadData = async () => {
+  const result2 = await getPointBookStatisticsAPI();
+  data.value = result2;
+  strength.value = Math.min(10, (5 / 60) * result2.todayTotalArrow);
+
+  const rect = await getElementRect(".heat-map");
+  let hot = 0;
+  if (result2.checkInCount > -3 && result2.checkInCount < 3) hot = 1;
+  else if (result2.checkInCount >= 3) hot = 2;
+  else if (result2.checkInCount >= 5) hot = 3;
+  else if (result2.checkInCount === 7) hot = 4;
+  uni.$emit("update-hot", hot);
+  loadImage.value = true;
+  const generateHeatmapAsync = async () => {
+    const weekArrows = result2.weekArrows
+      .filter((item) => item.x && item.y)
+      .map((item) => [item.x, item.y]);
+
+    try {
+      // 渐进式渲染：数据量大时先快速渲染粗略版本
+      if (weekArrows.length > 1000) {
+        const quickPath = await generateKDEHeatmapImage(
+          "heatMapCanvas",
+          rect.width,
+          rect.height,
+          weekArrows
+        );
+        heatMapImageSrc.value = quickPath;
+        // 延迟后再渲染精细版本
+        await new Promise((resolve) => setTimeout(resolve, 500));
+      }
+
+      // 渲染最终精细版本
+      const finalPath = await generateKDEHeatmapImage(
+        "heatMapCanvas",
+        rect.width,
+        rect.height,
+        weekArrows,
+        {
+          range: [0, 1],
+          gridSize: 120, // 更高的网格密度，减少锯齿
+          bandwidth: 0.15, // 稍小的带宽，让热力图更细腻
+          showPoints: false,
+        }
+      );
+      heatMapImageSrc.value = finalPath;
+      loadImage.value = false;
+      console.log("热力图图片地址:", finalPath);
+    } catch (error) {
+      console.error("生成热力图图片失败:", error);
+      loadImage.value = false;
+    }
+  };
+
+  // 异步生成热力图，不阻塞UI
+  generateHeatmapAsync();
+};
+
+const strengthText = computed(() => {
+  return strength.value > 6 ? "重度" : strength.value >= 4 ? "中度" : "轻度";
+});
+
+watch(
+  () => user.value.id,
+  (id) => {
+    if (id) loadData();
+  }
+);
+
+onShow(async () => {
+  uni.removeStorageSync("point-book");
+  if (user.value.id) loadData();
+  const result = await getPointBookRankListAPI(1);
+  list.value = result.list.slice(0, 3);
+  if (user.value.id && list.value.every((item) => item.id !== user.value.id)) {
+    list.value = [result.my, ...result.list.slice(0, 3)];
+  }
+});
+
+onMounted(async () => {
+  uni.$on("point-book-signin", onSignin);
+  const token = uni.getStorageSync(
+    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+  );
+  if (!user.value.id && token) {
+    const data = await getHomeData();
+    if (data.user) updateUser(data.user);
+  }
+  const config = await getPointBookConfigAPI();
+  uni.setStorageSync("point-book-config", config);
+  if (config.targetOption && config.targetOption[0]) {
+    bowTargetSrc.value = config.targetOption[0].icon;
+  }
+});
+
+onBeforeUnmount(() => {
+  uni.$off("point-book-signin", onSignin);
+});
+
+onShareAppMessage(() => {
+  return {
+    title: "高效记录每一次射箭，深度分析助你提升！",
+    path: "pages/point-book",
+    imageUrl:
+      "https://static.shelingxingqiu.com/attachment/2025-09-22/dcz4m4nbgycqqwknrv.png",
+  };
+});
+onShareTimeline(() => {
+  return {
+    title: "高效记录每一次射箭，深度分析助你提升！",
+    query: "from=timeline",
+    imageUrl:
+      "https://static.shelingxingqiu.com/attachment/2025-09-22/dcz4m4nbgycqqwknrv.png",
+  };
+});
+</script>
+
+<template>
+  <Container :bgType="4" bgColor="#F5F5F5" :whiteBackArrow="false" title="">
+    <view class="container">
+      <view class="daily-signin">
+        <view>
+          <image src="../static/week-check.png" />
+        </view>
+        <view :class="data.weeksCheckIn[0] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[0]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周一</text>
+        </view>
+        <view :class="data.weeksCheckIn[1] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[1]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周二</text>
+        </view>
+        <view :class="data.weeksCheckIn[2] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[2]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周三</text>
+        </view>
+        <view :class="data.weeksCheckIn[3] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[3]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周四</text>
+        </view>
+        <view :class="data.weeksCheckIn[4] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[4]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周五</text>
+        </view>
+        <view :class="data.weeksCheckIn[5] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[5]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周六</text>
+        </view>
+        <view :class="data.weeksCheckIn[6] ? 'checked' : ''">
+          <image
+            v-if="data.weeksCheckIn[6]"
+            src="../static/checked-green2.png"
+            mode="widthFix"
+          />
+          <view v-else></view>
+          <text>周日</text>
+        </view>
+      </view>
+      <view class="statistics">
+        <view>
+          <view class="statistics-item">
+            <text>{{ data.todayTotalArrow || "-" }}</text>
+            <text>箭</text>
+            <text>今日射箭</text>
+          </view>
+          <view class="statistics-item" :style="{ padding: '20rpx 0' }">
+            <text>{{ Math.round(data.todayTotalArrow * 1.6) || "-" }}</text>
+            <text>卡</text>
+            <text>今日消耗</text>
+          </view>
+          <view class="statistics-item">
+            <text>{{ strength || "-" }}</text>
+            <text v-show="strength" class="strength">{{ strengthText }}</text>
+            <text>运动强度</text>
+          </view>
+        </view>
+        <view>
+          <view :style="{ paddingBottom: '20rpx' }">
+            <view class="statistics-item">
+              <text>{{ data.totalDay || "-" }}</text>
+              <text>天</text>
+              <text>训练天数</text>
+            </view>
+            <view class="statistics-item">
+              <text>{{ data.totalArrow || "-" }}</text>
+              <text>箭</text>
+              <text>累计射箭</text>
+            </view>
+          </view>
+          <view :style="{ marginTop: '20rpx' }">
+            <view class="statistics-item">
+              <text>{{
+                data.yellowRate !== undefined
+                  ? Number((data.yellowRate * 100).toFixed(2))
+                  : "-"
+              }}</text>
+              <text>%</text>
+              <text>黄心率</text>
+            </view>
+            <view class="statistics-item">
+              <text>{{ data.averageRing || "-" }}</text>
+              <text>环</text>
+              <text>平均环数</text>
+            </view>
+          </view>
+          <view>
+            <button hover-class="none" @click="toRecordPage" class="image-btn">
+              <image src="../static/record-btn.png" mode="widthFix" />
+            </button>
+            <button hover-class="none" @click="startScoring" class="image-btn">
+              <image src="../static/start-scoring.png" mode="widthFix" />
+            </button>
+          </view>
+        </view>
+      </view>
+      <view class="title" :style="{ marginBottom: 0 }">
+        <image src="../static/point-book-title1.png" mode="widthFix" />
+      </view>
+      <image
+        src="https://static.shelingxingqiu.com/attachment/2025-12-31/dfc9dxrpyf4exh4rhd.png"
+        mode="widthFix"
+        class="bowtarget-theme"
+      />
+      <view class="heat-map">
+        <image
+          :src="bowTargetSrc || '../static/bow-target.png'"
+          mode="widthFix"
+        />
+        <image
+          v-if="heatMapImageSrc"
+          :src="heatMapImageSrc"
+          mode="aspectFill"
+        />
+        <view v-if="loadImage" class="load-image">
+          <text>生成中...</text>
+        </view>
+        <canvas
+          id="heatMapCanvas"
+          type="2d"
+          style="
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: -1000px;
+            left: 0;
+            z-index: 2;
+          "
+        />
+      </view>
+      <view class="reward" v-if="data.totalArrow">
+        <button hover-class="none" @click="showTip = true">
+          <image src="../static/reward-us.png" mode="widthFix" />
+        </button>
+      </view>
+      <RingBarChart :data="data.ringRate" v-if="user.id" />
+      <view class="title" v-if="user.id">
+        <image src="../static/point-book-title2.png" mode="widthFix" />
+      </view>
+      <view class="top-list">
+        <view class="rank-title-bar">
+          <text>排行</text>
+          <text>用户</text>
+          <text>本周箭数</text>
+          <text>消耗</text>
+        </view>
+        <PointRankItem v-for="item in list" :key="item.id" :data="item" />
+      </view>
+      <view
+        class="see-more"
+        @click="toRankPage"
+        v-if="list.length"
+        :style="{ marginBottom: isIOS ? '10rpx' : 0 }"
+      >
+        <text>查看完整榜单</text>
+        <image src="../static/enter-arrow-blue.png" mode="widthFix" />
+      </view>
+    </view>
+    <Signin
+      :show="showModal"
+      :onClose="() => (showModal = false)"
+      :noBg="true"
+    />
+    <ScreenHint2 :show="showTip || showTip2" :onClose="closeHint">
+      <RewardUs
+        v-if="showTip"
+        :show="showTip"
+        :onClose="() => (showTip = false)"
+      />
+      <view class="tip-content" v-if="showTip2">
+        <text>发现未完成的记分，是否继续编辑？</text>
+        <view>
+          <button hover-class="none" @click="toScorePage(false)">
+            重新计分
+          </button>
+          <button hover-class="none" @click="toScorePage(true)">
+            继续编辑
+          </button>
+        </view>
+      </view>
+    </ScreenHint2>
+  </Container>
+</template>
+
+<style scoped lang="scss">
+.container {
+  width: calc(100% - 50rpx);
+  padding: 25rpx;
+}
+.statistics {
+  border-radius: 25rpx;
+  border-bottom-left-radius: 50rpx;
+  border-bottom-right-radius: 50rpx;
+  border: 4rpx solid #fed848;
+  background: #fff;
+  font-size: 22rpx;
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx;
+  padding-left: 20rpx;
+}
+.statistics > view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.statistics > view:first-child {
+  align-items: center;
+  justify-content: center;
+  border-right: $uni-border;
+}
+.statistics > view:first-child > view {
+  width: 210rpx;
+}
+.statistics > view:last-child {
+  flex: 1;
+}
+.statistics > view:last-child > view {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: calc(100% - 20rpx);
+  padding-left: 20rpx;
+}
+.statistics > view:last-child > view:first-child {
+  border-bottom: $uni-border;
+}
+.statistics-item {
+  width: 180rpx;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  color: $uni-text-color;
+  font-size: 24rpx;
+}
+.statistics-item > text:first-child {
+  font-weight: 500;
+  font-size: 40rpx;
+  margin-right: 10rpx;
+}
+.statistics-item > text:nth-child(2) {
+  transform: translateY(16rpx);
+}
+.statistics-item > text:nth-child(3) {
+  width: 100%;
+  text-align: center;
+}
+.image-btn {
+  width: 170rpx;
+  height: 74rpx;
+  display: flex;
+  align-items: center;
+  overflow: unset;
+  margin-top: 30rpx;
+}
+.image-btn > image {
+  width: 100%;
+  height: 100%;
+}
+.daily-signin {
+  display: grid;
+  grid-template-columns: repeat(8, 1fr);
+  gap: 10rpx;
+  border-radius: 20rpx;
+  margin-bottom: 25rpx;
+}
+.daily-signin > view {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+  box-sizing: border-box;
+}
+.daily-signin > view:not(:first-child) {
+  background: #f8f8f8;
+  box-sizing: border-box;
+  width: 78rpx;
+  height: 94rpx;
+  padding-top: 10rpx;
+}
+.daily-signin > view:not(:first-child) > image {
+  width: 32rpx;
+  height: 32rpx;
+}
+.daily-signin > view:not(:first-child) > view {
+  width: 32rpx;
+  height: 32rpx;
+  border-radius: 50%;
+  box-sizing: border-box;
+  border: 2rpx solid #333;
+}
+.daily-signin > view > text {
+  font-size: 20rpx;
+  color: #999999;
+  font-weight: 500;
+  text-align: center;
+  margin-top: 10rpx;
+}
+.daily-signin > view:first-child > image {
+  width: 72rpx;
+  height: 94rpx;
+}
+.checked {
+  border: 2rpx solid #000;
+}
+.checked > text {
+  color: #333 !important;
+}
+.title {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin: 25rpx 0;
+}
+.title > image {
+  width: 566rpx;
+}
+.heat-map {
+  position: relative;
+  margin: 0 auto;
+  width: calc(100vw - 70rpx);
+  height: calc(100vw - 70rpx);
+  transform: scale(0.9);
+  border-radius: 50%;
+  overflow: hidden;
+}
+.heat-map > image {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.load-image {
+  position: absolute;
+  width: 160rpx;
+  top: calc(50% - 65rpx);
+  left: calc(50% - 75rpx);
+  color: #525252;
+  font-size: 20rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.reward {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -120rpx;
+  position: relative;
+  z-index: 10;
+}
+.reward > button {
+  width: 100rpx;
+}
+.reward > button > image {
+  width: 100%;
+  height: 100%;
+}
+.tip-content {
+  width: 100%;
+  padding: 25px;
+  display: flex;
+  flex-direction: column;
+  color: #000;
+}
+.tip-content > text {
+  width: 100%;
+  text-align: center;
+  font-size: 14px;
+  margin-top: 5px;
+}
+.tip-content > view {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+}
+.tip-content > view > button {
+  width: 48%;
+  background: linear-gradient(180deg, #fbfbfb 0%, #f5f5f5 100%);
+  border-radius: 22px;
+  border: 1px solid #eeeeee;
+  padding: 12px 0;
+  font-size: 14px;
+  color: #000;
+}
+.tip-content > view > button:last-child {
+  background: #fed847;
+}
+.bowtarget-theme {
+  width: 100vw;
+  margin-left: -25rpx;
+  margin-bottom: -30vw;
+}
+.top-list {
+  background: $uni-white;
+  border-radius: 25rpx;
+  border: 2rpx solid #fed848;
+  overflow: hidden;
+}
+.rank-title-bar {
+  background: $uni-white;
+  font-size: 24rpx;
+  color: #777777;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  width: calc(100% - 40rpx);
+  line-height: 80rpx;
+  padding: 0 20rpx;
+}
+.rank-title-bar > text:nth-child(1) {
+  width: 55rpx;
+}
+.rank-title-bar > text:nth-child(2) {
+  flex: 1;
+}
+.rank-title-bar > text:nth-child(3) {
+  width: 16%;
+}
+.rank-title-bar > text:nth-child(4) {
+  width: 25%;
+}
+.strength {
+  font-size: 22rpx;
+  color: #777777;
+  border-radius: 8rpx;
+  border: 1rpx solid #777777;
+  height: 20rpx;
+  padding: 8rpx;
+  line-height: 20rpx;
+  transform: translateY(10rpx) !important;
+}
+</style>

src/pages/practise-one.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -10,107 +11,118 @@ import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
-import { createPractiseAPI } from "@/apis";
+import audioManager from "@/audioManager";
-import { generateCanvasImage } from "@/util";
+
-import { MESSAGETYPES, roundsName } from "@/constants";
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
+import { sharePractiseData } from "@/canvas";
+import { wxShare, debounce } from "@/util";
+import { MESSAGETYPESV2, roundsName } from "@/constants";
+
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+
 const start = ref(false);
 const scores = ref([]);
 const total = 12;
-const currentRound = ref(0);
 const practiseResult = ref({});
-const power = ref(0);
 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);
+  await startPractiseAPI();
-  if (result) practiseId.value = result.id;
-  currentRound.value = 0;
   scores.value = [];
   start.value = true;
-  setTimeout(() => {
+  audioManager.play("练习开始");
-    uni.$emit("play-sound", "请开始射击");
-  }, 300);
 };
 
-async function onReceiveMessage(messages = []) {
+const onOver = async () => {
-  messages.forEach((msg) => {
+  practiseResult.value = await getPractiseAPI(practiseId.value);
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+  start.value = false;
-      if (scores.value.length < total) {
+};
-        scores.value.push(msg.target);
+
-        currentRound.value += 1;
+async function onReceiveMessage(msg) {
-        if (currentRound.value === 4) {
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
-          currentRound.value = 1;
+    scores.value = msg.details;
-        }
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-        if (practiseId && scores.value.length === total / 2) {
+    // setTimeout(onOver, 1500);
-          showGuide.value = true;
+  }
-          setTimeout(() => {
-            showGuide.value = false;
-          }, 3000);
-        }
-      }
-      power.value = msg.target.battery;
-    }
-    if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
-      if (practiseId.value && practiseId.value === msg.practice.id) {
-        setTimeout(() => {
-          start.value = false;
-          practiseResult.value = {
-            ...msg.practice,
-            arrows: JSON.parse(msg.practice.arrows),
-            lvl: msg.lvl,
-          };
-          generateCanvasImage(
-            "shareCanvas",
-            2,
-            user.value,
-            practiseResult.value
-          );
-        }, 1500);
-      }
-    }
-  });
 }
 
 async function onComplete() {
-  if (
+  const validArrows = (practiseResult.value.details || []).filter(
-    practiseResult.value.arrows &&
+    (a) => a.x !== -30 && a.y !== -30
-    practiseResult.value.arrows.length === total
+  );
-  ) {
+  if (validArrows.length === total) {
     uni.navigateBack();
   } else {
     practiseId.value = "";
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    currentRound.value = 0;
+    const result = await createPractiseAPI(total, 120);
+    if (result) practiseId.value = result.id;
   }
 }
 
-onMounted(() => {
+const onClickShare = debounce(async () => {
+  await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
+  await wxShare("shareCanvas");
+});
+
+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;
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
+  audioManager.stopAll();
+  endPractiseAPI();
 });
 </script>
 
 <template>
-  <Container :bgType="1" title="个人单组练习">
+  <Container
+    :bgType="1"
+    title="个人单组练习"
+    :showBottom="!start && !scores.length"
+  >
     <view>
-      <TestDistance v-if="!practiseId" />
+      <TestDistance v-if="!start && !practiseResult.id" />
-      <block v-if="practiseId">
+      <block v-else>
         <ShootProgress
           :tips="`${
             !start || scores.length === 12
@@ -120,7 +132,7 @@ onUnmounted(() => {
                 }轮`
           }`"
           :start="start"
-          :total="120"
+          :onStop="onOver"
         />
         <view class="user-row">
           <Avatar :src="user.avatar" :size="35" />
@@ -128,30 +140,34 @@ onUnmounted(() => {
             <text>还有两场，坚持</text>
             <text>就是胜利！💪</text>
           </BubbleTip>
-          <BowPower :power="power" />
+          <BowPower />
         </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.length < total ? 'un' : ''
+            practiseResult.details.filter(
+              (arrow) => arrow.x !== -30 && arrow.y !== -30
+            ).length < total
+              ? 'un'
+              : ''
           }finish-tip.png`"
         />
-        <canvas class="share-canvas" canvas-id="shareCanvas"></canvas>
+        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
       </block>
     </view>
-    <view :style="{ marginBottom: '20px' }">
+    <template #bottom>
-      <SButton v-if="!start" :onClick="onReady">准备好了，直接开始</SButton>
+      <SButton :onClick="onReady">准备好了，直接开始</SButton>
-    </view>
+    </template>
   </Container>
 </template>
 

src/pages/practise-two.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -10,104 +10,130 @@ import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
-import { createPractiseAPI } from "@/apis";
+import audioManager from "@/audioManager";
-import { generateCanvasImage } from "@/util";
+
-import { MESSAGETYPES } from "@/constants";
+import {
+  createPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+} from "@/apis";
+import { sharePractiseData } from "@/canvas";
+import { wxShare, debounce } from "@/util";
+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);
+
 const start = ref(false);
 const scores = ref([]);
 const total = 36;
 const practiseResult = ref({});
-const power = ref(0);
 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);
+  await startPractiseAPI();
-  if (result) practiseId.value = result.id;
   scores.value = [];
   start.value = true;
-  setTimeout(() => {
+  audioManager.play("练习开始");
-    uni.$emit("play-sound", "请开始射击");
-  }, 300);
 };
 
-async function onReceiveMessage(messages = []) {
+const onOver = async () => {
-  messages.forEach((msg) => {
+  practiseResult.value = await getPractiseAPI(practiseId.value);
-    if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+  start.value = false;
-      if (scores.value.length < total) {
+};
-        scores.value.push(msg.target);
+
-        if (practiseId && scores.value.length === total / 2) {
+async function onReceiveMessage(msg) {
-          showGuide.value = true;
+  if (msg.type === MESSAGETYPESV2.ShootResult) {
-          setTimeout(() => {
+    scores.value = msg.details;
-            showGuide.value = false;
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-          }, 3000);
+    setTimeout(onOver, 1500);
-        }
+  }
-      }
+  // messages.forEach((msg) => {
-      power.value = msg.target.battery;
+  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
-    }
+  //     if (scores.value.length < total) {
-    if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
+  //       scores.value.push(msg.target);
-      if (practiseId.value && practiseId.value === msg.practice.id) {
+  //       if (practiseId && scores.value.length === total / 2) {
-        setTimeout(() => {
+  //         showGuide.value = true;
-          start.value = false;
+  //         setTimeout(() => {
-          practiseResult.value = {
+  //           showGuide.value = false;
-            ...msg.practice,
+  //         }, 3000);
-            arrows: JSON.parse(msg.practice.arrows),
+  //       }
-            lvl: msg.lvl,
+  //       if (scores.value.length === total) {
-          };
+  //         setTimeout(onOver, 1500);
-          generateCanvasImage(
+  //       }
-            "shareCanvas",
+  //     }
-            3,
+  //   }
-            user.value,
+  // });
-            practiseResult.value
-          );
-        }, 1500);
-      }
-    }
-  });
 }
 
 async function onComplete() {
-  if (
+  const validArrows = (practiseResult.value.details || []).filter(
-    practiseResult.value.arrows &&
+    (a) => a.x !== -30 && a.y !== -30
-    practiseResult.value.arrows.length === total
+  );
-  ) {
+  if (validArrows.length === total) {
     uni.navigateBack();
   } else {
     practiseId.value = "";
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
+    const result = await createPractiseAPI(total, 3600);
+    if (result) practiseId.value = result.id;
   }
 }
 
-onMounted(() => {
+const onClickShare = debounce(async () => {
+  await sharePractiseData("shareCanvas", 3, user.value, practiseResult.value);
+  await wxShare("shareCanvas");
+});
+
+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;
 });
 
-onUnmounted(() => {
+onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("share-image", onClickShare);
+  audioManager.stopAll();
+  endPractiseAPI();
 });
 </script>
 
 <template>
-  <Container :bgType="1" title="日常耐力挑战">
+  <Container
+    :bgType="1"
+    title="日常耐力挑战"
+    :showBottom="!start && !scores.length"
+  >
     <view>
-      <TestDistance v-if="!practiseId" />
+      <TestDistance v-if="!start && !practiseResult.id" />
-      <block v-if="practiseId">
+      <block v-else>
         <ShootProgress
+          :tips="`请连续射${total}支箭`"
           :start="start"
-          :tips="`请连续射击${total}支箭`"
+          :total="3600"
-          :total="120"
+          :onStop="onOver"
         />
         <view class="user-row">
           <Avatar :src="user.avatar" :size="35" />
@@ -115,7 +141,7 @@ onUnmounted(() => {
             <text>完成过半，胜利</text>
             <text>在望！💪</text>
           </BubbleTip>
-          <BowPower :power="power" />
+          <BowPower />
         </view>
         <BowTarget
           :currentRound="scores.length"
@@ -124,28 +150,32 @@ onUnmounted(() => {
         />
         <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.length < total ? '2un' : ''
+            practiseResult.details.filter(
+              (arrow) => arrow.x !== -30 && arrow.y !== -30
+            ).length < total
+              ? '2un'
+              : ''
           }finish-tip.png`"
         />
-        <canvas class="share-canvas" canvas-id="shareCanvas"></canvas>
+        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
       </block>
     </view>
-    <view :style="{ marginBottom: '20px' }">
+    <template #bottom>
-      <SButton v-if="!start" :onClick="onReady">准备好了，直接开始</SButton>
+      <SButton :onClick="onReady">准备好了，直接开始</SButton>
-    </view>
+    </template>
   </Container>
 </template>
 

src/pages/practise.vue

@@ -4,23 +4,29 @@ 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";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, device, online } = storeToRefs(store);
 const data = ref({});
+const showTargetPicker = ref(false);
+const pendingPractiseType = ref("");
 
-const toPractiseOne = () => {
+const goPractise = async (type) => {
-  uni.navigateTo({
+  if (!canEenter(user.value, device.value, online.value)) return;
-    url: "/pages/practise-one",
+  pendingPractiseType.value = type;
-  });
+  showTargetPicker.value = true;
 };
 
-const toPractiseTwo = () => {
+const handleTargetConfirm = (target) => {
+  showTargetPicker.value = false;
+  const type = pendingPractiseType.value;
   uni.navigateTo({
-    url: "/pages/practise-two",
+    url: `/pages/practise-${type}?target=${target}`,
   });
 };
 
@@ -32,20 +38,18 @@ onShow(async () => {
 
 <template>
   <Container title="个人练习">
-    <view :style="{ width: '100%' }">
+    <view :style="{ width: '100%', height: '100%' }">
       <Guide>
-        <text :style="{ color: '#fed847' }"
+        <view class="guide-tips">
-          >师傅领进门，修行靠自身，赶紧练起来吧。</text
+          <text>师傅领进门，修行靠自身，赶紧练起来吧。</text>
-        >
+          <text>坚持练习就能你快速升级，早日加入全国排位赛！</text>
-        <text :style="{ fontSize: '12px' }"
+        </view>
-          >坚持练习就能你快速升级，早日加入全国排位赛！</text
-        >
       </Guide>
       <view class="practise-data">
         <view>
           <view>
             <Avatar :rankLvl="user.rankLvl" :src="user.avatar" :size="30" />
-            <text>{{ user.nickName }}</text>
+            <text class="truncate">{{ user.nickName }}</text>
           </view>
           <view>
             <text>已练习打卡</text>
@@ -78,14 +82,14 @@ onShow(async () => {
           </view>
         </view>
       </view>
-      <view class="practise-btn" @click="toPractiseOne">
+      <view class="practise-btn" @click="() => goPractise('one')">
         <image
           src="https://static.shelingxingqiu.com/attachment/2025-07-12/db9x668e2vdtqh0otq.png"
           class="practise1"
           mode="widthFix"
         />
       </view>
-      <view class="practise-btn" @click="toPractiseTwo">
+      <view class="practise-btn" @click="() => goPractise('two')">
         <image
           src="https://static.shelingxingqiu.com/attachment/2025-07-12/db9x668eehkvyicc08.png"
           class="practise2"
@@ -93,6 +97,11 @@ onShow(async () => {
         />
       </view>
     </view>
+    <TargetPicker
+      :show="showTargetPicker"
+      :onClose="() => (showTargetPicker = false)"
+      :onConfirm="handleTargetConfirm"
+    />
   </Container>
 </template>
 
@@ -127,6 +136,7 @@ onShow(async () => {
   color: #fff;
   margin-left: 10px;
   font-size: 16px;
+  width: 120px;
 }
 .practise-data > view:first-child > view:last-child > text:nth-child(2) {
   color: #f7d247;

src/pages/rank-intro.vue

@@ -13,7 +13,7 @@ import Container from "@/components/Container.vue";
         <view class="section">
           <view class="title">一、段位体系概述</view>
           <view class="text">
-            我们的段位体系分为多个等级，从低到高依次为：铜牌青铜、移动白银、荣耀黄金、永恒钻石、璀璨王者、非凡王者、无双王者、至尊王者、荣耀王者和传奇王者。每个大段位下又分为若干小段位，玩家需要通过积累积分来提升段位。
+            我们的段位体系分为多个等级，从低到高依次为：倔强青铜、秩序白银、黄金王者、永恒钻石、最强王者、非凡王者、无双王者、绝世王者、至圣王者、荣耀王者和传奇王者。每个大段位下又分为若干小段位，玩家需要通过积累积分来提升段位。
           </view>
         </view>
 
@@ -55,77 +55,77 @@ import Container from "@/components/Container.vue";
         <view class="section">
           <view class="title">三、（表格）</view>
           <view class="rank-table">
-            <view class="table-header">
+            <view class="table-row">
-              <view>大段位</view>
+              <text>大段位</text>
-              <view>小段位</view>
+              <text>小段位</text>
-              <view>积分（100积分=1星）</view>
+              <text>积分（100积分=1星）</text>
             </view>
             <view class="table-row">
-              <view>铜牌青铜</view>
+              <text>倔强青铜</text>
               <view>
-                <view>青铜1*</view>
+                <text>青铜1*</text>
-                <view>青铜2*</view>
+                <text>青铜2*</text>
-                <view>青铜3*</view>
+                <text>青铜3*</text>
               </view>
-              <view>每个小段位需要累计3星才能晋升到下一个段位，共9星。</view>
+              <text>每个小段位需要满 3星才能晋升到下一个段位，共9颗星。</text>
             </view>
             <view class="table-row">
-              <view>移动白银</view>
+              <text>秩序白银</text>
               <view>
-                <view>白铜1*</view>
+                <text>白铜1*</text>
-                <view>白铜2*</view>
+                <text>白铜2*</text>
-                <view>白铜3*</view>
+                <text>白铜3*</text>
               </view>
-              <view>每个小段位需要累计3星才能晋升到下一个段位，共9星。</view>
+              <text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</text>
             </view>
             <view class="table-row">
-              <view>黄金王者</view>
+              <text>黄金王者</text>
               <view>
-                <view>黄金1*</view>
+                <text>黄金1*</text>
-                <view>黄金2*</view>
+                <text>黄金2*</text>
-                <view>黄金3*</view>
+                <text>黄金3*</text>
-                <view>黄金4*</view>
+                <text>黄金4*</text>
               </view>
-              <view>每个小段位需要累计4星才能晋升到下一个段位，共15星。</view>
+              <text>每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。</text>
             </view>
             <view class="table-row">
-              <view>永恒钻石</view>
+              <text>永恒钻石</text>
               <view>
-                <view>钻石1*</view>
+                <text>钻石1*</text>
-                <view>钻石2*</view>
+                <text>钻石2*</text>
-                <view>钻石3*</view>
+                <text>钻石3*</text>
-                <view>钻石4*</view>
+                <text>钻石4*</text>
-                <view>钻石5*</view>
+                <text>钻石5*</text>
               </view>
-              <view>每个小段位需要累计5星才能晋升到下一个段位，共25星。</view>
+              <text>每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。</text>
             </view>
             <view class="table-row2">
-              <view>最强王者</view>
+              <text>最强王者</text>
-              <view>0-9</view>
+              <text>0-9</text>
             </view>
             <view class="table-row2">
-              <view>非凡王者</view>
+              <text>非凡王者</text>
-              <view>0-9</view>
+              <text>10-19</text>
             </view>
             <view class="table-row2">
-              <view>无双王者</view>
+              <text>无双王者</text>
-              <view>10-19</view>
+              <text>20-29</text>
             </view>
             <view class="table-row2">
-              <view>至尊王者</view>
+              <text>绝世王者</text>
-              <view>20-29</view>
+              <text>30-39</text>
             </view>
             <view class="table-row2">
-              <view>荣耀王者</view>
+              <text>至圣王者</text>
-              <view>30-39</view>
+              <text>40-49</text>
             </view>
             <view class="table-row2">
-              <view>璀璨王者</view>
+              <text>荣耀王者</text>
-              <view>40-49</view>
+              <text>50-99</text>
             </view>
             <view class="table-row2">
-              <view>传奇王者</view>
+              <text>传奇王者</text>
-              <view>100+</view>
+              <text>100+</text>
             </view>
           </view>
         </view>
@@ -134,7 +134,7 @@ import Container from "@/components/Container.vue";
   </Container>
 </template>
 
-<style scoped>
+<style scoped lang="scss">
 .container {
   width: 100%;
   height: 100%;
@@ -195,71 +195,47 @@ import Container from "@/components/Container.vue";
 }
 
 .rank-table {
-  border: 1px solid #e4e4e4;
   border-radius: 4px;
   font-size: 14px;
   color: #000;
+  width: calc(100vw - 20px);
 }
 
-.table-header {
+.rank-table > view {
   display: flex;
-  border-bottom: 1px solid #e4e4e4;
 }
 
-.table-header > view {
+.rank-table > view > text:last-child {
-  padding: 5px 10px;
+  margin-left: -1rpx;
-  width: 20%;
 }
-.table-header > view:last-child {
+
-  padding: 5px 10px;
+.rank-table text {
-  width: 60%;
+  padding: 10rpx 20rpx;
+  border: $uni-border;
+  box-sizing: border-box;
+  display: inline-block;
+  margin-top: -1rpx;
 }
-.table-header > view:nth-child(2) {
+
-  border-left: 1px solid #e4e4e4;
+.table-row text {
-  border-right: 1px solid #e4e4e4;
+  width: 25%;
 }
-.table-row {
+
+.table-row > view {
   display: flex;
-  min-height: 44px;
+  flex-direction: column;
-  border-bottom: 1px solid #e4e4e4;
+  width: 25%;
 }
-.table-row > view:first-child,
+
-.table-row > view:last-child,
+.table-row > view > text {
-.table-row > view:nth-child(2) > view {
+  width: 100%;
-  padding: 5px 10px;
 }
-.table-row > view:nth-child(2) {
+
-  border-left: 1px solid #e4e4e4;
+.table-row > text:nth-child(3) {
-  border-right: 1px solid #e4e4e4;
+  width: 50%;
 }
-.table-row > view:nth-child(2) > view {
+
-  border-bottom: 1px solid #e4e4e4;
+.table-row2 > text {
-}
+  width: 50%;
-.table-row > view:nth-child(2) > view:last-child {
-  border-bottom: none;
-}
-.table-row > view:first-child {
-  width: 20%;
-}
-.table-row > view:nth-child(2) {
-  width: 26.5%;
-}
-.table-row > view:last-child {
-  width: 60%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  line-height: 2;
-}
-.table-row2 {
-  display: flex;
-  border-bottom: 1px solid #e4e4e4;
-}
-.table-row2 > view {
-  padding: 5px 10px;
-}
-.table-row2 > view:first-child {
-  border-right: 1px solid #e4e4e4;
-  width: 38.8%;
 }
 </style>

src/pages/rank-list.vue

@@ -1,49 +1,337 @@
 <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 capsuleHeight = ref(0);
+const createRankState = () => ({
-const selectedIndex = ref(0);
+  list: [],
-const currentList = ref([]);
+  page: 0,
-const myData = ref({});
+  pageSize: PAGE_SIZE,
-const addBg = ref("");
+  loading: false,
-
+  noMore: false,
-onMounted(async () => {
+  loaded: false,
-  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
+  scrollTop: 0,
-  capsuleHeight.value = menuBtnInfo.top - 9;
+  myData: null,
-  currentList.value = rankData.value.rank;
+  myDataLoaded: false,
-  if (rankData.value.myRankPos) myData.value = rankData.value.myRankPos;
 });
 
-const handleSelect = (index) => {
+const rankTabs = [
-  selectedIndex.value = index;
+  {
-  if (index === 0) {
+    key: "score",
-    currentList.value = rankData.value.rank;
+    title: "积分榜",
-    if (rankData.value.myRankPos) myData.value = rankData.value.myRankPos;
+    subTitle: "排位赛积分",
-  } else if (index === 2) {
+    listApi: getScoreRankList,
-    currentList.value = rankData.value.ringRank;
+    myApi: getMyScoreRank,
-    if (rankData.value.myRingRankPos)
+  },
-      myData.value = rankData.value.myRingRankPos;
+  {
-  } else {
+    key: "mvp",
-    myData.value = {};
+    title: "MVP榜",
-    currentList.value = [];
+    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;
+  }
+  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>
-  <scroll-view class="container" scroll-y @scroll="onScrollView">
+  <view class="container">
     <view
       class="header"
       :style="{
@@ -51,144 +339,175 @@ const subTitles = ["排位赛积分", "本周MVP次数", "本周十环次数"];
       }"
     >
       <image
-        v-if="addBg"
+        :style="{ opacity: addBg ? 1 : 0 }"
-        class="bg-image"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
-        src="../static/app-bg.png"
         mode="widthFix"
       />
       <navigator open-type="navigateBack">
         <image class="header-back" src="../static/back.png" mode="widthFix" />
       </navigator>
-      <text
+      <text :style="{ opacity: addBg ? 1 : 0 }">本赛季排行榜</text>
-        :style="{ opacity: addBg ? 1 : 0, color: '#fff', fontWeight: 'bold' }"
-      >
-        本赛季排行榜
-      </text>
     </view>
-    <image src="../static/rankbg.png" mode="widthFix" class="header-bg" />
+    <scroll-view
-    <view class="rank-tabs">
+      scroll-y
+      :scroll-with-animation="tabSwitchAnimating"
+      :scroll-top="restoreScrollTop"
+      @scroll="onScrollView"
+      @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
-        v-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']"
+        v-if="stickyTabsActive"
-        :key="index"
+        class="rank-tabs-placeholder"
-        :style="{
+        :style="{ height: `${tabsHeight}px` }"
-          fontSize: index === selectedIndex ? '16px' : '14px',
+      />
-          color: index === selectedIndex ? '#000' : '#fff',
-          backgroundColor: index === selectedIndex ? '#FFD947' : '#383737',
-        }"
-        @tap="handleSelect(index)"
-      >
-        {{ rankType }}
-      </view>
-    </view>
-    <view class="rank-list">
-      <view class="rank-list-header">
-        <text>排名</text>
-        <text>用户ID</text>
-        <text>{{ subTitles[selectedIndex] }}</text>
-      </view>
       <view
-        v-for="(item, index) in currentList"
+        class="rank-tabs rank-tabs-anchor"
-        :key="index"
+        :class="{ 'rank-tabs-anchor-fixed': stickyTabsActive }"
-        class="rank-list-item"
+        :style="stickyTabsActive ? { top: `${stickyTabsTop}px` } : {}"
-        :style="{
-          backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent',
-        }"
       >
-        <image
+        <view
-          v-if="index === 0"
+          v-for="(rankType, index) in rankTabs"
-          class="player-bg"
+          :key="rankType.key"
-          src="../static/melee-player-bg1.png"
+          :style="{
-          mode="aspectFill"
+            fontSize: index === selectedIndex ? '16px' : '14px',
-        />
+            color: index === selectedIndex ? '#000' : '#fff',
-        <image
+            backgroundColor: index === selectedIndex ? '#FFD947' : '#383737',
-          v-if="index === 1"
+          }"
-          class="player-bg"
+          @tap="handleSelect(index)"
-          src="../static/melee-player-bg2.png"
+        >
-          mode="aspectFill"
+          {{ rankType.title }}
-        />
-        <image
-          v-if="index === 2"
-          class="player-bg"
-          src="../static/melee-player-bg3.png"
-          mode="aspectFill"
-        />
-        <image
-          v-if="index === 0"
-          class="player-crown"
-          src="../static/champ1.png"
-          mode="widthFix"
-        />
-        <image
-          v-if="index === 1"
-          class="player-crown"
-          src="../static/champ2.png"
-          mode="widthFix"
-        />
-        <image
-          v-if="index === 2"
-          class="player-crown"
-          src="../static/champ3.png"
-          mode="widthFix"
-        />
-        <view v-if="index > 2" class="view-crown">{{ index + 1 }}</view>
-        <Avatar :src="item.avatar" />
-        <view class="rank-item-content">
-          <text class="truncate">{{ item.name }}</text>
-          <text
-            >{{ getLvlName(item.totalScore) }}，{{ item.TotalGames }}场</text
-          >
         </view>
-        <text class="rank-item-integral" v-if="selectedIndex === 0">
-          <text :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-            >{{ item.totalScore }} </text
-          >分
-        </text>
-        <text class="rank-item-integral" v-if="selectedIndex === 2">
-          <text :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-            >{{ item.TenRings }} </text
-          >次
-        </text>
       </view>
-      <view v-if="!currentList.length" class="no-data">
+      <view class="rank-list">
-        <text>筹备中...</text>
+        <view class="rank-list-header">
+          <text>排名</text>
+          <text>用户ID</text>
+          <text>{{ currentSubTitle }}</text>
+        </view>
+        <view
+          v-for="(item, index) in currentList"
+          :key="`${currentTabKey}-${index}-${item.userId || item.name}`"
+          class="rank-list-item"
+          :style="{
+            backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent',
+          }"
+        >
+          <image
+            v-if="index === 0"
+            class="player-bg"
+            src="../static/melee-player-bg1.png"
+            mode="aspectFill"
+          />
+          <image
+            v-if="index === 1"
+            class="player-bg"
+            src="../static/melee-player-bg2.png"
+            mode="aspectFill"
+          />
+          <image
+            v-if="index === 2"
+            class="player-bg"
+            src="../static/melee-player-bg3.png"
+            mode="aspectFill"
+          />
+          <image
+            v-if="index === 0"
+            class="player-crown"
+            src="../static/champ1.png"
+            mode="widthFix"
+          />
+          <image
+            v-if="index === 1"
+            class="player-crown"
+            src="../static/champ2.png"
+            mode="widthFix"
+          />
+          <image
+            v-if="index === 2"
+            class="player-crown"
+            src="../static/champ3.png"
+            mode="widthFix"
+          />
+          <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>{{ formatLevelText(item) }}</text>
+          </view>
+          <text class="rank-item-integral">
+            <text
+              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
+            >
+              {{ getRankValue(item) }}
+            </text>
+            {{ getRankUnit() }}
+          </text>
+        </view>
+        <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>
-    </view>
+    </scroll-view>
-    <view class="my-rank-data" v-if="myData.userId">
+    <view class="my-rank-data" v-if="currentMyData">
       <image
         src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png"
         mode="widthFix"
       />
-      <text>{{ myData.rank }}</text>
+      <text>{{ getDisplayMyRank(currentMyData) }}</text>
-      <Avatar :src="user.avatar" />
+      <Avatar :src="currentMyData.avatar || user.avatar" />
       <view class="rank-item-content">
-        <text class="truncate">{{ user.nickName }}</text>
+        <text class="truncate">{{ currentMyData.name || user.nickName }}</text>
-        <text>{{ user.lvlName }}，{{ myData.TotalGames }}场</text>
+        <text>{{ formatLevelText(currentMyData) }}</text>
       </view>
-      <text class="rank-item-integral" v-if="selectedIndex === 2">
+      <text class="rank-item-integral">
         <text
           :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ rankData.myRankPos.TenRings }}</text
+        >
-        >次</text
+          {{ getRankValue(currentMyData) }}
-      >
+        </text>
-      <text class="rank-item-integral" v-else>
+        {{ getRankUnit() }}
-        <text
+      </text>
-          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ rankData.myRingRankPos.totalScore }}</text
-        >分</text
-      >
     </view>
-  </scroll-view>
+  </view>
 </template>
 
 <style scoped>
 .container {
   width: 100%;
-  height: 100vh;
-  padding-bottom: 100px;
 }
+
+.content-start-anchor {
+  width: 100%;
+  height: 0;
+}
+
 .header-bg {
   width: 100%;
 }
+
 .header {
   width: 100%;
   height: 50px;
@@ -196,28 +515,60 @@ const subTitles = ["排位赛积分", "本周MVP次数", "本周十环次数"];
   align-items: center;
   position: fixed;
   top: 0;
-  transition: all 0.3s ease;
   z-index: 10;
   overflow: hidden;
 }
-.header text {
+
-  transition: all 0.3s ease;
+.header-back {
-  line-height: 50px;
+  width: 22px;
+  height: 22px;
+  margin: 0px 15px;
+  margin-top: 5px;
   position: relative;
 }
+
+.header > image:first-child {
+  width: 100vw;
+  height: 100vh;
+  position: absolute;
+  top: 0;
+  left: 0;
+  transition: all 0.5s ease;
+}
+
+.header > text {
+  color: #fff;
+  font-weight: bold;
+  transition: all 0.5s ease;
+  position: relative;
+}
+
 .rank-tabs {
   width: calc(100% - 20px);
   display: flex;
   justify-content: space-around;
-  padding: 0 10px;
+  padding: 20rpx 10px;
-  margin-top: -15px;
 }
+
 .rank-tabs > view {
   width: 25%;
   padding: 10px;
   text-align: center;
   border-radius: 20px;
 }
+
+.rank-tabs-placeholder {
+  width: 100%;
+}
+
+.rank-tabs-anchor-fixed {
+  position: fixed;
+  left: 0;
+  z-index: 11;
+  background: #000000;
+  backdrop-filter: blur(8px);
+}
+
 .rank-list {
   display: flex;
   flex-direction: column;
@@ -225,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;
@@ -238,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%;
@@ -259,11 +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;
@@ -275,6 +635,7 @@ const subTitles = ["排位赛积分", "本周MVP次数", "本周十环次数"];
   background-color: #676767;
   position: relative;
 }
+
 .rank-item-content {
   display: flex;
   flex-direction: column;
@@ -284,36 +645,41 @@ 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 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
   width: calc(100% - 30px);
   padding: 15px;
-  padding-bottom: 30px;
   display: flex;
   align-items: center;
   justify-content: space-between;
   color: #fff9;
   font-size: 12px;
+  height: calc(10vh - 30px);
+  position: relative;
+  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;
@@ -325,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;
@@ -348,17 +718,11 @@ const subTitles = ["排位赛积分", "本周MVP次数", "本周十环次数"];
   color: #fff9;
   font-size: 14px;
 }
-.header-back {
+
-  width: 22px;
+.list-tip {
-  height: 22px;
+  justify-content: center !important;
-  margin: 0px 15px;
+  color: #fff9;
-  position: relative;
+  font-size: 12px;
-}
+  min-height: 60rpx;
-.bg-image {
-  width: 100vw;
-  height: 100vh;
-  position: absolute;
-  top: 0;
-  left: 0;
 }
 </style>

src/pages/team-battle.vue

@@ -1,12 +1,9 @@
 <script setup>
-import { ref, onMounted, onUnmounted, nextTick } from "vue";
+import {ref, onMounted, onBeforeUnmount, nextTick} from "vue";
-import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import {onLoad, onShow, onHide} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import BowTarget from "@/components/BowTarget.vue";
-import ShootProgress from "@/components/ShootProgress.vue";
-import PlayersRow from "@/components/PlayersRow.vue";
-import Timer from "@/components/Timer.vue";
 import BattleFooter from "@/components/BattleFooter.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import SButton from "@/components/SButton.vue";
@@ -14,21 +11,21 @@ import RoundEndTip from "@/components/RoundEndTip.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import TeamAvatars from "@/components/TeamAvatars.vue";
 import ShootProgress2 from "@/components/ShootProgress2.vue";
-import { getCurrentGameAPI } from "@/apis";
+import {laserCloseAPI, getBattleAPI} from "@/apis";
-import { isGameEnded } from "@/util";
+import {MESSAGETYPESV2} from "@/constants";
-import { MESSAGETYPES, roundsName } from "@/constants";
+import audioManager from "@/audioManager";
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { user } = storeToRefs(store);
+const {user} = storeToRefs(store);
-const start = ref(false);
+const start = ref(null);
 const tips = ref("");
 const battleId = ref("");
-const currentRound = ref(1);
+const currentRound = ref(0);
+const goldenRound = ref(0);
 const currentRedPoint = ref(0);
 const currentBluePoint = ref(0);
-const totalRounds = ref(0);
-const power = ref(0);
 const scores = ref([]);
 const blueScores = ref([]);
 const redTeam = ref([]);
@@ -39,310 +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);
 
-const onBack = () => {
+const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
-  uni.$showHint(2);
+  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;
+    }
+
+    if (t2.players) redTeam.value = [...t2.players];
+    else {
+      const cached = uni.getStorageSync("red-team");
+      if (cached && cached.length) redTeam.value = cached;
+    }
+
+    start.value = battleInfo.status !== 0;
+
+    if (battleInfo.status === 0) {
+      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      if (readyRemain > 0 && readyRemain < 15) {
+        setTimeout(() => {
+          uni.$emit("update-timer", 15 - readyRemain - 0.2);
+        }, 200);
+      }
+      return;
+    }
+    if (!arrowOnly) {
+      currentShooterId.value = battleInfo.current.playerId;
+      const redPlayer = battleInfo.teams[2].players.find(
+          (item) => item.id === battleInfo.current.playerId
+      );
+      let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
+      if (force) nextTips += "重回";
+      if (
+          battleInfo.current.playerId === user.value.id &&
+          redTeam.value.length > 1
+      ) {
+        nextTips += "你";
+      }
+      tips.value = nextTips;
+      uni.$emit("update-tips", nextTips);
+      uni.$emit("update-remain", {reset: true, value: 15, team: redTeam?'red':'blue'});
+      if (force) {
+        const remain = (Date.now() - battleInfo.current.startTime) / 1000;
+        console.log(`当前轮已进行${remain}秒`);
+        if (remain > 0 && remain < 15) {
+          updateRemainSecond.value = 15 - remain - 0.2
+        }
+      } else {
+        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 recoverData(battleInfo) {
+function onAudioEnded(s) {
-  uni.removeStorageSync("last-awake-time");
+  if (s.indexOf('请红方射箭') >= 0 || s.indexOf('请蓝方射箭') >= 0) {
-  battleId.value = battleInfo.id;
+    let team = s.indexOf('请红方射箭') >= 0 ? 'red' : 'blue';
-  redTeam.value = battleInfo.redTeam;
+    uni.$emit("update-remain", {stop: false, value: updateRemainSecond.value, team: team});
-  blueTeam.value = battleInfo.blueTeam;
+  }
-  if (battleInfo.status === 0) {
+  if (s.indexOf("比赛结束") >= 0) {
-    const readyRemain = Date.now() / 1000 - battleInfo.startTime;
+    console.log("比赛结束");
-    console.log(`当前局已进行${readyRemain}秒`);
+    onBattleEnd()
-    if (readyRemain > 0) {
+  }
-      setTimeout(() => {
+}
-        uni.$emit("update-timer", 15 - readyRemain);
+
-      }, 200);
+function onBattleEnd() {
-    }
+  if (matchStatus.value === 2) {
-  } else {
+    // 全部跳转到新结算页
-    start.value = true;
+    uni.redirectTo({
-    bluePoints.value = 0;
+      url: `/pages/friend-battle-result?battleId=${battleId.value}`,
-    redPoints.value = 0;
-    currentRound.value = battleInfo.currentRound;
-    totalRounds.value = battleInfo.maxRound;
-    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.redTeam[0].shotHistory[battleInfo.currentRound] ||
+}
-      battleInfo.blueTeam[0].shotHistory[battleInfo.currentRound]
+
-    ) {
+function onNewRound(msg) {
-      roundResults.value.push({
+  showRoundTip.value = true;
-        redArrows: battleInfo.redTeam[0].shotHistory[
+  isFinalShoot.value = msg.current.goldRound;
-          battleInfo.currentRound
+  const latestRound = msg.rounds[currentRound.value - 1];
-        ].filter((item) => !!item.playerId),
+  if (latestRound) {
-        blueArrows: battleInfo.blueTeam[0].shotHistory[
+    if (isFinalShoot.value) {
-          battleInfo.currentRound
+      currentBluePoint.value = msg.teams[1].score;
-        ].filter((item) => !!item.playerId),
+      currentRedPoint.value = msg.teams[2].score;
-      });
+    } else {
-    } else if (battleInfo.currentRound < 5) {
+      currentBluePoint.value = latestRound.scores[1].score;
-      roundResults.value.push({
+      currentRedPoint.value = latestRound.scores[2].score;
-        redArrows: [],
-        blueArrows: [],
-      });
-    }
-    if (battleInfo.goldenRound) {
-      const { ShotCount, RedRecords, BlueRecords } = battleInfo.goldenRound;
-      const roundCount = Math.max(RedRecords.length, BlueRecords.length);
-      currentRound.value += roundCount;
-      isFinalShoot.value = true;
-      for (let i = 0; i < roundCount; i++) {
-        const roundData = {
-          redArrows:
-            RedRecords && RedRecords[i] ? RedRecords[i].Arrows || [] : [],
-          blueArrows:
-            BlueRecords && BlueRecords[i] ? BlueRecords[i].Arrows || [] : [],
-        };
-        if (roundResults.value[5 + i]) {
-          roundResults.value[5 + i] = roundData;
-        } else {
-          roundResults.value.push(roundData);
-        }
-      }
-    }
-    const lastIndex = roundResults.value.length - 1;
-    if (roundResults.value[lastIndex]) {
-      const redArrows = roundResults.value[lastIndex].redArrows;
-      scores.value = [...redArrows].filter((item) => !!item.playerId);
-      const blueArrows = roundResults.value[lastIndex].blueArrows;
-      blueScores.value = [...blueArrows].filter((item) => !!item.playerId);
-    }
-    // if (battleInfo.status !== 11) return;
-    if (battleInfo.firePlayerIndex) {
-      currentShooterId.value = battleInfo.firePlayerIndex;
-      const redPlayer = redTeam.value.find(
-        (item) => item.id === currentShooterId.value
-      );
-      tips.value = redPlayer ? "请红队射箭" : "请蓝队射箭";
-      uni.$emit("update-tips", tips.value);
-    }
-    if (battleInfo.fireTime > 0) {
-      const remain = Date.now() / 1000 - battleInfo.fireTime;
-      console.log(`当前箭已过${remain}秒`);
-      if (remain > 0 && remain <= 15) {
-        // 等渲染好再通知
-        setTimeout(() => {
-          uni.$emit("update-ramain", 15 - remain);
-        }, 300);
-      }
     }
   }
 }
 
-async function onReceiveMessage(messages = []) {
+async function onReceiveMessage(msg) {
-  messages.forEach((msg) => {
+  if (Array.isArray(msg)) return;
-    if (msg.constructor === MESSAGETYPES.AllReady) {
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
-      start.value = true;
+    start.value = true;
-      totalRounds.value = msg.groupUserStatus.config.maxRounds;
+  } else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) {
-      roundResults.value = [
+    recoverData(msg);
-        {
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
-          redArrows: [],
+    uni.$emit("update-remain", {stop: true})
-          blueArrows: [],
+    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.ToSomeoneShoot) {
+  }
-      if (currentShooterId.value !== msg.userId) {
-        currentShooterId.value = msg.userId;
-        const redPlayer = redTeam.value.find(
-          (item) => item.id === currentShooterId.value
-        );
-        tips.value = redPlayer ? "请红队射箭" : "请蓝队射箭";
-        uni.$emit("update-tips", tips.value);
-        // if (redPlayer) tips.value = "红队" + redPlayer.id;
-        // const bluePlayer = blueTeam.value.find(
-        //   (item) => item.id === currentShooterId.value
-        // );
-        // if (bluePlayer) tips.value = "蓝队" + bluePlayer.id;
-        uni.$emit("update-tips", tips.value);
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.ShootResult) {
-      if (currentShooterId.value !== msg.userId) return;
-      const isRed = redTeam.value.find((item) => item.id === msg.userId);
-      if (isRed) scores.value.push({ ...msg.target });
-      else blueScores.value.push({ ...msg.target });
-      if (!roundResults.value[currentRound.value - 1]) {
-        roundResults.value.push({
-          redArrows: [],
-          blueArrows: [],
-        });
-      }
-      roundResults.value[currentRound.value - 1][
-        isRed ? "redArrows" : "blueArrows"
-      ].push({ ...msg.target });
-    }
-    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.currentRound < 5) {
-        currentRound.value = result.currentRound + 1;
-        roundResults.value.push({
-          redArrows: [],
-          blueArrows: [],
-        });
-        showRoundTip.value = true;
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.FinalShoot) {
-      currentShooterId.value = 0;
-      currentRound.value += 1;
-      roundResults.value.push({
-        redArrows: [],
-        blueArrows: [],
-      });
-      if (!isFinalShoot.value) {
-        isFinalShoot.value = true;
-        showRoundTip.value = true;
-        tips.value = "准备开始决金箭";
-      }
-    }
-    if (msg.constructor === MESSAGETYPES.MatchOver) {
-      if (msg.endStatus.noSaved) {
-        currentRound.value += 1;
-        currentBluePoint.value = 0;
-        currentRedPoint.value = 0;
-        showRoundTip.value = true;
-        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) {
+  if (options.battleId) battleId.value = options.battleId;
-    battleId.value = options.battleId;
+  // uni.enableAlertBeforeUnload({
-    redTeam.value = uni.getStorageSync("red-team");
+  //   message: "离开比赛可能导致比赛失败，是否继续？",
-    blueTeam.value = uni.getStorageSync("blue-team");
+  //   success: (res) => {
-    const battleInfo = uni.getStorageSync("current-battle");
+  //     console.log("已启用离开提示");
-    if (battleInfo) {
+  //   },
-      await nextTick(() => {
+  // });
-        recoverData(battleInfo);
-      });
-      setTimeout(getCurrentGameAPI, 2000);
-    }
-  }
 });
-onMounted(() => {
+onMounted(async () => {
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("audioEnded", onAudioEnded);
+  await laserCloseAPI();
 });
-onUnmounted(() => {
+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;
+    const result = await getBattleAPI(battleId.value);
-    getCurrentGameAPI();
+    if (!result) return;
-    const refreshData = () => {
+    if (result.status === 2) {
-      const lastAwakeTime = uni.getStorageSync("last-awake-time");
+      // 比赛已结束（如切后台再回来）：跳新结算页
-      if (lastAwakeTime) {
+      uni.redirectTo({
-        getCurrentGameAPI();
+        url: `/pages/friend-battle-result?battleId=${result.matchId}`,
-      } else {
+      });
-        clearInterval(refreshTimer.value);
+    } else {
-      }
+      recoverData(result, {force: true});
-    };
+    }
-    refreshTimer.value = setInterval(refreshData, 2000);
   }
 });
-onHide(() => {
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
-  uni.setStorageSync("last-awake-time", Date.now());
-});
 </script>
 
 <template>
-  <Container :bgType="3" :onBack="onBack">
+  <Container :bgType="start ? 3 : 1">
     <view class="container">
-      <BattleHeader v-if="!start" :redTeam="redTeam" :blueTeam="blueTeam" />
+      <BattleHeader
-      <TestDistance v-if="!start" :guide="false" />
+          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"
+            :team="blueTeam"
-          :isRed="false"
+            :isRed="false"
-          :currentShooterId="currentShooterId"
+            :currentShooterId="currentShooterId"
         />
-        <ShootProgress2 :tips="tips" :currentRound="'round' + currentRound" />
+        <ShootProgress2
-        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId" />
+            :tips="tips"
+            :currentRound="
+            goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound
+          "
+        />
+        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId"/>
       </view>
       <BowTarget
-        v-if="start"
+          v-if="start"
-        mode="team"
+          mode="team"
-        :power="start ? power : 0"
+          :scores="scores"
-        :scores="scores"
+          :blueScores="blueScores"
-        :blueScores="blueScores"
       />
       <BattleFooter
-        v-if="start"
+          v-if="start"
-        :roundResults="roundResults"
+          :roundResults="roundResults"
-        :redPoints="redPoints"
+          :redPoints="redPoints"
-        :bluePoints="bluePoints"
+          :bluePoints="bluePoints"
-        :power="power"
+          :goldenRound="goldenRound"
       />
-      <Timer v-if="!start" />
       <ScreenHint
-        :show="showRoundTip"
+          :show="showRoundTip"
-        :onClose="() => (showRoundTip = false)"
+          :onClose="() => (showRoundTip = false)"
-        :mode="isFinalShoot ? 'tall' : 'normal'"
+          :mode="isFinalShoot ? 'tall' : 'normal'"
       >
         <RoundEndTip
-          v-if="showRoundTip"
+            v-if="showRoundTip"
-          :isFinal="isFinalShoot"
+            :isFinal="isFinalShoot"
-          :round="currentRound - 1"
+            :round="currentRound"
-          :bluePoint="currentBluePoint"
+            :bluePoint="currentBluePoint"
-          :redPoint="currentRedPoint"
+            :redPoint="currentRedPoint"
-          :roundData="
+            :roundData="
-            roundResults[roundResults.length - 2]
+            roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
-              ? roundResults[roundResults.length - 2]
-              : []
           "
-          :onAutoClose="() => (showRoundTip = false)"
+            :onAutoClose="()=>{ showRoundTip = false}"
         />
       </ScreenHint>
     </view>
@@ -354,11 +281,12 @@ onHide(() => {
   width: 100%;
   height: 100%;
 }
+
 .players-row {
   display: flex;
   align-items: center;
-  justify-content: space-around;
+  justify-content: center;
-  margin-bottom: -7vw;
+  margin-top: -2%;
-  margin-top: -3vw;
+  margin-bottom: 6%;
 }
 </style>