更换图片地址

BUG修复
细节完善
2026-04-07 16:27:49 +08:00 · 2026-02-10 18:13:11 +08:00 · 2026-02-10 17:03:25 +08:00 · 2026-02-10 14:48:07 +08:00 · 2026-02-10 11:47:20 +08:00 · 2026-02-10 11:47:09 +08:00
23 changed files with 156 additions and 398 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "i18n-ally.localesPaths": []
+}
--- a/src/apis.js
+++ b/src/apis.js
@@ -270,78 +270,6 @@ export const readyGameAPI = (battleId) => {
  });
 };

-export const getGameAPI = async (battleId) => {
-  const result = await request("POST", "/user/battle/detail", {
-    id: battleId,
-  });
-  if (!result.battleStats) return {};
-  const {
-    battleStats = {},
-    playerStats = {},
-    goldenRoundRecords = [],
-  } = result;
-  const data = {
-    id: battleId,
-    mode: battleStats.mode, // 1.几V几 2.大乱斗
-    gameMode: battleStats.gameMode, // 1.约战 2.排位
-    teamSize: battleStats.teamSize,
-  };
-  if (battleStats && battleStats.mode === 1) {
-    data.winner = battleStats.winner;
-    data.roundsData = {};
-    data.redPlayers = {};
-    data.bluePlayers = {};
-    data.mvps = [];
-    data.goldenRounds =
-      goldenRoundRecords && goldenRoundRecords.length ? goldenRoundRecords : [];
-    playerStats.forEach((item) => {
-      const { playerBattleStats = {}, roundRecords = [] } = item;
-      if (playerBattleStats.team === 0) {
-        data.redPlayers[playerBattleStats.playerId] = playerBattleStats;
-      }
-      if (playerBattleStats.team === 1) {
-        data.bluePlayers[playerBattleStats.playerId] = playerBattleStats;
-      }
-      if (playerBattleStats.mvp) {
-        data.mvps.push(playerBattleStats);
-      }
-      roundRecords.forEach((round) => {
-        data.roundsData[round.roundNumber] = {
-          ...data.roundsData[round.roundNumber],
-          [round.playerId]: round.arrowHistory,
-        };
-      });
-    });
-    const totalRounds = Object.keys(data.roundsData).length;
-    (goldenRoundRecords || []).forEach((item, index) => {
-      item.arrowHistory.forEach((arrow) => {
-        if (!data.roundsData[totalRounds + index + 1]) {
-          data.roundsData[totalRounds + index + 1] = {};
-        }
-        if (!data.roundsData[totalRounds + index + 1][arrow.playerId]) {
-          data.roundsData[totalRounds + index + 1][arrow.playerId] = [];
-        }
-        data.roundsData[totalRounds + index + 1][arrow.playerId].push(arrow);
-      });
-    });
-
-    data.mvps.sort((a, b) => b.totalRings - a.totalRings);
-  }
-  if (battleStats && battleStats.mode === 2) {
-    data.players = [];
-    playerStats.forEach((item) => {
-      data.players.push({
-        ...item.playerBattleStats,
-        arrowHistory: item.roundRecords[0].arrowHistory,
-      });
-    });
-    data.players = data.players.sort((a, b) => b.totalScore - a.totalScore);
-  }
-  // console.log("game result:", result);
-  // console.log("format data:", data);
-  return data;
-};
-
 export const simulShootAPI = (device_id, x, y) => {
  const data = {
    device_id,
@@ -354,39 +282,12 @@ export const simulShootAPI = (device_id, x, y) => {
 };

 export const getBattleListAPI = async (page, battleType) => {
-  const data = [];
  const result = await request("POST", "/user/battle/details/list", {
    page,
+    pageSize: 10,
    battleType,
-    modeType: 0,
  });
-  (result.Battles || []).forEach((item) => {
-    let name = "";
-    if (item.battleStats.mode === 1) {
-      name = `${item.playerStats.length / 2}V${item.playerStats.length / 2}`;
-    }
-    if (item.battleStats.mode === 2) {
-      name = `${item.playerStats.length}人大乱斗`;
-    }
-    data.push({
-      name,
-      battleId: item.battleStats.battleId,
-      mode: item.battleStats.mode,
-      createdAt: item.battleStats.createdAt,
-      gameEndAt: item.battleStats.gameEndAt,
-      winner: item.battleStats.winner,
-      players: item.playerStats
-        .map((p) => p.playerBattleStats)
-        .sort((a, b) => b.totalScore - a.totalScore),
-      redPlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 0)
-        .map((p) => p.playerBattleStats),
-      bluePlayers: item.playerStats
-        .filter((p) => p.playerBattleStats.team === 1)
-        .map((p) => p.playerBattleStats),
-    });
-  });
-  return data;
+  return result.list;
 };

 export const getRankListAPI = () => {
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -1,3 +1,5 @@
+import { formatTimestamp } from "@/util";
+
 const loadImage = (src) =>
  new Promise((resolve, reject) => {
    try {
@@ -635,7 +637,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
      }
      renderText(
        ctx,
-        item.ring,
+        item.ringX ? "X" : item.ring,
        18,
        "#fed847",
        29.5 + (i % 9) * 30,
@@ -657,7 +659,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
      }
      renderText(
        ctx,
-        item.ring,
+        item.ringX ? "X" : item.ring,
        23,
        "#fed847",
        43 + rowIndex * 42,
@@ -737,9 +739,7 @@ export async function sharePractiseData(canvasId, type, user, data) {

    let subTitle = "正式开启弓箭手之路";
    if (type > 1) {
-      subTitle = `今日弓箭练习打卡 ${data.createdAt
-        .split(" ")[0]
-        .replaceAll("-", ".")}`;
+      subTitle = `今日弓箭练习打卡 ${formatTimestamp(data.startTime)}`;
    }

    ctx.drawImage(titleImg, (width - 160) / 2, 160, 160, 40);
@@ -748,14 +748,14 @@ export async function sharePractiseData(canvasId, type, user, data) {
    renderText(ctx, subTitle, 18, "#fff", width / 2, 224, "center");

    renderText(ctx, "共", 14, "#fff", 122, 300);
-    const totalRing = data.arrows.reduce((last, next) => last + next.ring, 0);
+    const totalRing = data.details.reduce((last, next) => last + next.ring, 0);
    renderText(ctx, totalRing, 14, "#fed847", 148, 300, "center");
    renderText(ctx, "环", 14, "#fff", 161, 300);

    renderLine(ctx, 77);
    renderLine(ctx, 185);

-    renderScores(ctx, data.arrows, scoreBgImg);
+    renderScores(ctx, data.details, scoreBgImg);

    ctx.drawImage(qrCodeImg, width * 0.06, height * 0.87, 52, 52);
    renderText(ctx, "射灵平台", 12, "#fff", width * 0.26, height * 0.9);
--- a/src/components/BattleHeader.vue
+++ b/src/components/BattleHeader.vue
@@ -73,7 +73,7 @@ defineProps({
          <text class="player-name">{{ player.name }}</text>
        </view>
        <image
-          v-if="winner === 0"
+          v-if="winner === 2"
          src="../static/winner-badge.png"
          mode="widthFix"
          class="right-winner-badge"
--- a/src/components/BowData.vue
+++ b/src/components/BowData.vue
@@ -49,16 +49,16 @@ const props = defineProps({
    <view class="desc">
      <text>{{ arrows.length }}</text>
      <text>支箭，共</text>
-      <text>{{ arrows.reduce((a, b) => a + b.ring, 0) }}</text>
+      <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
      <text>环</text>
    </view>
    <ScorePanel
      :completeEffect="false"
-      :rowCount="arrows.length === 12 ? 6 : 9"
+      :rowCount="total === 12 ? 6 : 9"
      :total="total"
      :arrows="arrows"
-      :margin="arrows.length === 12 ? 4 : 1"
-      :fontSize="arrows.length === 12 ? 25 : 22"
+      :margin="total === 12 ? 4 : 1"
+      :fontSize="total === 12 ? 25 : 22"
    />
  </view>
 </template>
--- a/src/components/HeaderProgress.vue
+++ b/src/components/HeaderProgress.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 import audioManager from "@/audioManager";
-import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import { getDirectionText } from "@/util";

 import useStore from "@/store";
@@ -55,11 +55,9 @@ async function onReceiveMessage(message) {
    totalShot.value = mode === 1 ? 3 : 2;
    currentRoundEnded.value = true;
    audioManager.play("比赛开始");
-  }
-  if (type === MESSAGETYPESV2.BattleEnd) {
+  } else if (type === MESSAGETYPESV2.BattleEnd) {
    audioManager.play("比赛结束");
-  }
-  if (type === MESSAGETYPESV2.ShootResult) {
+  } else if (type === MESSAGETYPESV2.ShootResult) {
    if (melee.value && current.playerId !== user.value.id) return;
    if (current.playerId === user.value.id) currentShot.value++;
    if (message.shootData) {
@@ -73,11 +71,16 @@ async function onReceiveMessage(message) {
        key.push(`向${getDirectionText(shootData.angle)}调整`);
      audioManager.play(key, false);
    }
-  }
-  if (type === MESSAGETYPESV2.NewRound) {
+  } else if (type === MESSAGETYPESV2.NewRound) {
    currentShot.value = 0;
    currentRound.value = current.round;
    currentRoundEnded.value = true;
+  } else if (type === MESSAGETYPESV2.InvalidShot) {
+    uni.showToast({
+      title: "距离不足，无效",
+      icon: "none",
+    });
+    audioManager.play("射击无效");
  }
 }

--- a/src/components/PlayersRow.vue
+++ b/src/components/PlayersRow.vue
@@ -1,137 +0,0 @@
-<script setup>
-defineProps({
-  avatar: {
-    type: String,
-    default: "",
-  },
-  blueTeam: {
-    type: Array,
-    default: () => [],
-  },
-  redTeam: {
-    type: Array,
-    default: () => [],
-  },
-  currentShooterId: {
-    type: Number,
-    default: 0,
-  },
-});
-</script>
-
-<template>
-  <view class="container">
-    <image v-if="avatar" class="avatar" :src="avatar" mode="widthFix" />
-    <view
-      v-if="blueTeam.length && redTeam.length"
-      :style="{ height: 20 + blueTeam.length * 20 + 'px' }"
-    >
-      <view
-        v-for="(player, index) in blueTeam"
-        :key="index"
-        :style="{
-          top: index * 20 + 'px',
-          zIndex: blueTeam.length - index,
-          left: 0,
-        }"
-      >
-        <image
-          class="avatar"
-          :src="player.avatar || '../static/user-icon.png'"
-          mode="widthFix"
-          :style="{
-            borderColor: currentShooterId === player.id ? '#5fadff' : '#fff',
-          }"
-        />
-        <text
-          :style="{
-            color: currentShooterId === player.id ? '#5fadff' : '#fff',
-            fontSize: currentShooterId === player.id ? 16 : 12 + 'px',
-          }"
-        >
-          {{ player.name }}
-        </text>
-      </view>
-    </view>
-    <view
-      v-if="!avatar"
-      :style="{
-        height: 20 + redTeam.length * 20 + 'px',
-      }"
-    >
-      <view
-        v-for="(player, index) in redTeam"
-        :key="index"
-        :style="{
-          top: index * 20 + 'px',
-          zIndex: redTeam.length - index,
-          right: 0,
-        }"
-      >
-        <text
-          :style="{
-            color: currentShooterId === player.id ? '#ff6060' : '#fff',
-            fontSize: currentShooterId === player.id ? 16 : 12 + 'px',
-            textAlign: 'right',
-          }"
-        >
-          {{ player.name }}
-        </text>
-        <image
-          class="avatar"
-          :src="player.avatar || '../static/user-icon.png'"
-          mode="widthFix"
-          :style="{
-            borderColor: currentShooterId === player.id ? '#ff6060' : '#fff',
-          }"
-        />
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped>
-.container {
-  width: calc(100% - 30px);
-  margin: 0 15px;
-  margin-top: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-}
-.container > view {
-  width: 50%;
-  position: relative;
-}
-.container > view > view {
-  position: absolute;
-  top: -20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 0.3s linear;
-}
-.container > view > view > text {
-  margin: 0 10px;
-  overflow: hidden;
-  width: 120px;
-  transition: all 0.3s linear;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.avatar {
-  width: 40px;
-  height: 40px;
-  min-width: 40px;
-  min-height: 40px;
-  border: 1px solid #fff;
-  border-radius: 50%;
-}
-.red-avatar {
-  border: 1px solid #ff6060;
-}
-.blue-avatar {
-  border: 1px solid #5fadff;
-}
-</style>
--- a/src/components/ScoreResult.vue
+++ b/src/components/ScoreResult.vue
@@ -56,16 +56,20 @@ onMounted(() => {
  );
 });

-const validArrows = computed(() => {
-  return (props.result.details || []).filter(
-    (arrow) => arrow.x !== -30 && arrow.y !== -30
-  ).length;
-});
-
 const getRing = (arrow) => {
  if (arrow.ringX) return "X";
-  return arrow.ring ? arrow.ring + "环" : "-";
+  return arrow.ring ? arrow.ring : "-";
 };
+
+const arrows = computed(() => {
+  const data = new Array(props.total).fill({ ring: 0 });
+  (props.result.details || []).forEach((arrow, index) => {
+    data[index] = arrow;
+  });
+  return data;
+});
+
+const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
 </script>

 <template>
@@ -96,8 +100,8 @@ const getRing = (arrow) => {
      </view>
      <view :style="{ gridTemplateColumns: `repeat(${rowCount}, 1fr)` }">
        <view v-for="(_, index) in new Array(total).fill(0)" :key="index">
-          {{ getRing(result.details[index])
-          }}<text v-if="getRing(result.details[index]) !== '-'">环</text>
+          {{ getRing(arrows[index])
+          }}<text v-if="getRing(arrows[index]) !== '-'">环</text>
        </view>
      </view>
      <view>
@@ -160,7 +164,7 @@ const getRing = (arrow) => {
      </view>
    </ScreenHint>
    <BowData
-      :total="result.details.length"
+      :total="arrows.length"
      :arrows="result.details"
      :show="showBowData"
      :onClose="() => (showBowData = false)"
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -143,6 +143,12 @@ async function onReceiveMessage(msg) {
  } else if (msg.type === MESSAGETYPESV2.HalfRest) {
    halfTime.value = true;
    audioManager.play("中场休息");
+  } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
+    uni.showToast({
+      title: "距离不足，无效",
+      icon: "none",
+    });
+    audioManager.play("射击无效");
  }
 }

--- a/src/components/Signin.vue
+++ b/src/components/Signin.vue
@@ -87,28 +87,34 @@ const handleLogin = async () => {
    });
  }
  loading.value = true;
-  const wxResult = await wxLogin();
-  const fileManager = uni.getFileSystemManager();
-  const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
-  const base64Url = `data:image/png;base64,${avatarBase64}`;
-  const result = await loginAPI(
-    phone.value,
-    nickName.value,
-    base64Url,
-    wxResult.code
-  );
-  const data = await getHomeData();
-  if (data.user) updateUser(data.user);
-  const devices = await getMyDevicesAPI();
-  if (devices.bindings && devices.bindings.length) {
-    updateDevice(devices.bindings[0].deviceId, devices.bindings[0].deviceName);
-    try {
+  try {
+    const wxResult = await wxLogin();
+    const fileManager = uni.getFileSystemManager();
+    const avatarBase64 = fileManager.readFileSync(avatarUrl.value, "base64");
+    const base64Url = `data:image/png;base64,${avatarBase64}`;
+    const result = await loginAPI(
+      phone.value,
+      nickName.value,
+      base64Url,
+      wxResult.code
+    );
+    const data = await getHomeData();
+    if (data.user) updateUser(data.user);
+    const devices = await getMyDevicesAPI();
+    if (devices.bindings && devices.bindings.length) {
+      updateDevice(
+        devices.bindings[0].deviceId,
+        devices.bindings[0].deviceName
+      );
      const data = await getDeviceBatteryAPI();
      updateOnline(data.online);
-    } catch (error) {}
+    }
+    props.onClose();
+  } catch (error) {
+    console.log("login error", error);
+  } finally {
+    loading.value = false;
  }
-  loading.value = false;
-  props.onClose();
 };

 const openServiceLink = () => {
--- a/src/constants.js
+++ b/src/constants.js
@@ -40,6 +40,7 @@ export const MESSAGETYPESV2 = {
  HalfRest: 7,
  TestDistance: 8,
  MatchSuccess: 9,
+  InvalidShot: 10,
 };

 export const topThreeColors = ["#FFD947", "#D2D2D2", "#FFA515"];
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, computed, onBeforeUnmount } from "vue";
 import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import PlayerSeats from "@/components/PlayerSeats.vue";
@@ -188,6 +188,18 @@ const removePlayer = async (player) => {
  await kickPlayerAPI(roomNumber.value, player.id);
 };

+const canClick = computed(() => {
+  if (ready.value) return false;
+  const { members = [] } = room.value;
+  if (members.length < 2) return false;
+  if (
+    owner.value.id === user.value.id &&
+    members.some((m) => !m.userInfo.state && m.userInfo.id !== owner.value.id)
+  )
+    return false;
+  return true;
+});
+
 onShareAppMessage(() => {
  return {
    title: "邀请您进入房间对战",
@@ -373,14 +385,16 @@ onBeforeUnmount(() => {
        :removePlayer="removePlayer"
      />
      <view>
-        <SButton :disabled="ready" :onClick="getReady">{{
-          allReady.value
-            ? "即将进入对局..."
-            : owner.id === user.id && (room.members || []).length > 2
-            ? "开始对局"
-            : "我准备好了"
-        }}</SButton>
-        <text class="tips">所有人准备后自动开始游戏。</text>
+        <SButton :disabled="!canClick" :onClick="getReady">
+          {{
+            allReady.value
+              ? "即将进入对局..."
+              : owner.id === user.id
+              ? "开始对局"
+              : "我准备好了"
+          }}
+        </SButton>
+        <text class="tips">所有人准备好后由房主点击开始</text>
      </view>
    </view>
  </Container>
--- a/src/pages/device-intro.vue
+++ b/src/pages/device-intro.vue
@@ -5,15 +5,15 @@ import SButton from "@/components/SButton.vue";
 import { capsuleHeight } from "@/util";

 const images = [
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmf6yitekatwe.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmi475gqdtrvx.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmgy8ej5wuap5.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmg6y7nveaadv.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlqg9zxastyn3.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlfr041aedqmb.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-12-04/depguhlpnlyxndnor5.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-09-04/dcjmxsmg68a8mezgzx.jpg",
-  "https://static.shelingxingqiu.com/attachment/2025-10-14/ddht51a3hiyw7ueli4.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_01.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_02.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_03.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_04.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_05.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_06.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_07.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_08.jpg",
+  "https://static.shelingxingqiu.com/mall/images/mall_09.jpg",
 ];

 const addBg = ref(false);
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -129,7 +129,7 @@ const nextStep = async () => {
    btnDisabled.value = true;
    step.value = 2;
    title.value = "-感知距离";
-    const result = await createPractiseAPI(total, 360);
+    const result = await createPractiseAPI(total, 120);
    if (result) practiseId.value = result.id;
  } else if (step.value === 2) {
    showGuide.value = false;
@@ -166,7 +166,7 @@ const onClose = async () => {
    start.value = false;
    scores.value = [];
    step.value = 3;
-    const result = await createPractiseAPI(total, 360);
+    const result = await createPractiseAPI(total, 120);
    if (result) practiseId.value = result.id;
  }
 };
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -39,11 +39,11 @@ const toPage = async (path) => {
    showModal.value = true;
    return;
  }
-  if (path === "/pages/first-try") {
-    // if (canEenter(user.value, device.value, online.value, path)) {
-    //   await uni.$checkAudio();
-    // } 
-  }
+  // if (path === "/pages/first-try") {
+  // if (canEenter(user.value, device.value, online.value, path)) {
+  //   await uni.$checkAudio();
+  // }
+  // }
  uni.navigateTo({ url: path });
 };

@@ -75,7 +75,6 @@ onShow(async () => {
      if ("823,209,293,257".indexOf(homeData.user.id) !== -1) {
        const show = uni.getStorageSync("show-the-user");
        if (!show) {
-          showTheUser.value = true;
          uni.setStorageSync("show-the-user", true);
        }
      }
--- a/src/pages/match-detail.vue
+++ b/src/pages/match-detail.vue
@@ -16,7 +16,7 @@ const players = ref([]);

 onLoad(async (options) => {
  if (!options.battleId) return;
-  battleId.value = options.battleId || "60143330377469952";
+  battleId.value = options.battleId || "60510101693403136";
  const result = await getBattleAPI(battleId.value);
  data.value = result;
  if (result.mode > 3) {
@@ -128,7 +128,7 @@ const checkBowData = (selected) => {
            <text :style="{ color: team == 1 ? '#64BAFF' : '#FF6767' }">
              {{ round.shoots[team].reduce((acc, cur) => acc + cur.ring, 0) }}环
            </text>
-            <text>得分 {{ round.scores[team].totalRing }}</text>
+            <text>得分 {{ round.scores[team].score }}</text>
          </view>
        </view>
      </view>
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -12,7 +12,6 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import audioManager from "@/audioManager";
 import { getBattleAPI, laserCloseAPI } from "@/apis";
-import { isGameEnded } from "@/util";
 import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -103,9 +102,11 @@ async function onReceiveMessage(msg) {
    halfRest.value = true;
    tips.value = "准备下半场";
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    uni.redirectTo({
-      url: "/pages/battle-result?battleId=" + msg.matchId,
-    });
+    setTimeout(() => {
+      uni.redirectTo({
+        url: "/pages/battle-result?battleId=" + msg.matchId,
+      });
+    }, 1000);
  }
 }
 onMounted(async () => {
--- a/src/pages/mine-bow-data.vue
+++ b/src/pages/mine-bow-data.vue
@@ -14,11 +14,10 @@ const arrows = ref([]);
 const total = ref(0);

 onLoad(async (options) => {
-  if (options.id) {
-    const result = await getPractiseAPI(options.id);
-    arrows.value = result.arrows;
-    total.value = result.completed_arrows;
-  }
+  if (!options.id) return;
+  const result = await getPractiseAPI(options.id || 176);
+  arrows.value = result.details;
+  total.value = result.details.length;
 });
 </script>

--- a/src/pages/my-growth.vue
+++ b/src/pages/my-growth.vue
@@ -17,7 +17,7 @@ const practiseList = ref([]);

 const toMatchDetail = (id) => {
  uni.navigateTo({
-    url: `/pages/match-detail?id=${id}`,
+    url: `/pages/match-detail?battleId=${id}`,
  });
 };
 const getPractiseDetail = async (id) => {
@@ -52,6 +52,10 @@ const onPractiseLoading = async (page) => {
  }
  return result.length;
 };
+const getName = (battle) => {
+  if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
+  return battle.mode + "人大乱斗";
+};
 </script>

 <template>
@@ -80,19 +84,19 @@ const onPractiseLoading = async (page) => {
            <view
              v-for="(item, index) in matchList"
              :key="index"
-              @click="() => toMatchDetail(item.battleId)"
+              @click="() => toMatchDetail(item.id)"
            >
              <view class="contest-header">
-                <text>{{ item.name }}</text>
-                <text>{{ item.createdAt }}</text>
+                <text>{{ getName(item) }}</text>
+                <text>{{ item.createTime }}</text>
                <image src="../static/back.png" mode="widthFix" />
              </view>
              <BattleHeader
-                :players="item.mode === 1 ? [] : item.players"
-                :blueTeam="item.bluePlayers"
-                :redTeam="item.redPlayers"
-                :winner="item.winner"
-                :showRank="item.mode === 2"
+                :players="item.teams[0] ? item.teams[0].players : []"
+                :blueTeam="item.teams[1] ? item.teams[1].players : []"
+                :redTeam="item.teams[2] ? item.teams[2].players : []"
+                :winner="item.winTeam"
+                :showRank="item.teams[0]"
                :showHeader="false"
              />
            </view>
@@ -103,19 +107,19 @@ const onPractiseLoading = async (page) => {
            <view
              v-for="(item, index) in battleList"
              :key="index"
-              @click="() => toMatchDetail(item.battleId)"
+              @click="() => toMatchDetail(item.id)"
            >
              <view class="contest-header">
-                <text>{{ item.name }}</text>
-                <text>{{ item.createdAt }}</text>
+                <text>{{ getName(item) }}</text>
+                <text>{{ item.createTime }}</text>
                <image src="../static/back.png" mode="widthFix" />
              </view>
              <BattleHeader
-                :players="item.mode === 1 ? [] : item.players"
-                :blueTeam="item.bluePlayers"
-                :redTeam="item.redPlayers"
-                :winner="item.winner"
-                :showRank="item.mode === 2"
+                :players="item.teams[0] ? item.teams[0].players : []"
+                :blueTeam="item.teams[1] ? item.teams[1].players : []"
+                :redTeam="item.teams[2] ? item.teams[2].players : []"
+                :winner="item.winTeam"
+                :showRank="item.teams[0]"
                :showHeader="false"
              />
            </view>
@@ -131,7 +135,7 @@ const onPractiseLoading = async (page) => {
            >
              <text
                >{{ item.completed_arrows === 36 ? "耐力挑战" : "单组练习" }}
-                {{ item.createdAt }}</text
+                {{ item.createTime }}</text
              >
              <image src="../static/back.png" mode="widthFix" />
            </view>
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -21,7 +21,7 @@ import {
 } from "@/apis";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
-import { MESSAGETYPESV2, MESSAGETYPES, roundsName } from "@/constants";
+import { MESSAGETYPESV2, roundsName } from "@/constants";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -31,7 +31,6 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 12;
-const currentRound = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -39,7 +38,6 @@ const tips = ref("");

 const onReady = async () => {
  await startPractiseAPI();
-  currentRound.value = 0;
  scores.value = [];
  start.value = true;
  audioManager.play("练习开始");
@@ -56,26 +54,6 @@ async function onReceiveMessage(msg) {
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    setTimeout(onOver, 1500);
  }
-  // messages.forEach((msg) => {
-  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
-  //     if (scores.value.length < total) {
-  //       scores.value.push(msg.target);
-  //       currentRound.value += 1;
-  //       if (currentRound.value === 4) {
-  //         currentRound.value = 1;
-  //       }
-  //       if (practiseId && scores.value.length === total / 2) {
-  //         showGuide.value = true;
-  //         setTimeout(() => {
-  //           showGuide.value = false;
-  //         }, 3000);
-  //       }
-  //       if (scores.value.length === total) {
-  //         setTimeout(onOver, 1500);
-  //       }
-  //     }
-  //   }
-  // });
 }

 async function onComplete() {
@@ -89,8 +67,7 @@ async function onComplete() {
    practiseResult.value = {};
    start.value = false;
    scores.value = [];
-    currentRound.value = 0;
-    const result = await createPractiseAPI(total, 360);
+    const result = await createPractiseAPI(total, 120);
    if (result) practiseId.value = result.id;
  }
 }
@@ -152,7 +129,7 @@ onBeforeUnmount(() => {
        </view>
        <BowTarget
          :totalRound="start ? total / 4 : 0"
-          :currentRound="currentRound"
+          :currentRound="scores.length % 3"
          :scores="scores"
        />
        <ScorePanel2 :arrows="scores" />
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -4,7 +4,6 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import BowTarget from "@/components/BowTarget.vue";
-import PlayersRow from "@/components/PlayersRow.vue";
 import BattleFooter from "@/components/BattleFooter.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import SButton from "@/components/SButton.vue";
@@ -13,8 +12,7 @@ import TestDistance from "@/components/TestDistance.vue";
 import TeamAvatars from "@/components/TeamAvatars.vue";
 import ShootProgress2 from "@/components/ShootProgress2.vue";
 import { laserCloseAPI, getBattleAPI } from "@/apis";
-import { isGameEnded, formatTimestamp } from "@/util";
-import { MESSAGETYPES, MESSAGETYPESV2, roundsName } from "@/constants";
+import { MESSAGETYPESV2 } from "@/constants";
 import audioManager from "@/audioManager";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -129,9 +127,11 @@ async function onReceiveMessage(msg) {
      }, 2000);
      return;
    }
-    uni.redirectTo({
-      url: "/pages/battle-result?battleId=" + msg.matchId,
-    });
+    setTimeout(() => {
+      uni.redirectTo({
+        url: "/pages/battle-result?battleId=" + msg.matchId,
+      });
+    }, 1000);
  }
 }

--- a/src/util.js
+++ b/src/util.js
@@ -1,5 +1,3 @@
-import { getUserGameState, getGameAPI } from "@/apis";
-
 export const formatTimestamp = (timestamp) => {
  const date = new Date(timestamp * 1000);
  const year = date.getFullYear();
@@ -89,27 +87,6 @@ export const wxShare = async (canvasId = "shareCanvas") => {
  }
 };

-export const isGameEnded = async (battleId) => {
-  const state = await getUserGameState();
-  if (!state.gaming) {
-    const result = await getGameAPI(battleId);
-    if (result.mode) {
-      uni.redirectTo({
-        url: `/pages/battle-result?battleId=${battleId}`,
-      });
-    } else {
-      uni.showToast({
-        title: "比赛已结束",
-        icon: "none",
-      });
-      setTimeout(() => {
-        uni.navigateBack();
-      }, 1000);
-    }
-  }
-  return !state.gaming;
-};
-
 // 获取元素尺寸和位置信息
 export const getElementRect = (classname) => {
  return new Promise((resolve) => {
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -47,9 +47,9 @@ function createWebSocket(token, onMessage) {
  uni.onSocketMessage((res) => {
    const { data, event } = JSON.parse(res.data);
    if (event === "pong") return;
-    if (data.type && data.data) {
+    if (data.type) {
      console.log("收到消息：", getMessageTypeName(data.type), data.data);
-      if (onMessage) onMessage({ ...data.data, type: data.type });
+      if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
      return;
    }
    if (onMessage && data.updates) onMessage(data.updates);
Author	SHA1	Message	Date
kron	1181a2133a	更换图片地址	2026-04-07 16:27:49 +08:00
kron	b9bb1e6653	BUG修复	2026-02-10 18:13:11 +08:00
kron	608de34dd3	细节完善	2026-02-10 17:03:25 +08:00
kron	88f1ef5d95	细节完善	2026-02-10 14:48:07 +08:00
kron	b0bf1880e4	完善个人练习分享	2026-02-10 11:47:20 +08:00
kron	812879d252	完善我的成长	2026-02-10 11:47:09 +08:00
kron	303e1830d3	BUG修复	2026-02-10 11:32:53 +08:00
kron	61ff1af4c3	细节完善	2026-02-10 09:20:01 +08:00
kron	a3a9f7b351	细节完善	2026-02-09 18:16:48 +08:00
kron	4801833fa9	删除无用文件	2026-02-09 18:16:39 +08:00