Merge branch 'feat-shebei' into test

project.config.json

@@ -243,14 +243,6 @@
       {
         "type": "folder",
         "value": "static/training-difficulty-design"
-      },
-      {
-        "type": "folder",
-        "value": "static/coin"
-      },
-      {
-        "type": "folder",
-        "value": "static/home-device"
       }
     ],
     "include": []

src/apis.js

@@ -599,13 +599,14 @@ export const getDeviceWifiStatusAPI = async () => {
     });
 };
 
+// 获取硬件盒子版本信息，用于判断当前设备是否需要 OTA 升级。
+export const getHardwareBoxVersionAPI = async () => {
+    return request("GET", "/user/hardwareBox/version");
+};
+
 // 发送硬件盒子 OTA 更新指令，服务端会返回后续轮询使用的任务 ID。
-export const sendHardwareBoxUpdateAPI = async ({versionNumber, wifiSsid, wifiPassword}) => {
+export const sendHardwareBoxUpdateAPI = async (data) => {
-    return request("POST", "/user/hardwareBox/sendUpdate", {
+    return request("POST", "/user/hardwareBox/sendUpdate", data);
-        versionNumber,
-        wifiSsid,
-        wifiPassword,
-    });
 };
 
 export const addNoteAPI = async (id, remark) => {
@@ -770,21 +771,6 @@ export const getGiftDetailAPI = (id) => {
     );
 };
 
-// 分页获取启用门店及当前用户在各店的会员状态。
-export const getStoreVipListAPI = ({page = 1, pageSize = 20} = {}) => {
-    return request("GET", "/store/list", {page, pageSize});
-};
-
-// 查询当前用户在指定门店的会员状态及权益剩余次数。
-export const getStoreBenefitAPI = (storeId) => {
-    return request("GET", "/store/benefit", {storeId});
-};
-
-// 获取体验中心 VIP 介绍纯文本，无需登录。
-export const getStoreVipIntroAPI = () => {
-    return request("GET", "/store/vip-intro");
-};
-
 // 根据用户定位分页获取附近门店。
 export const getNearbyStoresAPI = ({
     longitude,

src/audioManager.js

@@ -18,10 +18,6 @@ const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
 export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
   TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
 
-// 与服务端通关判定保持一致，proto3 省略的 false 同样按失败处理。
-export const getTrainingEndAudioKey = (completed) =>
-  completed === true ? "通关成功" : "通关失败";
-
 export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
   if (!shootData || typeof shootData !== "object") return [];
   const ring = Number(shootData.ring);
@@ -205,10 +201,6 @@ export const audioFils = {
     "https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.MP3",
   练习结束:
     "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3",
-  通关成功:
-    "https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E6%88%90%E5%8A%9F.mp3",
-  通关失败:
-    "https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E5%A4%B1%E8%B4%A5.mp3",
   射箭声音:
 	"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
   命中:

src/components/AppFooter.vue

@@ -7,13 +7,9 @@ const tabs = [
 
 function handleTabClick(index) {
   if (index === 0) {
-    uni.showToast({
+    uni.navigateTo({
-        title: "功能尚未开启",
+      url: "/pages/member/be-vip",
-        icon: "none",
     });
-    // uni.navigateTo({
-    //   url: "/pages/member/be-vip",
-    // });
   }
   if (index === 1) {
     uni.navigateTo({

src/components/TargetCanvas.vue

@@ -164,8 +164,6 @@ const defaultHighlightStyle = {
   color: "rgba(255, 228, 0, 0.6)",
   strokeColor: "rgba(254, 216, 71, 0.82)",
   lineWidthRatio: 0.003,
-  // 在最小线宽计算后应用倍数，确保不同靶面尺寸下按比例加粗。
-  lineWidthScale: 1,
 };
 
 // 合并默认靶纸样式和外部传入样式，ringColors 单独深合并。
@@ -321,7 +319,7 @@ const drawSectorHighlight = (
         (angles.endAngle - angles.startAngle) * safeRevealProgress,
       style.color,
       style.strokeColor,
-      Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale
+      Math.max(1, targetRadius * style.lineWidthRatio)
     );
   });
 };

src/composables/useOtaUpdate.js

@@ -13,15 +13,6 @@ const phaseTextMap = {
   installing: "正在安装固件",
 };
 
-// 设备详情中的 latestVersion 是升级目标，version 是当前固件版本。
-export const getOtaInfoFromDetail = (detail) => ({
-  versionNumber: String(detail?.latestVersion ?? "").trim(),
-  currentVersion: String(detail?.version ?? "").trim(),
-  versionInfo: String(detail?.versionInfo ?? "").trim(),
-  needUpdate: detail?.needUpdate === true || Number(detail?.needUpdate) === 1,
-  forceUpdate: detail?.forceUpdate === true || Number(detail?.forceUpdate) === 1,
-});
-
 // OTA 状态由首页、WiFi 设置页和我的设备页共享，页面切换后仍可继续接收进度。
 const updating = ref(false);
 const progress = ref(0);
@@ -124,7 +115,6 @@ function handleSocketMessage(message) {
     } else if (!isCurrentVersionMessage(message.data)) {
       return;
     }
-    if (!targetVersion && messageVersion) targetVersion = messageVersion;
 
     const nextProgress = Math.min(
       100,
@@ -148,7 +138,6 @@ function handleSocketMessage(message) {
   } else if (!isCurrentVersionMessage(message.data)) {
     return;
   }
-  if (!targetVersion && messageVersion) targetVersion = messageVersion;
 
   if (message.data?.status === "success") {
     finishUpdate("success");
@@ -171,20 +160,16 @@ export const useOtaUpdate = () => {
 
   const startUpdate = async ({
     versionNumber,
+    resourceUrl,
     wifiSsid = "",
     wifiPassword = "",
     onSuccess,
   }) => {
     if (updating.value) return false;
-    const nextVersion = String(versionNumber || "").trim();
-    if (!nextVersion) {
-      uni.showToast({ title: "缺少固件目标版本", icon: "none" });
-      return false;
-    }
 
     updateRunId += 1;
     const runId = updateRunId;
-    targetVersion = nextVersion;
+    targetVersion = String(versionNumber || "");
     lastFinishedVersion = "";
     successCallback = onSuccess || null;
     resultVisible.value = false;
@@ -203,6 +188,7 @@ export const useOtaUpdate = () => {
         versionNumber: targetVersion,
         wifiSsid,
         wifiPassword,
+        resourceUrl,
       });
       if (runId !== updateRunId || !updating.value) return false;
       if (!updateResult?.taskId) {

src/manifest.json

@@ -294,14 +294,6 @@
                 {
                     "type" : "folder",
                     "value" : "static/training-difficulty-design"
-                },
-                {
-                    "type" : "folder",
-                    "value" : "static/coin"
-                },
-                {
-                    "type" : "folder",
-                    "value" : "static/home-device"
                 }
             ]
         },

src/matchWebsocket.js

@@ -18,7 +18,6 @@ import {
   getPrecisionShotAudioKeys,
   getRhythmShotAudioKeys,
   getStabilityShotAudioKeys,
-  getTrainingEndAudioKey,
   getTrainingStartAudioKey,
   STABILITY_ENERGY_50_AUDIO_KEY,
   STABILITY_ENERGY_70_AUDIO_KEY,
@@ -604,10 +603,6 @@ function getAckAudioKeys(message, businessMessage) {
       if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
       return ["比赛结束"];
     case ServerMessageType.SERVER_MSG_PRACTICE_END:
-      // 个人训练的 ACK 等待实际播放的通关语音，其他练习保留原有配置。
-      if (currentContext?.practiceEndAudioKey === "练习结束") {
-        return [getTrainingEndAudioKey(businessMessage?.completed)];
-      }
       return [currentContext?.practiceEndAudioKey || "比赛结束"];
     case ServerMessageType.SERVER_MSG_CHECK:
       return getTestDistanceAudioKeys(businessMessage?.shootData);

src/pages.json

@@ -21,9 +21,6 @@
     {
       "path": "pages/audio-test"
     },
-    {
-      "path": "pages/calibration"
-    },
     {
       "path": "pages/about-us"
     },
@@ -60,12 +57,6 @@
     {
       "path": "pages/match-page"
     },
-    {
-      "path": "pages/my-device"
-    },
-    {
-      "path": "pages/device-intro"
-    },
     {
       "path": "pages/user"
     },
@@ -107,12 +98,6 @@
     },
     {
       "path": "pages/mine-bow-data"
-    },
-    {
-      "path": "pages/ota-wifi",
-      "style": {
-        "navigationStyle": "custom"
-      }
     }
   ],
   "globalStyle": {
@@ -136,9 +121,6 @@
     {
       "root": "pages/coin",
       "pages": [
-        {
-          "path": "vip-intro"
-        },
         {
           "path": "index"
         },
@@ -174,9 +156,6 @@
         {
           "path": "device-bind-failure"
         },
-        {
-          "path": "device-already-bound"
-        },
         {
           "path": "device-intro"
         },

src/pages/coin/components/CoinBalancePanel.vue

@@ -38,12 +38,13 @@ defineProps({
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 100%;
+  width: 706rpx;
   height: 60rpx;
   margin-top: 0;
+  border: 2rpx solid rgba(255, 217, 71, 0.25);
   border-radius: 12rpx;
   box-sizing: border-box;
-  background: linear-gradient(90deg, transparent, rgba(4, 4, 4, 0.7), transparent);
+  background-color: rgba(255, 217, 71, 0.06);
 }
 
 .balance-item {
@@ -68,7 +69,7 @@ defineProps({
 
 .balance-list__line {
   width: 2rpx;
-  height: 16rpx;
+  height: 28rpx;
   background-color: rgba(255, 255, 255, 0.5);
   margin: 0 22rpx;
 }

src/pages/coin/components/CoinHeader.vue

@@ -10,13 +10,11 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  switchable: { type: Boolean, default: false },
   onBack: {
     type: Function,
     default: null,
   },
 });
-const emit = defineEmits(["select-store"]);
 </script>
 
 <template>
@@ -32,20 +30,16 @@ const emit = defineEmits(["select-store"]);
           >
             {{ title }}
           </text>
-          <view v-if="subtitle" class="coin-header__store" @click="switchable && emit('select-store')">
+          <text v-if="subtitle" class="coin-header__subtitle">
-            <text class="coin-header__subtitle">{{ subtitle }}</text>
+            {{ subtitle }}
-            <image v-if="switchable" class="coin-header__switch" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-switch.png" mode="aspectFit" />
+          </text>
-          </view>
         </view>
       </template>
     </Header>
   </view>
 </template>
 
-<style scoped lang="scss">
+<style scoped>
-.coin-header__store { display: flex; align-items: center; max-width: 430rpx; }
-.coin-header__store .coin-header__subtitle { overflow: hidden; text-overflow: ellipsis; }
-.coin-header__switch { flex-shrink: 0; width: 28rpx; height: 28rpx; margin-left: 10rpx; }
 .coin-header {
   position: sticky;
   top: 0;

src/pages/coin/components/ProductHeroSwiper.vue

@@ -2,7 +2,7 @@
 import { computed, ref } from "vue";
 
 const DEFAULT_PRODUCT_IMAGE =
-  "https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
+  "https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-item.png";
 const props = defineProps({
   images: {
     type: Array,

src/pages/coin/components/RewardProductCard.vue

@@ -51,9 +51,6 @@ const productImage = computed(() => {
   height: 312rpx;
   overflow: hidden;
   border-radius: 12rpx;
-  background-image: url("https://static.shelingxingqiu.com/shootmini/static/coin/product-card-bg.png");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
 }
 
 .product-card__image {

src/pages/coin/components/StoreBenefitCard.vue

@@ -1,80 +0,0 @@
-<script setup>
-defineProps({
-  benefit: {
-    type: Object,
-    required: true,
-  },
-});
-</script>
-
-<template>
-  <!-- 与会员卡共用剩余次数，接口缺失时显示占位。 -->
-  <view class="benefit-card">
-    <text class="benefit-card__badge">{{ benefit.remaining }}次</text>
-    <image class="benefit-card__icon" :src="benefit.icon" mode="aspectFit" />
-    <view class="benefit-card__content">
-      <text class="benefit-card__title">{{ benefit.title }}</text>
-      <text class="benefit-card__description">{{ benefit.description }}</text>
-    </view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.benefit-card {
-  position: relative;
-  display: flex;
-  align-items: center;
-  min-height: 176rpx;
-  margin-bottom: 24rpx;
-  padding: 28rpx 28rpx 28rpx 56rpx;
-  box-sizing: border-box;
-  border-radius: 20rpx;
-  background: linear-gradient(180deg, #080808, rgba(152, 124, 84, 0.4));
-}
-
-// .benefit-card:last-child {
-//   margin-bottom: 0;
-// }
-
-.benefit-card__badge {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 64rpx;
-  height: 32rpx;
-  border-radius: 16rpx 0 16rpx 0;
-  background: linear-gradient(135deg, #ffd19a, #a17636);
-  color: #ffffff;
-  font-size: 22rpx;
-  line-height: 30rpx;
-  text-align: center;
-}
-
-.benefit-card__icon {
-  flex-shrink: 0;
-  width: 120rpx;
-  height: 120rpx;
-  margin-right: 38rpx;
-}
-
-.benefit-card__content {
-  flex: 1;
-  min-width: 0;
-}
-
-.benefit-card__title {
-  display: block;
-  color: #fae6bc;
-  font-size: 30rpx;
-  line-height: 42rpx;
-  font-weight: 500;
-}
-
-.benefit-card__description {
-  display: block;
-  margin-top: 10rpx;
-  color: #ffffff;
-  font-size: 22rpx;
-  line-height: 30rpx;
-}
-</style>

src/pages/coin/components/StoreSectionTabs.vue

@@ -1,61 +0,0 @@
-<script setup>
-defineProps({
-  tabs: {
-    type: Array,
-    default: () => [],
-  },
-  active: {
-    type: String,
-    default: "vip",
-  },
-});
-
-const emit = defineEmits(["select"]);
-</script>
-
-<template>
-  <!-- 业务 Tab 只切换内容，不接管系统导航。 -->
-  <view class="section-tabs">
-    <view
-      v-for="tab in tabs"
-      :key="tab.key"
-      class="section-tabs__item"
-      :class="{ 'section-tabs__item--active': active === tab.key }"
-      hover-class="section-tabs__item--pressed"
-      @click="emit('select', tab.key)"
-    >
-      <text>{{ tab.label }}</text>
-    </view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.section-tabs {
-  display: flex;
-  justify-content: space-between;
-  padding: 20rpx 40rpx 0;
-  box-sizing: border-box;
-}
-
-.section-tabs__item {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 326rpx;
-  height: 68rpx;
-  border-radius: 34rpx;
-  color: #999999;
-  background: #000000;
-  font-size: 28rpx;
-  line-height: 40rpx;
-}
-
-.section-tabs__item--active {
-  color: #ffffff;
-  background: linear-gradient(135deg, #ffd19a, #a17636);
-}
-
-.section-tabs__item--pressed {
-  opacity: 0.8;
-}
-</style>

src/pages/coin/components/StoreVipCard.vue

@@ -1,135 +0,0 @@
-<script setup>
-defineProps({
-  membership: {
-    type: Object,
-    required: true,
-  },
-  benefits: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(["introduction"]);
-</script>
-
-<template>
-  <view class="vip-card" :class="{ 'vip-card--active': membership.active }">
-    <!-- 切图仅含静态字效与徽章，次数、有效期和状态独立渲染。 -->
-    <image class="vip-card__background" :src="membership.cardImage" mode="aspectFit" />
-    <view class="vip-card__benefits">
-      <view v-for="benefit in benefits" :key="benefit.key" class="vip-card__benefit">
-        <text class="vip-card__label">{{ benefit.title }}</text>
-        <view class="vip-card__count">
-          <text class="vip-card__number">{{ membership.remaining[benefit.key] }}</text>
-          <text class="vip-card__unit">次</text>
-        </view>
-      </view>
-    </view>
-    <text class="vip-card__status">
-      {{ membership.active ? `有效期至${membership.expiresAt}` : "未开通" }}
-    </text>
-    <view class="vip-card__introduction" @click="emit('introduction')">
-      <text>查看更多关于体验中心VIP的介绍 &gt;</text>
-    </view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.vip-card {
-  position: relative;
-  width: 750rpx;
-  height: 288rpx;
-  color: #333333;
-}
-
-.vip-card__background {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 750rpx;
-  height: 288rpx;
-}
-
-.vip-card__benefits {
-  position: absolute;
-  top: 124rpx;
-  left: 70rpx;
-  display: flex;
-  justify-content: space-between;
-  width: 400rpx;
-}
-
-.vip-card__benefit {
-  width: 120rpx;
-  text-align: center;
-}
-
-.vip-card__label {
-  display: block;
-  font-size: 20rpx;
-  line-height: 28rpx;
-  white-space: nowrap;
-  opacity: 0.8;
-}
-
-.vip-card__count {
-  display: flex;
-  align-items: baseline;
-  justify-content: center;
-  position: relative;
-  height: 44rpx;
-}
-
-.vip-card__count::before {
-  content: "";
-  position: absolute;
-  left: 16rpx;
-  bottom: 4rpx;
-  width: 88rpx;
-  height: 12rpx;
-  border-radius: 8rpx;
-  background: #ffd947;
-}
-
-.vip-card__number {
-  position: relative;
-  font-size: 40rpx;
-  line-height: 48rpx;
-  font-weight: 500;
-}
-
-.vip-card__unit {
-  position: relative;
-  margin-left: 2rpx;
-  font-size: 22rpx;
-  line-height: 30rpx;
-  opacity: 0.8;
-}
-
-.vip-card__status {
-  position: absolute;
-  top: 212rpx;
-  left: 496rpx;
-  width: 232rpx;
-  color: #888888;
-  font-size: 22rpx;
-  line-height: 30rpx;
-  text-align: center;
-  white-space: nowrap;
-}
-
-.vip-card--active .vip-card__status {
-  color: #b47d42;
-}
-
-.vip-card__introduction {
-  position: absolute;
-  left: 74rpx;
-  bottom: 16rpx;
-  padding: 6rpx 0;
-  font-size: 22rpx;
-  line-height: 30rpx;
-  opacity: 0.8;
-}
-</style>

src/pages/coin/components/StoreVipFooter.vue

@@ -1,62 +0,0 @@
-<script setup>
-const props = defineProps({
-  active: {
-    type: Boolean,
-    default: false,
-  },
-});
-const emit = defineEmits(["open"]);
-const handleOpen = () => {
-  if (!props.active) emit("open");
-};
-</script>
-
-<template>
-  <!-- 当前门店已开通时仅展示状态，未开通时提供线下开通提醒。 -->
-  <view class="vip-footer">
-    <text class="vip-footer__price">特惠价格：9.9元/90天</text>
-    <view class="vip-footer__status" @click="handleOpen">
-      <image class="vip-footer__badge" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-badge.png" mode="aspectFit" />
-      <text>{{ active ? "您已开通VIP" : "开通方式：请前往线下门店联系工作人员开通" }}</text>
-    </view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.vip-footer {
-  margin-top: 84rpx;
-  padding: 0 24rpx 22rpx;
-  box-sizing: border-box;
-}
-
-.vip-footer__price {
-  display: block;
-  color: #fae6bc;
-  font-size: 40rpx;
-  line-height: 56rpx;
-  font-weight: 500;
-  text-align: center;
-}
-
-.vip-footer__status {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 90rpx;
-  margin-top: 12rpx;
-  padding: 8rpx 28rpx;
-  box-sizing: border-box;
-  border-radius: 46rpx;
-  color: #333333;
-  background: #ffd947;
-  font-size: 26rpx;
-  line-height: 36rpx;
-}
-
-.vip-footer__badge {
-  flex-shrink: 0;
-  width: 80rpx;
-  height: 74rpx;
-  margin-right: 4rpx;
-}
-</style>

src/pages/coin/data.js

@@ -1,4 +1,3 @@
-// 金币快捷入口保持原有路由与图标配置。
 export const quickMenus = [
   {
     key: "rules",
@@ -21,30 +20,3 @@ export const quickMenus = [
     icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
   },
 ];
-
-// 体验中心业务 Tab。
-export const storeSections = [
-  { key: "vip", label: "体验中心VIP" },
-  { key: "coin", label: "我的金币" },
-];
-
-export const storeVipBenefits = [
-  {
-    key: "trial",
-    title: "免费体验权益",
-    description: "使用该权益可免费体验智能弓箭30分钟1次，加入官方社群还可以额外获赠1次。",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-trial.png",
-  },
-  {
-    key: "discount",
-    title: "特惠购买权益",
-    description: "使用该权益可以19.9元的特惠价格购买30分钟体验服务1次。",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-discount.png",
-  },
-  {
-    key: "drink",
-    title: "到店赠饮权益",
-    description: "使用该权益每次到店后可获得免费赠送的指定饮品一支。",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-drink.png",
-  },
-];

src/pages/coin/index.vue

@@ -1,53 +1,14 @@
 <script setup>
-import { computed, ref } from "vue";
+import { ref } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
-import ModalDialog from "@/components/ModalDialog.vue";
 import CoinHeader from "./components/CoinHeader.vue";
 import CoinBalancePanel from "./components/CoinBalancePanel.vue";
 import CoinQuickMenu from "./components/CoinQuickMenu.vue";
 import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
 import RewardProductCard from "./components/RewardProductCard.vue";
 import { getGiftListAPI, getMyGoldAPI } from "@/apis";
-import { quickMenus, storeSections, storeVipBenefits } from "./data";
+import { quickMenus } from "./data";
-import StoreSectionTabs from "./components/StoreSectionTabs.vue";
-import StoreVipCard from "./components/StoreVipCard.vue";
-import StoreBenefitCard from "./components/StoreBenefitCard.vue";
-import StoreVipFooter from "./components/StoreVipFooter.vue";
-import { getSelectedExperienceStore, rememberExperienceStore, loadStoreMembership } from "@/utils/storeVip";
-
-const activeTab = ref("vip");
-const membership = ref(null);
-const vipLoading = ref(false);
-const vipError = ref("");
-const displayedBenefits = computed(() => storeVipBenefits.map((benefit) => ({
-  ...benefit, remaining: membership.value?.remaining[benefit.key] ?? "--",
-})));
-const loadMembership = async () => {
-  if (!selectedStoreId.value || vipLoading.value) return;
-  vipLoading.value = true;
-  vipError.value = "";
-  membership.value = null;
-  try {
-    const result = await loadStoreMembership(selectedStoreId.value);
-    membership.value = result;
-    if (result.name) selectedStoreName.value = result.name;
-    rememberExperienceStore(selectedStoreId.value, selectedStoreName.value);
-  } catch (error) {
-    vipError.value = "会员信息加载失败，请点击重试或切换门店";
-    console.error("加载门店会员失败", error);
-  } finally {
-    vipLoading.value = false;
-  }
-};
-const selectStore = () => uni.redirectTo({ url: `/pages/coin/nearby-stores?tab=${activeTab.value}` });
-const selectTab = (tab) => {
-  if (storeSections.some((item) => item.key === tab)) activeTab.value = tab;
-};
-const showVipIntroduction = () => uni.navigateTo({ url: "/pages/coin/vip-intro" });
-const vipOpeningVisible = ref(false);
-const showVipOpening = () => { vipOpeningVisible.value = true; };
-const closeVipOpening = () => { vipOpeningVisible.value = false; };
 
 const PAGE_SIZE = 20;
 const coinSummary = ref({
@@ -58,8 +19,8 @@ const selectedStoreId = ref("");
 const selectedStoreName = ref("");
 const rewardProducts = ref([]);
 const productPage = ref(0);
+const productTotal = ref(0);
 const productLoading = ref(false);
-const productError = ref(false);
 const productNoMore = ref(false);
 
 const loadCoinSummary = async () => {
@@ -79,7 +40,6 @@ const loadProducts = async ({ reset = false } = {}) => {
 
   const nextPage = reset ? 1 : productPage.value + 1;
   productLoading.value = true;
-  productError.value = false;
   if (reset) productNoMore.value = false;
 
   try {
@@ -105,6 +65,7 @@ const loadProducts = async ({ reset = false } = {}) => {
     const totalCount = Number(result?.totalCount ?? result?.total);
     const responsePageSize =
       Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
+    productTotal.value = Number.isFinite(totalCount) ? totalCount : 0;
 
     if (Number.isFinite(pageCount) && pageCount >= 0) {
       productNoMore.value = productPage.value >= pageCount;
@@ -118,7 +79,6 @@ const loadProducts = async ({ reset = false } = {}) => {
       rewardProducts.value = [];
       productPage.value = 0;
     }
-    productError.value = true;
     console.error("加载礼品列表失败", error);
   } finally {
     productLoading.value = false;
@@ -155,7 +115,7 @@ const decodeRouteText = (value = "") => {
 const onMenuSelect = (menu) => {
   if (menu.key === "nearbyStores") {
     uni.redirectTo({
-      url: `/pages/coin/nearby-stores?tab=${activeTab.value}`,
+      url: "/pages/coin/nearby-stores",
     });
     return;
   }
@@ -183,69 +143,27 @@ const toProductDetail = (product) => {
 };
 
 onLoad((options = {}) => {
-  activeTab.value = options.tab === "coin" ? "coin" : "vip";
+  const storeId = String(options.storeId || "");
-  const previous = getSelectedExperienceStore();
-  const storeId = String(options.storeId || previous?.id || "");
   if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
-    selectStore();
+    uni.redirectTo({
+      url: "/pages/coin/nearby-stores",
+    });
     return;
   }
-  selectedStoreId.value = storeId;
-  selectedStoreName.value = options.storeId
-    ? decodeRouteText(options.storeName)
-    : previous?.name || "";
-  rememberExperienceStore(storeId, selectedStoreName.value);
-  loadProducts({ reset: true });
-});
 
-// 从介绍、商品等页面返回时刷新会员和余额。
+  selectedStoreId.value = storeId;
-onShow(() => {
+  selectedStoreName.value = decodeRouteText(options.storeName);
-  if (!selectedStoreId.value) return;
-  loadMembership();
   loadCoinSummary();
+  loadProducts({ reset: true });
 });
 </script>
 
 <template>
-  <!-- 标题固定，门店切换复用原有附近门店页面。 -->
+  <Container :bgType="6" :isHome="true" @scrolltolower="loadProducts">
-  <Container :bgType="6" bgColor="#22222e" :isHome="true" @scrolltolower="activeTab === 'coin' && loadProducts()">
     <template #header>
-      <CoinHeader title="线下体验中心" :subtitle="selectedStoreName || '选择门店'" switchable @select-store="selectStore" />
+      <CoinHeader title="我的金币" :subtitle="selectedStoreName" />
     </template>
     <view class="coin-page">
-      <StoreSectionTabs
-        :tabs="storeSections"
-        :active="activeTab"
-        @select="selectTab"
-      />
-
-      <!-- 卡片与权益列表共用当前门店的会员数据。 -->
-      <view v-if="activeTab === 'vip'" class="vip-section">
-        <view v-if="vipLoading" class="page-status">会员信息加载中...</view>
-        <view v-else-if="vipError" class="page-status" @click="loadMembership">{{ vipError }}</view>
-        <StoreVipCard
-          v-else-if="membership"
-          :membership="membership"
-          :benefits="storeVipBenefits"
-          @introduction="showVipIntroduction"
-        />
-        <view class="vip-section__content">
-          <text class="vip-section__description">
-            门店体验中心VIP是为热爱射箭运动的用户专属打造的VIP服务，开通后即可享受以下三大专属权益：
-          </text>
-          <view class="vip-section__benefits">
-            <StoreBenefitCard
-              v-for="benefit in displayedBenefits"
-              :key="benefit.key"
-              :benefit="benefit"
-            />
-          </view>
-        </view>
-        <StoreVipFooter v-if="membership" :active="membership.active" @open="showVipOpening" />
-      </view>
-
-      <!-- 保留原金币接口、分页与详情链路。 -->
-      <view v-else class="coin-section">
       <CoinBalancePanel
         :cumulative="coinSummary.cumulative"
         :available="coinSummary.available"
@@ -264,23 +182,11 @@ onShow(() => {
           </view>
         </view>
       </view>
-        <view v-if="productLoading" class="page-status">加载中...</view>
-        <view v-else-if="productError" class="page-status" @click="loadProducts()">加载失败，点击重试</view>
-        <view v-else-if="productNoMore" class="page-status">{{ rewardProducts.length ? '没有更多商品了~' : '暂无兑换商品~' }}</view>
-      </view>
     </view>
   </Container>
-  <ModalDialog
-    :show="vipOpeningVisible"
-    content="请前往线下门店体验中心，联系工作人员开通VIP。"
-    :show-cancel="false"
-    confirm-text="我已知晓"
-    :on-confirm="closeVipOpening"
-  />
 </template>
 
-<style scoped lang="scss">
+<style scoped>
-.page-status { padding: 30rpx; color: #cccccc; text-align: center; font-size: 26rpx; }
 .coin-page {
   width: 100%;
   min-height: 100%;
@@ -288,30 +194,6 @@ onShow(() => {
   box-sizing: border-box;
 }
 
-.vip-section {
-  padding-top: 30rpx;
-}
-
-.vip-section__content {
-  padding: 0 28rpx;
-}
-
-.vip-section__description {
-  display: block;
-  margin-top: 50rpx;
-  color: #ffffff;
-  font-size: 24rpx;
-  line-height: 34rpx;
-}
-
-.vip-section__benefits {
-  margin-top: 30rpx;
-}
-
-.coin-section {
-  padding-top: 20rpx;
-}
-
 .reward-section {
   padding: 20rpx 28rpx 40rpx;
   box-sizing: border-box;

src/pages/coin/nearby-stores.vue

@@ -6,9 +6,6 @@ import CoinHeader from "./components/CoinHeader.vue";
 import LocationPermissionState from "./components/LocationPermissionState.vue";
 import StoreCard from "./components/StoreCard.vue";
 import { getNearbyStoresAPI } from "@/apis";
-import { rememberExperienceStore } from "@/utils/storeVip";
-
-const activeTab = ref("vip");
 
 const PAGE_SIZE = 20;
 const DEFAULT_STORE_IMAGE =
@@ -116,16 +113,12 @@ const selectStore = (store) => {
   }
 
   const storeName = encodeURIComponent(store?.name || "");
-  rememberExperienceStore(storeId, store?.name || "");
   uni.redirectTo({
-    url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}&tab=${activeTab.value}`,
+    url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}`,
   });
 };
 
-onLoad((options = {}) => {
+onLoad(locateAndLoadStores);
-  activeTab.value = options.tab === "coin" ? "coin" : "vip";
-  locateAndLoadStores();
-});
 </script>
 
 <template>

src/pages/coin/vip-intro.vue

@@ -1,48 +0,0 @@
-<script setup>
-import { ref } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
-import Container from "@/components/Container.vue";
-import CoinHeader from "./components/CoinHeader.vue";
-import { getStoreVipIntroAPI } from "@/apis";
-
-const content = ref("");
-const loading = ref(false);
-const failed = ref(false);
-
-const loadIntroduction = async () => {
-  if (loading.value) return;
-  loading.value = true;
-  failed.value = false;
-  try {
-    const result = await getStoreVipIntroAPI();
-    if (typeof result?.content !== "string") {
-      throw new Error("体验中心 VIP 介绍响应格式异常");
-    }
-    // 保留服务端原文与换行，空白内容单独展示提示。
-    content.value = result.content;
-  } catch (error) {
-    failed.value = true;
-    console.error("加载体验中心 VIP 介绍失败", error);
-  } finally {
-    loading.value = false;
-  }
-};
-
-onLoad(loadIntroduction);
-</script>
-
-<template>
-  <Container :bgType="6" bgColor="#22222e" :isHome="true">
-    <template #header><CoinHeader title="体验中心VIP介绍" /></template>
-    <view class="vip-intro">
-      <text v-if="loading">加载中...</text>
-      <text v-else-if="failed" @click="loadIntroduction">加载失败，点击重试</text>
-      <text v-else-if="content.trim()">{{ content }}</text>
-      <text v-else>暂无介绍内容</text>
-    </view>
-  </Container>
-</template>
-
-<style scoped lang="scss">
-.vip-intro { padding: 32rpx 28rpx; color: #ffffff; font-size: 28rpx; line-height: 44rpx; white-space: pre-wrap; }
-</style>

src/pages/device/composables/useDeviceBinding.js

@@ -18,16 +18,6 @@ export function useDeviceBinding({
     });
   };
 
-  const showAlreadyBoundPage = () => {
-    uni.navigateTo({
-      url: "/pages/device/device-already-bound",
-      fail: (error) => {
-        console.error("打开设备已绑定页失败", error);
-        uni.showToast({ title: "设备已绑定其他账号，请解绑后再绑定", icon: "none" });
-      },
-    });
-  };
-
   const handleScan = () => {
     uni.scanCode({
       onlyFromCamera: true,
@@ -55,8 +45,10 @@ export function useDeviceBinding({
       const result = await bindDeviceAPIV2(token.value);
       confirmBindTip.value = false;
       if (result?.binded) {
-        token.value = "";
+        uni.showToast({
-        showAlreadyBoundPage();
+          title: "设备已绑定其他账号，请解绑后再绑定",
+          icon: "none",
+        });
         return;
       }
       const deviceId = String(result?.deviceId || "").trim();

src/pages/device/composables/useDeviceStatus.js

@@ -82,7 +82,8 @@ export function useDeviceStatus({
   const maskedDeviceId = computed(() => {
     const id = String(device.value.deviceId || "");
     if (!id) return "暂无设备编号";
-    return "*****";
+    if (id.length <= 3) return id;
+    return `${"*".repeat(Math.min(5, id.length - 3))}${id.slice(-3)}`;
   });
   const deviceRows = computed(() => [
     { label: "设备型号", value: deviceDetails.value.model || "射灵智能弓" },
@@ -98,7 +99,7 @@ export function useDeviceStatus({
 
   const refreshDeviceDetails = async () => {
     const deviceId = device.value.deviceId;
-    if (!deviceId) return null;
+    if (!deviceId) return;
 
     const requestVersion = ++deviceDetailRequestVersion;
     try {
@@ -110,17 +111,13 @@ export function useDeviceStatus({
         requestVersion !== deviceDetailRequestVersion ||
         device.value.deviceId !== deviceId
       ) {
-        return null;
+        return;
       }
 
       deviceDetails.value = {
         ...deviceDetails.value,
         ...detail,
         deviceModelName: detail.deviceModelName ?? "",
-        latestVersion: detail.latestVersion ?? "",
-        needUpdate: detail.needUpdate ?? false,
-        forceUpdate: detail.forceUpdate ?? false,
-        version: detail.version ?? "",
         bindTime: String(
           detail.bindTime ?? deviceDetails.value.bindTime ?? ""
         ).trim(),
@@ -129,11 +126,9 @@ export function useDeviceStatus({
         ).trim(),
       };
       updateDeviceUsageDuration(detail.onlineDuration, deviceId);
-      return detail;
     } catch (error) {
       // 实时刷新失败时保留当前页面数据，等待下次通知或页面重新显示。
       console.log("刷新设备详情失败", error);
-      return null;
     }
   };
 
@@ -148,10 +143,6 @@ export function useDeviceStatus({
         let latestDevice = {
           ...currentDevice,
           deviceModelName: "",
-          latestVersion: "",
-          needUpdate: false,
-          forceUpdate: false,
-          version: "",
           bindTime: "",
           qrCodeUrl: "",
         };

src/pages/device/device-already-bound.vue

@@ -1,154 +0,0 @@
-<script setup>
-import Container from "@/components/Container.vue";
-
-// 结果页从设备页进入，返回时优先保留原页面状态。
-const goBackToDevicePage = () => {
-  const pages = getCurrentPages();
-  if (pages.length > 1) {
-    uni.navigateBack({ delta: 1 });
-    return;
-  }
-  uni.redirectTo({ url: "/pages/device/my-device" });
-};
-
-// 回到设备页后复用其扫码绑定流程。
-const retryScan = () => {
-  const pages = getCurrentPages();
-  if (pages.length > 1) {
-    uni.navigateBack({
-      delta: 1,
-      success: () => uni.$emit("device-bind-retry-scan"),
-    });
-    return;
-  }
-  uni.redirectTo({ url: "/pages/device/my-device?retryScan=1" });
-};
-</script>
-
-<template>
-  <view class="device-already-bound-page">
-    <Container
-      :bgType="12"
-      bgColor="transparent"
-      :onBack="goBackToDevicePage"
-      headerClass="already-bound-header"
-      :scroll="false"
-      :usePageScroll="true"
-    >
-      <view class="already-bound-page">
-        <view class="already-bound-scene">
-          <view class="already-bound-hero-wrap">
-            <view class="already-bound-hero-shadow"></view>
-            <image
-              class="already-bound-hero"
-              src="/static/device-assets/device-already-bound-hero.png"
-              mode="aspectFit"
-            />
-          </view>
-          <view class="already-bound-message">
-            <text>该设备已经绑定了其他账号，</text>
-            <text>如需绑定本账号，请先解除绑定。</text>
-          </view>
-          <view class="already-bound-retry" @click="$clickSound(retryScan)">
-            <text>重新扫码</text>
-          </view>
-        </view>
-      </view>
-    </Container>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.device-already-bound-page {
-  position: relative;
-  min-height: 100vh;
-  background: transparent;
-}
-
-.already-bound-header {
-  position: relative;
-  z-index: 20;
-  pointer-events: auto;
-}
-
-/* 与现有绑定结果页保持相同的 375 宽画布尺寸。 */
-.already-bound-page {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1;
-  width: 100%;
-  height: 100vh;
-  overflow: hidden;
-  pointer-events: none;
-}
-
-.already-bound-scene {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.already-bound-hero-wrap,
-.already-bound-message,
-.already-bound-retry {
-  position: absolute;
-}
-
-.already-bound-hero-wrap {
-  top: 568rpx;
-  left: 244rpx;
-  width: 260rpx;
-  height: 222rpx;
-}
-
-.already-bound-hero-shadow {
-  position: absolute;
-  left: 22rpx;
-  bottom: 0;
-  width: 238rpx;
-  height: 40rpx;
-  border-radius: 50%;
-  background: rgba(0, 0, 0, 0.3);
-}
-
-.already-bound-hero {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 260rpx;
-  height: 222rpx;
-}
-
-.already-bound-message {
-  top: 804rpx;
-  left: 110rpx;
-  display: flex;
-  width: 530rpx;
-  flex-direction: column;
-  align-items: center;
-  color: #fff;
-  font-family: PingFang SC-Regular;
-  font-size: 28rpx;
-  line-height: 40rpx;
-  text-align: center;
-  white-space: nowrap;
-}
-
-.already-bound-retry {
-  top: 930rpx;
-  left: 195rpx;
-  display: flex;
-  width: 360rpx;
-  height: 70rpx;
-  box-sizing: border-box;
-  align-items: center;
-  justify-content: center;
-  border: 2rpx solid #ffd947;
-  border-radius: 78rpx;
-  color: #ffd947;
-  font-size: 26rpx;
-  line-height: 26rpx;
-  pointer-events: auto;
-}
-</style>

src/pages/device/my-device.vue

@@ -8,6 +8,7 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import ModalDialog from "@/components/ModalDialog.vue";
 import OtaModal from "@/components/OtaModal.vue";
 import {
+  getHardwareBoxVersionAPI,
   laserAimAPI,
   updateDeviceAliasAPI,
 } from "@/apis";
@@ -18,7 +19,7 @@ import {
   DEVICE_NAME_STORAGE_KEY,
   useDeviceStatus,
 } from "./composables/useDeviceStatus";
-import { getOtaInfoFromDetail, useOtaUpdate } from "@/composables/useOtaUpdate";
+import { useOtaUpdate } from "@/composables/useOtaUpdate";
 
 const store = useStore();
 const { updateDevice, updateDeviceUsageDuration, clearDevice } = store;
@@ -61,8 +62,11 @@ const showDeviceId = ref(false);
 const latestVersionDialogVisible = ref(false);
 const firmwareConfirmVisible = ref(false);
 const wifiRequiredVisible = ref(false);
+const otaNeedUpdate = ref(false);
 const firmwareActionPending = ref(false);
 const pendingOtaInfo = ref(null);
+let otaCheckPromise = null;
+let otaCheckRequestVersion = 0;
 
 const {
   updating: otaUpdating,
@@ -109,12 +113,6 @@ const wifiStatusText = computed(() => {
 const bindingDateText = computed(() =>
   formatBindingDate(deviceDetails.value.bindTime)
 );
-const otaNeedUpdate = computed(() => {
-  const info = getOtaInfoFromDetail(deviceDetails.value);
-  return isDeviceOnline.value &&
-    deviceDetails.value.deviceId === device.value.deviceId &&
-    info.needUpdate && !!info.versionNumber;
-});
 
 // 固件版本统一以大写 V 开头，避免接口返回格式不一致影响弹窗展示。
 const formatFirmwareVersion = (value) => {
@@ -124,12 +122,18 @@ const formatFirmwareVersion = (value) => {
 };
 
 const firmwareConfirmContent = computed(() => {
-  const currentVersion = formatFirmwareVersion(pendingOtaInfo.value?.currentVersion);
+  const currentVersion = formatFirmwareVersion(deviceStatus.value.version);
-  const latestVersion = formatFirmwareVersion(pendingOtaInfo.value?.versionNumber);
+  const latestVersion = formatFirmwareVersion(
+    pendingOtaInfo.value?.versionNumber
+  );
+
   if (currentVersion && latestVersion) {
     return `当前固件版本为 ${currentVersion}，发现新固件版本 ${latestVersion}，是否立即更新固件？`;
   }
-  return latestVersion ? `发现新固件版本 ${latestVersion}，是否立即更新固件？` : "是否立即更新固件？";
+  if (latestVersion) {
+    return `发现新固件版本 ${latestVersion}，是否立即更新固件？`;
+  }
+  return "发现新固件版本，是否立即更新固件？";
 });
 
 const deviceIdText = computed(() =>
@@ -268,20 +272,84 @@ const joinWifi = () => {
   uni.navigateTo({ url: "/pages/device/ota-wifi" });
 };
 
-const closeFirmwareConfirm = () => {
+const clearOtaState = () => {
-  firmwareConfirmVisible.value = false;
+  otaCheckRequestVersion += 1;
+  otaCheckPromise = null;
+  otaNeedUpdate.value = false;
+};
+
+const loadOtaVersionInfo = async () => {
+  if (otaCheckPromise) return otaCheckPromise;
+
+  const deviceId = device.value.deviceId;
+  if (!deviceId || !isDeviceOnline.value) return null;
+
+  const requestVersion = ++otaCheckRequestVersion;
+  const request = getHardwareBoxVersionAPI()
+    .then((versionInfo) => {
+      if (
+        requestVersion !== otaCheckRequestVersion ||
+        device.value.deviceId !== deviceId ||
+        !isDeviceOnline.value
+      ) {
+        return null;
+      }
+
+      if (!versionInfo || typeof versionInfo !== "object") {
+        throw new Error("固件版本信息为空");
+      }
+
+      const needUpdate =
+        versionInfo.needUpdate === true || Number(versionInfo.needUpdate) === 1;
+      otaNeedUpdate.value = needUpdate;
+      return {
+        versionNumber: versionInfo.versionNumber || "",
+        resourceUrl: versionInfo.resourceUrl || "",
+        needUpdate,
+      };
+    })
+    .finally(() => {
+      if (otaCheckPromise === request) {
+        otaCheckPromise = null;
+      }
+    });
+
+  otaCheckPromise = request;
+  return request;
+};
+
+const refreshOtaUpdateState = async () => {
+  otaNeedUpdate.value = false;
+  if (!device.value.deviceId || !isDeviceOnline.value) {
+    clearOtaState();
+    return;
+  }
+
+  try {
+    await loadOtaVersionInfo();
+  } catch (error) {
+    clearOtaState();
+    console.log("检查固件更新失败", error);
+  }
 };
 
 const closeLatestVersionDialog = () => {
   latestVersionDialogVisible.value = false;
 };
 
+const closeFirmwareConfirm = () => {
+  firmwareConfirmVisible.value = false;
+};
+
 const runFirmwareUpdate = () => {
-  const otaInfo = pendingOtaInfo.value;
+  const versionInfo = pendingOtaInfo.value;
-  if (!otaInfo || otaInfo.deviceId !== device.value.deviceId) return;
+  if (!versionInfo) return;
   void startOtaUpdate({
-    versionNumber: otaInfo.versionNumber,
+    versionNumber: versionInfo.versionNumber,
-    onSuccess: () => void refreshDeviceDetails(),
+    resourceUrl: versionInfo.resourceUrl,
+    onSuccess: () => {
+      otaNeedUpdate.value = false;
+    },
   });
 };
 
@@ -299,43 +367,42 @@ const confirmFirmwareUpdate = () => {
 };
 
 const goWifiForFirmwareUpdate = () => {
-  const otaInfo = pendingOtaInfo.value;
+  const versionInfo = pendingOtaInfo.value;
-  if (!otaInfo || otaInfo.deviceId !== device.value.deviceId) return;
+  if (!versionInfo) return;
   wifiRequiredVisible.value = false;
-  const versionNumber = encodeURIComponent(otaInfo.versionNumber);
+  const query = [
-  uni.navigateTo({ url: `/pages/device/ota-wifi?source=firmware-update&versionNumber=${versionNumber}` });
+    "source=firmware-update",
+    `versionNumber=${encodeURIComponent(versionInfo.versionNumber)}`,
+    `resourceUrl=${encodeURIComponent(versionInfo.resourceUrl)}`,
+  ].join("&");
+  uni.navigateTo({ url: `/pages/device/ota-wifi?${query}` });
 };
 
 const handleOtaResultClose = () => {
   closeOtaResult();
-  void refreshDeviceDetails();
+  void refreshOtaUpdateState();
 };
 
 const goFirmwareUpdate = async () => {
-  if (firmwareActionPending.value || otaUpdating.value) return;
+  if (firmwareActionPending.value) return;
   if (!isDeviceOnline.value) {
     uni.showToast({ title: "请先开启智能弓", icon: "none" });
     return;
   }
+
   firmwareActionPending.value = true;
-  const deviceId = device.value.deviceId;
   try {
-    const detail = await refreshDeviceDetails();
+    const versionInfo = await loadOtaVersionInfo();
-    if (!detail || device.value.deviceId !== deviceId) {
+    if (!versionInfo) return;
-      uni.showToast({ title: "获取设备详情失败，请重试", icon: "none" });
+    if (!versionInfo.needUpdate) {
-      return;
-    }
-    const otaInfo = getOtaInfoFromDetail(detail);
-    if (!otaInfo.needUpdate) {
       latestVersionDialogVisible.value = true;
       return;
     }
-    if (!otaInfo.versionNumber) {
+
-      uni.showToast({ title: "缺少固件目标版本，请重试", icon: "none" });
+    pendingOtaInfo.value = versionInfo;
-      return;
-    }
-    pendingOtaInfo.value = { ...otaInfo, deviceId };
     firmwareConfirmVisible.value = true;
+  } catch (error) {
+    uni.showToast({ title: "获取更新版本失败，请重试", icon: "none" });
   } finally {
     firmwareActionPending.value = false;
   }
@@ -384,20 +451,15 @@ watch(
   (isOnline, wasOnline) => {
     if (isOnline && !wasOnline) {
       void refreshDeviceDetails();
-    } else if (!isOnline) {
+      void refreshOtaUpdateState();
-      firmwareConfirmVisible.value = false;
+      return;
-      wifiRequiredVisible.value = false;
+    }
+    if (!isOnline) {
+      clearOtaState();
     }
   }
 );
 
-watch(() => device.value.deviceId, () => {
-  pendingOtaInfo.value = null;
-  latestVersionDialogVisible.value = false;
-  firmwareConfirmVisible.value = false;
-  wifiRequiredVisible.value = false;
-});
-
 onLoad((options = {}) => {
   retryScanOnShow.value = options.retryScan === "1";
 });
@@ -413,6 +475,7 @@ onUnmounted(() => {
 onShow(async () => {
   calibration.value = uni.getStorageSync("calibration");
   await syncDeviceBinding();
+  void refreshOtaUpdateState();
   if (retryScanOnShow.value) {
     retryScanOnShow.value = false;
     handleScan();
@@ -447,12 +510,12 @@ onShow(async () => {
           <text class="highlight-text">射灵智能弓箭</text>
           <text>设备上的二维码</text>
         </view>
-        <!-- <view class="benefit-copy">
+        <view class="benefit-copy">
           <text>新设备首次绑定账号可获赠</text>
           <text class="highlight-text">6个月射灵会员礼包</text>
           <text>，</text>
           <text>该礼包仅可使用一次，请确保当前登录账号为您本人账号。</text>
-        </view> -->
+        </view>
         <button class="help-link" hover-class="none" @click="showTip = true">
           <text>没找到二维码或遇到问题&gt;</text>
         </button>
@@ -544,7 +607,10 @@ onShow(async () => {
           </view>
           <view class="action-label-wrap">
             <text>固件更新</text>
-            <text v-if="otaNeedUpdate" class="action-badge action-badge--new">New</text>
+            <text
+              v-if="otaNeedUpdate"
+              class="action-badge action-badge--new"
+            >New</text>
           </view>
         </view>
         <view class="action-item" @click="joinWifi">
@@ -658,7 +724,6 @@ onShow(async () => {
       :content="firmwareConfirmContent"
       cancelText="暂不更新"
       confirmText="立即更新"
-      :showCancel="!pendingOtaInfo?.forceUpdate"
       :onCancel="closeFirmwareConfirm"
       :onConfirm="confirmFirmwareUpdate"
     ></ModalDialog>
@@ -866,7 +931,7 @@ onShow(async () => {
 }
 
 .help-link {
-  margin-top: 36rpx;
+  margin-top: 72rpx;
   color: #ffd947;
   font-size: 26rpx;
   line-height: 36rpx;
@@ -874,8 +939,8 @@ onShow(async () => {
 
 .product-link {
   position: fixed;
-  bottom: 208rpx;
+  bottom: 104rpx;
-  /* bottom: calc(env(safe-area-inset-bottom) + 104rpx); */
+  bottom: calc(env(safe-area-inset-bottom) + 104rpx);
   left: 0;
   z-index: 2;
   width: 100%;

src/pages/device/ota-wifi.vue

@@ -9,10 +9,10 @@ import useStore from "@/store";
 import { capsuleHeight } from "@/util";
 import {
   connectDeviceWifiAPI,
-  getDeviceDetailAPI,
   getDeviceWifiStatusAPI,
+  getHardwareBoxVersionAPI,
 } from "@/apis";
-import { getOtaInfoFromDetail, useOtaUpdate } from "@/composables/useOtaUpdate";
+import { useOtaUpdate } from "@/composables/useOtaUpdate";
 
 const STATES = {
   SCANNING: "SCANNING",
@@ -23,7 +23,7 @@ const STATES = {
 };
 
 const isIOS = uni.getDeviceInfo().osName === "ios";
-const { device, deviceStatus } = storeToRefs(useStore());
+const { deviceStatus } = storeToRefs(useStore());
 const currentState = ref(STATES.SCANNING);
 const connectedWifi = ref(null);
 const connectedWifiName = ref("");
@@ -39,14 +39,16 @@ const connectMode = ref("secure"); // secure | open | manual
 const connectError = ref("");
 const connectStatusText = ref("");
 const isSubmittingWifi = ref(false);
-const wifiSuccessVisible = ref(false);
 const keyboardHeight = ref(0);
 // 控制密码输入框是否显示明文
 const showPassword = ref(false);
 // 刷新防抖标志：扫描进行中为 true，禁止重复点击；扫描结束（成功/失败）后重置为 false。
 const isRefreshing = ref(false);
 const fromFirmwareUpdate = ref(false);
-const routeOtaVersionNumber = ref("");
+const routeOtaInfo = ref({
+  versionNumber: "",
+  resourceUrl: "",
+});
 const countdownVisible = ref(false);
 const countdownSeconds = ref(3);
 const firmwareMessageVisible = ref(false);
@@ -365,13 +367,10 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
       secure: connectMode.value === "secure" || !!password,
     };
     connectError.value = "";
+    currentState.value = STATES.CONNECTED;
     void refreshConnectedWifiName();
     if (fromFirmwareUpdate.value) {
-      currentState.value = STATES.CONNECTED;
       openFirmwareCountdown();
-    } else {
-      // 保留配网输入界面，避免成功提示出现前先露出 WiFi 列表。
-      wifiSuccessVisible.value = true;
     }
   } catch (err) {
     if (requestId === wifiConnectRequestId) {
@@ -386,13 +385,6 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
   }
 };
 
-// 普通配网成功后，确认并收起输入界面，停留在当前 WiFi 页面。
-const confirmWifiSuccess = () => {
-  if (!wifiSuccessVisible.value) return;
-  wifiSuccessVisible.value = false;
-  currentState.value = STATES.CONNECTED;
-};
-
 // 校验用户输入并提交 WiFi 配置，不再把手机连接结果当作设备连接成功。
 const joinNetwork = () => {
   if (joinDisabled.value) return;
@@ -403,38 +395,37 @@ const joinNetwork = () => {
   submitDeviceWifiConfig({ ssid, password });
 };
 
+// 获取 OTA 更新版本信息，正常使用入口传参，缺失时再请求后端兜底。
+const getOtaVersionInfo = async () => {
+  if (routeOtaInfo.value.versionNumber && routeOtaInfo.value.resourceUrl) {
+    return {
+      needUpdate: true,
+      versionNumber: routeOtaInfo.value.versionNumber,
+      resourceUrl: routeOtaInfo.value.resourceUrl,
+    };
+  }
+  return getHardwareBoxVersionAPI();
+};
+
 const startFirmwareUpdate = async () => {
   if (!fromFirmwareUpdate.value || !connectedWifi.value || otaUpdating.value) return;
-  const deviceId = device.value.deviceId;
-  const wifi = connectedWifi.value;
-  if (!deviceId) return;
   try {
-    const response = await getDeviceDetailAPI(deviceId);
+    const versionInfo = await getOtaVersionInfo();
-    const detail = response?.detail || response?.data?.detail;
+    if (!versionInfo?.needUpdate) {
-    if (!detail || device.value.deviceId !== deviceId) throw new Error("设备详情已失效");
-    const otaInfo = getOtaInfoFromDetail(detail);
-    if (!otaInfo.needUpdate) {
       firmwareMessage.value = "当前已是最新版本";
       firmwareMessageVisible.value = true;
       return;
     }
-    if (!otaInfo.versionNumber) {
-      firmwareMessage.value = "缺少固件目标版本，请返回后重试";
-      firmwareMessageVisible.value = true;
-      return;
-    }
-    // WiFi 连接可能耗时较长，以更新前的最新设备详情为准。
-    routeOtaVersionNumber.value = otaInfo.versionNumber;
-  } catch (error) {
-    firmwareMessage.value = "获取设备详情失败，请返回后重试";
-    firmwareMessageVisible.value = true;
-    return;
-  }
     await startOtaUpdate({
-    versionNumber: routeOtaVersionNumber.value,
+      versionNumber: versionInfo.versionNumber,
-    wifiSsid: wifi.SSID,
+      wifiSsid: connectedWifi.value.SSID,
-    wifiPassword: wifi.password || "",
+      wifiPassword: connectedWifi.value.password || "",
+      resourceUrl: versionInfo.resourceUrl,
     });
+  } catch (error) {
+    firmwareMessage.value = "获取更新版本失败，请重试";
+    firmwareMessageVisible.value = true;
+  }
 };
 
 const clearFirmwareCountdown = () => {
@@ -475,7 +466,10 @@ const togglePasswordVisibility = () => {
 // 页面加载时识别普通 WiFi 入口和固件更新入口。
 onLoad((options = {}) => {
   fromFirmwareUpdate.value = options.source === "firmware-update";
-  routeOtaVersionNumber.value = decodeURIComponent(options.versionNumber || "");
+  routeOtaInfo.value = {
+    versionNumber: decodeURIComponent(options.versionNumber || ""),
+    resourceUrl: decodeURIComponent(options.resourceUrl || ""),
+  };
 });
 
 // 页面挂载后启动 WiFi 扫描流程。
@@ -766,14 +760,6 @@ onUnmounted(() => {
       </view>
     </view>
 
-    <ModalDialog
-      :show="wifiSuccessVisible"
-      content="WIFI连接成功"
-      confirmText="确定"
-      :showCancel="false"
-      :onConfirm="confirmWifiSuccess"
-    ></ModalDialog>
-
     <ModalDialog
       :show="countdownVisible"
       title="WiFi连接成功"

src/pages/index.vue

@@ -13,14 +13,14 @@ import OtaModal from "@/components/OtaModal.vue";
 import {
   checkUserBindAPI,
   getAppConfig,
-  getDeviceDetailAPI,
+  getHardwareBoxVersionAPI,
   getHomeData,
   getMyDevicesAPI,
   getScoreRankList,
   silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
-import {getOtaInfoFromDetail, useOtaUpdate} from "@/composables/useOtaUpdate";
+import {useOtaUpdate} from "@/composables/useOtaUpdate";
 
 import useStore from "@/store";
 import {storeToRefs} from "pinia";
@@ -74,9 +74,16 @@ const isDeviceCharging = computed(
   () => deviceCardState.value === "online" && deviceStatus.value?.charging === true
 );
 
+// OTA 相关
 const otaVisible = ref(false);
 const wifiRequiredVisible = ref(false);
-const otaInfo = ref({ versionNumber: "", versionInfo: "", needUpdate: false, forceUpdate: false });
+const otaInfo = ref({
+  versionNumber: "",
+  versionInfo: "",
+  resourceUrl: "",
+  forceUpdate: false,
+  needUpdate: false,
+});
 const isStartingOta = ref(false);
 let isCheckingOta = false;
 let otaCheckQueuedForOnline = false;
@@ -91,122 +98,157 @@ const {
   closeResult: closeOtaResult,
 } = useOtaUpdate();
 
-// 首页仅用绑定设备详情判断是否需要升级，不再请求旧版本接口。
+// 获取并保存后端返回的 OTA 版本信息，供弹窗展示和更新接口使用。
-const checkOtaUpdate = async () => {
+const applyOtaVersionInfo = (versionInfo) => {
-  if (isCheckingOta || otaVisible.value || otaUpdating.value || otaResultVisible.value) return;
+  otaInfo.value = {
-  const deviceId = String(device.value.deviceId || "");
+    versionNumber: versionInfo?.versionNumber || "",
-  if (!user.value.id || !deviceId || online.value !== true) return;
+    versionInfo: versionInfo?.versionInfo || "",
-  isCheckingOta = true;
+    resourceUrl: versionInfo?.resourceUrl || "",
-  try {
+    forceUpdate: Number(versionInfo?.forceUpdate) === 1,
-    const response = await getDeviceDetailAPI(deviceId);
+    needUpdate:
-    const detail = response?.detail || response?.data?.detail;
+      versionInfo?.needUpdate === true || Number(versionInfo?.needUpdate) === 1,
-    if (!detail || device.value.deviceId !== deviceId || online.value !== true) return;
+  };
-    if (otaVisible.value || otaUpdating.value || otaResultVisible.value) return;
+};
-    otaInfo.value = getOtaInfoFromDetail(detail);
-    if (!otaInfo.value.needUpdate || !otaInfo.value.versionNumber) return;
 
-    const dismissed = uni.getStorageSync("ota_dismissed_at");
+// 检查当前设备盒子是否存在可升级版本。
-    const recentlyDismissed = dismissed?.deviceId === deviceId &&
+const checkOtaUpdate = async () => {
-      dismissed?.versionNumber === otaInfo.value.versionNumber &&
+  if (
-      Date.now() - Number(dismissed?.at || 0) < 24 * 60 * 60 * 1000;
+    isCheckingOta ||
-    if (!otaInfo.value.forceUpdate && recentlyDismissed) return;
+    otaVisible.value ||
+    otaUpdating.value ||
+    otaResultVisible.value
+  ) return;
+  isCheckingOta = true;
+
+  try {
+    if (
+      online.value !== true ||
+      otaVisible.value ||
+      otaUpdating.value ||
+      otaResultVisible.value
+    ) return;
+
+    let versionInfo;
+    try {
+      versionInfo = await getHardwareBoxVersionAPI();
+    } catch (err) {
+      return;
+    }
+    if (otaVisible.value || otaUpdating.value || otaResultVisible.value) return;
+    applyOtaVersionInfo(versionInfo);
+    if (!otaInfo.value.needUpdate) return;
+
+    const dismissedAt = uni.getStorageSync("ota_dismissed_at");
+    const now = Date.now();
+    if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
     otaVisible.value = true;
-  } catch (error) {
-    console.log("检查固件更新失败", error);
   } finally {
     isCheckingOta = false;
-    if (otaCheckQueuedForOnline) {
+    const shouldRecheckForOnline = otaCheckQueuedForOnline;
     otaCheckQueuedForOnline = false;
+    if (
+      shouldRecheckForOnline &&
+      !otaVisible.value &&
+      !otaUpdating.value &&
+      !otaResultVisible.value
+    ) {
       void checkOtaUpdate();
     }
   }
 };
 
+// 设备由 WS 通知上线时补查 OTA；已显示任何 OTA 弹窗时保留当前流程和结果。
 watch(online, (nextOnline, previousOnline) => {
-  if (!nextOnline) {
+  if (
-    otaVisible.value = false;
+    previousOnline !== false ||
+    nextOnline !== true ||
+    otaVisible.value ||
+    otaUpdating.value ||
+    otaResultVisible.value
+  ) return;
+  if (isCheckingOta) {
+    otaCheckQueuedForOnline = true;
     return;
   }
-  if (previousOnline === false) {
+  void checkOtaUpdate();
-    if (isCheckingOta) otaCheckQueuedForOnline = true;
-    else void checkOtaUpdate();
-  }
-});
-
-watch(() => device.value.deviceId, () => {
-  otaVisible.value = false;
-  otaInfo.value = { versionNumber: "", versionInfo: "", needUpdate: false, forceUpdate: false };
 });
 
+// 任一页面发起或恢复 OTA 后，关闭首页的版本发现弹窗，避免两层弹窗重叠。
 watch([otaUpdating, otaResultVisible], ([updating, resultVisible]) => {
-  if (updating || resultVisible) otaVisible.value = false;
+  if (!updating && !resultVisible) return;
+  otaVisible.value = false;
+  isStartingOta.value = false;
 });
 
-const getOtaWifiUrl = () =>
+// 拼接 OTA WiFi 页参数，让未连 WiFi 的设备继续使用同一份版本信息。
-  `/pages/device/ota-wifi?source=firmware-update&versionNumber=${encodeURIComponent(otaInfo.value.versionNumber)}`;
+const getOtaWifiUrl = () => {
+  const { versionNumber, resourceUrl } = otaInfo.value;
+  const query = [
+    "source=firmware-update",
+    `versionNumber=${encodeURIComponent(versionNumber)}`,
+    `resourceUrl=${encodeURIComponent(resourceUrl)}`,
+  ].join("&");
+  return `/pages/device/ota-wifi?${query}`;
+};
 
+// 处理 OTA 弹窗暂不更新，强制更新时不允许关闭。
 const handleOtaDismiss = () => {
   if (otaInfo.value.forceUpdate) return;
-  uni.setStorageSync("ota_dismissed_at", {
+  uni.setStorageSync("ota_dismissed_at", Date.now());
-    deviceId: device.value.deviceId,
-    versionNumber: otaInfo.value.versionNumber,
-    at: Date.now(),
-  });
   otaVisible.value = false;
 };
 
-// 点击更新或失败重试时检查设备网络状态，并使用详情中的目标版本号。
+// 设备盒子已连 WiFi 时，通过共享 OTA 状态发起更新。
+const startHomeOtaUpdate = async () => {
+  otaVisible.value = false;
+  await startOtaUpdate({
+    versionNumber: otaInfo.value.versionNumber,
+    resourceUrl: otaInfo.value.resourceUrl,
+    onSuccess: () => {
+      otaInfo.value = {...otaInfo.value, needUpdate: false};
+    },
+  });
+  isStartingOta.value = false;
+};
+
+// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网，未联网时先展示连接引导。
 const handleOtaUpdate = async () => {
   if (isStartingOta.value) return;
   isStartingOta.value = true;
-  const deviceId = String(device.value.deviceId || "");
-  try {
-    if (!deviceId || deviceStatus.value?.online !== true) {
-      uni.showToast({ title: "请先开启智能弓", icon: "none" });
-      return;
-    }
-    const response = await getDeviceDetailAPI(deviceId);
-    const detail = response?.detail || response?.data?.detail;
-    if (!detail || device.value.deviceId !== deviceId) {
-      uni.showToast({ title: "获取设备详情失败，请重试", icon: "none" });
-      return;
-    }
-    otaInfo.value = getOtaInfoFromDetail(detail);
-    if (!otaInfo.value.needUpdate) {
-      otaVisible.value = false;
-      uni.showToast({ title: "当前已是最新版本", icon: "none" });
-      return;
-    }
-    if (!otaInfo.value.versionNumber) {
-      uni.showToast({ title: "缺少固件目标版本", icon: "none" });
-      return;
-    }
   const currentDeviceStatus = deviceStatus.value;
+
   if (currentDeviceStatus?.online !== true) {
-      uni.showToast({ title: "请先开启智能弓", icon: "none" });
-      return;
-    }
-    if (Date.now() - Number(currentDeviceStatus?.receivedAt || 0) > DEVICE_STATUS_STALE_TIME) {
-      uni.showToast({ title: "设备状态同步中，请稍后重试", icon: "none" });
-      return;
-    }
-    otaVisible.value = false;
-    if (String(currentDeviceStatus?.netType || "").toLowerCase() === "wifi") {
-      await startOtaUpdate({
-        versionNumber: otaInfo.value.versionNumber,
-        onSuccess: () => { otaInfo.value = { ...otaInfo.value, needUpdate: false }; },
-      });
-    } else {
-      wifiRequiredVisible.value = true;
-    }
-  } catch (error) {
-    uni.showToast({ title: "获取设备详情失败，请重试", icon: "none" });
-  } finally {
     isStartingOta.value = false;
+    uni.showToast({
+      title: "请先开启智能弓",
+      icon: "none",
+    });
+    return;
   }
+
+  if (
+    Date.now() - Number(currentDeviceStatus?.receivedAt || 0) >
+    DEVICE_STATUS_STALE_TIME
+  ) {
+    isStartingOta.value = false;
+    uni.showToast({
+      title: "设备状态同步中，请稍后重试",
+      icon: "none",
+    });
+    return;
+  }
+
+  if (String(currentDeviceStatus?.netType || "").toLowerCase() === "wifi") {
+    startHomeOtaUpdate();
+    return;
+  }
+
+  isStartingOta.value = false;
+  otaVisible.value = false;
+  wifiRequiredVisible.value = true;
 };
 
-// 从首页更新失败提示进入 WiFi 配置页。
+// 从首页固件更新提示进入 WiFi 配置页，并继续沿用当前版本信息。
 const goWifiForOtaUpdate = () => {
   wifiRequiredVisible.value = false;
   uni.navigateTo({ url: getOtaWifiUrl() });
@@ -215,13 +257,22 @@ const goWifiForOtaUpdate = () => {
 // 处理 OTA 更新成功后的完成按钮，关闭共享结果弹窗。
 const handleOtaDone = () => {
   closeOtaResult();
-  otaInfo.value = { ...otaInfo.value, needUpdate: false };
 };
 
-// 处理共享 OTA 更新失败后的重试。
+// 处理共享 OTA 更新失败后的重试，先刷新版本参数再重新判断网络状态。
 const handleOtaRetry = async () => {
   closeOtaResult();
+  try {
+    const versionInfo = await getHardwareBoxVersionAPI();
+    applyOtaVersionInfo(versionInfo);
+    if (!otaInfo.value.needUpdate) return;
     await handleOtaUpdate();
+  } catch (error) {
+    uni.showToast({
+      title: "获取更新版本失败，请重试",
+      icon: "none",
+    });
+  }
 };
 
 // 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
@@ -295,6 +346,10 @@ onShow(async () => {
   const env = uni.getAccountInfoSync().miniProgram.envVersion;
   const token = uni.getStorageSync(`${env}_token`);
 
+  if (token || user.value.id) {
+    await checkOtaUpdate();
+  }
+
   if (!user.value.id && !token) {
     // showModal.value = true;
     // try {
@@ -346,7 +401,6 @@ onShow(async () => {
         }, 3000);
       }
       await syncHomeDevice();
-      await checkOtaUpdate();
     }
   }
 
@@ -378,10 +432,12 @@ onShareTimeline(() => {
 
 <template>
   <Container :isHome="true" :showBackToGame="true">
+    <!-- 首页版本发现弹窗仅负责触发更新，执行状态由三个页面共享。 -->
     <OtaModal
       :visible="otaVisible && !otaUpdating && !otaResultVisible"
       state="new_version"
       :version="otaInfo.versionNumber"
+      :description="''"
       :changelog="otaInfo.versionInfo"
       :forceUpdate="otaInfo.forceUpdate"
       @update="handleOtaUpdate"
@@ -478,7 +534,7 @@ onShareTimeline(() => {
                   @click.stop="$clickSound(() => toPage('/pages/device/my-device'))"
               >
                     <image
-                    v-if="otaInfo.needUpdate && otaInfo.versionNumber"
+                        v-if="otaInfo.needUpdate"
                         class="device-status-refresh"
                     src="https://static.shelingxingqiu.com/shootmini/static/home-device/device-state-refresh.png"
                     mode="scaleToFill"

src/pages/training/components/BowTarget.vue

@@ -546,7 +546,6 @@ onBeforeUnmount(() => {
         :showCrosshair="false"
         :showRingLabels="false"
         :highlightOnly="true"
-        :highlightStyle="{ strokeColor: '#00fffc', lineWidthScale: 3 }"
         :sectorCount="sectorCount"
         :activeSector="activeSector"
         :activeRings="activeRings"

src/pages/training/components/ShootProgress.vue

@@ -8,7 +8,6 @@ import {
   nextTick,
 } from "vue";
 import audioManager, {
-  getTrainingEndAudioKey,
   getTrainingStartAudioKey,
   RHYTHM_SHOOT_WINDOW_AUDIO_KEY,
 } from "@/audioManager";
@@ -78,10 +77,6 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  scoreSlot: {
-    type: Number,
-    default: 0,
-  },
   isVip: {
     type: Boolean,
     default: false,
@@ -112,8 +107,6 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(["rhythm-round-complete"]);
-
 const trainingTitleIconMap = Object.freeze({
   base:
     "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jcxl.png",
@@ -146,7 +139,6 @@ let rhythmCountdownTimer = null;
 let rhythmTransitionTimer = null;
 let rhythmServerClockOffsetMs = 0;
 let rhythmSyncGeneration = 0;
-let rhythmRoundCompletionTimer = null;
 
 const isRhythmTraining = computed(() => props.trainingType === "rhythm");
 const isStabilityTraining = computed(
@@ -191,12 +183,8 @@ const progressPercent = computed(() => {
   return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
 });
 
-const stabilityEnergyCostPercentText = computed(() => {
+const stabilityEnergyCostText = computed(() => {
-  const scoreSlot = Number(props.scoreSlot);
+  const value = Math.max(0, Number(props.energyCostPerSec) || 0);
-  // 以满能量值为基数，换算每秒损失的能量百分比。
-  const value = scoreSlot > 0
-    ? (Math.max(0, Number(props.energyCostPerSec) || 0) / scoreSlot) * 100
-    : 0;
   return Number.isInteger(value) ? String(value) : String(Number(value.toFixed(2)));
 });
 
@@ -227,7 +215,7 @@ const rhythmTitle = computed(() => {
   if (!validRhythmHitReq.value) {
     return `在最后的${validRhythmShootTime.value}秒内射箭`;
   }
-  return `在最后的${validRhythmShootTime.value}秒射箭并命中${validRhythmHitReq.value}环内`;
+  return `在最后的${validRhythmShootTime.value}秒并命中${validRhythmHitReq.value}环内`;
 });
 
 const displayName = computed(() => {
@@ -310,30 +298,6 @@ const getRhythmRoundRemainingMs = () => {
   );
 };
 
-const clearRhythmRoundCompletionTimer = () => {
-  if (rhythmRoundCompletionTimer !== null) {
-    clearTimeout(rhythmRoundCompletionTimer);
-    rhythmRoundCompletionTimer = null;
-  }
-};
-
-// 与当前显示的倒计时一起计时；消息校准不重建此任务，避免同一轮重复计数。
-const scheduleRhythmRoundCompletion = (remainingMs) => {
-  if (
-    rhythmRoundCompletionTimer !== null ||
-    !props.start ||
-    !isRhythmTraining.value ||
-    remainingMs <= 0
-  ) return;
-
-  rhythmRoundCompletionTimer = setTimeout(() => {
-    rhythmRoundCompletionTimer = null;
-    if (!props.start || !isRhythmTraining.value) return;
-    emit("rhythm-round-complete");
-    scheduleRhythmRoundCompletion(rhythmRoundDurationMs.value);
-  }, remainingMs);
-};
-
 const updateRhythmShootWindow = (isInWindow) => {
   const nextIsInWindow = Boolean(isInWindow);
   const enteredShootWindow =
@@ -392,8 +356,7 @@ const syncRhythmCountdown = async () => {
   const generation = ++rhythmSyncGeneration;
   clearRhythmTimers();
 
-  if (!isRhythmTraining.value || !props.start) {
+  if (!isRhythmTraining.value) {
-    clearRhythmRoundCompletionTimer();
     rhythmTransitionStyle.value = "none";
     rhythmRemainingMs.value = 0;
     rhythmRemainingSeconds.value = 0;
@@ -411,7 +374,6 @@ const syncRhythmCountdown = async () => {
     !validRhythmShootTime.value ||
     !normalizeTimestamp(props.shootWindowStart)
   ) {
-    clearRhythmRoundCompletionTimer();
     rhythmTransitionStyle.value = "none";
     rhythmRemainingMs.value = 0;
     rhythmRemainingSeconds.value = 0;
@@ -421,7 +383,6 @@ const syncRhythmCountdown = async () => {
 
   rhythmTransitionStyle.value = "none";
   rhythmRemainingMs.value = getRhythmRoundRemainingMs();
-  scheduleRhythmRoundCompletion(rhythmRemainingMs.value);
   rhythmRemainingSeconds.value = Math.ceil(rhythmRemainingMs.value / 1000);
   updateRhythmShootWindow(
     rhythmRemainingMs.value > 0 &&
@@ -493,7 +454,6 @@ watch(
 
 watch(
   () => [
-    props.start,
     props.trainingType,
     props.roundTime,
     props.shootTime,
@@ -525,7 +485,7 @@ async function onReceiveMessage(msg) {
       audioManager.play("比赛开始");
     }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play(getTrainingEndAudioKey(msg.completed), false);
+    audioManager.play("练习结束", false);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     // 精准和节奏训练由页面统一处理专属结果语音，其他训练保持原播放链路。
     if (props.externalShootResultAudio) return;
@@ -582,7 +542,6 @@ onBeforeUnmount(() => {
   clearTimer();
   rhythmSyncGeneration += 1;
   clearRhythmTimers();
-  clearRhythmRoundCompletionTimer();
 });
 </script>
 
@@ -599,7 +558,7 @@ onBeforeUnmount(() => {
   >
     <template v-if="isStabilityTraining">
       <text class="stability-progress__cost">
-        每秒失去{{ stabilityEnergyCostPercentText }}%能量
+        每秒失去{{ stabilityEnergyCostText }}点能量
       </text>
       <view v-if="countdownEnabled" class="stability-progress__countdown">
         <view

src/pages/training/components/TrainingDifficultyPreviewCard.vue

@@ -20,8 +20,7 @@ const previewLines = computed(() => {
         : [{ text: line }];
       const parts = rawParts
         .map((part) => ({
-          text: String(part?.text ?? part ?? ""),
+          text: String(part?.text ?? part ?? "").trim(),
-          highlight: part?.highlight === true,
         }))
         .filter((part) => part.text);
 
@@ -49,7 +48,6 @@ const previewLines = computed(() => {
           <text
             v-for="(part, partIndex) in line.parts"
             :key="partIndex"
-            :class="{ 'difficulty-preview__highlight': part.highlight }"
           >{{ part.text }}</text>
         </view>
       </view>
@@ -91,7 +89,7 @@ const previewLines = computed(() => {
 }
 
 .difficulty-preview__copy {
-  width: 100%;
+  width: 84%;
   margin: 0 auto;
   display: block;
   color: #ffffff;
@@ -104,9 +102,4 @@ const previewLines = computed(() => {
 .difficulty-preview__line {
   display: block;
 }
-
-.difficulty-preview__highlight {
-  color: #ffd543;
-  font-weight: 500;
-}
 </style>

src/pages/training/difficulty.vue

@@ -110,51 +110,50 @@ const createDifficultySummary = (item = {}) => {
   const timeLimit = toNumber(item.time_limit);
   const hitReq = toNumber(item.hit_req);
   const totalReq = toNumber(item.total_req);
-  const rhythmRequiredArrows = toNumber(item.total_req, arrows) || arrows;
+  const energyReqPercent = toNumber(item.energy_req_percent);
-  const timeParts = timeLimit > 0
+  const shootingTimeText =
-    ? [{ text: `${timeLimit}`, highlight: true }, { text: "秒内，" }]
+    timeLimit > 0 ? `在${timeLimit}秒内进行射箭` : "不限时进行射箭";
-    : [{ text: "不限时，" }];
+  const enduranceTimeText =
+    timeLimit > 0
+      ? `在${timeLimit}秒内完成${arrows}箭`
+      : `不限时完成${arrows}箭`;
 
   const summaryMap = {
     base: [
-      { parts: [
+      shootingTimeText,
-        ...timeParts,
+      `需要有${arrows}箭命中${hitReq}环内`,
-        { text: "命中" }, { text: `${arrows}`, highlight: true },
-        { text: "支" }, { text: `≥${hitReq}`, highlight: true },
-        { text: "环的箭" },
-      ] },
     ],
     endurance: [
-      { parts: [
+      enduranceTimeText,
-        ...timeParts,
+      `且累计环数大于${totalReq}环`,
-        { text: "共射出" }, { text: `≥${arrows}`, highlight: true },
-        { text: "支箭，且总环数" }, { text: `≥${totalReq}`, highlight: true },
-        { text: "环" },
-      ] },
     ],
     precision: [
-      { parts: [
+      shootingTimeText,
-        ...timeParts,
+      `需要有${arrows}箭命中高亮区域`,
-        { text: "命中" }, { text: `${arrows}`, highlight: true },
-        { text: "箭高亮区域" },
-      ] },
     ],
     rhythm: [
-      { parts: [
+      arrows > 0
-        { text: `${arrows}`, highlight: true },
+        ? `需要在指定时间节点射出${arrows}射箭`
-        { text: "个节奏内，随节奏射箭，命中" },
+        : "需要在指定时间节点射箭",
-        { text: `${rhythmRequiredArrows}`, highlight: true },
+      hitReq > 0 ? `且每箭命中${hitReq}环内` : "且每箭命中指定区域",
-        { text: "箭成绩" }, { text: `≥${hitReq}`, highlight: true },
-        { text: "环且踩中节拍区间" },
-      ] },
     ],
     stability: [
       {
         parts: [
-          ...timeParts,
+          { text: timeLimit > 0 ? "在" : "" },
-          { text: "每射一箭" },
+          {
-          { text: `≥${hitReq}`, highlight: true },
+            text: timeLimit > 0 ? `${timeLimit}秒` : "不限时",
-          { text: "环可为能量槽充能，能量充满即过关" },
+            highlight: true,
+          },
+          { text: timeLimit > 0 ? "内射箭，命中" : "射箭，命中" },
+          { text: `${hitReq}环`, highlight: true },
+          { text: "可获得能量" },
+        ],
+      },
+      {
+        parts: [
+          { text: "计时结束能量需要大于" },
+          { text: `${energyReqPercent}%`, highlight: true },
         ],
       },
     ],
@@ -629,7 +628,6 @@ const createPracticeQuery = (difficulty) => {
     },
     rhythm: {
       hitReq: toNumber(difficulty.hit_req),
-      totalReq: toNumber(difficulty.total_req, toNumber(difficulty.arrows)),
       mode: toNumber(difficulty.mode),
       roundTime: toNumber(difficulty.round_time ?? difficulty.roundTime),
       shootTime: toNumber(difficulty.shoot_time ?? difficulty.shootTime),

src/pages/training/practise-one.vue

@@ -102,8 +102,8 @@ const rhythmServerTimestamp = ref(0);
 const rhythmFallbackWindowStart = ref(0);
 const rhythmFallbackTimestamp = ref(0);
 const rhythmHasActiveServerAnchor = ref(false);
-// 仅由前端每轮倒计时完成事件累加，不根据服务端箭数推算。
+// 节奏训练目标箭数以服务端 total_arrows 为准；首帧缺失时用 arrows_left 初始化并保持稳定。
-const rhythmCompletedRounds = ref(0);
+const rhythmTargetArrows = ref(0);
 // 服务端状态立即落到 practiceInfo，精准训练的目标区域单独延迟展示。
 const visiblePrecisionTarget = ref({
   randomBlock: 0,
@@ -440,11 +440,10 @@ const trainingCopy = computed(() => {
     return {
       inline: true,
       details: [
-        { text: "命中 " },
+        { text: "计时结束前需要有" },
         { text: `(${completedArrows}/${targetArrows})`, highlight: true },
-        { text: " 支" },
+        { text: "箭命中" },
-        { text: `≥${hitReq}`, highlight: true },
+        { text: `${hitReq}环`, highlight: true },
-        { text: "环的箭" },
       ],
     };
   }
@@ -464,11 +463,11 @@ const trainingCopy = computed(() => {
     return {
       inline: true,
       details: [
-        { text: "射出≥ " },
+        { text: "计时结束前完成" },
         { text: `(${currentArrows}/${targetArrows})`, highlight: true },
-        { text: " 支箭，总环数达到≥ " },
+        { text: "箭且累计命中" },
         { text: `(${currentRings}/${targetRings})`, highlight: true },
-        { text: " 环" },
+        { text: "环" },
       ],
     };
   }
@@ -487,34 +486,36 @@ const trainingCopy = computed(() => {
     return {
       inline: true,
       details: [
-        { text: "命中高亮区域 " },
+        { text: "射箭命中高亮区域需完成" },
         { text: `(${completedArrows}/${targetArrows})`, highlight: true },
-        { text: " 箭" },
+        { text: "箭" },
       ],
     };
   }
 
   if (trainingType.value === "rhythm") {
-    // 总节奏数沿用关卡配置，与选择页保持一致，不使用消息中的箭数覆盖。
+    const targetArrows = getPositiveInteger(rhythmTargetArrows.value);
-    const totalArrows = getPositiveInteger(total.value);
+    const arrowsLeft = Math.min(
-    // 节奏数由前端倒计时累计，达标箭数与下方金色箭记录使用同一判定。
+      targetArrows,
-    const targetArrows =
+      Math.max(
-      getPositiveInteger(practiceInfo.value.targetArrows) ||
+        0,
-      getPositiveInteger(trainingParams.value.totalReq) || totalArrows;
+        getPracticeNumber(practiceInfo.value.arrowsLeft, targetArrows)
-    // 展示当前节奏序号，从 1 开始；内部仍累计已完成次数。
+      )
-    const currentRound = Math.min(totalArrows, rhythmCompletedRounds.value + 1);
+    );
+    const completedArrows = targetArrows - arrowsLeft;
     const hitReq = rhythmHitReq.value;
-    const qualifiedArrows = scores.value.filter((arrow) => arrow?.ok === true).length;
 
     return {
       inline: true,
       details: [
-        { text: `(${currentRound}/${totalArrows})`, highlight: true },
+        { text: "在进度条读取到高亮区间时射箭命中" },
-        { text: " 个节奏内，跟随节奏射箭，命中 " },
+        {
-        { text: `(${qualifiedArrows}/${targetArrows})`, highlight: true },
+          text: hitReq > 0 ? `${hitReq}环内` : "指定区域",
-        { text: " 箭" },
+          highlight: true,
-        { text: `≥${hitReq}`, highlight: true },
+        },
-        { text: "环且踩中节拍区间" },
+        { text: "，需完成" },
+        { text: `(${completedArrows}/${targetArrows})`, highlight: true },
+        { text: "箭" },
       ],
     };
   }
@@ -524,12 +525,26 @@ const trainingCopy = computed(() => {
       practiceInfo.value.hitReq,
       trainingParams.value.hitReq
     );
+    const stabilityTimeLimit = getPracticeNumber(
+      practiceInfo.value.timeLimit,
+      trainingParams.value.timeLimit
+    );
+
     return {
       inline: true,
       details: [
-        { text: "每射一箭" },
+        { text: stabilityTimeLimit > 0 ? "在" : "" },
-        { text: `≥${hitReq}`, highlight: true },
+        {
-        { text: "环可为能量槽充能，充满即过关" },
+          text: stabilityTimeLimit > 0 ? `${stabilityTimeLimit}秒` : "不限时",
+          highlight: true,
+        },
+        { text: stabilityTimeLimit > 0 ? "内射箭，命中" : "射箭，命中" },
+        { text: `${hitReq}环`, highlight: true },
+        { text: "可获得能量，计时结束能量需要大于" },
+        {
+          text: `${stabilityEnergyReqPercent.value}%`,
+          highlight: true,
+        },
       ],
     };
   }
@@ -694,14 +709,31 @@ const cacheRhythmTrainingConfig = (message = {}) => {
   }
 };
 
-const onRhythmRoundComplete = () => {
+const cacheRhythmTargetArrows = (message = {}) => {
-  if (!isShootingStage.value || !start.value || !isRhythmTraining.value || practiceEnded.value) return;
+  const messageTrainingType = String(
-  const totalRounds = getPositiveInteger(total.value);
+    message.trainingType ?? message.training_type ?? trainingType.value
-  rhythmCompletedRounds.value = Math.min(totalRounds, rhythmCompletedRounds.value + 1);
+  ).trim();
+  if (messageTrainingType !== "rhythm") return;
+
+  const totalArrows = getPositiveInteger(
+    message.totalArrows ?? message.total_arrows
+  );
+  if (totalArrows > 0) {
+    rhythmTargetArrows.value = totalArrows;
+    return;
+  }
+
+  // 兼容服务端首帧 total_arrows 暂为 0：只初始化一次，避免剩余数递减时分母跟着变化。
+  if (rhythmTargetArrows.value === 0) {
+    rhythmTargetArrows.value = getPositiveInteger(
+      message.arrowsLeft ?? message.arrows_left
+    );
+  }
 };
 
 const syncPracticeInfo = (message = {}) => {
   cacheRhythmTrainingConfig(message);
+  cacheRhythmTargetArrows(message);
   const messageTrainingType = String(
     message.trainingType ?? message.training_type ?? trainingType.value
   ).trim();
@@ -712,22 +744,6 @@ const syncPracticeInfo = (message = {}) => {
     return result;
   }, {});
 
-  const isRhythmSnapshot =
-    messageTrainingType === "rhythm" &&
-    (message.type === undefined ||
-      [
-        MESSAGETYPESV2.BattleStart,
-        MESSAGETYPESV2.ShootResult,
-        MESSAGETYPESV2.BattleEnd,
-      ].includes(message.type));
-
-  if (isRhythmSnapshot) {
-    // 达标箭数的 0 按 protobuf 默认值处理；剩余数缺失不能用于推算节奏进度。
-    if (!Object.prototype.hasOwnProperty.call(nextInfo, "qualifiedArrows")) {
-      nextInfo.qualifiedArrows = 0;
-    }
-  }
-
   const isStabilityEnergySnapshot =
     messageTrainingType === "stability" &&
     (Object.prototype.hasOwnProperty.call(message, "currentEnergy") ||
@@ -1406,7 +1422,7 @@ onLoad((options = {}) => {
   serverAddr.value = trainingContext.serverAddr || "";
 
   const startAudioKey = getTrainingStartAudioKey(trainingParams.value.type);
-  const warmupKeys = [startAudioKey, "通关成功", "通关失败", "胜利", "失败"];
+  const warmupKeys = [startAudioKey, "胜利", "失败"];
   if (trainingParams.value.type === "precision") {
     warmupKeys.push("Bingo命中目标", "未命中");
   } else if (trainingParams.value.type === "rhythm") {
@@ -1436,7 +1452,6 @@ const onReady = async () => {
   }
 
   practiceStarting.value = true;
-  rhythmCompletedRounds.value = 0;
   pageStage.value = pageStages.LOADING;
   clearHighlightTestTimer();
   useHighlightTest.value = false;
@@ -1678,7 +1693,7 @@ async function onRetry() {
   rhythmFallbackWindowStart.value = 0;
   rhythmFallbackTimestamp.value = 0;
   rhythmHasActiveServerAnchor.value = false;
-  rhythmCompletedRounds.value = 0;
+  rhythmTargetArrows.value = 0;
   invalidateShotPresentations({ resetVisible: true });
   start.value = false;
   scores.value = [];
@@ -1701,7 +1716,7 @@ function onAudioEnded(key) {
   Array.from(audioWaiters).forEach((waiter) => {
     if (waiter.expectedKey === key) waiter.done();
   });
-  if (["比赛结束", "练习结束", "通关成功", "通关失败"].includes(String(key || ""))) {
+  if (["比赛结束", "练习结束"].includes(String(key || ""))) {
     void onOver();
   }
 }
@@ -1840,7 +1855,6 @@ onBeforeUnmount(() => {
             :serverTimestamp="rhythmCountdownTimestamp"
             :hitReq="rhythmHitReq"
             :energyCostPerSec="stabilityEnergyCostPerSec"
-            :scoreSlot="stabilityScoreSlot"
             :isVip="isVip"
             :isSvip="isSvip"
             :externalShootResultAudio="
@@ -1849,7 +1863,6 @@ onBeforeUnmount(() => {
               trainingType === 'stability'
             "
             :onStop="onTimeLimitReached"
-            @rhythm-round-complete="onRhythmRoundComplete"
           />
           <view class="user-row">
             <!-- <Avatar :src="user.avatar" :size="35" /> -->
@@ -2125,7 +2138,7 @@ onBeforeUnmount(() => {
   font-size: 26rpx;
   font-weight: 400;
   line-height: 40rpx;
-  white-space: pre-line;
+  white-space: normal;
   word-break: break-all;
 }
 .text1{
@@ -2141,7 +2154,9 @@ onBeforeUnmount(() => {
   line-height: 36rpx;
 }
 .text2-yellow{
+  font-size: 30rpx;
   color: #FFD947;
   font-weight: 500;
+  margin: 0 4rpx;
 }
 </style>

src/pages/user.vue

@@ -1,7 +1,5 @@
 <script setup>
 import { ref, onMounted } from "vue";
-import { onShow } from "@dcloudio/uni-app";
-import { getSelectedExperienceStore, hasAnyStoreVip } from "@/utils/storeVip";
 import Container from "@/components/Container.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import UserItem from "@/components/UserItem.vue";
@@ -28,40 +26,20 @@ const toFristTryPage = async () => {
   }
 };
 const toCoinPage = () => {
-  const selected = getSelectedExperienceStore();
   uni.navigateTo({
-    url: selected ? "/pages/coin/index?tab=vip" : "/pages/coin/nearby-stores?tab=vip",
+    url: "/pages/coin/nearby-stores",
   });
 };
 const showCoinEntry = ref(false);
-const storeVipLabel = ref("加载中");
-const storeVipFailed = ref(false);
-let entryRequest = 0;
 const loadCoinEntryVisibility = async () => {
-  const requestId = ++entryRequest;
   showCoinEntry.value = false;
-  storeVipFailed.value = false;
-  storeVipLabel.value = "加载中";
   try {
     const result = await getMyGoldAPI();
-    if (requestId !== entryRequest) return;
     showCoinEntry.value = result?.hasTempBind === true;
-    if (!showCoinEntry.value) return;
-    try {
-      const active = await hasAnyStoreVip();
-      if (requestId !== entryRequest) return;
-      storeVipLabel.value = active ? "VIP已开通" : "VIP未开通";
-    } catch (error) {
-      if (requestId !== entryRequest) return;
-      storeVipLabel.value = "加载失败，重试";
-      storeVipFailed.value = true;
-      console.error("加载入口门店VIP失败", error);
-    }
   } catch (error) {
     console.error("加载金币入口状态失败", error);
   }
 };
-onShow(loadCoinEntryVisibility);
 const toBeVipPage = () => {
   uni.navigateTo({
     url: "/pages/member/be-vip",
@@ -107,6 +85,7 @@ const logout = () => {
   updateUser();
 };
 onMounted(() => {
+  loadCoinEntryVisibility();
   const accountInfo = uni.getAccountInfoSync();
   const envVersion = accountInfo.miniProgram.envVersion;
   if (envVersion !== "release") showLogout.value = true;
@@ -148,12 +127,10 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
         </UserItem>
         <UserItem
           v-if="showCoinEntry"
-          title="线下体验中心"
+          title="我的金币"
           :onClick="toCoinPage"
-        >
+        />
-          <text class="store-vip-label" @click.stop="storeVipFailed ? loadCoinEntryVisibility() : toCoinPage()">{{ storeVipLabel }}</text>
+        <UserItem title="会员" :onClick="toBeVipPage">
-        </UserItem>
-        <!-- <UserItem title="会员" :onClick="toBeVipPage">
           <view
             v-if="user.sVip === true"
             class="member-nickname member-nickname--svip"
@@ -168,7 +145,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
             <text class="member-nickname__text">已开通VIP</text>
           </view>
           <text v-else>未开通</text>
-        </UserItem> -->
+        </UserItem>
         <UserItem title="等级介绍" :onClick="toGradeIntroPage">
           <text :style="{ color: '#4C76FF' }">Lv{{ user.lvl }}</text>
           <text
@@ -228,7 +205,6 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
 </template>
 
 <style scoped>
-.store-vip-label { padding: 4rpx 12rpx; border: 1rpx solid #999999; border-radius: 20rpx; font-size: 24rpx; }
 .container {
   background-color: #f5f5f5;
   height: calc(100% - 65px);

src/utils/storeVip.js

@@ -1,70 +0,0 @@
-import { getStoreBenefitAPI, getStoreVipListAPI } from "@/apis";
-import useStore from "@/store";
-
-// 按账号隔离最近选择，刷新登录令牌后仍可恢复同一门店。
-const selectionKey = () => {
-  const version = uni.getAccountInfoSync().miniProgram.envVersion;
-  return `${version}_experience_store_${useStore().user.id || "guest"}`;
-};
-
-export const getSelectedExperienceStore = () => {
-  const value = uni.getStorageSync(selectionKey());
-  return value && /^\d+$/.test(String(value.id)) && Number(value.id) > 0
-    ? { id: String(value.id), name: String(value.name || "") }
-    : null;
-};
-
-export const rememberExperienceStore = (id, name) => {
-  uni.setStorageSync(selectionKey(), { id: String(id), name });
-};
-
-// 入口汇总所有门店；找到有效会员即可结束，未开通须查询完整列表。
-export const hasAnyStoreVip = async () => {
-  const pageSize = 20;
-  let received = 0;
-  for (let page = 1; ; page += 1) {
-    const result = await getStoreVipListAPI({ page, pageSize });
-    const list = result?.list;
-    if (!Array.isArray(list) || !Number.isSafeInteger(result.total) || result.total < 0) {
-      throw new Error("门店会员列表响应格式异常");
-    }
-    if (list.some((item) => item?.isVip === true)) return true;
-    if (list.some((item) => typeof item?.isVip !== "boolean")) {
-      throw new Error("门店会员状态缺失");
-    }
-    received += list.length;
-    if (received >= result.total) return false;
-    // 列表尚未读完却返回空页时，不把不完整结果判为未开通。
-    if (!list.length) throw new Error("门店会员列表分页异常");
-  }
-};
-
-// 只接受非负整数，缺失或异常值不能转换成“已用完”的 0 次。
-const normalizeRemaining = (benefit) => {
-  const remain = benefit?.remain;
-  return Number.isSafeInteger(remain) && remain >= 0 ? remain : "--";
-};
-
-export const normalizeStoreMembership = (store) => {
-  if (typeof store?.isVip !== "boolean") throw new Error("门店会员状态缺失");
-  const active = store.isVip === true;
-  return {
-    active,
-    cardImage: `https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-card-${active ? "active" : "inactive"}.png`,
-    expiresAt: active ? String(store.vipExpireAt || "").slice(0, 10).replace(/-/g, "/") || "--" : "",
-    // 未开通或已过期统一为 0；有效会员逐项读取后端剩余次数。
-    remaining: {
-      trial: active ? normalizeRemaining(store.freeTrial) : 0,
-      discount: active ? normalizeRemaining(store.discountPurchase) : 0,
-      drink: active ? normalizeRemaining(store.drink) : 0,
-    },
-  };
-};
-
-export const loadStoreMembership = async (storeId) => {
-  const result = await getStoreBenefitAPI(storeId);
-  if (String(result?.storeId) !== String(storeId)) {
-    throw new Error("门店权益响应与当前门店不匹配");
-  }
-  return { name: result.storeName || "", ...normalizeStoreMembership(result) };
-};

src/websocket.js

@@ -93,30 +93,36 @@ function createWebSocket(token, onMessage) {
       "/addons/shoot/otaResult",
     ];
     if (passthroughEvents.includes(event)) {
-      if ((code == null || Number(code) === 0) && onMessage && data && typeof data === "object") {
+      if (
+        (code == null || Number(code) === 0) &&
+        onMessage &&
+        data &&
+        typeof data === "object"
+      ) {
         onMessage({ event, data, code, timestamp });
       }
       return;
     }
-    if (data?.type) {
+    if (!data || typeof data !== "object") return;
+    if (data.type) {
       if (ENABLE_REALTIME_MESSAGE_LOG) {
         console.log("收到 WebSocket 消息", getMessageTypeName(data.type));
       }
       if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
       return;
     }
-    const updates = Array.isArray(data?.updates) ? data.updates : [];
+    if (!Array.isArray(data.updates)) return;
-    if (!updates.length) return;
+    if (onMessage) onMessage(data.updates);
-    if (onMessage) onMessage(updates);
+    const firstMessage = data.updates[0];
-    const msg = updates[0];
+    if (firstMessage && ENABLE_REALTIME_MESSAGE_LOG) {
-    if (msg) {
-      if (ENABLE_REALTIME_MESSAGE_LOG) {
       console.log(
         "收到 WebSocket 更新",
-          getMessageTypeName(msg.constructor),
+        getMessageTypeName(firstMessage.constructor),
         { updateCount: data.updates.length }
       );
     }
+    data.updates.forEach((msg) => {
+      if (msg) {
         if (msg.constructor === MESSAGETYPES.RankUpdate) {
           uni.setStorageSync("latestRank", msg.lvl);
         } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -130,6 +136,7 @@ function createWebSocket(token, onMessage) {
         }
       }
     });
+  });
 
   socketTask.onError((err) => {
     if (socket !== socketTask) return;