fix：新增更新中图片&设备页面新增跳转wifi页面入口

(cherry picked from commit a6becf67ff)

.gitignore

@@ -10,9 +10,10 @@ lerna-debug.log*
 node_modules
 .history
 .github
+.claude
 openspec
 CLAUDE.md
-dosc
+docs
 .DS_Store
 dist
 *.local

AGENTS.md

@@ -264,7 +264,6 @@ AI 应主动：
 * 少解释
 * 优先 patch
 * 优先 diff
-* 写好中文注释
 
 除非用户明确要求：
 否则不要输出完整项目。

package.json

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

src/App.vue

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

src/apis.js

@@ -6,7 +6,7 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-            // BASE_URL = "http://localhost:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
@@ -42,10 +42,13 @@ function request(method, url, data = {}) {
                     if (code === 0) resolve(data);
                     else if (message) {
                         if (message.indexOf("登录身份已失效") !== -1) {
+                            console.log('1111111111111111111,token失效')
                             uni.removeStorageSync(
                                 `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
                             );
                             uni.$emit("update-user");
+                            reject({ type: "AUTH_INVALID", message });
+                            return;
                         }
                         if (message === "ROOM_FULL") {
                             resolve({full: true});
@@ -407,15 +410,6 @@ export const getPractiseDataAPI = async () => {
     return request("GET", "/user/practice/statistics");
 };
 
-export const getPersonalTrainingAPI = async () => {
-    return request("GET", "/personal/training");
-};
-
-export const getTrainingDifficultyListAPI = async (type) => {
-    const query = type ? `?type=${encodeURIComponent(type)}` : "";
-    return request("GET", `/training/difficulty/list${query}`);
-};
-
 export const getBattleDataAPI = async () => {
     return request("GET", "/user/fight/statistics");
 };

src/audioManager.js

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

src/components/AppBackground.vue

@@ -57,30 +57,6 @@ const props = defineProps({
 	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
 	  mode="widthFix"
 	/>
-  <image
-      class="bg-image"
-      v-if="type === 7"
-      src="@/static/app-bg6.png"
-      mode="widthFix"
-    />
-    <image
-      class="bg-image"
-      v-if="type === 8"
-      src="@/static/app-bg7.png"
-      mode="widthFix"
-    />
-    <image
-      class="bg-image"
-      v-if="type === 9"
-      src="@/static/app-bg8.png"
-      mode="widthFix"
-    />
-    <image
-      class="bg-image"
-      v-if="type === 10"
-      src="@/static/app-bg9.png"
-      mode="widthFix"
-    />
     <view class="bg-overlay" v-if="type === 0"></view>
   </view>
 </template>

src/components/AppFooter.vue

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

src/components/BackToGame.vue

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

src/components/BattleHeader.vue

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

src/components/Container.vue

@@ -116,7 +116,7 @@ const backToGame = debounce(async () => {
       await checkAudioProgress();
       if (result.mode <= 3) {
         uni.navigateTo({
-          url: `/pages/team-battle?battleId=${result.matchId}`,
+          url: `/pages/team-battle/index?battleId=${result.matchId}`,
         });
       } else {
         uni.navigateTo({
@@ -206,7 +206,7 @@ const goCalibration = async () => {
           <button hover-class="none" @click="() => (showHint = false)">
             取消
           </button>
-          <button hover-class="none" @click="cancelMatching">确认</button>
+          <button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
         </view>
       </view>
       <view v-if="hintType === 4" class="tip-content">

src/components/CreateRoom.vue

@@ -17,12 +17,19 @@ const props = defineProps({
   },
 });
 
-const battleMode = ref(1);
+/** 对战模式：0=未选 1=1v1 2=乱斗 3=2v2 4=3v3 */
-const targetMode = ref(1);
+const battleMode = ref(0);
+/** 靶纸尺寸：0=未选 1=20cm 2=40cm */
+const targetMode = ref(0);
 const loading = ref(false);
 const roomNumber = ref("");
 
 const createRoom = debounce(async () => {
+  // 校验必填项：对战模式与靶纸均必须选择
+  if (!battleMode.value || !targetMode.value) {
+    uni.showToast({ title: '请完善创建信息', icon: 'none' });
+    return;
+  }
   if (game.value.inBattle) {
     uni.$showHint(1);
     return;
@@ -105,7 +112,7 @@ const createRoom = debounce(async () => {
         <text>40厘米全环靶</text>
       </view>
     </view>
-    <SButton :onClick="createRoom">创建房间</SButton>
+    <SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton>
   </view>
 </template>
 

src/components/GuideTwo.vue

@@ -9,12 +9,12 @@ defineProps({
 
 <template>
   <view class="container">
-    <image class="shooter2" src="../static/shooter2.png" mode="widthFix" />
+    <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="../static/long-bubble-border.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/long-bubble-border.png"
         mode="widthFix"
       />
       <slot />
@@ -26,20 +26,21 @@ defineProps({
 .container {
   display: flex;
   align-items: center;
-  padding: 0 15px;
+  padding: 0 26rpx 0 28rpx;
   margin-bottom: 14rpx;
-  width: clac(100% - 30px);
+  width: clac(100% - 54rpx);
 }
 .container .shooter2 {
-  width: 150rpx;
+  display: block;
-  height: 162rpx;
+  width: 133rpx;
+  height: 144rpx;
 }
 .container .bg-box {
   color: #fff;
   font-size: 28rpx;
   position: relative;
   flex: 1;
-  min-height: 55px;
+  height: 128rpx;
   display: flex;
   align-items: center;
   justify-content: center;

src/components/Header.vue

@@ -57,8 +57,9 @@ const signin = () => {
 
 const loading = ref(false);
 const pointBook = ref(null);
-const showProgress = ref(false);
 const heat = ref(0);
+/** 房间号按钮动态定位样式（position: fixed，根据胶囊真实位置计算，脱离 flex 流避免挤压标题） */
+const battleRoomBtnStyle = ref({});
 
 const updateLoading = (value) => {
   loading.value = value;
@@ -80,8 +81,22 @@ onMounted(() => {
       pointBook.value = uni.getStorageSync("last-point-book");
     }
   }
-  if (currentPage.route === "pages/team-battle") {
+  // 仅在对战房间页获取胶囊位置，按钮用 fixed 定位精确贴靠胶囊左侧（脱离 flex 流，不挤压标题）
-    showProgress.value = true;
+  if (currentPage.route === "pages/battle-room") {
+    try {
+      const menuButtonRect = uni.getMenuButtonBoundingClientRect();
+      const { windowWidth } = uni.getSystemInfoSync();
+      battleRoomBtnStyle.value = {
+        // 按钮右边缘距视口右侧 = 屏幕宽 - 胶囊左边缘 + 4px 安全间隙
+        right: (windowWidth - menuButtonRect.left + 4) + "px",
+        // 垂直位置与胶囊顶部对齐
+        top: menuButtonRect.top + "px",
+        // 高度与胶囊一致，视觉融合
+        height: menuButtonRect.height + "px",
+      };
+    } catch (e) {
+      // 获取失败时使用 CSS 兜底定位（28vw + 4px 作为 right，8px 作为 top）
+    }
   }
   uni.$on("update-hot", updateHot);
 });
@@ -170,15 +185,22 @@ onBeforeUnmount(() => {
         }}</text
       >
     </view>
-    <view v-if="showProgress" class="battle-progress">
+    <view
+      v-if="
+        currentPage === 'pages/team-battle' ||
+        currentPage === 'pages/team-battle/index'
+      "
+      class="battle-progress"
+    >
       <HeaderProgress />
     </view>
-    <!-- 对战房间：整个胶囊为分享按钮，房号从 Store 读取 -->
+    <!-- 对战房间：整个胶囊为分享按钮，房号从 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" />
@@ -270,10 +292,12 @@ onBeforeUnmount(() => {
   margin: 0 20rpx;
   max-width: 300rpx;
 }
-/* 对战房间：整个胶囊作为分享按钮，靠右对齐 */
+/* 对战房间：整个胶囊作为分享按钮，fixed 定位脱离 flex 流，紧贴系统胶囊左侧 */
 .battle-room-number {
-  margin-left: auto;
+  position: fixed;
-  margin-right: 10rpx;
+  /* 兜底定位（JS 获取胶囊位置失败时生效）：约 28vw 对应胶囊区域左边缘 */
+  right: calc(28vw + 4px);
+  top: 8px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -282,9 +306,7 @@ onBeforeUnmount(() => {
   background: rgba(0, 0, 0, 0.15);
   border-radius: 96rpx;
   border: 1rpx solid #5b5758;
-  flex-shrink: 0;
   padding: 0;
-  line-height: normal;
 }
 /* 重置 button 默认边框 */
 .battle-room-number::after {

src/components/HeaderProgress.vue

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

src/components/Matching.vue

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

src/components/OtaModal.vue

@@ -0,0 +1,396 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  state: {
+    type: String,
+    default: "new_version", // new_version | update_progress | update_success | update_failure
+  },
+  version: {
+    type: String,
+    default: "",
+  },
+  progress: {
+    type: Number,
+    default: 40,
+  },
+  // 副标题：如“新版本将优化智能弓体验”
+  description: {
+    type: String,
+    default: "",
+  },
+  // 详细说明：如“升级前请确保：...”
+  changelog: {
+    type: String,
+    default: "",
+  },
+  forceUpdate: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(["update", "skip", "close", "done", "retry"]);
+
+const isNewVersion = computed(() => props.state === "new_version");
+const isProgress = computed(() => props.state === "update_progress");
+const isSuccess = computed(() => props.state === "update_success");
+const isFailure = computed(() => props.state === "update_failure");
+// Clamp progress to keep the progress bar width within its container.
+const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0)));
+</script>
+
+<template>
+  <view v-if="visible" class="ota-mask">
+    <!-- 图标 + 弹窗卡片 容器 -->
+    <view
+      class="ota-outer"
+      :class="isNewVersion ? 'outer-new' : 'outer-result'"
+    >
+      <!-- 悬浮图标（溢出卡片顶部） -->
+      <image
+        v-if="isNewVersion"
+        src="../static/ota/ota-mascot.png"
+        mode="aspectFit"
+        class="float-icon float-mascot"
+      />
+      <image
+        v-else-if="isSuccess"
+        src="../static/ota/check-char.png"
+        mode="aspectFit"
+        class="float-icon float-check"
+      />
+      <image
+        v-else-if="isFailure"
+        src="../static/ota/close-char.png"
+        mode="aspectFit"
+        class="float-icon float-close"
+      />
+      <image
+        v-else-if="isProgress"
+        src="../static/ota/target-char.png"
+        mode="aspectFit"
+        class="float-icon float-target"
+      />
+
+      <!-- 弹窗卡片：overflow:visible 允许按钮溢出底部，背景图通过 ota-bg-clip 独立裁剪保持圆角 -->
+      <view class="ota-dialog">
+        <view class="ota-bg-clip">
+          <image src="../static/ota/ota-bg.png" mode="aspectFill" class="ota-bg" />
+        </view>
+        <view
+          class="ota-content"
+          :class="{ 'content-new': isNewVersion, 'content-result': isProgress || isSuccess || isFailure }"
+        >
+
+          <!-- 发现新版本：new-ver.png 已包含标题图，不再重复文字；版本号使用 ota-ver.png 胶囊背景 -->
+          <block v-if="isNewVersion">
+            <image src="../static/ota/new-ver.png" mode="aspectFit" class="new-ver-img" />
+            <view v-if="version" class="version-tag-wrap">
+              <image src="../static/ota/ota-ver.png" mode="aspectFill" class="version-tag-bg-img" />
+              <text class="version-tag">{{ version }}</text>
+            </view>
+            <!-- 副标题：如“新版本将优化智能弓体验”，离下方详情 12rpx -->
+            <text v-if="description" class="desc-text">{{ description }}</text>
+            <!-- 详细说明：如“升级前请确保：...” -->
+            <text v-if="changelog" class="changelog-text">{{ changelog }}</text>
+            <view class="btn-group">
+              <view class="primary-btn" @click="emit('update')">
+                <text class="primary-btn-text">立即更新</text>
+              </view>
+              <text v-if="!forceUpdate" class="skip-text" @click="emit('skip')">暂不更新</text>
+            </view>
+          </block>
+
+          <!-- 更新成功：图片左边距 34rpx，文案左边距 44rpx，按钮浮动底部居中 -->
+          <block v-else-if="isSuccess">
+            <image src="../static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
+            <text class="dialog-desc">请关机并重启智能弓</text>
+            <view class="btn-group-result">
+              <view class="primary-btn" @click="emit('done')">
+                <text class="primary-btn-text">完成</text>
+              </view>
+            </view>
+          </block>
+
+          <!-- 更新中：复用成功标题图，正文区域展示进度条，无底部按钮 -->
+          <block v-else-if="isProgress">
+            <image src="../static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
+            <view class="progress-wrap">
+              <view class="progress-track">
+                <view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
+              </view>
+            </view>
+          </block>
+
+          <!-- 更新失败：图片左边距 34rpx，文案左对齐 44rpx，按钮浮动底部居中 -->
+          <block v-else-if="isFailure">
+            <image src="../static/ota/update-fail.png" mode="aspectFit" class="result-title-img" style="width: 222rpx; height: 62rpx;" />
+            <text class="dialog-desc">请确保：</text>
+            <text class="dialog-desc">1、智能弓已开启</text>
+            <text class="dialog-desc">2、网路连接稳定</text>
+            <view class="btn-group-result">
+              <view class="primary-btn" @click="emit('retry')">
+                <text class="primary-btn-text">重试</text>
+              </view>
+            </view>
+          </block>
+
+        </view>
+      </view>
+    </view>
+
+    <!-- 关闭按钮（仅新版本状态，非强制更新时，位于弹窗下方） -->
+    <view
+      v-if="isNewVersion && !forceUpdate"
+      class="ota-close-below"
+      @click="emit('close')"
+    >
+      <image src="../static/sicon/close.png" mode="aspectFit" style="width: 56rpx; height: 56rpx;" />
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.ota-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.7);
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 外层容器：相对定位，为浮动图标创造溢出空间 */
+.ota-outer {
+  position: relative;
+  overflow: visible;
+}
+/* 设计图：吉祥物向上突出弹窗顶部 40px（375px基准）× 2 = 80rpx */
+.outer-new {
+  padding-top: 80rpx;
+}
+.outer-result {
+  padding-top: 80rpx;
+  padding-bottom: 66rpx;
+}
+
+/* 浮动图标（绝对定位，位于卡片顶部上方） */
+.float-icon {
+  position: absolute;
+  z-index: 2;
+}
+/* 吉祥物尺寸：设计图 149×109px（375px基准）× 2 = 298×218rpx */
+.float-mascot {
+  width: 298rpx;
+  height: 218rpx;
+  top: -5px;
+  right: -74rpx;
+}
+.float-check {
+  width: 194rpx;
+  height: 166rpx;
+  top: 20px;
+  right: 30rpx;
+}
+.float-close {
+  width: 194rpx;
+  height: 164rpx;
+  top: 20px;
+  right: 30rpx;
+}
+.float-target {
+  width: 194rpx;
+  height: 166rpx;
+  top: 20px;
+  right: 30rpx;
+}
+
+/* 弹窗卡片：overflow:visible 允许按钮溢出底部，背景通过 ota-bg-clip 独立裁剪 */
+.ota-dialog {
+  position: relative;
+  width: 482rpx;
+  border-radius: 24rpx;
+  border: 2rpx solid #F9D5A1;
+  overflow: visible;
+  background-color: #392F1D;
+}
+/* 背景图裁剪层：独立 overflow:hidden + border-radius 保持圆角效果 */
+.ota-bg-clip {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border-radius: 24rpx;
+  overflow: hidden;
+  z-index: 0;
+}
+.ota-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.ota-content {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  /* 按钮以外内容均左对齐 */
+  align-items: flex-start;
+}
+.content-new {
+  padding: 30rpx 0 40rpx 0;
+}
+.content-result {
+  padding: 30rpx 0 66rpx 0;
+}
+
+/* 发现新版本内容 */
+.new-ver-img {
+  width: 274rpx;
+  height: 62rpx;
+  /* 左边距 34rpx，去掉 margin-bottom */
+  margin-left: 34rpx;
+}
+/* 版本号胶囊容器：相对定位，使 ota-ver.png 作为背景衬底 */
+.version-tag-wrap {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* 离标题图 -10rpx，左边距 50rpx，离下方副标题 22rpx */
+  margin-top: -10rpx;
+  margin-left: 50rpx;
+  margin-bottom: 22rpx;
+}
+/* ota-ver.png 胶囊背景图 */
+.version-tag-bg-img {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+/* 版本号文字：浮于背景图之上 */
+.version-tag {
+  position: relative;
+  z-index: 1;
+  color: rgba(254, 222, 100, 1);
+  font-size: 24rpx;
+  padding: 8rpx 22rpx 4rpx 24rpx;
+}
+/* 副标题（如"新版本将优化智能弓体验"）：左边距 44rpx，离下方文案 12rpx */
+.desc-text {
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #FFFFFF;
+  line-height: 36rpx;
+  text-align: left;
+  margin-left: 44rpx;
+  margin-bottom: 12rpx;
+}
+/* 详细说明文案（如“升级前请确保：...”）：左边距 44rpx */
+.changelog-text {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #FFFFFF;
+  line-height: 40rpx;
+  text-align: left;
+  margin-left: 44rpx;
+  margin-bottom: 0;
+}
+
+/* 按钮组（新版本状态）：离上方文案 30rpx，内部按钮间距 24rpx */
+.btn-group {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 30rpx;
+  gap: 24rpx;
+}
+/* 按钮组（结果状态）：绝对定位，溢出卡片底边 -35rpx 悬浮在底边中间 */
+.btn-group-result {
+  position: absolute;
+  bottom: -35rpx;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+/* 主按钮：按照设计规范 width: 232rpx, height: 70rpx */
+.primary-btn {
+  width: 232rpx;
+  height: 70rpx;
+  background-color: #FED847;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.primary-btn-text {
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #000000;
+  line-height: 36rpx;
+}
+/* 暂不更新：设计规范颜色 #5FADFF 蓝色 */
+.skip-text {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #5FADFF;
+  line-height: 36rpx;
+}
+
+/* 更新结果内容：图片左边距 34rpx，下边距 16rpx */
+.result-title-img {
+  margin-left: 34rpx;
+  margin-bottom: 16rpx;
+}
+/* 结果页文案：左对齐，左边距 44rpx，与 new_version 保持一致 */
+.dialog-desc {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #FFFFFF;
+  line-height: 40rpx;
+  text-align: left;
+  margin-left: 44rpx;
+}
+.progress-wrap {
+  width: 394rpx;
+  margin-top: 40rpx;
+  margin-left: 44rpx;
+}
+.progress-track {
+  width: 100%;
+  height: 18rpx;
+  background-color: rgba(255, 255, 255, 0.28);
+  border-radius: 999rpx;
+  overflow: hidden;
+}
+.progress-fill {
+  height: 100%;
+  background-color: #FED847;
+  border-radius: 999rpx;
+}
+
+/* 关闭按钮（位于弹窗下方） */
+.ota-close-below {
+  margin-top: 40rpx;
+  display: flex;
+  justify-content: center;
+}
+</style>

src/components/PlayerScore.vue

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

src/components/PlayerSeats.vue

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

src/components/ShootProgress2.vue

@@ -29,6 +29,33 @@ const updateRemain = (value) => {
     if (timer.value) clearInterval(timer.value);
     return
   }
+  // zeroThenReset：ToSomeoneShoot 到达时，若进度条仍在倒计时则先瞬间清零（约 150ms 停留）再显示下一玩家满值
+  // 若进度条已到 0（loading 状态），直接切换满值
+  if (value.zeroThenReset) {
+    if (timer.value) clearInterval(timer.value);
+    const wasNonZero = remain.value > 0;
+    // 更新下一玩家颜色和方向（在清零和满值时均生效）
+    currentTeam.value = value.team;
+    if (value.team === 'red') barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+    if (value.team === 'blue') barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+    transitionStyle.value = "none";
+    if (wasNonZero) {
+      // 瞬间清零，停留约 150ms 后切换为满值
+      remain.value = 0;
+      loading.value = true;
+      setTimeout(() => {
+        remain.value = value.value;
+        loading.value = false;
+        setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+      }, 150);
+    } else {
+      // 已在底部，直接切换满值
+      remain.value = value.value;
+      loading.value = false;
+      setTimeout(() => { transitionStyle.value = "all 1s linear"; }, 50);
+    }
+    return;
+  }
   loading.value = false;
   currentTeam.value = value.team
   if (value.team === 'red')
@@ -36,7 +63,14 @@ const updateRemain = (value) => {
   if (value.team === 'blue')
     barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
   if (value.reset) {
+    // 重置前先清除旧计时器，防止超时未射箭时旧 interval 残留，导致进度条震荡
+    if (timer.value) clearInterval(timer.value);
+    // 重置时瞬间跳满格，禁用 CSS 过渡避免从旧值「涨到满」的动画
+    transitionStyle.value = "none";
     remain.value = value.value;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
     return;
   }
   const newVal = Math.round(value.value);
@@ -51,6 +85,8 @@ const updateRemain = (value) => {
     remain.value = newVal;
   }
 
+  // 启动前先清除旧计时器，防止多次 {stop:false} 事件叠加多个 interval
+  if (timer.value) clearInterval(timer.value);
   timer.value = setInterval(() => {
     loading.value = remain.value === 0;
     if (remain.value > 0) remain.value--;

src/components/TeamAvatars.vue

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

src/main.js

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

src/manifest.json

@@ -64,7 +64,11 @@
         "usingComponents" : true,
         "darkmode" : true,
         "themeLocation" : "theme.json",
-        "permission" : {},
+        "permission" : {
+          "scope.userLocation": {
+            "desc": "用于扫描附近 WiFi，完成设备 OTA 升级网络连接"
+          }
+        },
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     }
 }

src/mock/index.js

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

src/mock/trainingDifficulty.js

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

src/pages.json

@@ -31,7 +31,7 @@
       }
     },
     {
-      "path": "pages/team-battle"
+      "path": "pages/team-battle/index"
     },
     {
       "path": "pages/melee-battle"
@@ -39,6 +39,9 @@
     {
       "path": "pages/battle-result"
     },
+    {
+      "path": "pages/friend-battle-result"
+    },
     {
       "path": "pages/point-book-edit"
     },
@@ -118,13 +121,10 @@
       "path": "pages/mine-bow-data"
     },
     {
-      "path": "pages/training/difficulty"
+      "path": "pages/ota-wifi",
-    },
+      "style": {
-    {
+        "navigationStyle": "custom"
-      "path": "pages/training/index"
+      }
-    },
-    {
-      "path": "pages/training/practise-one"
     }
   ],
   "globalStyle": {

src/pages/battle-result.vue

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

src/pages/battle-room.vue

@@ -9,9 +9,7 @@ import Avatar from "@/components/Avatar.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import {
   getRoomAPI,
-  destroyRoomAPI,
   exitRoomAPI,
-  startRoomAPI,
   chooseTeamAPI,
   getReadyAPI,
   kickPlayerAPI,
@@ -19,6 +17,7 @@ import {
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+import audioManager from "@/audioManager";
 const store = useStore();
 const { user } = storeToRefs(store);
 
@@ -42,10 +41,23 @@ const battleTitle = computed(() => {
   return `${half}v${half}对抗赛`;
 });
 
+/** 靶纸尺寸（cm），由 URL 参数或 API 返回的 targetType 字段填充 */
+const targetSize = ref(0);
+
+/**
+ * 根据 targetSize 动态生成靶纸尺寸文本，如"40cm"
+ * 数据未就绪时显示 "--"；数据来源：创建者取 URL 参数 target，加入者取 API 返回的 targetType
+ */
+const targetSizeLabel = computed(() =>
+  targetSize.value ? `${targetSize.value}cm` : '--'
+);
+
 const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
 const goBattle = ref(false);
+/** 从结算页返回时为 true，跳过进场靶纸语音 */
+const skipTargetAudio = ref(false);
 
 /**
  * 从服务端刷新当前房间数据，更新成员列表、准备状态等信息
@@ -56,6 +68,15 @@ async function refreshRoomData() {
   const result = await getRoomAPI(roomNumber.value);
   if (result.started) return;
   room.value = result;
+  // 加入者通过 API 返回的 targetType 字段同步靶纸尺寸，并持久化到本地缓存
+  if (result.targetType) {
+    targetSize.value = result.targetType;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, result.targetType);
+  } else if (targetSize.value === 0) {
+    // API 无该字段时，从本地缓存兜底（如"返回房间"场景）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
   owner.value = {};
   opponent.value = {};
   const members = result.members || [];
@@ -115,10 +136,6 @@ async function refreshRoomData() {
   // timer.value = setTimeout(refreshRoomData, 2000);
 }
 
-const startGame = async () => {
-  const result = await startRoomAPI(room.value.number);
-};
-
 const getReady = async () => {
   await getReadyAPI(roomNumber.value);
 };
@@ -178,7 +195,7 @@ async function onReceiveMessage(message) {
       uni.setStorageSync("blue-team", message.teams[1].players || []);
       uni.setStorageSync("red-team", message.teams[2].players || []);
       uni.redirectTo({
-        url: "/pages/team-battle?battleId=" + message.matchId,
+        url: "/pages/team-battle/index?battleId=" + message.matchId,
       });
     } else {
       uni.redirectTo({
@@ -193,14 +210,6 @@ const chooseTeam = async (team) => {
   refreshMembers(result.members);
 };
 
-const destroyRoom = async () => {
-  if (roomNumber.value) await destroyRoomAPI(roomNumber.value);
-};
-
-const exitRoom = async () => {
-  uni.navigateBack();
-};
-
 /** 待确认踢出的玩家信息 */
 const playerToKick = ref(null);
 /** 控制踢出确认弹窗的显示状态 */
@@ -241,11 +250,41 @@ const canClick = computed(() => {
   return true;
 });
 
+/**
+ * 根据对战类型和人数动态生成分享文案
+ * 1v1 / 默认 → "星球论箭，来一决高下敢否?"
+ * 2v2 → "2v2对抗赛，是兄弟来助我一把!"
+ * 3v3 → "3v3对抗赛，来了马上发车!"
+ * 乱斗 → "热血乱斗赛，敢来争锋?"
+ */
+const shareTitle = computed(() => {
+  const { battleType, count } = room.value;
+  if (battleType === 2) return '热血乱斗赛，敢来争锋?';
+  if (battleType === 1 && count === 4) return '2v2对抗赛，是兄弟来助我一把!';
+  if (battleType === 1 && count === 6) return '3v3对抗赛，来了马上发车!';
+  return '星球论箭，来一决高下敢否?';
+});
+
+/**
+ * 根据对战类型和靶纸尺寸动态返回分享封面图路径，共 4 张图：
+ *   contest_share_20.png — 约战/对抗赛 + 20cm 靶
+ *   contest_share_40.png — 约战/对抗赛 + 40cm 靶
+ *   melee_share_20.png   — 多人乱斗 + 20cm 靶
+ *   melee_share_40.png   — 多人乱斗 + 40cm 靶
+ *
+ * 当 targetSize 未知时默认取 20cm 图。
+ */
+const shareImage = computed(() => {
+  const type = room.value.battleType === 2 ? 'melee' : 'contest';
+  const size = targetSize.value === 40 ? '40' : '20';
+  return `https://static.shelingxingqiu.com/shootmini/static/share/${type}_share_${size}.png`;
+});
+
 onShareAppMessage(() => {
   return {
-    title: "邀请您进入房间对战",
+    title: shareTitle.value,
     path: "/pages/friend-battle?roomID=" + roomNumber.value,
-    imageUrl: "",
+    imageUrl: shareImage.value,
   };
 });
 
@@ -265,10 +304,21 @@ onShow(() => {
  * - 同步到 Pinia Store（供 Header 组件展示房号胶囊）
  */
 onLoad(async (options) => {
+  // 从结算页跳回时携带 fromResult=1，标记跳过进场语音
+  if (options.fromResult) skipTargetAudio.value = true;
   if (options.roomNumber) {
     roomNumber.value = options.roomNumber;
     store.updateRoomNumber(options.roomNumber);
   }
+  // 创建者通过 URL 参数 target（1→20cm，2→40cm）初始化靶纸尺寸，并持久化到本地缓存
+  if (options.target) {
+    targetSize.value = parseInt(options.target) * 20;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, targetSize.value);
+  } else if (roomNumber.value) {
+    // "返回房间"等无 target 参数的场景：从本地缓存恢复（待 refreshRoomData 进一步覆盖）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
 });
 
 /**
@@ -280,6 +330,13 @@ onMounted(() => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  // 页面加载完成 1 秒后根据靶纸尺寸播报对应语音；从结算页返回时跳过
+  setTimeout(() => {
+    if (!skipTargetAudio.value) {
+      const key = targetSize.value === 40 ? '40CM全环靶' : '20CM全环靶';
+      audioManager.play(key);
+    }
+  }, 1000);
 });
 
 onBeforeUnmount(() => {
@@ -299,11 +356,8 @@ onBeforeUnmount(() => {
       <GuideTwo>
         <view class="battle-guide">
           <view class="guide-tips">
-            <text>弓箭手们，人都到齐了吗?</text>
+            <text class="guide-tips__target">请使用{{ targetSizeLabel }}全环靶</text>
-            <text v-if="room.battleType === 1">{{
+            <text class="guide-tips__warn">如果实际靶纸与选择靶纸不同，将导致射箭无效</text>
-              `${room.count / 2}v${room.count / 2}比赛即将开始!`
-            }}</text>
-            <text v-if="room.battleType === 2">大乱斗即将开始! </text>
           </view>
         </view>
       </GuideTwo>
@@ -344,7 +398,8 @@ onBeforeUnmount(() => {
             <view v-for="(item, index) in players" :key="index">
               <Avatar v-if="item.id" :src="item.avatar" :size="36" />
               <text v-if="owner.id === item.id">管理员</text>
-              <button v-if="owner.id !== item.id && item.id" hover-class="none" class="remove-player"
+              <!-- 仅房主可见踢人按钮，且不能踢自己 -->
+              <button v-if="owner.id !== item.id && item.id && owner.id === user.id" hover-class="none" class="remove-player"
                 @click="() => removePlayer(item)" :style="{ top: '-10rpx', right: '-10rpx' }">
                 <image src="../static/close-white.png" mode="widthFix" />
               </button>
@@ -384,10 +439,11 @@ onBeforeUnmount(() => {
           </view>
         </view>
       </block>
+      <!-- isOwner：当前用户是房主时才展示踢人按钮 -->
       <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
-        :removePlayer="removePlayer" />
+        :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
       <view>
-        <SButton :disabled="!canClick" :onClick="getReady">
+        <SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)">
           {{
             allReady.value
               ? "即将进入对局..."
@@ -818,4 +874,23 @@ onBeforeUnmount(() => {
   border: 1rpx solid #a3793f66;
   color: #fed847;
 }
+
+.guide-tips__target {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: rgba(255, 217, 71, 0.8);
+}
+
+.guide-tips__warn {
+  font-weight: 400;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-top: 6rpx;
+}
+
+.guide-tips {
+  display: flex;
+  flex-direction: column;
+  padding-left: 20rpx;
+}
 </style>

src/pages/friend-battle.vue

@@ -98,8 +98,10 @@ onLoad(async (options) => {
   <Container title="好友约战" :showBackToGame="true">
     <view :style="{ width: '100%', height: '100%' }">
       <GuideTwo>
-        <text :style="{color: 'rgba(255,217,71,0.8)'}">约上朋友开几局，欢乐多，不寂寞</text>
+        <view class="guide-tips">
-        <text>一起练升级更快，早日加入全国排位赛！</text>
+          <text class="guide-tips__main">约上朋友开几局，欢乐多，不寂寞</text>
+          <text class="guide-tips__sub">一起练升级更快，早日加入全国排位赛！</text>
+        </view>
       </GuideTwo>
       <view class="my-data">
         <view>
@@ -139,7 +141,7 @@ onLoad(async (options) => {
         <image src="../static/founded-room.png" mode="widthFix" />
         <view>
           <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
-          <view @click="enterRoom(roomNumber)">进入房间</view>
+          <view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
         </view>
       </view>
       <view class="create-room">
@@ -153,7 +155,7 @@ onLoad(async (options) => {
           </view>
         </view>
         <view>
-          <SButton width="80%" :rounded="30" :onClick="onCreateRoom">
+          <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
             创建约战房
           </SButton>
         </view>
@@ -162,7 +164,8 @@ onLoad(async (options) => {
         <view v-if="warnning" class="warnning">
           {{ warnning }}
         </view>
-        <CreateRoom v-if="!warnning" :onConfirm="() => (showModal = false)" />
+        <!-- showModal 关闭时立即销毁组件，重开时重建，确保选项重置为 0 -->
+        <CreateRoom v-if="!warnning && showModal" :onConfirm="() => (showModal = false)" />
       </SModal>
       <Signin :show="showSignin" :onClose="onSignin" />
     </view>
@@ -170,6 +173,24 @@ onLoad(async (options) => {
 </template>
 
 <style scoped>
+.guide-tips {
+  display: flex;
+  flex-direction: column;
+  padding-left: 112rpx;
+  width: 100%;
+}
+.guide-tips__main {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: rgba(255, 217, 71, 0.8);
+}
+.guide-tips__sub {
+  font-weight: 400;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-top: 6rpx;
+}
+
 .founded-room {
   display: flex;
   flex-direction: column;

src/pages/index.vue

@@ -6,6 +6,7 @@ import AppFooter from "@/components/AppFooter.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
+import OtaModal from "@/components/OtaModal.vue";
 
 import {
   checkUserBindAPI,
@@ -36,6 +37,44 @@ const showModal = ref(false);
 const showGuide = ref(false);
 const scoreRankList = ref([]);
 
+// OTA 相关
+const otaVisible = ref(false);
+const otaState = ref("new_version");
+const OTA_MOCK = {
+  hasUpdate: true,
+  version: "V8.7.0",
+  description: "新版本将优化智能弓体验",
+  details: "升级前请确保：\n1、智能弓已开启，且电量充足\n2、所处稳定的 Wi-Fi 环境中。",
+  forceUpdate: false,
+};
+
+const checkOtaUpdate = () => {
+  if (!OTA_MOCK.hasUpdate) return;
+  const dismissedAt = uni.getStorageSync("ota_dismissed_at");
+  const now = Date.now();
+  if (dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
+  otaState.value = "new_version";
+  otaVisible.value = true;
+};
+
+const handleOtaDismiss = () => {
+  uni.setStorageSync("ota_dismissed_at", Date.now());
+  otaVisible.value = false;
+};
+
+const handleOtaUpdate = () => {
+  otaVisible.value = false;
+  uni.navigateTo({ url: "/pages/ota-wifi" });
+};
+
+const handleOtaDone = () => {
+  otaVisible.value = false;
+};
+
+const handleOtaRetry = () => {
+  otaVisible.value = false;
+};
+
 // 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
 const getScoreRankData = (result) => {
   if (Array.isArray(result)) return result;
@@ -63,33 +102,42 @@ const toRankListPage = () => {
   });
 };
 
-onShow(async () => {
+onShow(async (options) => {
+  // 检查是否从 OTA 更新页面返回
+  if (options && options.updateResult) {
+    otaState.value = options.updateResult;
+    otaVisible.value = true;
+  } else {
+    checkOtaUpdate();
+  }
+
   const env = uni.getAccountInfoSync().miniProgram.envVersion;
   const token = uni.getStorageSync(`${env}_token`);
 
   if (!user.value.id && !token) {
-    try {
+    // showModal.value = true;
-      const wxResult = await uni.login({provider: "weixin"});
+    // try {
-      const bindResult = await checkUserBindAPI(wxResult.code);
+    //   const wxResult = await uni.login({provider: "weixin"});
-      if (bindResult.binded) {
+    //   const bindResult = await checkUserBindAPI(wxResult.code);
-        const newResult = await uni.login({provider: "weixin"});
+    //   if (bindResult.binded) {
-        const silentResult = await silentLoginAPI(newResult.code);
+    //     const newResult = await uni.login({provider: "weixin"});
-        if (silentResult.user) updateUser(silentResult.user);
+    //     const silentResult = await silentLoginAPI(newResult.code);
-        const devices = await getMyDevicesAPI();
+    //     if (silentResult.user) updateUser(silentResult.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);
+    //       const data = await getDeviceBatteryAPI();
-        }
+    //       updateOnline(data.online);
-      } else {
+    //     }
-        showModal.value = true;
+    //   } else {
-      }
+    //     showModal.value = true;
-    } catch (e) {
+    //   }
-      console.log("检查绑定状态失败", e);
+    // } catch (e) {
-    }
+    //   console.log("检查绑定状态失败", e);
+    // }
   }
 
   const promises = [getScoreRankList(undefined, 1, 10)];
@@ -157,12 +205,26 @@ onShareTimeline(() => {
 
 <template>
   <Container :isHome="true" :showBackToGame="true">
+    <!-- OTA 升级弹窗：使用 visible 控制显隐，description 为副标题，changelog 为详细说明 -->
+    <OtaModal
+      :visible="otaVisible"
+      :state="otaState"
+      :version="OTA_MOCK.version"
+      :description="OTA_MOCK.description"
+      :changelog="OTA_MOCK.details"
+      :forceUpdate="OTA_MOCK.forceUpdate"
+      @update="handleOtaUpdate"
+      @skip="handleOtaDismiss"
+      @close="handleOtaDismiss"
+      @done="handleOtaDone"
+      @retry="handleOtaRetry"
+    />
     <view class="container">
       <view class="top-theme">
-        <image
+        <!-- <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' }">
@@ -178,7 +240,7 @@ onShareTimeline(() => {
                 v-else
                 src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
                 mode="widthFix"
-                @click="() => toPage('/pages/my-device')"
+                @click="$clickSound(() => toPage('/pages/my-device'))"
             />
             <block v-if="user.id">
               <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -196,11 +258,10 @@ onShareTimeline(() => {
             </BubbleTip>
           </view>
           <view class="play-card">
-            <!-- toPage('/pages/practise') -->
+            <view @click="$clickSound(() => toPage('/pages/practise'))">
-            <view @click="() => toPage('/pages/training/index')">
               <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
-            <view @click="() => toPage('/pages/friend-battle')">
+            <view @click="$clickSound(() => toPage('/pages/friend-battle'))">
               <image src="../static/friend-battle.png" mode="widthFix"/>
             </view>
           </view>
@@ -212,7 +273,7 @@ onShareTimeline(() => {
           />
           <button
               class="into-btn"
-              @click="() => toPage('/pages/ranking')"
+              @click="$clickSound(() => toPage('/pages/ranking'))"
               hover-class="none"
           ></button>
           <view class="ranking-players" @click="toRankListPage">
@@ -476,7 +537,7 @@ onShareTimeline(() => {
 
 .top-theme {
   position: absolute;
-  display: flex;
+  display: none;
   align-items: center;
   justify-content: center;
   width: 100%;

src/pages/match-detail.vue

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

src/pages/match-page.vue

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

src/pages/melee-battle.vue

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

src/pages/my-device.vue

@@ -93,6 +93,11 @@ const unbindDevice = async () => {
   device.value = {};
 };
 
+/** 连接wifi跳转到wifi列表页面 */
+const joinWifi = () => {
+  uni.navigateTo({ url: "/pages/ota-wifi" });
+};
+
 const toDeviceIntroPage = () => {
   uni.navigateTo({
     url: "/pages/device-intro",
@@ -130,7 +135,7 @@ onShow(() => {
 <template>
   <Container title="弓箭绑定">
     <view v-if="!device.deviceId" class="scan-code">
-      <button hover-class="none" @click="handleScan">
+      <button hover-class="none" @click="$clickSound(handleScan)">
         <image src="../static/scan.png" mode="widthFix" />
       </button>
       <button hover-class="none" @click="showTip = true">
@@ -269,10 +274,15 @@ onShow(() => {
         </view>
       </view>
       <view :style="{ marginTop: '240rpx' }">
-        <SButton :onClick="unbindDevice" width="80vw" :rounded="40"
+        <SButton :onClick="() => $clickSound(unbindDevice)" width="80vw" :rounded="40"
           >解绑</SButton
         >
       </view>
+      <view :style="{ marginTop: '20rpx' }">
+        <SButton :onClick="() => $clickSound(joinWifi)" width="80vw" :rounded="40"
+          >设备连接WIFI</SButton
+        >
+      </view>
     </view>
   </Container>
 </template>

src/pages/my-growth.vue

@@ -55,7 +55,14 @@ const onPractiseLoading = async (page) => {
 };
 const getName = (battle) => {
   if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
-  return battle.mode + "人大乱斗";
+  // 排位赛大乱斗：mode 数字与实际人数不一致，使用固定映射
+  if (battle.way === 2) {
+    if (battle.mode === 4) return "5人大乱斗";
+    if (battle.mode === 5) return "10人大乱斗";
+  }
+  // 好友约战大乱斗：从 teams[0].players 取实际参与人数动态展示
+  const count = battle.teams?.[0]?.players?.length;
+  return count ? `${count}人大乱斗` : "大乱斗";
 };
 
 /**
@@ -108,7 +115,7 @@ onLoad((options) => {
                 :blueTeam="item.teams[1] ? item.teams[1].players : []"
                 :redTeam="item.teams[2] ? item.teams[2].players : []"
                 :winner="item.winTeam"
-                :showRank="item.teams[0]"
+                :showRank="!!item.teams[0]"
                 :showHeader="false"
               />
             </view>
@@ -131,7 +138,7 @@ onLoad((options) => {
                 :blueTeam="item.teams[1] ? item.teams[1].players : []"
                 :redTeam="item.teams[2] ? item.teams[2].players : []"
                 :winner="item.winTeam"
-                :showRank="item.teams[0]"
+                :showRank="!!item.teams[0]"
                 :showHeader="false"
               />
             </view>

src/pages/ota-wifi.vue

@@ -0,0 +1,979 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import ScreenHint from "@/components/ScreenHint.vue";
+
+const STATES = {
+  SCANNING: "SCANNING",
+  LIST: "LIST",
+  CONNECTING: "CONNECTING",
+  CONNECTED: "CONNECTED",
+  UPDATING: "UPDATING",
+  DONE: "DONE",
+  FAILED: "FAILED",
+};
+
+const isIOS = uni.getDeviceInfo().osName === "ios";
+const currentState = ref(STATES.SCANNING);
+const connectedWifi = ref(null);
+const wifiList = ref([]);
+const showWifiBanner = ref(false);
+
+const connectingWifi = ref(null);
+const connectInput = ref({ ssid: "", password: "" });
+const connectMode = ref("secure"); // secure | open | manual
+const connectError = ref("");
+const keyboardHeight = ref(0);
+// 控制密码输入框是否显示明文
+const showPassword = ref(false);
+// 刷新防抖标志：扫描进行中为 true，禁止重复点击；扫描结束（成功/失败）后重置为 false。
+const isRefreshing = ref(false);
+
+const progress = ref(0);
+let progressTimer = null;
+let timeoutTimer = null;
+// 控制授权拒绝弹窗显示/隐藏
+const wifiAuthDeniedVisible = ref(false);
+
+// 判断 WiFi 列表失败是否由用户拒绝授权引起（兼容 errno:103 及各平台 errMsg 变体）。
+const isWifiPermissionDenied = (err) => {
+  if (err?.errno === 103) return true;
+  const errMsg = err?.errMsg || "";
+  return /auth den|authorize|permission denied|user denied|scope\.userLocation/i.test(errMsg);
+};
+
+// 显示授权拒绝弹窗，通过 ScreenHint 组件呈现。
+const showWifiPermissionDeniedModal = () => {
+  wifiAuthDeniedVisible.value = true;
+};
+
+// 用户点击「重新授权」时，打开小程序权限设置页，引导用户开启位置权限后重新扫描。
+const handleReauthorize = () => {
+  wifiAuthDeniedVisible.value = false;
+  uni.openSetting({
+    success(res) {
+      // 若用户在设置页开启了位置权限，则重新启动 WiFi 扫描
+      if (res.authSetting["scope.userLocation"]) {
+        startScanning();
+      }
+    },
+  });
+};
+
+// 将 iOS 当前手机连接的 WiFi 写入候选列表，供用户继续填写设备连接密码；扫描结束后重置刷新防抖标志。
+const applyIOSConnectedWifi = (wifi) => {
+  const ssid = wifi?.SSID;
+  if (!ssid) {
+    wifiList.value = [];
+    currentState.value = STATES.LIST;
+    isRefreshing.value = false;
+    return;
+  }
+
+  wifiList.value = [
+    {
+      ...wifi,
+      SSID: ssid,
+      secure: wifi.secure !== false,
+      fromCurrentWifi: true,
+    },
+  ];
+  currentState.value = STATES.LIST;
+  isRefreshing.value = false;
+};
+
+// 获取 iOS 当前手机连接的 WiFi，并把它作为可选网络展示。
+const syncIOSConnectedWifi = () => {
+  wx.getConnectedWifi({
+    success(res) {
+      console.log("[OTA WiFi] wx.getConnectedWifi success:", res);
+      applyIOSConnectedWifi(res.wifi || res);
+    },
+    fail(err) {
+      console.warn("[OTA WiFi] wx.getConnectedWifi fail:", {
+        errCode: err?.errCode,
+        errMsg: err?.errMsg,
+        err,
+      });
+      wifiList.value = [];
+      currentState.value = STATES.LIST;
+      isRefreshing.value = false;
+    },
+  });
+};
+
+// 启动 iOS WiFi 能力；iOS 只用当前手机连接的 WiFi 作为候选网络。
+const startIOSScanning = () => {
+  wx.startWifi({
+    success(res) {
+      console.log("[OTA WiFi] wx.startWifi success:", res);
+      syncIOSConnectedWifi();
+    },
+    fail(err) {
+      console.error("[OTA WiFi] wx.startWifi fail:", {
+        errCode: err?.errCode,
+        errMsg: err?.errMsg,
+        err,
+      });
+      if (err.errCode === 12005) showWifiBanner.value = true;
+      currentState.value = STATES.LIST;
+      isRefreshing.value = false;
+    },
+  });
+};
+
+// 启动小程序 WiFi 能力并按平台获取可用网络；也作为刷新按钮的点击处理器，重新获取最新 WiFi 列表。
+// 扫描进行中时防抖：若上次扫描尚未完成则直接 return，避免重复触发导致弹窗异常。
+const startScanning = () => {
+  if (isRefreshing.value) return;
+  isRefreshing.value = true;
+  currentState.value = STATES.SCANNING;
+  wifiList.value = [];
+  showWifiBanner.value = false;
+  connectError.value = "";
+
+  if (isIOS) {
+    startIOSScanning();
+    return;
+  }
+
+  wx.startWifi({
+    success(res) {
+      console.log("[OTA WiFi] wx.startWifi success:", res);
+      wx.getWifiList({
+        success(res) {
+          console.log("[OTA WiFi] wx.getWifiList request success:", res);
+        },
+        fail(err) {
+          console.error("[OTA WiFi] wx.getWifiList fail:", {
+            errCode: err?.errCode,
+            errMsg: err?.errMsg,
+            err,
+          });
+          if (isWifiPermissionDenied(err)) showWifiPermissionDeniedModal();
+          if (err.errCode === 12005) showWifiBanner.value = true;
+          isRefreshing.value = false;
+        },
+      });
+    },
+    fail(err) {
+      console.error("[OTA WiFi] wx.startWifi fail:", {
+        errCode: err?.errCode,
+        errMsg: err?.errMsg,
+        err,
+      });
+      if (isWifiPermissionDenied(err)) showWifiPermissionDeniedModal();
+      if (err.errCode === 12005) showWifiBanner.value = true;
+      isRefreshing.value = false;
+    },
+  });
+
+  wx.onGetWifiList((res) => {
+    const realWifiList = res.wifiList || [];
+    if (realWifiList.length) {
+      console.log("[OTA WiFi] wx.onGetWifiList received wifiList:", realWifiList);
+    } else {
+      console.warn("[OTA WiFi] wx.onGetWifiList received empty wifiList:", res);
+    }
+    wifiList.value = realWifiList;
+    currentState.value = STATES.LIST;
+    isRefreshing.value = false;
+  });
+};
+
+const selectWifi = (wifi) => {
+  connectingWifi.value = wifi;
+  connectInput.value = { ssid: wifi.SSID, password: "" };
+  connectMode.value = wifi.secure ? "secure" : "open";
+  connectError.value = "";
+  currentState.value = STATES.CONNECTING;
+};
+
+const selectOther = () => {
+  connectingWifi.value = null;
+  connectInput.value = { ssid: "", password: "" };
+  connectMode.value = "manual";
+  connectError.value = "";
+  currentState.value = STATES.CONNECTING;
+};
+
+const closeConnectSheet = () => {
+  connectError.value = "";
+  currentState.value = connectedWifi.value ? STATES.CONNECTED : STATES.LIST;
+};
+
+const hasChinese = (str) => /[\u4e00-\u9fa5]/.test(str);
+
+const ssidWarning = computed(() => {
+  if (connectMode.value === "manual" && hasChinese(connectInput.value.ssid)) {
+    return "网络名称仅支持英文字符及数字，请连接英文名网络或把网络改为英文";
+  }
+  return "";
+});
+
+const joinDisabled = computed(() => {
+  if (connectMode.value === "secure") return !connectInput.value.password;
+  if (connectMode.value === "manual") return !connectInput.value.ssid;
+  return false;
+});
+
+// 按当前页面状态限制 WiFi 列表高度，避免列表撑开整页。
+const wifiListScrollHeight = computed(() => {
+  if (currentState.value === STATES.SCANNING) return "auto";
+  const itemCount = wifiList.value.length + 1;
+  const maxHeight = currentState.value === STATES.CONNECTED ? 276 : 420;
+  return `${Math.min(itemCount * 92, maxHeight)}rpx`;
+});
+
+// 提交 WiFi 配置给游戏设备；后端接口未接入前只提示占位信息并停留在弹窗。
+const submitDeviceWifiConfig = ({ ssid, password }) => {
+  console.log("[OTA WiFi] submit device wifi config pending:", {
+    ssid,
+    hasPassword: !!password,
+  });
+  connectError.value = "设备连接接口待接入";
+  uni.showToast({
+    title: "设备连接接口待接入",
+    icon: "none",
+  });
+};
+
+// 校验用户输入并提交 WiFi 配置，不再把手机连接结果当作设备连接成功。
+const joinNetwork = () => {
+  if (joinDisabled.value) return;
+  connectError.value = "";
+  const ssid = connectInput.value.ssid;
+  const password = connectInput.value.password;
+
+  submitDeviceWifiConfig({ ssid, password });
+};
+
+const startUpdate = () => {
+  currentState.value = STATES.UPDATING;
+  progress.value = 0;
+  clearInterval(progressTimer);
+  progressTimer = setInterval(() => {
+    if (progress.value >= 90) {
+      clearInterval(progressTimer);
+      return;
+    }
+    const increment = Math.max(0.5, 2 - progress.value / 60);
+    progress.value = Math.min(90, progress.value + increment);
+  }, 500);
+  clearTimeout(timeoutTimer);
+  timeoutTimer = setTimeout(() => {
+    if (currentState.value === STATES.UPDATING) {
+      clearInterval(progressTimer);
+      currentState.value = STATES.FAILED;
+    }
+  }, 5 * 60 * 1000);
+};
+
+const handleWsDone = () => {
+  clearInterval(progressTimer);
+  clearTimeout(timeoutTimer);
+  progress.value = 100;
+  setTimeout(() => {
+    currentState.value = STATES.DONE;
+  }, 300);
+};
+
+const handleWsFail = () => {
+  clearInterval(progressTimer);
+  clearTimeout(timeoutTimer);
+  currentState.value = STATES.FAILED;
+};
+
+const handleDone = () => {
+  uni.navigateBack({
+    delta: 1,
+    success() {
+      const pages = getCurrentPages();
+      const prevPage = pages[pages.length - 2];
+      if (prevPage) {
+        prevPage.$vm.otaState = "update_success";
+        prevPage.$vm.otaVisible = true;
+      }
+    },
+  });
+};
+
+const handleRetry = () => {
+  if (connectedWifi.value) {
+    currentState.value = STATES.CONNECTED;
+  } else {
+    startScanning();
+  }
+};
+
+// 监听系统输入法高度，用于让底部弹窗避开键盘遮挡。
+const handleKeyboardHeightChange = (res) => {
+  keyboardHeight.value = res?.height || 0;
+};
+
+// 切换密码显示状态前先收起键盘，避免安全键盘和普通输入法切换时复用旧高度产生黑条。
+const togglePasswordVisibility = () => {
+  uni.hideKeyboard({
+    complete() {
+      keyboardHeight.value = 0;
+      showPassword.value = !showPassword.value;
+    },
+  });
+};
+
+// 页面挂载后启动 WiFi 扫描流程。
+onMounted(() => {
+  if (typeof uni.onKeyboardHeightChange === "function") {
+    uni.onKeyboardHeightChange(handleKeyboardHeightChange);
+  }
+  startScanning();
+});
+
+// iOS 从系统 WiFi 设置返回小程序后，同步当前手机连接的 WiFi。
+onShow(() => {
+  if (isIOS && currentState.value === STATES.LIST) {
+    syncIOSConnectedWifi();
+  }
+});
+
+onUnmounted(() => {
+  if (typeof uni.offKeyboardHeightChange === "function") {
+    uni.offKeyboardHeightChange(handleKeyboardHeightChange);
+  }
+  clearInterval(progressTimer);
+  clearTimeout(timeoutTimer);
+  wx.offGetWifiList && wx.offGetWifiList();
+});
+</script>
+
+<template>
+  <Container title="连接无线网络">
+    <!-- WiFi 不可用 Banner -->
+    <view v-if="showWifiBanner" class="wifi-banner">
+      <text class="wifi-banner-text">请先开启 WiFi 后刷新重试</text>
+    </view>
+
+    <!-- SCANNING / LIST / CONNECTED -->
+    <view
+      v-if="currentState === 'SCANNING' || currentState === 'LIST' || currentState === 'CONNECTED'"
+      class="wifi-page"
+    >
+      <!-- Hero: wifi1.png 单图（已内含吉祥物） -->
+      <view class="hero-area">
+        <image src="../static/ota/wifi1.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
+      </view>
+
+      <text class="page-title" :class="{ 'connected-page-title': currentState === 'CONNECTED' }">
+        {{ currentState === 'CONNECTED' ? '连接成功' : '连接无线网络' }}
+      </text>
+      <text v-if="currentState !== 'CONNECTED'" class="page-subtitle">网络名称仅支持英文字符及数字</text>
+
+      <view v-if="isIOS && currentState !== 'CONNECTED'" class="ios-guide">
+        <text class="ios-guide-text">请先在系统 WiFi 设置中连接目标网络，返回后选择当前 WiFi 并填写密码</text>
+      </view>
+
+      <!-- 已连接网络卡片 -->
+      <view v-if="currentState === 'CONNECTED'" class="section-label-row connected-section-label-row">
+        <text class="section-label">连接网络</text>
+      </view>
+      <view v-if="currentState === 'CONNECTED'" class="wifi-list-card connected-wifi-card">
+        <view class="wifi-item connected-wifi-item">
+          <image class="check-icon" src="../static/sicon/check.png" mode="aspectFit" />
+          <text class="wifi-ssid connected-wifi-ssid">{{ connectedWifi?.SSID }}</text>
+          <view class="wifi-icons connected-wifi-icons">
+            <image
+              v-if="connectedWifi?.secure"
+              class="security-icon"
+              src="../static/sicon/pwd.png"
+              mode="aspectFit"
+            />
+            <image class="signal-icon" src="../static/sicon/wifi.png" mode="aspectFit" />
+          </view>
+        </view>
+      </view>
+
+      <!-- 网络列表标题 -->
+      <view class="section-label-row">
+        <text class="section-label">网络</text>
+        <image
+          src="../static/sicon/refresh.png"
+          mode="aspectFit"
+          :style="{ width: '34rpx', height: '34rpx', marginLeft: '8rpx', opacity: isRefreshing ? 0.3 : 0.7 }"
+          @click="startScanning"
+        />
+      </view>
+
+      <!-- 网络列表卡片 -->
+      <scroll-view
+        scroll-y
+        class="wifi-list-card"
+        :class="{ 'wifi-list-scroll': currentState !== 'SCANNING' }"
+        :style="{ height: wifiListScrollHeight }"
+      >
+        <block v-if="currentState === 'SCANNING'">
+          <view class="wifi-item" @click="selectOther">
+            <text class="wifi-ssid other-text">其他...</text>
+          </view>
+        </block>
+        <block v-else>
+          <view
+            v-for="(wifi, idx) in wifiList"
+            :key="wifi.SSID"
+            class="wifi-item"
+            @click="selectWifi(wifi)"
+          >
+            <text class="wifi-ssid">{{ wifi.SSID }}</text>
+            <view class="wifi-icons">
+              <image
+                v-if="wifi.secure"
+                class="security-icon"
+                src="../static/sicon/pwd.png"
+                mode="aspectFit"
+              />
+              <image class="signal-icon" src="../static/sicon/wifi.png" mode="aspectFit" />
+            </view>
+          </view>
+          <view class="wifi-item" @click="selectOther">
+            <text class="wifi-ssid other-text">其他...</text>
+          </view>
+        </block>
+      </scroll-view>
+
+      <!-- CONNECTED：开始更新按钮 -->
+      <view v-if="currentState === 'CONNECTED'" class="bottom-btn-area connected-bottom-btn-area">
+        <view class="primary-btn update-btn" @click="startUpdate">
+          <text class="primary-btn-text">开始更新</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- UPDATING -->
+    <view v-else-if="currentState === 'UPDATING'" class="center-page">
+      <image src="../static/ota/target-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
+      <text class="page-title" style="margin-top: 24rpx;">更新中,请稍等片刻...</text>
+      <view class="progress-wrap">
+        <view class="progress-track">
+          <view class="progress-fill" :style="{ width: progress + '%' }"></view>
+        </view>
+        <text class="progress-pct">{{ Math.floor(progress) }}%</text>
+      </view>
+    </view>
+
+    <!-- DONE -->
+    <view v-else-if="currentState === 'DONE'" class="center-page">
+      <image src="../static/ota/check-char.png" mode="aspectFit" style="width: 194rpx; height: 166rpx;" />
+      <text class="page-title" style="margin-top: 24rpx;">更新完成</text>
+      <text class="page-desc-white">请关机并重启智能弓</text>
+      <view class="primary-btn done-btn" style="margin-top:20px" @click="handleDone">
+        <text class="primary-btn-text">完成</text>
+      </view>
+    </view>
+
+    <!-- FAILED -->
+    <view v-else-if="currentState === 'FAILED'" class="center-page">
+      <image src="../static/ota/close-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
+      <text class="page-title fail-title" style="margin-top: 24rpx;">更新失败</text>
+      <text class="page-desc-white">请确保：</text>
+      <text class="page-desc-white">1、智能弓已开启</text>
+      <text class="page-desc-white">2、网路连接稳定</text>
+      <view class="primary-btn done-btn" style="margin-top: 40rpx;" @click="handleRetry">
+        <text class="primary-btn-text">重试</text>
+      </view>
+    </view>
+
+    <!-- CONNECTING 底部弹窗 -->
+    <view v-if="currentState === 'CONNECTING'" class="sheet-mask">
+      <view class="sheet" :style="{ marginBottom: keyboardHeight + 'px' }" @click.stop="">
+        <image src="../static/ota/ota-bg.png" mode="aspectFill" class="sheet-bg" />
+        <view class="sheet-inner">
+
+          <!-- 有密码网络 -->
+          <block v-if="connectMode === 'secure'">
+            <view class="sheet-header">
+              <view class="sheet-nav-btn" @click="closeConnectSheet">
+                <image src="../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
+              </view>
+              <text class="sheet-title">加入"{{ connectInput.ssid }}"</text>
+              <view
+                class="sheet-nav-btn"
+                :class="{ 'nav-disabled': joinDisabled }"
+                @click="joinNetwork"
+              >
+                <image src="../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
+              </view>
+            </view>
+            <view class="input-row-card">
+              <text class="input-label">密码</text>
+              <input
+                class="input-field"
+                :password="!showPassword"
+                :adjust-position="false"
+                v-model="connectInput.password"
+                placeholder="输入网络密码"
+                placeholder-class="input-placeholder"
+                confirm-type="done"
+                @confirm="joinNetwork"
+              />
+              <!-- 密码显示/隐藏切换按钮 -->
+              <view class="pwd-eye-btn" @click="togglePasswordVisibility">
+                <image
+                  :src="showPassword ? '../static/sicon/eye-on.png' : '../static/sicon/eye-off.png'"
+                  mode="aspectFit"
+                  style="width: 40rpx; height: 40rpx;"
+                />
+              </view>
+            </view>
+            <text v-if="connectError" class="connect-error">{{ connectError }}</text>
+          </block>
+
+          <!-- 无密码网络 -->
+          <block v-else-if="connectMode === 'open'">
+            <view class="sheet-header">
+              <view class="sheet-nav-btn" @click="closeConnectSheet">
+                <image src="../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
+              </view>
+              <text class="sheet-title">加入"{{ connectInput.ssid }}"</text>
+              <view class="sheet-nav-btn" @click="joinNetwork">
+                <image src="../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
+              </view>
+            </view>
+            <text class="sheet-hint">该网络为开放网络，点击 ✓ 加入</text>
+            <text v-if="connectError" class="connect-error">{{ connectError }}</text>
+          </block>
+
+          <!-- 手动输入 -->
+          <block v-else-if="connectMode === 'manual'">
+            <view class="sheet-header">
+              <view class="sheet-nav-btn" @click="closeConnectSheet">
+                <image src="../static/sicon/arrow-left.png" mode="aspectFit" style="width: 40rpx; height: 40rpx;" />
+              </view>
+              <text class="sheet-title">加入无线网络</text>
+              <view
+                class="sheet-nav-btn"
+                :class="{ 'nav-disabled': joinDisabled }"
+                @click="joinNetwork"
+              >
+                <image src="../static/sicon/check.png" mode="aspectFit" style="width: 28rpx; height: 24rpx;" />
+              </view>
+            </view>
+            <view class="input-row-card">
+              <text class="input-label">名称</text>
+              <input
+                class="input-field"
+                v-model="connectInput.ssid"
+                placeholder="输入网络名称"
+                placeholder-class="input-placeholder"
+              />
+            </view>
+            <view class="input-row-card">
+              <text class="input-label">密码</text>
+              <input
+                class="input-field"
+                :password="!showPassword"
+                :adjust-position="false"
+                v-model="connectInput.password"
+                placeholder="输入网络密码"
+                placeholder-class="input-placeholder"
+                confirm-type="done"
+                @confirm="joinNetwork"
+              />
+              <!-- 密码显示/隐藏切换按钮 -->
+              <view class="pwd-eye-btn" @click="togglePasswordVisibility">
+                <image
+                  :src="showPassword ? '../static/sicon/eye-on.png' : '../static/sicon/eye-off.png'"
+                  mode="aspectFit"
+                  style="width: 40rpx; height: 40rpx;"
+                />
+              </view>
+            </view>
+            <text v-if="ssidWarning" class="connect-error">{{ ssidWarning }}</text>
+            <text v-else-if="connectError" class="connect-error">{{ connectError }}</text>
+          </block>
+
+        </view>
+      </view>
+    </view>
+
+    <!-- 授权拒绝弹窗 -->
+    <ScreenHint :show="wifiAuthDeniedVisible" :onClose="() => (wifiAuthDeniedVisible = false)">
+      <view class="wifi-auth-denied">
+        <text class="wifi-auth-denied-text">拒绝授权获取wifi列表失败，请重新授权或手动输入</text>
+        <view class="wifi-auth-denied-btns">
+          <view class="wifi-auth-denied-btn cancel-btn" @click="wifiAuthDeniedVisible = false">
+            <text>取消授权</text>
+          </view>
+          <view class="wifi-auth-denied-btn confirm-btn" @click="handleReauthorize">
+            <text>重新授权</text>
+          </view>
+        </view>
+      </view>
+    </ScreenHint>
+  </Container>
+</template>
+
+<style scoped>
+.wifi-auth-denied {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 32rpx 40rpx 24rpx;
+  gap: 32rpx;
+}
+.wifi-auth-denied-text {
+  color: #fff;
+  font-size: 28rpx;
+  text-align: center;
+  line-height: 1.6;
+}
+.wifi-auth-denied-btns {
+  display: flex;
+  flex-direction: row;
+  gap: 24rpx;
+  width: 100%;
+  justify-content: center;
+}
+.wifi-auth-denied-btn {
+  flex: 1;
+  height: 72rpx;
+  border-radius: 36rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+}
+.wifi-auth-denied-btn.cancel-btn {
+  background: rgba(255, 255, 255, 0.15);
+  color: #fff;
+}
+.wifi-auth-denied-btn.confirm-btn {
+  background: rgba(254, 216, 71, 1);
+  color: #1a1a2e;
+  font-weight: 600;
+}
+
+.wifi-banner {
+  background-color: rgba(255, 200, 0, 0.12);
+  border: 1rpx solid rgba(254, 216, 71, 0.5);
+  border-radius: 8rpx;
+  padding: 16rpx 24rpx;
+  margin: 16rpx 24rpx 0;
+}
+.wifi-banner-text {
+  color: rgba(254, 216, 71, 1);
+  font-size: 26rpx;
+}
+
+.wifi-page {
+  padding: 0 67rpx 40rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.hero-area {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 40rpx 0 24rpx;
+}
+
+.page-title {
+  color: rgba(91, 196, 255, 1);
+  font-size: 36rpx;
+  font-weight: 600;
+  text-align: center;
+  margin-bottom: 8rpx;
+}
+.connected-page-title {
+  color: #4DD9C8;
+}
+.page-subtitle {
+  color: rgba(255, 255, 255, 0.5);
+  font-size: 24rpx;
+  text-align: center;
+  margin-bottom: 32rpx;
+}
+.fail-title {
+  color: rgba(255, 100, 100, 1);
+}
+
+.ios-guide {
+  background-color: rgba(95, 173, 255, 0.12);
+  border-radius: 8rpx;
+  padding: 16rpx 24rpx;
+  margin-bottom: 20rpx;
+}
+.ios-guide-text {
+  color: rgba(95, 173, 255, 1);
+  font-size: 26rpx;
+}
+
+.section-label-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 24rpx;
+  padding: 0 22rpx;
+}
+.connected-section-label-row {
+  margin-top: 32rpx;
+}
+.section-label {
+  color: rgba(255, 255, 255, 0.56);
+  font-size: 28rpx;
+}
+
+.wifi-list-card {
+  background-color: rgba(30, 35, 50, 0.96);
+  border-radius: 24rpx;
+  overflow: hidden;
+  margin-bottom: 20rpx;
+}
+.wifi-list-scroll {
+  flex-shrink: 0;
+}
+.connected-wifi-card {
+  background-color: rgba(35, 40, 56, 0.96);
+  margin-bottom: 44rpx;
+}
+.wifi-item {
+  position: relative;
+  display: flex;
+  align-items: center;
+  min-height: 92rpx;
+  padding: 0 26rpx 0 66rpx;
+}
+.wifi-item:not(:last-child)::after {
+  content: "";
+  position: absolute;
+  left: 66rpx;
+  right: 26rpx;
+  bottom: 0;
+  height: 1rpx;
+  background-color: rgba(255, 255, 255, 0.08);
+}
+.connected-wifi-item {
+  min-height: 88rpx;
+  padding-left: 28rpx;
+}
+.wifi-ssid {
+  color: rgba(255, 255, 255, 1);
+  font-size: 28rpx;
+  line-height: 36rpx;
+  flex: 1;
+}
+.connected-wifi-ssid {
+  font-weight: 500;
+}
+.other-text {
+  color: rgba(255, 255, 255, 0.86);
+}
+.wifi-icons {
+  display: flex;
+  align-items: center;
+  gap: 12rpx;
+  flex-shrink: 0;
+}
+.connected-wifi-icons {
+  gap: 14rpx;
+}
+.check-icon {
+  width: 28rpx;
+  height: 24rpx;
+  margin-right: 16rpx;
+  flex-shrink: 0;
+}
+.security-icon {
+  width: 24rpx;
+  height: 30rpx;
+  flex-shrink: 0;
+}
+.signal-icon {
+  width: 36rpx;
+  height: 32rpx;
+  flex-shrink: 0;
+}
+
+.bottom-btn-area {
+  margin-top: 24rpx;
+}
+.connected-bottom-btn-area {
+  display: flex;
+  justify-content: center;
+  margin-top: 20rpx;
+}
+
+.primary-btn {
+  background-color: rgba(254, 216, 71, 1);
+  border-radius: 50rpx;
+  height: 88rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.update-btn {
+  width: 412rpx;
+}
+.primary-btn-text {
+  color: rgba(0, 0, 0, 1);
+  font-size: 30rpx;
+  font-weight: 500;
+}
+
+.center-page {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 80rpx 32rpx 40rpx;
+}
+.page-desc-white {
+  color: rgba(255, 255, 255, 1);
+  font-size: 28rpx;
+  line-height: 52rpx;
+  text-align: center;
+}
+.done-btn {
+  width: 80%;
+}
+
+.progress-wrap {
+  width: 80%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 16rpx;
+  margin-top: 40rpx;
+}
+.progress-track {
+  width: 100%;
+  height: 10rpx;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 5rpx;
+  overflow: hidden;
+}
+.progress-fill {
+  height: 100%;
+  background-color: rgba(91, 196, 255, 1);
+  border-radius: 5rpx;
+  transition: width 0.4s ease;
+}
+.progress-pct {
+  color: rgba(91, 196, 255, 1);
+  font-size: 28rpx;
+  font-weight: 600;
+}
+
+.sheet-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 999;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.sheet {
+  position: relative;
+  background-color: rgba(57, 47, 29, 1);
+  border-top-left-radius: 28rpx;
+  border-top-right-radius: 28rpx;
+  overflow: hidden;
+  min-height: 320rpx;
+  border: 1rpx solid rgba(249, 213, 161, 0.4);
+  border-bottom: none;
+}
+.sheet-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+}
+.sheet-inner {
+  position: relative;
+  z-index: 1;
+  padding: 32rpx 32rpx 112rpx;
+}
+
+.sheet-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 32rpx;
+}
+.sheet-nav-btn {
+  width: 64rpx;
+  height: 64rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.nav-disabled {
+  opacity: 0.3;
+}
+.sheet-title {
+  color: rgba(255, 255, 255, 1);
+  font-size: 30rpx;
+  font-weight: 600;
+  flex: 1;
+  text-align: center;
+}
+.sheet-hint {
+  color: rgba(255, 255, 255, 0.7);
+  font-size: 26rpx;
+  text-align: center;
+  margin-bottom: 24rpx;
+}
+.connect-error {
+  color: rgba(254, 216, 71, 1);
+  font-size: 26rpx;
+  line-height: 40rpx;
+  margin-top: 16rpx;
+  display: block;
+  /* 错误提示文案居中展示 */
+  text-align: center;
+}
+
+.input-row-card {
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 16rpx;
+  display: flex;
+  align-items: center;
+  padding: 24rpx 24rpx;
+  margin-left: 48rpx;
+  margin-right: 48rpx;
+}
+.input-row-card + .input-row-card {
+  margin-top: 16rpx;
+}
+.input-label {
+  color: rgba(255, 255, 255, 0.8);
+  font-size: 28rpx;
+  width: 80rpx;
+  flex-shrink: 0;
+}
+.input-field {
+  flex: 1;
+  color: rgba(255, 255, 255, 1);
+  font-size: 28rpx;
+  background: transparent;
+  border: none;
+  padding: 0 8rpx;
+}
+.input-placeholder {
+  color: rgba(255, 255, 255, 0.3);
+}
+
+/* 密码查看切换按钮 */
+.pwd-eye-btn {
+  width: 56rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+</style>

src/pages/point-book-create.vue

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

src/pages/point-book-edit.vue

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

src/pages/point-book.vue

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

src/pages/practise-one.vue

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

src/pages/practise-two.vue

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

src/pages/ranking.vue

@@ -281,27 +281,27 @@ onShow(async () => {
         <image
           src="../static/rank/battle1v1.svg"
           mode="widthFix"
-          @click.stop="() => toMatchPage(1, 2)"
+          @click.stop="$clickSound(() => toMatchPage(1, 2))"
         />
         <image
           src="../static/rank/battle2v2.svg"
           mode="widthFix"
-          @click.stop="() => toMatchPage(2, 4)"
+          @click.stop="$clickSound(() => toMatchPage(2, 4))"
         />
         <image
           src="../static/rank/battle3v3.svg"
           mode="widthFix"
-          @click.stop="() => toMatchPage(3, 6)"
+          @click.stop="$clickSound(() => toMatchPage(3, 6))"
         />
         <image
           src="../static/rank/battle5.svg"
           mode="widthFix"
-          @click.stop="() => toMatchPage(4, 5)"
+          @click.stop="$clickSound(() => toMatchPage(4, 5))"
         />
         <image
           src="../static/rank/battle10.svg"
           mode="widthFix"
-          @click.stop="() => toMatchPage(5, 10)"
+          @click.stop="$clickSound(() => toMatchPage(5, 10))"
         />
       </view>
     </view>
@@ -323,6 +323,7 @@ onShow(async () => {
           >
             <text>{{ seasonName }}</text>
             <image
+              class="triangle-icon"
               v-show="seasonData.length > 1"
               src="../static/rank/triangle.png"
               mode="widthFix"
@@ -592,6 +593,7 @@ onShow(async () => {
 .ranking-season > image {
   width: 12px;
   height: 12px;
+  transform: rotateX(180deg);
 }
 
 .ranking-season > text {
@@ -807,18 +809,18 @@ onShow(async () => {
 }
 
 .season-list {
-  background-color: #000c;
+  background-color: rgba(0, 0, 0, 0.8);
   border-radius: 15px;
   color: #fff;
   font-size: 12px;
-  padding: 5px 0;
+  padding: 12px 0;
   position: absolute;
   width: 220rpx;
   height: auto;
   max-height: 400rpx;
   overflow: hidden;
   overflow-y: auto;
-  top: -44rpx;
+  top: -42rpx;
   right: -30rpx;
   letter-spacing: 2px;
   z-index: 10;
@@ -829,7 +831,7 @@ onShow(async () => {
   display: flex;
   align-items: center;
   word-break: keep-all;
-  padding: 20rpx 0;
+  padding: 20rpx 10rpx;
 }
 
 .season-list > view > text {

src/pages/team-battle.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
-import PointSwitcher from "@/components/PointSwitcher.vue";
+import PointSwitcher from "./PointSwitcher.vue";
 
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import { simulShootAPI } from "@/apis";
@@ -26,6 +26,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  latestShotFlash: {
+    type: Object,
+    default: null,
+  },
   mode: {
     type: String,
     default: "solo", // solo 单排，team 双排
@@ -39,45 +43,36 @@ const props = defineProps({
 const pMode = ref(true);
 const latestOne = ref(null);
 const bluelatestOne = ref(null);
-const prevScores = ref([]);
-const prevBlueScores = ref([]);
 const timer = ref(null);
 const dirTimer = ref(null);
 const angle = ref(null);
 const circleColor = ref("");
 
-watch(
+function showShotFlash(flash) {
-  () => props.scores,
+  const shootData = flash?.shootData;
-  (newVal) => {
+  if (!shootData) return;
-    if (newVal.length - prevScores.value.length === 1) {
-      latestOne.value = newVal[newVal.length - 1];
   if (timer.value) clearTimeout(timer.value);
+
+  if (flash.team === "red") {
+    latestOne.value = shootData;
     timer.value = setTimeout(() => {
       latestOne.value = null;
     }, 1000);
+    return;
   }
-    prevScores.value = [...newVal];
-  },
-  {
-    deep: true,
-  }
-);
 
-watch(
+  bluelatestOne.value = shootData;
-  () => props.blueScores,
-  (newVal) => {
-    if (newVal.length - prevBlueScores.value.length === 1) {
-      bluelatestOne.value = newVal[newVal.length - 1];
-      if (timer.value) clearTimeout(timer.value);
   timer.value = setTimeout(() => {
     bluelatestOne.value = null;
   }, 1000);
-    }
+}
-    prevBlueScores.value = [...newVal];
+
+watch(
+  () => props.latestShotFlash,
+  (newVal) => {
+    showShotFlash(newVal);
   },
-  {
+  { immediate: true }
-    deep: true,
-  }
 );
 
 function calcRealX(num, offset = 3.4) {
@@ -152,13 +147,13 @@ onBeforeUnmount(() => {
 
 <template>
   <view class="container">
-    <!-- <view class="header" v-if="totalRound > 0">
+    <view class="header" v-if="totalRound > 0">
       <text v-if="totalRound > 0" class="round-count">{{
         (currentRound > totalRound ? totalRound : currentRound) +
         "/" +
         totalRound
       }}</text>
-    </view> -->
+    </view>
     <view class="target">
       <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
         <view :style="{ background: circleColor }">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount } from "vue";
-import Guide from "@/components/Guide.vue";
+import Guide from "./Guide.vue";
-import BowPower from "@/components/BowPower.vue";
+import BowPower from "./BowPower.vue";
-import Avatar from "@/components/Avatar.vue";
+import Avatar from "./Avatar.vue";
 import audioManager from "@/audioManager";
 import { simulShootAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";
@@ -75,10 +75,16 @@ onBeforeUnmount(() => {
 
 <template>
   <view class="container">
+    <Guide v-show="guide">
+      <view class="guide-tips">
+        <text>请确保站距达到5米</text>
+        <text>低于5米的射箭无效</text>
+      </view>
+    </Guide>
     <view class="test-area">
       <image
         class="text-bg"
-        src="../../../static/training-difficulty-design/par-bg.png"
+        src="https://static.shelingxingqiu.com/attachment/2025-07-05/db3skuq1n9rj4fmld4.png"
         mode="widthFix"
       />
       <button
@@ -90,9 +96,8 @@ onBeforeUnmount(() => {
         模拟射箭
       </button>
       <view class="warnning-text">
-        <view class="target-tip">当前靶子为<text class="text-yellow">20cm</text>全环靶,请更换靶子</view>
         <block v-if="distance > 0">
-          <text>当前距离<text class="text-yellow">{{ distance }}</text>米</text>
+          <text>当前距离{{ distance }}米</text>
           <text v-if="distance >= 5">已达到距离要求</text>
           <text v-else>请调整站位</text>
         </block>
@@ -150,47 +155,39 @@ onBeforeUnmount(() => {
   text-align: center;
 }
 .test-area {
-  width: 100%;
-  height: auto;
-  position: relative;
-}
-
-.text-bg {
-  width: 100%;
-  position: relative;
-}
-.warnning-text {
-  color: #fff;
   display: flex;
   flex-direction: column;
-  height: 200rpx;
+  align-items: center;
-  position: absolute;
+  justify-content: space-between;
-  top: 142rpx;
-  left: 0;
   width: 100%;
-  font-size: 36rpx;
+  height: 112vw;
+  position: relative;
+}
+.test-area > view:last-child {
+  padding: 15px;
+  width: calc(100% - 30px);
+}
+.text-bg {
+  width: 100%;
+  position: absolute;
+  top: -14.4%;
+  left: 0;
+}
+.warnning-text {
+  color: #fed847;
+  font-size: 27px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  height: 40%;
+}
+.warnning-text > text {
+  width: 70vw;
   text-align: center;
 }
-.target-tip{
-  margin-bottom: 28rpx;
-}
-.text-yellow{
-  color: #FED847;
-}
 .simul {
   position: absolute;
   color: #fff;
   right: 10px;
-  top: 30rpx;
 }
-.user-row{
-  position: absolute;
-  bottom: 34rpx;
-  left: 0rpx;
-  width: 100%;
-  padding: 0 34rpx;
-  box-sizing: border-box;
-}
-
-
 </style>

src/pages/training/components/BubbleTip.vue

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

src/pages/training/components/ScorePanel2.vue

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

src/pages/training/components/ScoreResult.vue

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

src/pages/training/components/ShootProgress.vue

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

src/pages/training/components/TrainingDifficultyBadge.vue

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

src/pages/training/components/TrainingDifficultyPreviewCard.vue

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

src/pages/training/components/TrainingDifficultyStartButton.vue

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

src/pages/training/difficulty.vue

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

src/pages/training/index.vue

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

src/pages/training/practise-one.vue

@@ -1,293 +0,0 @@
-<script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
-import Container from "@/components/Container.vue";
-import ShootProgress from "./components/ShootProgress.vue";
-import BowTarget from "./components/BowTarget.vue";
-import ScorePanel2 from "./components/ScorePanel2.vue";
-import ScoreResult from "./components/ScoreResult.vue";
-import Avatar from "@/components/Avatar.vue";
-import BowPower from "@/components/BowPower.vue";
-import TestDistance from "./components/TestDistance.vue";
-import BubbleTip from "./components/BubbleTip.vue";
-import audioManager from "@/audioManager";
-
-import {
-  createPractiseAPI,
-  startPractiseAPI,
-  endPractiseAPI,
-  getPractiseAPI,
-} from "@/apis";
-import { sharePractiseData } from "@/canvas";
-import { wxShare, debounce } from "@/util";
-import { MESSAGETYPESV2, roundsName } from "@/constants";
-
-import useStore from "@/store";
-import { storeToRefs } from "pinia";
-const store = useStore();
-const { user } = storeToRefs(store);
-
-const sound = ref(true);
-const start = ref(false);
-const scores = ref([]);
-const total = 12;
-const practiseResult = ref({});
-const practiseId = ref("");
-const showGuide = ref(false);
-const tips = ref("");
-const targetType = ref(1);
-const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
-
-onLoad((options) => {
-  if (options.target) {
-    targetType.value = Number(options.target);
-  }
-});
-
-const onReady = async () => {
-  await startPractiseAPI();
-  scores.value = [];
-  start.value = true;
-  audioManager.play("练习开始");
-};
-
-const onOver = async () => {
-  practiseResult.value = await getPractiseAPI(practiseId.value);
-  start.value = false;
-};
-
-async function onReceiveMessage(msg) {
-  if (msg.type === MESSAGETYPESV2.ShootResult) {
-    scores.value = msg.details;
-  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    // setTimeout(onOver, 1500);
-  }
-}
-
-function onComplete() {
-  uni.$emit(trainingDifficultyRefreshEvent);
-  uni.navigateBack();
-}
-
-async function onRetry() {
-  practiseId.value = "";
-  practiseResult.value = {};
-  start.value = false;
-  scores.value = [];
-  const result = await createPractiseAPI(total, 120, targetType.value);
-  if (result) practiseId.value = result.id;
-}
-
-const onClickShare = debounce(async () => {
-  await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
-  await wxShare("shareCanvas");
-});
-
-function onAudioEnded(s) {
-  if (s.indexOf("比赛结束") >= 0) {
-    onOver()
-  }
-}
-
-const updateSound = () => {
-  sound.value = !sound.value;
-  audioManager.setMuted(!sound.value);
-};
-
-
-onMounted(async () => {
-  // audioManager.play("第一轮");
-  uni.setKeepScreenOn({
-    keepScreenOn: true,
-  });
-  uni.$on("socket-inbox", onReceiveMessage);
-  uni.$on("share-image", onClickShare);
-  uni.$on("audioEnded", onAudioEnded);
-  const result = await createPractiseAPI(total, 120, targetType.value);
-  if (result) practiseId.value = result.id;
-});
-
-onBeforeUnmount(() => {
-  uni.setKeepScreenOn({
-    keepScreenOn: false,
-  });
-  uni.$off("socket-inbox", onReceiveMessage);
-  uni.$off("share-image", onClickShare);
-  uni.$off("audioEnded", onAudioEnded);
-  audioManager.stopAll();
-  endPractiseAPI();
-});
-</script>
-
-<template>
-  <Container
-    :bgType="!start && !practiseResult.id?9:10"
-    :showBottom="!start && !scores.length"
-  >
-    <view>
-      <TestDistance v-if="!start && !practiseResult.id" />
-      <block v-else>
-        <ShootProgress
-          :start="start"
-          :onStop="onOver"
-        />
-        <view class="user-row">
-          <!-- <Avatar :src="user.avatar" :size="35" /> -->
-          <BubbleTip v-if="showGuide" type="normal2">
-            <text>还有两场，坚持</text>
-            <text>就是胜利！💪</text>
-          </BubbleTip>
-          <!-- <BowPower /> -->
-        </view>
-        <BowTarget
-        :totalRound="start ? total / 4 : 0"
-        :currentRound="scores.length % 3"
-        :scores="scores"
-        />
-        <view class="sound-text-box">
-          <button class="sound-btn" hover-class="none" @click="updateSound">
-            <image
-              class="sound-icon"
-              :src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
-              mode="aspectFit"
-            />
-          </button>
-          <view class="bat-text-big-box">
-            <image
-              class="dao-icon"
-              src="../../static/training-difficulty-design/dao-icon.png"
-              mode="widthFix"
-            />
-            <view class="bat-text-box">
-              <view class="bat-text-small-box">
-                <view class="text-round-box">
-                  <view class="text1">每箭命中9环之上</view>
-                  <view class="text2">剩余<text class="text2-yellow">3</text>箭</view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <ScorePanel2 :arrows="scores" :total="total" />
-        <ScoreResult
-          v-if="practiseResult.details"
-          :rowCount="6"
-          :total="total"
-          :onClose="onComplete"
-          :onRetry="onRetry"
-          :result="practiseResult"
-        />
-        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
-      </block>
-    </view>
-    <template #bottom>
-      <view class="btn-box">
-        <image
-          class="btn-box-bg"
-          src="../../static/training-difficulty-design/par-star.png"
-          mode="widthFix"
-        />
-        <button class="btn" @click="onReady">准备好了，开始练习</button>
-      </view>
-    </template>
-  </Container>
-</template>
-
-<style scoped>
-.btn-box{
-  width: 488rpx;
-  height: 234rpx;
-  position: fixed;
-  bottom: 130rpx;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.btn-box-bg{
-  width: 100%;
-}
-.btn{
-  width: 330rpx;
-  height: 70rpx;
-  line-height: 70rpx;
-  background: #FED847;
-  border-radius: 44rpx;
-  text-align: center;
-  color: #000000;
-  font-size: 28rpx;
-  font-weight: 500;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  bottom: -36rpx;
-}
-
-.sound-text-box{
-  height: 125rpx;
-  padding: 0 56rpx;
-  display: flex;
-  align-items: flex-end;
-}
-.sound-btn {
-  width: 76rpx;
-  height: 70rpx;
-  border: none;
-}
-
-.sound-btn::after {
-  border: none;
-}
-
-.sound-icon {
-  width: 76rpx;
-  height: 70rpx;
-}
-.bat-text-big-box{
-  flex: 1;
-  position: relative;
-}
-.dao-icon{
-  width: 160rpx;
-  height: 125rpx;
-  position: absolute;
-  left: 0;
-  bottom: 0;
-}
-.text-round-box{
-  width: 100%;
-}
-.bat-text-box{
-  display: flex;
-}
-.bat-text-small-box{
-  background: rgba(0, 0, 0, 0.5);
-  width: auto;
-  min-width: 100rpx;
-  border-radius: 16rpx 60rpx 60rpx 16rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding-left: 176rpx;
-  height: 112rpx;
-  padding-right: 30rpx;
-  font-size: 30rpx;
-  color: #E7BA80;
-}
-.text1{
-  font-size: 30rpx;
-  font-weight: 400;
-  color: #E7BA80;
-  line-height: 42rpx;
-}
-.text2{
-  color: #FFFFFF;
-  font-size: 26rpx;
-  font-weight: 400;
-  line-height: 36rpx;
-}
-.text2-yellow{
-  font-size: 30rpx;
-  color: #FFD947;
-  font-weight: 500;
-  margin: 0 4rpx;
-}
-</style>

src/pages/user.vue

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

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

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

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

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

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

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