fix: 把 OTA 图片本地引用改成了同名 CDN 地址

update:优化获取手机号
update:优化vip套餐
2026-07-09 16:25:28 +08:00 · 2026-07-06 11:15:38 +08:00 · 2026-07-06 09:37:08 +08:00 · 2026-07-03 17:46:00 +08:00 · 2026-07-03 17:04:09 +08:00 · 2026-07-03 17:03:51 +08:00
47 changed files with 2746 additions and 254 deletions
@@ -10,6 +10,7 @@ lerna-debug.log*
 node_modules
 .history
 .github
+.claude
 openspec
 CLAUDE.md
 docs
@@ -23,7 +23,10 @@ try {
    console.error("获取环境信息失败，使用默认正式环境", e);
 }

-function request(method, url, data = {}) {
+const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
+
+// 统一处理业务接口请求，包含登录态、业务错误和 WiFi 连接空响应兼容。
+function request(method, url, data = {}, baseUrl = BASE_URL) {
    const token = uni.getStorageSync(
        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
    );
@@ -31,16 +34,21 @@ function request(method, url, data = {}) {
    if (token) header.Authorization = `Bearer ${token || ""}`;
    return new Promise((resolve, reject) => {
        uni.request({
-            url: `${BASE_URL}${url}`,
+            url: `${baseUrl}${url}`,
            method,
            header,
            data,
            timeout: 10000,
            success: (res) => {
+                if (url === "/user/hardwareBox/connectWifi" && res.statusCode === 200 && res.data && Object.keys(res.data).length === 0) {
+                    resolve({});
+                    return;
+                }
                if (res.data) {
                    const {code, data, message} = res.data;
                    if (code === 0) resolve(data);
                    else if (message) {
+                        const error = {code, data, message};
                        if (message.indexOf("登录身份已失效") !== -1) {
                            console.log('1111111111111111111,token失效')
                            uni.removeStorageSync(
@@ -50,6 +58,10 @@ function request(method, url, data = {}) {
                            reject({ type: "AUTH_INVALID", message });
                            return;
                        }
+                        if (message.indexOf("已达上限") !== -1) {
+                            reject(error);
+                            return;
+                        }
                        if (message === "ROOM_FULL") {
                            resolve({full: true});
                            return;
@@ -97,8 +109,10 @@ function request(method, url, data = {}) {
                            title: message,
                            icon: "none",
                        });
+                        reject(error);
+                        return;
                    }
-                    reject("");
+                    reject({code, data, message});
                }
            },
            fail: (err) => {
@@ -167,6 +181,10 @@ export const getAppConfig = () => {
    return request("GET", "/index/appConfig");
 };

+export const getDailyCountAPI = () => {
+    return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL);
+};
+
 export const getHomeData = (seasonId) => {
    return request("GET", `/user/myHome?seasonId=${seasonId}`);
 };
@@ -348,6 +366,17 @@ export const createOrderAPI = (vipId) => {
    });
 };

+export const virtualPayOrderAPI = (vipId = 0, code = "") => {
+    return request("POST", "/user/virtualPay/createOrder", {
+        vipId,
+        code,
+    });
+};
+
+export const getOrderDetailAPI = (orderId) => {
+    return request("GET", `/user/order/detail?orderId=${encodeURIComponent(orderId)}`);
+};
+
 export const payOrderAPI = (id) => {
    return request("POST", "/user/order/pay", {
        id,
@@ -460,6 +489,26 @@ export const getDeviceBatteryAPI = async () => {
    return request("GET", "/user/device/battery");
 };

+// 设备连接指定 WiFi，只下发 WiFi 凭证，不触发 OTA 升级。
+export const connectDeviceWifiAPI = async (ssid, password) => {
+    return request("POST", "/user/hardwareBox/connectWifi", {ssid, password});
+};
+
+// 获取硬件盒子版本信息，用于判断当前设备是否需要 OTA 升级。
+export const getHardwareBoxVersionAPI = async () => {
+    return request("GET", "/user/hardwareBox/version");
+};
+
+// 发送硬件盒子 OTA 更新指令，服务端会返回后续轮询使用的任务 ID。
+export const sendHardwareBoxUpdateAPI = async (data) => {
+    return request("POST", "/user/hardwareBox/sendUpdate", data);
+};
+
+// 根据任务 ID 获取硬件盒子 OTA 更新状态。
+export const getHardwareBoxTaskStatusAPI = async (taskId) => {
+    return request("GET", `/user/hardwareBox/taskStatus?taskId=${taskId}`);
+};
+
 export const addNoteAPI = async (id, remark) => {
    return request("POST", "/user/score/sheet/remark", {id, remark});
 };
@@ -472,6 +521,10 @@ export const getPhoneNumberAPI = (data) => {
    return request("POST", "/index/getPhone", data);
 };

+export const getPhoneNumberAPIv2 = (data) => {
+    return request("POST", "/index/getPhone/v2", data);
+};
+
 export const getPointBookRankListAPI = (page = 1) => {
    return request(
        "GET",
@@ -40,6 +40,8 @@ export const audioFils = {
    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutya59b6pu0ur4um.mp3",
  比赛开始:
    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcuu5z3a3lumkutske.mp3",
+  下半场开始:
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E4%B8%8B%E5%8D%8A%E5%9C%BA%E5%BC%80%E5%A7%8B.mp3",
  请开始射击:
    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3",
  射击无效:
@@ -456,23 +456,29 @@ export const generateShareImage = async (canvasId, data) => {
    // 2D 即时绘制，无需 ctx.draw()
  } catch (e) {
    console.error("generateShareImage 绘制失败:", e);
+    throw e;
  }
 };

 // 顶部导入与工具方法
 async function getCanvas2DContext(canvasId, targetWidth, targetHeight) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
    const query = uni.createSelectorQuery();
    query
      .select(`#${canvasId}`)
      .fields({ node: true, size: true })
      .exec((res) => {
-        const { node: canvas } = res[0] || {};
+        const canvasInfo = res && res[0];
+        const { node: canvas } = canvasInfo || {};
+        if (!canvas || typeof canvas.getContext !== "function") {
+          reject(new Error(`canvas ${canvasId} not found`));
+          return;
+        }
        const ctx = canvas.getContext("2d");
        const dpr = uni.getSystemInfoSync().pixelRatio || 1;

-        const w = targetWidth || res[0].width;
-        const h = targetHeight || res[0].height;
+        const w = targetWidth || canvasInfo.width;
+        const h = targetHeight || canvasInfo.height;

        canvas.width = w * dpr;
        canvas.height = h * dpr;
@@ -561,6 +567,7 @@ export const sharePointData = async (canvasId, data) => {
    // 2D 即时绘制，无需 ctx.draw()
  } catch (e) {
    console.error("generateShareImage 绘制失败:", e);
+    throw e;
  }
 };

@@ -778,6 +785,7 @@ export async function sharePractiseData(canvasId, type, user, data) {
    // 2D 模式下无需 ctx.draw()
  } catch (err) {
    console.log(err);
+    throw err;
  }
 }

@@ -207,7 +207,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
  justify-content: center;
  color: #fff9;
  font-size: 12px;
-  padding-top: 7px;
+  /* padding-top: 7px; */
  flex: 0 0 auto;
 }
 .player-name {
@@ -34,6 +34,7 @@ const phase = ref("idle");
 const activePlayKey = ref("");
 const animationKey = ref("");
 const impactEmitted = ref(false);
+const activeShot = ref(null);
 let timers = [];

 const isActive = computed(() => phase.value !== "idle");
@@ -54,9 +55,17 @@ const safeTargetSize = computed(() => {
  };
 });

+function hasShotPoint(shot) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  return Number.isFinite(x) && Number.isFinite(y);
+}
+
+const effectiveShot = computed(() => activeShot.value || props.shot);
+
 const shotPoint = computed(() => {
-  const x = Number(props.shot?.x);
-  const y = Number(props.shot?.y);
+  const x = Number(effectiveShot.value?.x);
+  const y = Number(effectiveShot.value?.y);
  return {
    x: Number.isFinite(x) ? x : 0,
    y: Number.isFinite(y) ? y : 0,
@@ -179,16 +188,20 @@ function finish(playKey) {
  clearTimers();
  phase.value = "idle";
  activePlayKey.value = "";
+  activeShot.value = null;
  emit("complete", playKey);
 }

 function play() {
-  if (!props.playKey || !props.shot || !props.shot.ring) return;
+  if (!props.playKey || !props.shot || !props.shot.ring || !hasShotPoint(props.shot)) {
+    return;
+  }

  clearTimers();
  activePlayKey.value = props.playKey;
  animationKey.value = `${props.playKey}`;
  impactEmitted.value = false;
+  activeShot.value = { ...props.shot };
  phase.value = "playing";

  queueTimer(() => {
@@ -1,5 +1,13 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount, computed, nextTick } from "vue";
+import {
+  ref,
+  watch,
+  onMounted,
+  onBeforeUnmount,
+  computed,
+  nextTick,
+  getCurrentInstance,
+} from "vue";
 import PointSwitcher from "@/components/PointSwitcher.vue";
 import BowShotEffect from "@/components/BowShotEffect.vue";

@@ -56,8 +64,6 @@ 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);
@@ -66,7 +72,9 @@ const shotEffect = ref(null);
 const hiddenRedLatestKey = ref("");
 const hiddenBlueLatestKey = ref("");
 const targetShaking = ref(false);
+const targetSize = ref({ width: 0, height: 0 });
 const shakeTimer = ref(null);
+const instance = getCurrentInstance();
 const ROUND_TIP_OFFSET_Y = -32;
 const EXPERIENCE_TIP_OFFSET_Y = -68;

@@ -82,8 +90,14 @@ function buildShotEffectKey(team, shot, index) {
  ].join("-");
 }

+function hasShotPoint(shot) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  return Number.isFinite(x) && Number.isFinite(y);
+}
+
 function shouldPlayShotEffect(shot) {
-  return props.isSvip && !!shot && Number(shot.ring) > 0;
+  return props.isSvip && !!shot && Number(shot.ring) > 0 && hasShotPoint(shot);
 }

 function clearTipTimer() {
@@ -154,6 +168,29 @@ function shakeTarget() {
  });
 }

+function updateTargetSize() {
+  nextTick(() => {
+    const query = instance?.proxy
+      ? uni.createSelectorQuery().in(instance.proxy)
+      : uni.createSelectorQuery();
+
+    query
+      .select(".target")
+      .boundingClientRect((rect) => {
+        const width = Number(rect?.width);
+        const height = Number(rect?.height);
+        if (!Number.isFinite(width) || !Number.isFinite(height)) return;
+        if (width <= 0 || height <= 0) return;
+        targetSize.value = { width, height };
+      })
+      .exec();
+  });
+}
+
+function handleWindowResize() {
+  updateTargetSize();
+}
+
 function shouldHideRedHit(index) {
  return !!hiddenRedLatestKey.value && index === props.scores.length - 1;
 }
@@ -163,46 +200,44 @@ function shouldHideBlueHit(index) {
 }

 watch(
-  () => props.scores,
-  (newVal) => {
-    if (newVal.length - prevScores.value.length === 1) {
-      const latestShot = newVal[newVal.length - 1];
+  () => props.scores.length,
+  (newLen, oldLen) => {
+    if (newLen === oldLen + 1) {
+      const latestShot = props.scores[newLen - 1];
      if (shouldPlayShotEffect(latestShot)) {
-        triggerShotEffect("red", latestShot, newVal.length - 1);
+        triggerShotEffect("red", latestShot, newLen - 1);
      } else {
        showShotTip("red", latestShot);
      }
-    } else if (newVal.length <= prevScores.value.length) {
+      return;
+    }
+
+    if (newLen < oldLen) {
      latestOne.value = null;
      hiddenRedLatestKey.value = "";
      if (shotEffect.value?.team === "red") shotEffect.value = null;
    }
-    prevScores.value = [...newVal];
-  },
-  {
-    deep: true,
  }
 );

 watch(
-  () => props.blueScores,
-  (newVal) => {
-    if (newVal.length - prevBlueScores.value.length === 1) {
-      const latestShot = newVal[newVal.length - 1];
+  () => props.blueScores.length,
+  (newLen, oldLen) => {
+    if (newLen === oldLen + 1) {
+      const latestShot = props.blueScores[newLen - 1];
      if (shouldPlayShotEffect(latestShot)) {
-        triggerShotEffect("blue", latestShot, newVal.length - 1);
+        triggerShotEffect("blue", latestShot, newLen - 1);
      } else {
        showShotTip("blue", latestShot);
      }
-    } else if (newVal.length <= prevBlueScores.value.length) {
+      return;
+    }
+
+    if (newLen < oldLen) {
      bluelatestOne.value = null;
      hiddenBlueLatestKey.value = "";
      if (shotEffect.value?.team === "blue") shotEffect.value = null;
    }
-    prevBlueScores.value = [...newVal];
-  },
-  {
-    deep: true,
  }
 );

@@ -349,6 +384,8 @@ async function onReceiveMessage(message) {

 onMounted(() => {
  uni.$on("socket-inbox", onReceiveMessage);
+  updateTargetSize();
+  if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });

 onBeforeUnmount(() => {
@@ -365,6 +402,7 @@ onBeforeUnmount(() => {
    shakeTimer.value = null;
  }
  uni.$off("socket-inbox", onReceiveMessage);
+  if (uni.offWindowResize) uni.offWindowResize(handleWindowResize);
 });
 </script>

@@ -461,6 +499,9 @@ onBeforeUnmount(() => {
        :shot="shotEffect && shotEffect.shot"
        :playKey="shotEffect ? shotEffect.key : ''"
        :targetRadius="safeTargetRadius"
+        :targetWidth="targetSize.width"
+        :targetHeight="targetSize.height"
+        :hitOffsetPx="currentHitRadiusPx"
        @impact="shakeTarget"
        @complete="completeShotEffect"
      />
@@ -41,6 +41,10 @@ const props = defineProps({
    type: Boolean,
    default: true,
  },
+  titleStyle: {
+    type: [String, Object, Array],
+    default: () => ({}),
+  },
  showBottom: {
    type: Boolean,
    default: true,
@@ -155,6 +159,7 @@ const goCalibration = async () => {
      :title="title"
      :onBack="onBack"
      :whiteBackArrow="whiteBackArrow"
+      :titleStyle="titleStyle"
    />
    <BackToGame v-if="showBackToGame" />
    <scroll-view
@@ -26,6 +26,10 @@ const props = defineProps({
    type: Boolean,
    default: true,
  },
+  titleStyle: {
+    type: [String, Object, Array],
+    default: () => ({}),
+  },
 });

 const onClick = () => {
@@ -118,7 +122,9 @@ onBeforeUnmount(() => {
        mode="widthFix"
      />
    </view>
-    <view :style="{ color: whiteBackArrow ? '#fff' : '#000' }">
+    <view
+      :style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]"
+    >
      <view
        v-if="currentPage === 'pages/point-book'"
        class="user-header"
@@ -0,0 +1,429 @@
+<script setup>
+import { computed } from "vue";
+import { getDeviceBatteryAPI } from "@/apis";
+
+const OTA_MIN_BATTERY = 50;
+const OTA_LOW_BATTERY_TEXT = "电量不足 50%，暂不支持 OTA 升级";
+const OTA_OFFLINE_TEXT = "请先开启智能弓";
+
+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)));
+
+// 点击立即更新前先校验设备在线状态，再校验设备电量。
+const handleUpdateClick = async () => {
+  try {
+    const deviceStatus = await getDeviceBatteryAPI();
+    if (deviceStatus?.online !== true) {
+      uni.showToast({
+        title: OTA_OFFLINE_TEXT,
+        icon: "none",
+      });
+      return;
+    }
+
+    if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
+      uni.showToast({
+        title: OTA_LOW_BATTERY_TEXT,
+        icon: "none",
+      });
+      return;
+    }
+  } catch (err) {
+    emit("update");
+    return;
+  }
+  emit("update");
+};
+</script>
+
+<template>
+  <view v-if="visible" class="ota-mask">
+    <!-- 图标 + 弹窗卡片 容器 -->
+    <view
+      class="ota-outer"
+      :class="isNewVersion ? 'outer-new' : 'outer-result'"
+    >
+      <!-- 悬浮图标（溢出卡片顶部） -->
+      <image
+        v-if="isNewVersion"
+        src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-mascot.png"
+        mode="aspectFit"
+        class="float-icon float-mascot"
+      />
+      <image
+        v-else-if="isSuccess"
+        src="https://static.shelingxingqiu.com/shootmini/static/ota/check-char.png"
+        mode="aspectFit"
+        class="float-icon float-check"
+      />
+      <image
+        v-else-if="isFailure"
+        src="https://static.shelingxingqiu.com/shootmini/static/ota/close-char.png"
+        mode="aspectFit"
+        class="float-icon float-close"
+      />
+      <image
+        v-else-if="isProgress"
+        src="https://static.shelingxingqiu.com/shootmini/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="https://static.shelingxingqiu.com/shootmini/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="https://static.shelingxingqiu.com/shootmini/static/ota/new-ver.png" mode="aspectFit" class="new-ver-img" />
+            <view v-if="version" class="version-tag-wrap">
+              <image src="https://static.shelingxingqiu.com/shootmini/static/ota/ota-ver.png" mode="aspectFit" 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="handleUpdateClick">
+                <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="https://static.shelingxingqiu.com/shootmini/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="https://static.shelingxingqiu.com/shootmini/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="https://static.shelingxingqiu.com/shootmini/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 || isFailure) && !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;
+  width: 116rpx;
+  height: 44rpx;
+  /* 离标题图 -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>
@@ -70,6 +70,11 @@ const arrows = computed(() => {
 });

 const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
+const isMember = computed(() => user.value.vip === true || user.value.sVip === true);
+const openCoachComment = () => {
+  if (!isMember.value) return;
+  showComment.value = true;
+};
 </script>

 <template>
@@ -112,9 +117,10 @@ const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
            :onClick="onClickShare"
          />
          <IconButton
+            v-if="isMember"
            name="教练点评"
            src="../static/review.png"
-            :onClick="() => (showComment = true)"
+            :onClick="openCoachComment"
          />
        </block>
        <SButton
@@ -137,7 +143,7 @@ const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
          }}</text
          >环的成绩，所有箭支上靶后的平均点间距为<text
            :style="{ color: '#fed847' }"
-            >{{ Number((result.average_distance || 0).toFixed(2)) }}</text
+            >{{ Number((result?.interpretation?.spreadStability || 0).toFixed(2)) }}</text
          >，{{
            result.spreadEvaluation === "Dispersed"
              ? "还需要持续改进哦~"
@@ -38,6 +38,10 @@ const props = defineProps({
    type: Boolean,
    default: false,
  },
+  halfRest: {
+    type: Boolean,
+    default: false,
+  },
  onStop: {
    type: Function,
    default: () => {},
@@ -136,8 +140,9 @@ const updateSound = () => {
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    const audioKey = props.melee && (halfTime.value || props.halfRest) ? "下半场开始" : "比赛开始";
    halfTime.value = false;
-    audioManager.play("比赛开始");
+    audioManager.play(audioKey);
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    audioManager.play("比赛结束", false);
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
@@ -11,6 +11,7 @@ import {
  loginAPI,
  getHomeData,
  getPhoneNumberAPI,
+  getPhoneNumberAPIv2,
  getDeviceBatteryAPI,
 } from "@/apis";

@@ -43,12 +44,12 @@ const handleAgree = () => {

 async function getphonenumber(e) {
  if (e.detail.code) {
-    const wxResult = await wxLogin();
-    const result = await getPhoneNumberAPI({
-      ...e.detail,
-      code: wxResult.code,
+    // const wxResult = await wxLogin();
+    const result = await getPhoneNumberAPIv2({
+      // ...e.detail,
+      code: e.detail.code,
    });
-    if (result.phone) phone.value = result.phone;
+    if (result.purePhoneNumber) phone.value = result.purePhoneNumber;
  }
 }

@@ -64,7 +64,11 @@
        "usingComponents" : true,
        "darkmode" : true,
        "themeLocation" : "theme.json",
-        "permission" : {},
+        "permission" : {
+          "scope.userLocation": {
+            "desc": "用于扫描附近 WiFi，完成设备 OTA 升级网络连接"
+          }
+        },
        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
    }
 }
@@ -125,6 +125,12 @@
    },
    {
      "path": "pages/mine-bow-data"
+    },
+    {
+      "path": "pages/ota-wifi",
+      "style": {
+        "navigationStyle": "custom"
+      }
    }
  ],
  "globalStyle": {
@@ -7,6 +7,7 @@ import GuideTwo from "@/components/GuideTwo.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
+import ModalDialog from "@/components/ModalDialog.vue";
 import {
  getRoomAPI,
  exitRoomAPI,
@@ -14,6 +15,7 @@ import {
  getReadyAPI,
  kickPlayerAPI,
 } from "@/apis";
+import { isLimitError } from "@/util";
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -56,6 +58,7 @@ const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
 const goBattle = ref(false);
+const showLimitModal = ref(false);
 /** 从结算页返回时为 true，跳过进场靶纸语音 */
 const skipTargetAudio = ref(false);

@@ -137,7 +140,26 @@ async function refreshRoomData() {
 }

 const getReady = async () => {
-  await getReadyAPI(roomNumber.value);
+  try {
+    await getReadyAPI(roomNumber.value);
+  } catch (error) {
+    if (isLimitError(error)) {
+      showLimitModal.value = true;
+      return;
+    }
+    console.log("room ready error", error);
+  }
+};
+
+const closeLimitModal = () => {
+  showLimitModal.value = false;
+};
+
+const goVipPage = () => {
+  showLimitModal.value = false;
+  uni.navigateTo({
+    url: "/pages/member/be-vip",
+  });
 };

 const refreshMembers = (members = []) => {
@@ -456,6 +478,14 @@ onBeforeUnmount(() => {
      </view>
    </view>
  </Container>
+  <ModalDialog
+    :show="showLimitModal"
+    :content="'今日约战次数已经用完\n开通会员可增加次数'"
+    cancelText="知道了"
+    confirmText="去开通"
+    :onCancel="closeLimitModal"
+    :onConfirm="goVipPage"
+  />
  <!-- 踢出玩家二次确认弹窗（不传 onClose，屏蔽 X 关闭按钮） -->
  <ScreenHint :show="showKickConfirm">
    <view class="kick-confirm">
@@ -29,6 +29,7 @@ import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
 const scores = ref([]);
+const isSvip = ref(false);
 const step = ref(0);
 const total = 12;
 const stepButtonTexts = [
@@ -48,6 +49,7 @@ const practiseId = ref("");
 const showGuide = ref(false);
 const laserActive = ref(false);
 const guideSwiperIndex = ref(0);
+const sharing = ref(false);

 const guideImages = [
  "https://static.shelingxingqiu.com/shootmini/static/target.png",
@@ -113,6 +115,7 @@ const onOver = async () => {

 async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    isSvip.value = msg.sVip === true;
    scores.value = msg.details;
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    setTimeout(onOver, 1500);
@@ -139,8 +142,19 @@ async function onReceiveMessage(msg) {
 }

 const onClickShare = debounce(async () => {
-  await sharePractiseData("shareCanvas", 1, user.value, practiseResult.value);
-  await wxShare("shareCanvas");
+  if (sharing.value) return;
+  sharing.value = true;
+  try {
+    await sharePractiseData("shareCanvas", 1, user.value, practiseResult.value);
+    await wxShare("shareCanvas");
+  } catch (e) {
+    uni.showToast({
+      title: "海报生成失败，请稍后重试",
+      icon: "none",
+    });
+  } finally {
+    sharing.value = false;
+  }
 });

 onMounted(() => {
@@ -192,6 +206,7 @@ const nextStep = async () => {
    title.value = "小试牛刀";
    await startPractiseAPI();
    scores.value = [];
+    isSvip.value = false;
    step.value = 5;
    start.value = true;
    setTimeout(() => {
@@ -218,6 +233,7 @@ const onClose = async () => {
    practiseResult.value = {};
    start.value = false;
    scores.value = [];
+    isSvip.value = false;
    step.value = 4;
    const result = await createPractiseAPI(total, 120);
    if (result) practiseId.value = result.id;
@@ -331,6 +347,7 @@ const onClose = async () => {
        :currentRound="step === 5 ? scores.length : 0"
        :totalRound="step === 5 ? total : 0"
        :scores="scores"
+        :isSvip="isSvip"
      />
      <ScorePanel
        v-if="step === 5"
@@ -8,14 +8,16 @@ import SModal from "@/components/SModal.vue";
 import Signin from "@/components/Signin.vue";
 import CreateRoom from "@/components/CreateRoom.vue";
 import Avatar from "@/components/Avatar.vue";
+import ModalDialog from "@/components/ModalDialog.vue";

-import { getRoomAPI, joinRoomAPI, getBattleDataAPI } from "@/apis";
-import { debounce, canEenter } from "@/util";
+import { getRoomAPI, joinRoomAPI, getBattleDataAPI, getDailyCountAPI } from "@/apis";
+import { debounce, canEenter, getLimitCountText, isLimitReached } from "@/util";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user, device, online, game } = storeToRefs(store);
+const { user, device, online, game, dailyCount } = storeToRefs(store);
+const { updateDailyCount } = store;

 const showModal = ref(false);
 const showSignin = ref(false);
@@ -24,8 +26,12 @@ const roomNumber = ref("");
 const data = ref({});
 const roomID = ref("");
 const loading = ref(false);
+const showLimitModal = ref(false);
 const isSVip = computed(() => user.value.sVip === true);
 const isVip = computed(() => user.value.vip === true && !isSVip.value);
+const challengeLimitText = computed(() =>
+  getLimitCountText("约战", dailyCount.value.challenge)
+);

 const enterRoom = debounce(async (number) => {
  if (loading.value) return;
@@ -67,9 +73,37 @@ const enterRoom = debounce(async (number) => {
 });
 const onCreateRoom = async () => {
  if (!canEenter(user.value, device.value, online.value)) return;
+  const countData = await loadDailyCount();
+  if (isLimitReached(countData.challenge)) {
+    showLimitModal.value = true;
+    return;
+  }
  warnning.value = "";
  showModal.value = true;
 };
+
+const closeLimitModal = () => {
+  showLimitModal.value = false;
+};
+
+const goVipPage = () => {
+  showLimitModal.value = false;
+  uni.navigateTo({
+    url: "/pages/member/be-vip",
+  });
+};
+
+const loadDailyCount = async () => {
+  if (!user.value.id) return dailyCount.value;
+  try {
+    const result = await getDailyCountAPI();
+    updateDailyCount(result);
+    return result || dailyCount.value;
+  } catch (error) {
+    console.log("load daily count error", error);
+    return dailyCount.value;
+  }
+};
 const onSignin = () => {
  if (roomID.value && user.value.id) enterRoom(roomID.value);
  showSignin.value = false;
@@ -83,7 +117,10 @@ const goMyRecord = () => {
 };
 onShow(async () => {
  if (user.value.id) {
-    const result = await getBattleDataAPI();
+    const [result] = await Promise.all([
+      getBattleDataAPI(),
+      loadDailyCount(),
+    ]);
    data.value = result;
  }
 });
@@ -168,6 +205,9 @@ onLoad(async (options) => {
          </view>
        </view>
        <view>
+          <view v-if="challengeLimitText" class="pp-text">
+            {{ challengeLimitText }}
+          </view>
          <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
            创建约战房
          </SButton>
@@ -183,6 +223,14 @@ onLoad(async (options) => {
      <Signin :show="showSignin" :onClose="onSignin" />
    </view>
  </Container>
+  <ModalDialog
+    :show="showLimitModal"
+    :content="'今日约战次数已经用完\n开通会员可增加次数'"
+    cancelText="知道了"
+    confirmText="去开通"
+    :onCancel="closeLimitModal"
+    :onConfirm="goVipPage"
+  />
 </template>

 <style scoped>
@@ -268,7 +316,7 @@ onLoad(async (options) => {
 }

 .create-room>view:nth-child(3) {
-  margin: 12vw auto;
+  margin: 12vw auto 5vw auto;
  position: relative;
  display: flex;
  align-items: center;
@@ -304,6 +352,13 @@ onLoad(async (options) => {
  margin-right: 2px;
 }

+.pp-text{
+  color: #fff;
+  text-align: center;
+  font-size: 22rpx;
+  margin-bottom: 20rpx;
+}
+
 .warnning {
  width: 100%;
  height: 100%;
@@ -1,31 +1,66 @@
 <script setup>
+import { computed } from "vue";
 import Container from "@/components/Container.vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+
+const MAX_LEVEL = 100;
+const LEVEL_NODE_WIDTH_RPX = 72;
+const TRACK_PADDING_RPX = 20;
+const windowWidth = uni.getSystemInfoSync().windowWidth;
+const rpxToPx = (value) => (value * windowWidth) / 750;
+const levels = Array.from({ length: MAX_LEVEL }, (_, index) => index + 1);
+const currentLevel = computed(() => {
+  const level = Number(user.value?.lvl) || 1;
+  return Math.min(Math.max(level, 1), MAX_LEVEL);
+});
+const currentLevelScrollLeft = computed(() => {
+  const nodeWidth = rpxToPx(LEVEL_NODE_WIDTH_RPX);
+  const trackPadding = rpxToPx(TRACK_PADDING_RPX);
+  const contentWidth = rpxToPx(
+    TRACK_PADDING_RPX * 2 + MAX_LEVEL * LEVEL_NODE_WIDTH_RPX
+  );
+  const currentCenter =
+    trackPadding + (currentLevel.value - 1) * nodeWidth + nodeWidth / 2;
+  const targetLeft = currentCenter - windowWidth / 2;
+  const maxScrollLeft = Math.max(contentWidth - windowWidth, 0);
+
+  return Math.min(Math.max(targetLeft, 0), maxScrollLeft);
+});
 </script>

 <template>
  <Container title="等级介绍">
    <view class="container">
      <!-- 等级进度条 -->
-      <view class="level-progress">
-        <view v-for="(_, index) in 10" :key="index" class="progress-dot">
+      <scroll-view
+        class="level-progress"
+        scroll-x
+        :show-scrollbar="false"
+        :scroll-left="currentLevelScrollLeft"
+        scroll-with-animation
+      >
+        <view class="level-track">
          <view
-            :style="{
-              backgroundColor:
-                index + 1 < user.lvl
-                  ? '#fff9'
-                  : index + 1 === user.lvl
-                  ? '#fed847'
-                  : 'transparent',
-              borderColor: index + 1 === user.lvl ? '#fed847' : '#fff9',
-            }"
-          />
-          <view />
+            v-for="level in levels"
+            :id="`level-${level}`"
+            :key="level"
+            :class="[
+              'level-node',
+              level < currentLevel ? 'level-node--done' : '',
+              level === currentLevel ? 'level-node--current' : '',
+            ]"
+          >
+            <view class="level-node__top">
+              <view class="level-node__dot" />
+              <view v-if="level < MAX_LEVEL" class="level-node__line" />
+            </view>
+            <text class="level-node__label">{{ level }}</text>
+          </view>
        </view>
-      </view>
+      </scroll-view>

      <!-- 说明文本 -->
      <view class="body">
@@ -65,28 +100,80 @@ const { user } = storeToRefs(store);

 .level-progress {
  width: 100%;
-  height: 32rpx;
-  display: flex;
-  justify-content: center;
-  padding-top: 20rpx;
-  padding-bottom: 40rpx;
+  white-space: nowrap;
+  padding: 24rpx 0 34rpx;
+  box-sizing: border-box;
 }

-.progress-dot {
+.level-track {
+  display: inline-flex;
+  align-items: flex-start;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+}
+
+.level-node {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  width: 72rpx;
+  flex: 0 0 72rpx;
+}
+
+.level-node__top {
  display: flex;
  align-items: center;
+  width: 100%;
 }
-.progress-dot > view:first-child {
-  width: 3.8vw;
-  height: 3.8vw;
+
+.level-node__dot {
+  width: 28rpx;
+  height: 28rpx;
  border-radius: 50%;
-  border: 1px solid #fff9;
+  border: 3rpx solid rgba(255, 255, 255, 0.45);
+  box-sizing: border-box;
 }
-.progress-dot > view:last-child {
-  width: 3.8vw;
-  height: 1px;
-  margin: 0 2px;
-  background-color: #fff9;
+
+.level-node__line {
+  flex: 1;
+  height: 2rpx;
+  background-color: rgba(255, 255, 255, 0.45);
+}
+
+.level-node__label {
+  width: 28rpx;
+  margin-top: 14rpx;
+  color: rgba(255, 255, 255, 0.45);
+  font-size: 24rpx;
+  line-height: 28rpx;
+  text-align: center;
+}
+
+.level-node--done .level-node__dot {
+  background-color: #ffffff;
+  border-color: #ffffff;
+}
+
+.level-node--done .level-node__line {
+  background-color: rgba(255, 255, 255, 0.8);
+}
+
+.level-node--done .level-node__label {
+  color: rgba(255, 255, 255, 0.72);
+}
+
+.level-node--current .level-node__dot {
+  background-color: #fed847;
+  border-color: #fed847;
+}
+
+.level-node--current .level-node__line {
+  background-color: rgba(255, 255, 255, 0.45);
+}
+
+.level-node--current .level-node__label {
+  color: #fed847;
+  font-weight: 700;
 }

 .body {
@@ -1,19 +1,23 @@
 <script setup>
-import {onMounted, ref} from "vue";
+import {onMounted, onUnmounted, ref} from "vue";
 import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
+import OtaModal from "@/components/OtaModal.vue";

 import {
  checkUserBindAPI,
  getAppConfig,
  getDeviceBatteryAPI,
+  getHardwareBoxTaskStatusAPI,
+  getHardwareBoxVersionAPI,
  getHomeData,
  getMyDevicesAPI,
  getScoreRankList,
+  sendHardwareBoxUpdateAPI,
  silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
@@ -37,6 +41,208 @@ const showModal = ref(false);
 const showGuide = ref(false);
 const scoreRankList = ref([]);

+// OTA 相关
+const otaVisible = ref(false);
+const otaState = ref("new_version");
+const otaProgress = ref(0);
+const otaInfo = ref({
+  versionNumber: "",
+  versionInfo: "",
+  resourceUrl: "",
+  forceUpdate: false,
+});
+const isStartingOta = ref(false);
+let otaProgressTimer = null;
+let otaStatusTimer = null;
+let otaTimeoutTimer = null;
+
+// 清理首页 OTA 更新定时器，避免弹窗关闭或页面卸载后继续轮询。
+const clearOtaUpdateTimers = () => {
+  clearInterval(otaProgressTimer);
+  clearTimeout(otaStatusTimer);
+  clearTimeout(otaTimeoutTimer);
+  otaProgressTimer = null;
+  otaStatusTimer = null;
+  otaTimeoutTimer = null;
+};
+
+// 启动首页 OTA 本地进度动画，最终成功失败以后端任务状态为准。
+const startOtaProgressAnimation = () => {
+  clearInterval(otaProgressTimer);
+  otaProgressTimer = setInterval(() => {
+    if (otaProgress.value >= 90) {
+      clearInterval(otaProgressTimer);
+      return;
+    }
+    const increment = Math.max(0.5, 2 - otaProgress.value / 60);
+    otaProgress.value = Math.min(90, otaProgress.value + increment);
+  }, 500);
+};
+
+// 获取并保存后端返回的 OTA 版本信息，供弹窗展示和更新接口使用。
+const applyOtaVersionInfo = (versionInfo) => {
+  otaInfo.value = {
+    versionNumber: versionInfo?.versionNumber || "",
+    versionInfo: versionInfo?.versionInfo || "",
+    resourceUrl: versionInfo?.resourceUrl || "",
+    forceUpdate: Number(versionInfo?.forceUpdate) === 1,
+  };
+};
+
+// 检查当前设备盒子是否存在可升级版本。
+const checkOtaUpdate = async () => {
+  let versionInfo;
+  try {
+    versionInfo = await getHardwareBoxVersionAPI();
+  } catch (err) {
+    return;
+  }
+  if (!versionInfo?.needUpdate) return;
+  applyOtaVersionInfo(versionInfo);
+
+  const dismissedAt = uni.getStorageSync("ota_dismissed_at");
+  const now = Date.now();
+  if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
+  otaState.value = "new_version";
+  otaVisible.value = true;
+};
+
+// 拼接 OTA WiFi 页参数，让未连 WiFi 的设备继续使用同一份版本信息。
+const getOtaWifiUrl = () => {
+  const { versionNumber, resourceUrl } = otaInfo.value;
+  const query = [
+    `versionNumber=${encodeURIComponent(versionNumber)}`,
+    `resourceUrl=${encodeURIComponent(resourceUrl)}`,
+  ].join("&");
+  return `/pages/ota-wifi?${query}`;
+};
+
+// 处理 OTA 弹窗暂不更新，强制更新时不允许关闭。
+const handleOtaDismiss = () => {
+  if (otaInfo.value.forceUpdate) return;
+  uni.setStorageSync("ota_dismissed_at", Date.now());
+  otaVisible.value = false;
+};
+
+// 将首页 OTA 直连更新流程标记为失败。
+const failHomeOtaUpdate = () => {
+  clearOtaUpdateTimers();
+  isStartingOta.value = false;
+  otaState.value = "update_failure";
+  otaVisible.value = true;
+};
+
+// 将首页 OTA 直连更新流程标记为成功。
+const completeHomeOtaUpdate = () => {
+  clearOtaUpdateTimers();
+  isStartingOta.value = false;
+  otaProgress.value = 100;
+  setTimeout(() => {
+    otaState.value = "update_success";
+    otaVisible.value = true;
+  }, 300);
+};
+
+// 轮询首页直接发起的 OTA 更新任务状态。
+const pollHomeOtaTaskStatus = (taskId) => {
+  clearTimeout(otaStatusTimer);
+  otaStatusTimer = setTimeout(async () => {
+    try {
+      const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
+      const status = Number(taskStatus?.status);
+      if (status === 2) {
+        completeHomeOtaUpdate();
+        return;
+      }
+      if (status === 3) {
+        failHomeOtaUpdate();
+        return;
+      }
+      if (status === 0 || status === 1) {
+        pollHomeOtaTaskStatus(taskId);
+        return;
+      }
+      failHomeOtaUpdate();
+    } catch (err) {
+      failHomeOtaUpdate();
+    }
+  }, 3000);
+};
+
+// 设备盒子已连 WiFi 时，从首页直接传空 WiFi 信息发起 OTA 更新。
+const startHomeOtaUpdate = async () => {
+  otaState.value = "update_progress";
+  otaVisible.value = true;
+  otaProgress.value = 0;
+  startOtaProgressAnimation();
+  otaTimeoutTimer = setTimeout(() => {
+    if (otaState.value === "update_progress") {
+      failHomeOtaUpdate();
+    }
+  }, 5 * 60 * 1000);
+
+  try {
+    const updateResult = await sendHardwareBoxUpdateAPI({
+      versionNumber: otaInfo.value.versionNumber,
+      wifiSsid: "",
+      wifiPassword: "",
+      resourceUrl: otaInfo.value.resourceUrl,
+    });
+    if (!updateResult?.taskId) {
+      failHomeOtaUpdate();
+      return;
+    }
+    pollHomeOtaTaskStatus(updateResult.taskId);
+  } catch (err) {
+    failHomeOtaUpdate();
+  }
+};
+
+// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网，已联网则首页直接更新，否则跳转 WiFi 页面。
+const handleOtaUpdate = async () => {
+  if (isStartingOta.value) return;
+  isStartingOta.value = true;
+  let deviceStatus;
+  try {
+    deviceStatus = await getDeviceBatteryAPI();
+  } catch (err) {
+    isStartingOta.value = false;
+    uni.showToast({
+      title: "获取设备状态失败，请重试",
+      icon: "none",
+    });
+    return;
+  }
+
+  if (deviceStatus?.online !== true) {
+    isStartingOta.value = false;
+    uni.showToast({
+      title: "请先开启智能弓",
+      icon: "none",
+    });
+    return;
+  }
+
+  if (String(deviceStatus?.netType || "").toLowerCase() === "wifi") {
+    startHomeOtaUpdate();
+    return;
+  }
+
+  isStartingOta.value = false;
+  otaVisible.value = false;
+  uni.navigateTo({ url: getOtaWifiUrl() });
+};
+
+// 处理 OTA 更新成功后的完成按钮，关闭结果弹窗。
+const handleOtaDone = () => {
+  otaVisible.value = false;
+};
+
+// 处理 OTA 更新失败后的重试按钮，重新走立即更新判断流程。
+const handleOtaRetry = () => {
+  handleOtaUpdate();
+};
+
 // 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
 const getScoreRankData = (result) => {
  if (Array.isArray(result)) return result;
@@ -64,10 +270,18 @@ const toRankListPage = () => {
  });
 };

-onShow(async () => {
+onShow(async (options) => {
  const env = uni.getAccountInfoSync().miniProgram.envVersion;
  const token = uni.getStorageSync(`${env}_token`);

+  // 检查是否从 OTA 更新页面返回
+  if (options && options.updateResult) {
+    otaState.value = options.updateResult;
+    otaVisible.value = true;
+  } else if (token || user.value.id) {
+    await checkOtaUpdate();
+  }
+
  if (!user.value.id && !token) {
    // showModal.value = true;
    // try {
@@ -141,6 +355,10 @@ onMounted(async () => {
  console.log("全局配置：", config);
 });

+onUnmounted(() => {
+  clearOtaUpdateTimers();
+});
+
 onShareAppMessage(() => {
  return {
    title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
@@ -161,6 +379,21 @@ onShareTimeline(() => {

 <template>
  <Container :isHome="true" :showBackToGame="true">
+    <!-- OTA 升级弹窗：使用 visible 控制显隐，description 为副标题，changelog 为详细说明 -->
+    <OtaModal
+      :visible="otaVisible"
+      :state="otaState"
+      :version="otaInfo.versionNumber"
+      :progress="otaProgress"
+      :description="''"
+      :changelog="otaInfo.versionInfo"
+      :forceUpdate="otaInfo.forceUpdate"
+      @update="handleOtaUpdate"
+      @skip="handleOtaDismiss"
+      @close="handleOtaDismiss"
+      @done="handleOtaDone"
+      @retry="handleOtaRetry"
+    />
    <view class="container">
      <view class="top-theme">
        <!-- <image
@@ -3,12 +3,15 @@ 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 ModalDialog from "@/components/ModalDialog.vue";
 import { matchGameAPI, getBattleAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";
+import { isLimitError } from "@/util";

 const gameType = ref(0);
 const teamSize = ref(0);
 const onComplete = ref(null);
+const showLimitModal = ref(false);

 /** 匹配超时计时器，用于检测 WS 消息丢失或真正超时 */
 const matchTimeoutTimer = ref(null);
@@ -58,6 +61,18 @@ async function stopMatch() {
  uni.$showHint(3);
 }

+const closeLimitModal = () => {
+  showLimitModal.value = false;
+  uni.navigateBack();
+};
+
+const goVipPage = () => {
+  showLimitModal.value = false;
+  uni.redirectTo({
+    url: "/pages/member/be-vip",
+  });
+};
+
 /**
 * 取消匹配，带容错处理：
 * - 取消成功 → 返回大厅
@@ -136,10 +151,19 @@ onBeforeUnmount(() => {

 onShow(async () => {
  if (gameType.value && teamSize.value) {
-    matchGameAPI(true, gameType.value, teamSize.value);
-    // 启动超时计时器，防止 WS 消息丢失或长时间无对手导致用户卡死
-    clearMatchTimeout();
-    matchTimeoutTimer.value = setTimeout(handleMatchTimeout, MATCH_TIMEOUT_MS);
+    try {
+      await matchGameAPI(true, gameType.value, teamSize.value);
+      // 启动超时计时器，防止 WS 消息丢失或长时间无对手导致用户卡死
+      clearMatchTimeout();
+      matchTimeoutTimer.value = setTimeout(handleMatchTimeout, MATCH_TIMEOUT_MS);
+    } catch (error) {
+      clearMatchTimeout();
+      if (isLimitError(error)) {
+        showLimitModal.value = true;
+        return;
+      }
+      uni.navigateBack();
+    }
  }
 });

@@ -154,6 +178,14 @@ onHide(() => {
      <Matching :stopMatch="stopMatch" :onComplete="onComplete" />
    </view>
  </Container>
+  <ModalDialog
+    :show="showLimitModal"
+    :content="'今日排位赛次数已经用完\n开通会员可增加次数'"
+    cancelText="知道了"
+    confirmText="去开通"
+    :onCancel="closeLimitModal"
+    :onConfirm="goVipPage"
+  />
 </template>

 <style scoped>
@@ -295,6 +295,7 @@ onShow(async () => {
        :tips="tips"
        :total="90"
        :melee="true"
+        :halfRest="halfRest"
        :battleId="battleId"
      />
      <view v-if="start" class="user-row">
@@ -1,10 +1,10 @@
 <script setup>
-import { computed, ref, onBeforeUnmount } from "vue";
+import { computed, ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Signin from "@/components/Signin.vue";
-import { createOrderAPI, getAppConfig, getHomeData } from "@/apis";
-import { capsuleHeight } from "@/util";
+import { virtualPayOrderAPI, getAppConfig, getHomeData, getOrderDetailAPI } from "@/apis";
+import { capsuleHeight, wxLogin } from "@/util";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";

@@ -18,11 +18,8 @@ const showModal = ref(false);
 const loadingConfig = ref(false);
 const paying = ref(false);
 const refreshing = ref(false);
-const timer = ref(null);
-const lastDate = ref(user.value.expiredAt || 0);
-const maxRefreshTimes = 12;

-// 会员页核心展示数据：视觉、权益、套餐均按蓝湖当前两张设计稿拆分。
+// 会员页核心展示数据：视觉、权益按蓝湖当前两张设计稿拆分，套餐完全使用接口数据。
 const memberTypes = [
  {
    key: "normal",
@@ -44,11 +41,6 @@ const memberTypes = [
      { label: "排位赛\n每日+20次", icon: "../../static/vip/vip-rank.png" },
      { label: "约战\n每日+20次", icon: "../../static/vip/vip-battle.png" },
    ],
-    packages: [
-      { name: "连续包月", price: "20", original: "35" },
-      { name: "12个月", price: "300", original: "420" },
-      { name: "3个月", price: "84", original: "105" },
-    ],
  },
  {
    key: "super",
@@ -73,11 +65,6 @@ const memberTypes = [
      { label: "排位赛无限制", icon: "../../static/vip/svip-rank.png" },
      { label: "专享SVIP客服", icon: "../../static/vip/svip-service.png" },
    ],
-    packages: [
-      { name: "连续包月", price: "20", original: "35" },
-      { name: "12个月", price: "300", original: "420" },
-      { name: "3个月", price: "84", original: "105" },
-    ],
  },
 ];

@@ -100,16 +87,6 @@ const getVipExpiredValue = (type, source = user.value) => {
  return type.key === "super" ? source.superVipExpiredAt : source.normalVipExpiredAt;
 };

-// 支付后轮询需要比较最新会员到期时间，兼容旧字段 expiredAt。
-const getLatestVipExpiredTime = (source = user.value) => {
-  if (!source) return 0;
-  return Math.max(
-    toTimestamp(source.normalVipExpiredAt),
-    toTimestamp(source.superVipExpiredAt),
-    toTimestamp(source.expiredAt)
-  );
-};
-
 // 未过期才展示“会员生效中”样式，已过期或无值继续展示未开通样式。
 const isVipActive = (type) => {
  return toTimestamp(getVipExpiredValue(type)) > Date.now();
@@ -153,9 +130,34 @@ const getMenuName = (item) => {
  return item.name || item.vipName || item.title || "";
 };

+const formatPrice = (value) => {
+  if (value === undefined || value === null || value === "") return "";
+  return String(value).replace("￥", "").replace("¥", "");
+};
+
 const getMenuPrice = (item) => {
-  const value = item.price || item.total || item.amount || item.money;
-  return value ? String(value).replace("￥", "").replace("¥", "") : "";
+  return formatPrice(item && item.price);
+};
+
+const getMenuOriginalPrice = (item) => {
+  return formatPrice(item && item.originalPrice);
+};
+
+const getMenuSortValue = (item) => {
+  const value = item && item.sort;
+  if (value === undefined || value === null || value === "") return Number.MAX_SAFE_INTEGER;
+  const sort = Number(value);
+  return Number.isFinite(sort) ? sort : Number.MAX_SAFE_INTEGER;
+};
+
+const sortMenusBySort = (menus = []) => {
+  return menus
+    .map((item, index) => ({ item, index }))
+    .sort((a, b) => {
+      const sortDiff = getMenuSortValue(a.item) - getMenuSortValue(b.item);
+      return sortDiff || a.index - b.index;
+    })
+    .map(({ item }) => item);
 };

 const getMenuType = (item) => {
@@ -173,41 +175,19 @@ const getMenuType = (item) => {
  return "";
 };

-const getPackageMonths = (name) => {
-  if (/连续包月/.test(name)) return 1;
-  const match = String(name || "").match(/(\d+)\s*个?月/);
-  return match ? Number(match[1]) : 0;
-};
-
-const matchPackageSource = (type, pack, index) => {
-  const menus = configMenus.value;
-  const typedMenus = menus.filter((item) => {
-    const menuType = getMenuType(item);
-    if (type.key === "super") return menuType === "super";
-    return menuType === "normal";
-  });
-  const pool = typedMenus.length ? typedMenus : menus;
-  const packMonths = getPackageMonths(pack.name);
-  return (
-    pool.find((item) => getMenuName(item).indexOf(pack.name) !== -1) ||
-    pool.find((item) => packMonths && getPackageMonths(getMenuName(item)) === packMonths) ||
-    pool.find((item) => getMenuPrice(item) === pack.price) ||
-    pool[index]
-  );
-};
-
 const getPackages = (type) => {
-  return type.packages.map((item, index) => {
-    const source = matchPackageSource(type, item, index);
-    return {
-      ...item,
-      source,
-      name: source ? getMenuName(source) || item.name : item.name,
-      price: source ? getMenuPrice(source) || item.price : item.price,
-      icon: source && source.icon,
-      id: source && source.id,
-    };
-  });
+  return sortMenusBySort(configMenus.value)
+    .filter((item) => getMenuType(item) === type.key)
+    .map((item) => {
+      return {
+        source: item,
+        id: item.id,
+        name: getMenuName(item),
+        price: getMenuPrice(item),
+        originalPrice: getMenuOriginalPrice(item),
+        icon: item.icon,
+      };
+    });
 };

 const currentPackages = computed(() => {
@@ -263,41 +243,38 @@ const loadVipConfig = async () => {
  }
 };

-const clearRefreshTimer = () => {
-  if (timer.value) {
-    clearInterval(timer.value);
-    timer.value = null;
+const refreshUserAfterPay = async () => {
+  refreshing.value = true;
+  try {
+    const result = await getHomeData();
+    if (result.user) {
+      updateUser(result.user);
+    }
+  } catch (error) {
+    console.log("refresh user after pay error", error);
+  } finally {
+    refreshing.value = false;
  }
 };

-const refreshUserAfterPay = () => {
-  clearRefreshTimer();
-  let refreshTimes = 0;
-  // 先记录支付前的最大到期时间，轮询到更大的值就认为会员状态已刷新。
-  lastDate.value = getLatestVipExpiredTime();
-  refreshing.value = true;
-  timer.value = setInterval(async () => {
-    refreshTimes += 1;
-    try {
-      const result = await getHomeData();
-      const latestExpiredAt = getLatestVipExpiredTime(result.user);
-      if (result.user && latestExpiredAt > lastDate.value) {
-        lastDate.value = latestExpiredAt;
-        updateUser(result.user);
-        clearRefreshTimer();
-        refreshing.value = false;
-      } else if (refreshTimes >= maxRefreshTimes) {
-        clearRefreshTimer();
-        refreshing.value = false;
-      }
-    } catch (error) {
-      console.log("refresh user after pay error", error);
-      if (refreshTimes >= maxRefreshTimes) {
-        clearRefreshTimer();
-        refreshing.value = false;
-      }
-    }
-  }, 1000);
+const getVirtualPaySignData = (result) => {
+  // 后端可能返回字符串或对象，这里统一转成微信虚拟支付需要的 JSON 字符串。
+  const signDataObj = typeof result?.signData === "string" ? JSON.parse(result.signData) : result?.signData;
+  if (!signDataObj) return "";
+
+  // 微信虚拟支付短剧/虚拟商品模式需要购买数量；后端未返回时使用订单数量兜底。
+  if (!signDataObj.buyQuantity) {
+    signDataObj.buyQuantity = result.quantity || 1;
+  }
+  return JSON.stringify(signDataObj);
+};
+
+const isVirtualPayCancel = (res = {}) => {
+  const message = String(res.errMsg || res.message || "").toLowerCase();
+  const errCode = Number(res.errCode);
+  const errno = Number(res.errno);
+
+  return message.includes("cancel") || errCode === -23 || errno === -2;
 };

 const onPay = async () => {
@@ -317,12 +294,22 @@ const onPay = async () => {
    });
    return;
  }
+  if (typeof wx === "undefined" || !wx.requestVirtualPayment) {
+    uni.showToast({
+      title: "当前环境不支持微信虚拟支付",
+      icon: "none",
+    });
+    return;
+  }
  paying.value = true;
  let waitingPayment = false;
+  let payToast = null;
  try {
-    const result = await createOrderAPI(vipId);
-    const params = result?.pay?.order?.jsApi?.params;
-    if (!params?.timeStamp || !params?.nonceStr || !params?.package || !params?.paySign) {
+    // 微信虚拟支付创建订单前需要登录 code，服务端用它换取本次支付签名参数。
+    const wxResult = await wxLogin();
+    const result = await virtualPayOrderAPI(vipId, wxResult.code);
+    const finalSignData = getVirtualPaySignData(result);
+    if (!finalSignData || !result?.paySig || !result?.signature) {
      uni.showToast({
        title: "支付参数生成失败",
        icon: "none",
@@ -330,34 +317,57 @@ const onPay = async () => {
      refreshing.value = false;
      return;
    }
-    waitingPayment = true;
-    wx.requestPayment({
-      timeStamp: params.timeStamp, // 微信支付时间戳
-      nonceStr: params.nonceStr, // 微信支付随机串
-      package: params.package, // 预支付交易会话标识
-      paySign: params.paySign, // 微信支付签名
-      signType: params.signType || "RSA",
-      success() {
-        uni.showToast({
+    wx.requestVirtualPayment({
+      signData: finalSignData,
+      paySig: result.paySig,
+      signature: result.signature,
+      mode: "short_series_goods",
+      async success() {
+        payToast = {
          title: "支付成功",
-          icon: "none",
-        });
+          icon: "success",
+        };
+        if (result?.outTradeNo) {
+          try {
+            const orderDetail = await getOrderDetailAPI(result.outTradeNo);
+            console.log("virtual pay order detail", orderDetail);
+          } catch (error) {
+            console.log("virtual pay order detail error", error);
+          }
+        }
+        // 客户端支付成功后，会员是否真正生效仍以服务端用户信息刷新结果为准。
        refreshUserAfterPay();
      },
      fail(res) {
-        console.log("pay error", res);
-        if (res.errMsg && res.errMsg.indexOf("cancel") !== -1) return;
-        uni.showToast({
-          title: "支付失败，请稍后重试",
+        console.log("virtual pay error", res);
+        if (isVirtualPayCancel(res)) {
+          payToast = {
+            title: "支付已取消",
+            icon: "none",
+          };
+          return;
+        }
+        payToast = {
+          title: res.message || "支付失败，请稍后重试",
          icon: "none",
-        });
+        };
      },
      complete() {
        paying.value = false;
+        if (payToast) {
+          setTimeout(() => {
+            uni.showToast(payToast);
+          }, 200);
+        }
      },
    });
+    waitingPayment = true;
  } catch (error) {
-    console.log("create vip order error", error);
+    console.log("create virtual pay order error", error);
+    uni.showToast({
+      title: error.message || "下单失败",
+      icon: "none",
+    });
  } finally {
    if (!waitingPayment) paying.value = false;
  }
@@ -365,9 +375,6 @@ const onPay = async () => {

 onShow(loadVipConfig);

-onBeforeUnmount(() => {
-  clearRefreshTimer();
-});
 </script>

 <template>
@@ -449,7 +456,7 @@ onBeforeUnmount(() => {
                <view class="package-list">
                  <view
                    v-for="(pack, index) in getPackages(type)"
-                    :key="`${type.key}-${pack.name}`"
+                    :key="`${type.key}-${pack.id || pack.name || index}`"
                    class="package-card"
                    :class="{ 'package-card--active': selectedPackageIndex === index }"
                    @click="selectPackage(index)"
@@ -460,8 +467,8 @@ onBeforeUnmount(() => {
                        <text class="package-price__symbol">¥</text>
                        <text class="package-price__value">{{ pack.price }}</text>
                      </view>
-                      <view class="package-origin">
-                        <text>¥{{ pack.original }}</text>
+                      <view v-if="pack.originalPrice" class="package-origin">
+                        <text>¥{{ pack.originalPrice }}</text>
                        <view class="package-origin__line" />
                      </view>
                    </view>
@@ -473,13 +480,14 @@ onBeforeUnmount(() => {
                hover-class="none"
                class="activate-btn"
                :class="type.buttonClass"
-                :disabled="loadingConfig || paying || refreshing"
+                :disabled="loadingConfig || paying || refreshing || !selectedPackage"
                @click="onPay"
              >
                <text v-if="loadingConfig">加载套餐中</text>
                <text v-else-if="paying">创建订单中</text>
-                <text v-else-if="!refreshing">¥ {{ selectedPackage.price }} 一键激活</text>
-                <text v-else>刷新会员状态中</text>
+                <text v-else-if="refreshing">刷新会员状态中</text>
+                <text v-else-if="selectedPackage">¥ {{ selectedPackage.price }} 一键激活</text>
+                <text v-else>套餐暂不可购买</text>
              </button>

              <view class="agreement">
@@ -746,8 +754,8 @@ onBeforeUnmount(() => {
 }

 .package-list {
-  display: flex;
-  width: 984rpx;
+  display: inline-flex;
+  min-width: 100%;
  padding: 6rpx 84rpx 6rpx 6rpx;
  box-sizing: border-box;
 }
@@ -755,6 +763,7 @@ onBeforeUnmount(() => {
 .package-card {
  position: relative;
  width: 264rpx;
+  flex: 0 0 264rpx;
  height: 224rpx;
  border-radius: 16rpx;
  border: 2rpx solid #999999;
@@ -97,12 +97,10 @@ const cancelOrder = async () => {
              >复制</text
            >
          </view>
-          <text>下单时间：{{ data.vipCreateAt }}</text>
-          <text
-            >支付时间：{{
+          <text>创建时间：{{ data.orderCreateAt }}</text>
+          <text v-if="data.orderStatus === 4">支付时间：{{
              data.orderStatus === 4 ? data.paymentTime : ""
-            }}</text
-          >
+            }}</text>
          <text>金额：{{ data.total }} 元</text>
          <text>支付方式：微信</text>
        </view>
@@ -78,7 +78,7 @@ import Container from "@/components/Container.vue";
              <text class="table-cell">专享</text>
            </view>
            <view class="table-row">
-              <text class="table-cell table-cell--feature">会员标识</text>
+              <text class="table-cell table-cell--feature">昵称美化</text>
              <text class="table-cell">无</text>
              <text class="table-cell">专享</text>
              <text class="table-cell">专享</text>
@@ -103,6 +103,11 @@ const unbindDevice = async () => {
  clearDevice();
 };

+/** 连接wifi跳转到wifi列表页面 */
+const joinWifi = () => {
+  uni.navigateTo({ url: "/pages/ota-wifi" });
+};
+
 const toDeviceIntroPage = () => {
  uni.navigateTo({
    url: "/pages/device-intro",
@@ -322,6 +327,11 @@ onShow(async () => {
          >解绑</SButton
        >
      </view>
+      <view :style="{ marginTop: '20rpx' }">
+        <SButton :onClick="() => $clickSound(joinWifi)" width="80vw" :rounded="40"
+          >设备连接WIFI</SButton
+        >
+      </view>
    </view>
  </Container>
 </template>
@@ -81,9 +81,17 @@ const loading = ref(false);
 const shareImage = async () => {
  if (loading.value) return;
  loading.value = true;
-  await generateShareImage("shareImageCanvas", record.value);
-  await wxShare("shareImageCanvas");
-  loading.value = false;
+  try {
+    await generateShareImage("shareImageCanvas", record.value);
+    await wxShare("shareImageCanvas");
+  } catch (e) {
+    uni.showToast({
+      title: "海报生成失败，请稍后重试",
+      icon: "none",
+    });
+  } finally {
+    loading.value = false;
+  }
 };

 onLoad(async (options) => {
@@ -15,11 +15,22 @@ const list = ref([]);
 const mine = ref({
  averageRing: 0,
 });
+const sharing = ref(false);

 const shareImage = async () => {
-  if (!mine.value.id) return;
-  await sharePointData("shareCanvas", mine.value);
-  await wxShare("shareCanvas");
+  if (!mine.value.id || sharing.value) return;
+  sharing.value = true;
+  try {
+    await sharePointData("shareCanvas", mine.value);
+    await wxShare("shareCanvas");
+  } catch (e) {
+    uni.showToast({
+      title: "海报生成失败，请稍后重试",
+      icon: "none",
+    });
+  } finally {
+    sharing.value = false;
+  }
 };

 onMounted(async () => {
@@ -39,6 +39,7 @@ const practiseId = ref("");
 const showGuide = ref(false);
 const tips = ref("");
 const targetType = ref(1);
+const sharing = ref(false);

 onLoad((options) => {
  if (options.target) {
@@ -116,8 +117,19 @@ async function onComplete() {
 }

 const onClickShare = debounce(async () => {
-  await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
-  await wxShare("shareCanvas");
+  if (sharing.value) return;
+  sharing.value = true;
+  try {
+    await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
+    await wxShare("shareCanvas");
+  } catch (e) {
+    uni.showToast({
+      title: "海报生成失败，请稍后重试",
+      icon: "none",
+    });
+  } finally {
+    sharing.value = false;
+  }
 });

 function onAudioEnded(s) {
@@ -38,6 +38,7 @@ const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
 const targetType = ref(1);
+const sharing = ref(false);

 onLoad((options) => {
  if (options.target) {
@@ -131,8 +132,19 @@ async function onComplete() {
 }

 const onClickShare = debounce(async () => {
-  await sharePractiseData("shareCanvas", 3, user.value, practiseResult.value);
-  await wxShare("shareCanvas");
+  if (sharing.value) return;
+  sharing.value = true;
+  try {
+    await sharePractiseData("shareCanvas", 3, user.value, practiseResult.value);
+    await wxShare("shareCanvas");
+  } catch (e) {
+    uni.showToast({
+      title: "海报生成失败，请稍后重试",
+      icon: "none",
+    });
+  } finally {
+    sharing.value = false;
+  }
 });

 onMounted(async () => {
@@ -13,7 +13,7 @@ import Container from "@/components/Container.vue";
        <view class="section">
          <view class="title">一、段位体系概述</view>
          <view class="text">
-            我们的段位体系分为多个等级，从低到高依次为：倔强青铜、秩序白银、黄金王者、永恒钻石、最强王者、非凡王者、无双王者、绝世王者、至圣王者、荣耀王者和传奇王者。每个大段位下又分为若干小段位，玩家需要通过积累积分来提升段位。
+            我们的段位体系分为多个等级，从低到高依次为：倔强青铜、秩序白银、荣耀黄金、永恒钻石、最强王者、非凡王者、无双王者、绝世王者、至圣王者、荣耀王者和传奇王者。每个大段位下又分为若干小段位，玩家需要通过积累积分来提升段位。
          </view>
        </view>

@@ -79,7 +79,7 @@ import Container from "@/components/Container.vue";
              <text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</text>
            </view>
            <view class="table-row">
-              <text>黄金王者</text>
+              <text>荣耀黄金</text>
              <view>
                <text>黄金1*</text>
                <text>黄金2*</text>
@@ -3,21 +3,23 @@ import { computed, ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
+import ModalDialog from "@/components/ModalDialog.vue";
 import { topThreeColors } from "@/constants";
 import {
+  getDailyCountAPI,
  getSeasonList,
  getSeasonStats,
  getScoreRankList,
  getTenRingRankList,
  getMvpRankList,
 } from "@/apis";
-import { canEenter } from "@/util";
+import { canEenter, getLimitCountText, isLimitReached } from "@/util";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";

 const store = useStore();
-const { user, device, online, game } = storeToRefs(store);
-const { getLvlName } = store;
+const { user, device, online, game, dailyCount } = storeToRefs(store);
+const { getLvlName, updateDailyCount } = store;

 const defaultSeasonStats = {
  nickName: "",
@@ -55,8 +57,12 @@ const rankLoading = ref(false);
 const scoreRankList = ref([]);
 const mvpRankList = ref([]);
 const tenRingRankList = ref([]);
+const showLimitModal = ref(false);
 const isSVip = computed(() => user.value.sVip === true);
 const isVip = computed(() => user.value.vip === true && !isSVip.value);
+const rankedLimitText = computed(() =>
+  getLimitCountText("排位", dailyCount.value.ranked)
+);

 const isMember = (item = {}) => item.vip === true || item.sVip === true;

@@ -115,12 +121,40 @@ const toMatchPage = async (gameType, teamSize) => {
    uni.$showHint(1);
    return;
  }
+  const countData = await loadDailyCount();
+  if (isLimitReached(countData.ranked)) {
+    showLimitModal.value = true;
+    return;
+  }
  await uni.$checkAudio();
  uni.navigateTo({
    url: `/pages/match-page?gameType=${gameType}&teamSize=${teamSize}`,
  });
 };

+const closeLimitModal = () => {
+  showLimitModal.value = false;
+};
+
+const goVipPage = () => {
+  showLimitModal.value = false;
+  uni.navigateTo({
+    url: "/pages/member/be-vip",
+  });
+};
+
+const loadDailyCount = async () => {
+  if (!user.value.id) return dailyCount.value;
+  try {
+    const result = await getDailyCountAPI();
+    updateDailyCount(result);
+    return result || dailyCount.value;
+  } catch (error) {
+    console.log("load daily count error", error);
+    return dailyCount.value;
+  }
+};
+
 const toMyGrowthPage = () => {
  uni.navigateTo({
    url: "/pages/my-growth",
@@ -246,7 +280,10 @@ const onChangeSeason = async (seasonId, name) => {
 // 页面显示时先拿赛季列表，再拉当前赛季统计和默认榜单数据。
 onShow(async () => {
  try {
-    const seasonResult = await getSeasonList();
+    const [seasonResult] = await Promise.all([
+      getSeasonList(),
+      loadDailyCount(),
+    ]);
    seasonData.value = seasonResult.list || [];

    if (!seasonData.value.length) {
@@ -282,7 +319,12 @@ onShow(async () => {
 </script>

 <template>
-  <Container title="排位赛" :showBackToGame="true" :bgType="6">
+  <Container
+    :title="rankedLimitText ? rankedLimitText : '排位赛'" 
+    :titleStyle="rankedLimitText ? { fontSize: '24rpx', fontWeight: 'normal' } : {}"
+    :showBackToGame="true"
+    :bgType="6"
+  >
    <view class="battle-types-box">
      <view class="battle-types">
        <view class="first">
@@ -580,6 +622,14 @@ onShow(async () => {
      </view>
    </view>
  </Container>
+  <ModalDialog
+    :show="showLimitModal"
+    :content="'今日排位赛次数已经用完\n开通会员可增加次数'"
+    cancelText="知道了"
+    confirmText="去开通"
+    :onCancel="closeLimitModal"
+    :onConfirm="goVipPage"
+  />
 </template>

 <style scoped>
@@ -926,4 +976,19 @@ onShow(async () => {
  font-size: 10px !important;
  margin-bottom: 7px;
 }
+.flex-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+  padding: 0 10rpx;
+}
+.lf-text{
+  font-size: 22rpx;
+  color: #bf985e;
+}
+.rg-text{
+  font-size: 24rpx;
+  color: #fff;
+}
 </style>
@@ -26,6 +26,17 @@ const getDefaultGame = () => ({
  tips: "",
 });

+const getDefaultDailyCount = () => ({
+  challenge: {
+    count: 0,
+    limit: -1,
+  },
+  ranked: {
+    count: 0,
+    limit: -1,
+  },
+});
+
 const getLvlName = (rankLvl, rankList = []) => {
  if (!rankList) return;
  let lvlName = "";
@@ -99,6 +110,7 @@ export default defineStore("store", {
      totalShot: 0, // 轮次总箭数（用于 HeaderProgress 恢复状态）
      tips: "", // 当前提示文案（用于 HeaderProgress 恢复状态，替代 uni.$emit 避免时序问题）
    },
+    dailyCount: getDefaultDailyCount(),
  }),

  // 计算属性
@@ -171,12 +183,19 @@ export default defineStore("store", {
    updateRoomNumber(number) {
      this.game.roomNumber = number;
    },
+    updateDailyCount(data = {}) {
+      this.dailyCount = {
+        ...getDefaultDailyCount(),
+        ...(data || {}),
+      };
+    },
    clearSessionState() {
      this.$patch({
        user: getDefaultUser(),
        device: getDefaultDevice(),
        online: false,
        game: getDefaultGame(),
+        dailyCount: getDefaultDailyCount(),
      });
      uni.removeStorageSync(PERSISTED_STORE_KEY);
      setTimeout(() => {
@@ -1,5 +1,5 @@
 export const formatTimestamp = (timestamp) => {
-  const date = new Date(timestamp * 1000);
+  const date = new Date(timestamp);
  const year = date.getFullYear();
  const month = date.getMonth() + 1;
  const day = date.getDate();
@@ -11,11 +11,13 @@ export const debounce = (fn, delay = 300) => {
  let timer = null;
  return async (...args) => {
    if (timer) clearTimeout(timer);
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
      timer = setTimeout(async () => {
        try {
          const result = await fn(...args);
          resolve(result);
+        } catch (error) {
+          reject(error);
        } finally {
          timer = null;
        }
@@ -24,6 +26,28 @@ export const debounce = (fn, delay = 300) => {
  };
 };

+export const isUnlimitedLimit = (item = {}) => Number(item.limit) === -1;
+
+export const getLimitCountText = (label, item = {}) => {
+  if (!item || isUnlimitedLimit(item)) return "";
+  const count = Number(item.count || 0);
+  const limit = Number(item.limit || 0);
+  return `今日${label}次数：${count}/${limit}`;
+};
+
+export const isLimitReached = (item = {}) => {
+  if (!item || isUnlimitedLimit(item)) return false;
+  return Number(item.count || 0) >= Number(item.limit || 0);
+};
+
+export const isLimitError = (error) => {
+  const message = typeof error === "string" ? error : error?.message;
+  return String(message || "").includes("已达上限");
+};
+
+const isShareCancel = (error) =>
+  String(error?.errMsg || error || "").toLowerCase().includes("cancel");
+
 export const wxShare = async (canvasId = "shareCanvas") => {
  try {
    // 先尝试按 id 查找 <canvas type="2d"> 节点
@@ -54,35 +78,63 @@ export const wxShare = async (canvasId = "shareCanvas") => {
          quality: 1,
          success: (r) => {
            const p = r.tempFilePath || r.apFilePath || r.filePath;
+            if (!p) {
+              reject(new Error("share image path is empty"));
+              return;
+            }
            resolve(p);
          },
          fail: reject,
        });
      });
-      wx.showShareImageMenu({
-        entrancePath: "pages/index",
-        path: tempPath,
+      await new Promise((resolve, reject) => {
+        wx.showShareImageMenu({
+          entrancePath: "pages/index",
+          path: tempPath,
+          success: resolve,
+          fail: (error) => {
+            if (isShareCancel(error)) {
+              resolve({ canceled: true });
+              return;
+            }
+            reject(error);
+          },
+        });
      });
      return tempPath;
    }

    // 回退：旧版非 2D 画布（通过 canvasId 导出）
-    const res = await uni.canvasToTempFilePath({
-      canvasId,
-      fileType: "png",
-      quality: 1,
+    const res = await new Promise((resolve, reject) => {
+      uni.canvasToTempFilePath({
+        canvasId,
+        fileType: "png",
+        quality: 1,
+        success: resolve,
+        fail: reject,
+      });
    });
-    wx.showShareImageMenu({
-      entrancePath: "pages/index",
-      path: res.tempFilePath,
+    const tempPath = res.tempFilePath || res.apFilePath || res.filePath;
+    if (!tempPath) {
+      throw new Error("share image path is empty");
+    }
+    await new Promise((resolve, reject) => {
+      wx.showShareImageMenu({
+        entrancePath: "pages/index",
+        path: tempPath,
+        success: resolve,
+        fail: (error) => {
+          if (isShareCancel(error)) {
+            resolve({ canceled: true });
+            return;
+          }
+          reject(error);
+        },
+      });
    });
-    return res.tempFilePath;
+    return tempPath;
  } catch (error) {
    console.log("生成图片失败:", error);
-    uni.showToast({
-      title: "生成图片失败",
-      icon: "error",
-    });
    throw error;
  }
 };
Author	SHA1	Message	Date
chenlimao	ad8bc1f152	fix: 把 OTA 图片本地引用改成了同名 CDN 地址	2026-07-09 16:25:28 +08:00
zhangyi	348d490de8	update:优化获取手机号	2026-07-06 11:15:38 +08:00
zhangyi	d3e0307854	update:优化vip套餐	2026-07-06 09:37:08 +08:00
zhangyi	0a678cb387	update：修复大乱斗特效飘移	2026-07-03 17:46:00 +08:00
zhangyi	3c7467fbdf	Merge branch 'test' into feat-vip	2026-07-03 17:04:09 +08:00
zhangyi	6aa3c6fd6c	update:补充乱斗语音	2026-07-03 17:03:51 +08:00
zhangyi	8b11e41957	Merge branch 'feat-vip' into test	2026-07-03 13:56:06 +08:00
zhangyi	8c6374b2c5	update:对接虚拟支付	2026-07-03 13:55:24 +08:00
chenlimao	78a495de60	fix: OTA升级电量限制改为50	2026-07-02 09:22:35 +08:00
chenlimao	ef13ff6a2b	fix: 修复wifi页面连接超时问题	2026-07-01 15:56:21 +08:00
chenlimao	8b7a94b8c4	fix: 修复wifi页面连接超时问题	2026-07-01 15:54:58 +08:00
zhangyi	3e99bb8ad9	update:新手教程新增vip特效	2026-07-01 11:52:03 +08:00
chenlimao	40b94dbad8	fix: OTAwifi页面跳转逻辑优化	2026-06-30 17:06:52 +08:00
chenlimao	422a93dbe2	fix: 首页ota更新失败弹窗增加关闭按钮	2026-06-29 15:44:52 +08:00
chenlimao	5c74edf001	fix: 修复版本号背景图展示不完全问题	2026-06-29 15:11:06 +08:00
chenlimao	937308e51d	feat: OTA部分接口对接后端	2026-06-29 13:41:28 +08:00
chenlimao	165f1a40bd	Merge branch 'test' into ota-mode # Conflicts: # src/apis.js	2026-06-26 14:45:51 +08:00
chenlimao	35c49bbb10	feat: OTA部分对接代码提交	2026-06-26 14:43:44 +08:00
zhangyi	ad0fb0b337	update:教练点评判断优化	2026-06-26 11:04:51 +08:00
zhangyi	02290615e8	update:教练点评判断优化	2026-06-26 11:04:24 +08:00
zhangyi	df628b48c6	update:优化套餐说明	2026-06-26 10:32:25 +08:00
zhangyi	ca6bba4dff	update:优化套餐说明	2026-06-26 10:32:06 +08:00
zhangyi	c435372d33	Merge branch 'feat-vip' into test	2026-06-25 18:16:54 +08:00
zhangyi	4c32bbfb13	update:对接会员限制次数	2026-06-25 18:16:13 +08:00
zhangyi	b6b517be9e	Merge branch 'feat-vip' into test	2026-06-24 17:10:24 +08:00
zhangyi	4bea563109	update:更新靶纸，新增约战次数	2026-06-24 17:09:34 +08:00
chenlimao	54e5427a77	fix：新增更新中图片&设备页面新增跳转wifi页面入口	2026-06-09 09:59:13 +08:00
chenlimao	9b47b313a7	fix：wifi页面底部弹窗错误文案样式修改	2026-06-03 16:07:47 +08:00
chenlimao	350c6373ab	fix：修复wifi弹窗不同输入法导致的结构错层	2026-06-03 13:42:48 +08:00
chenlimao	048b0e9fa9	fix：OTA弹窗新增更新中状态弹窗	2026-06-03 10:09:27 +08:00
chenlimao	39d34d5bff	fix：wifi页面各种更新状态UI样式优化	2026-06-02 17:55:18 +08:00
chenlimao	37f4f0c019	fix：wifi页面密码查看图标引入	2026-06-02 16:50:10 +08:00
chenlimao	e9cd9c8c9f	fix：wifi页面新增授权失败的逻辑	2026-06-02 15:52:31 +08:00
chenlimao	73a41ab897	fix：wifi页面wifi列表新增刷新功能	2026-06-02 15:30:31 +08:00
chenlimao	32c37e283f	fix：wifi页面弹窗隐藏逻辑修改&密码输入框新增查看密码功能	2026-06-02 15:03:10 +08:00
chenlimao	209103742d	fix：wifi页面解决输入框遮住问题	2026-06-02 14:48:24 +08:00
chenlimao	27d11a8129	fix：小程序获取wifi兼容iso设备	2026-06-01 18:10:17 +08:00
chenlimao	c9ea368a19	fix：wifi页面列表样式优化	2026-06-01 17:46:18 +08:00
chenlimao	b5e7e72104	fix：已连接网络模块结构样式完成	2026-06-01 17:09:14 +08:00
chenlimao	7a00c1bb1f	fix：OTA弹窗+wifi页面结构样式修改	2026-06-01 16:44:08 +08:00