From 1eab5a151e735e9b8e360047780e6679c5785409 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Mon, 2 Jun 2025 14:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis.js                  |   7 --
 src/components/Container.vue |   4 +
 src/pages/first-try.vue      | 197 ++++++++++++++++++-----------------
 src/pages/index.vue          |  18 +---
 src/pages/user.vue           |   5 +-
 src/store.js                 |   6 +-
 6 files changed, 118 insertions(+), 119 deletions(-)

diff --git a/src/apis.js b/src/apis.js
index 32e87a1..5e785ea 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -119,10 +119,3 @@ export const readyGameAPI = (battleId) => {
     battleId,
   });
 };
-
-export const finishGameAPI = (battleId, arrow) => {
-  return request("POST", "/user/game/shoot", {
-    battleId,
-    arrow,
-  });
-};
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 7a76c57..11f0253 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -28,5 +28,9 @@ defineProps({
   width: 100%;
   height: calc(100vh - 96px);
   overflow: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
 }
 </style>
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index 1631d1b..39105af 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -46,6 +46,7 @@ onMounted(() => {
         if (scores.value.length === total) {
           showScore.value = true;
         }
+        // if (step.value === 2 && msg.target.dst / 100 > 5) {
         if (step.value === 2 && msg.target.dst > 5) {
           btnDisabled.value = false;
         }
@@ -68,7 +69,6 @@ const nextStep = async () => {
   if (step.value === 0) {
     step.value = 1;
   } else if (step.value === 1) {
-    await createPractise(1);
     btnDisabled.value = true;
     step.value = 2;
   } else if (step.value === 2) {
@@ -95,109 +95,116 @@ const onClose = () => {
 
 <template>
   <Container :bgType="1" title="新手试炼场">
-    <Guide v-if="step !== 4" :tall="step === 2 || step === 5">
-      <text v-if="step === 0">
-        hi，<text :style="{ color: '#fed847' }">{{ user.nickName }}</text>
-        ，这是新人必刷小任务，0基础小白也能快速掌握弓箭技巧和游戏规则哦~：）
-      </text>
-      <text v-if="step === 1"
-        >这是我们人帅技高的高教练。首先，请按教练示范，尝试自己去做这些动作和手势吧。</text
-      >
-      <view v-if="step === 2">
-        <view :style="{ display: 'flex', flexDirection: 'column' }">
-          <text :style="{ color: '#fed847' }">你知道5米射程有多远吗？</text>
-          <text>
-            在我们的排位赛中，射程小于5米的成绩无效、哦！建议平时练习距离至少5米。现在，来边射箭边调整你的站位点吧！
-          </text>
-        </view>
-      </view>
-      <view v-if="step === 3">
-        <view :style="{ display: 'flex', flexDirection: 'column' }">
-          <text :style="{ color: '#fed847' }">一切准备就绪</text>
-          <text>试着完成一个真正的弓箭手任务吧！</text>
-        </view>
-      </view>
-      <view v-if="step === 5">
-        <view
-          :style="{ display: 'flex', flexDirection: 'column', marginTop: 20 }"
+    <view class="container">
+      <Guide v-if="step !== 4" :tall="step === 2 || step === 5">
+        <text v-if="step === 0">
+          hi，<text :style="{ color: '#fed847' }">{{ user.nickName }}</text>
+          ，这是新人必刷小任务，0基础小白也能快速掌握弓箭技巧和游戏规则哦~：）
+        </text>
+        <text v-if="step === 1"
+          >这是我们人帅技高的高教练。首先，请按教练示范，尝试自己去做这些动作和手势吧。</text
         >
-          <text :style="{ color: '#fed847' }">新手试炼场通关啦，优秀！</text>
-          <text
-            >反曲弓运动基本知识和射灵世界系统规则你已Get，是不是挺容易呀：）</text
-          >
-          <!-- 这行是占位用的 -->
-          <text :style="{ opacity: 0 }">新手试炼场通关啦，优秀！</text>
+        <view v-if="step === 2">
+          <view :style="{ display: 'flex', flexDirection: 'column' }">
+            <text :style="{ color: '#fed847' }">你知道5米射程有多远吗？</text>
+            <text>
+              在我们的排位赛中，射程小于5米的成绩无效、哦！建议平时练习距离至少5米。现在，来边射箭边调整你的站位点吧！
+            </text>
+          </view>
         </view>
+        <view v-if="step === 3">
+          <view :style="{ display: 'flex', flexDirection: 'column' }">
+            <text :style="{ color: '#fed847' }">一切准备就绪</text>
+            <text>试着完成一个真正的弓箭手任务吧！</text>
+          </view>
+        </view>
+        <view v-if="step === 5">
+          <view
+            :style="{ display: 'flex', flexDirection: 'column', marginTop: 20 }"
+          >
+            <text :style="{ color: '#fed847' }">新手试炼场通关啦，优秀！</text>
+            <text
+              >反曲弓运动基本知识和射灵世界系统规则你已Get，是不是挺容易呀：）</text
+            >
+            <!-- 这行是占位用的 -->
+            <text :style="{ opacity: 0 }">新手试炼场通关啦，优秀！</text>
+          </view>
+        </view>
+      </Guide>
+      <image
+        src="../static/first-try-tip.png"
+        class="try-tip"
+        mode="widthFix"
+        v-if="step === 0"
+      />
+      <image
+        src="../static/first-try-tip2.png"
+        class="try-tip"
+        mode="widthFix"
+        v-if="step === 3"
+      />
+      <image
+        src="../static/first-try-tip3.png"
+        class="try-tip"
+        mode="widthFix"
+        v-if="step === 5"
+      />
+      <view style="height: 570px" v-if="step === 1">
+        <Swiper
+          :data="[
+            '../static/first-try-tip.png',
+            '../static/first-try-tip.png',
+            '../static/first-try-tip.png',
+          ]"
+        />
       </view>
-    </Guide>
-    <image
-      src="../static/first-try-tip.png"
-      class="try-tip"
-      mode="widthFix"
-      v-if="step === 0"
-    />
-    <image
-      src="../static/first-try-tip2.png"
-      class="try-tip"
-      mode="widthFix"
-      v-if="step === 3"
-    />
-    <image
-      src="../static/first-try-tip3.png"
-      class="try-tip"
-      mode="widthFix"
-      v-if="step === 5"
-    />
-    <view style="height: 570px" v-if="step === 1">
-      <Swiper
-        :data="[
-          '../static/first-try-tip.png',
-          '../static/first-try-tip.png',
-          '../static/first-try-tip.png',
-        ]"
+      <ShootProgress
+        v-if="step === 4"
+        tips="请开始连续射箭"
+        :total="100"
+        :start="start"
+      />
+      <BowTarget
+        :avatar="user.avatarUrl"
+        :power="power"
+        :debug="step === 2"
+        v-if="step === 2 || step === 4"
+        :tips="
+          step === 2 && scores.length > 0
+            ? `本次射程${scores[scores.length - 1].dst / 100}米，${
+                scores[scores.length - 1].dst / 100 >= 5 ? '已' : '未'
+              }达到距离要求`
+            : ''
+        "
+        :scores="scores"
+      />
+      <ScorePanel
+        v-if="step === 4"
+        :total="total"
+        :rowCount="6"
+        :scores="scores.map((s) => s.ring)"
+      />
+      <ScoreResult
+        :total="total"
+        :rowCount="6"
+        :show="showScore"
+        v-if="step === 4"
+        :onClose="onClose"
+        :result="practiseResult"
       />
     </view>
-    <ShootProgress
-      v-if="step === 4"
-      tips="请开始连续射箭"
-      :total="100"
-      :start="start"
-    />
-    <BowTarget
-      :avatar="user.avatarUrl"
-      :power="power"
-      :debug="step === 2"
-      v-if="step === 2 || step === 4"
-      :tips="
-        step === 2 && scores.length > 0
-          ? `本次射程${scores[scores.length - 1].dst}米，${
-              scores[scores.length - 1].dst >= 5 ? '已' : '未'
-            }达到距离要求`
-          : ''
-      "
-      :scores="scores"
-    />
-    <ScorePanel
-      v-if="step === 4"
-      :total="total"
-      :rowCount="6"
-      :scores="scores.map((s) => s.ring)"
-    />
-    <ScoreResult
-      :total="total"
-      :rowCount="6"
-      :show="showScore"
-      v-if="step === 4"
-      :onClose="onClose"
-      :result="practiseResult"
-    />
-    <SButton v-if="step !== 4" :onClick="nextStep" :disabled="btnDisabled">{{
-      stepButtonTexts[step]
-    }}</SButton>
+    <view :style="{ marginBottom: '25px' }">
+      <SButton v-if="step !== 4" :onClick="nextStep" :disabled="btnDisabled">{{
+        stepButtonTexts[step]
+      }}</SButton>
+    </view>
   </Container>
 </template>
 
 <style scoped>
+.container {
+  width: 100%;
+}
 .try-tip {
   width: calc(100% - 20px);
   margin: 10px 10px;
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6f5cb70..cec9e66 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -8,6 +8,7 @@ import useStore from "@/store";
 
 import { storeToRefs } from "pinia";
 const store = useStore();
+const { updateConfig } = store;
 // 使用storeToRefs，用于UI里显示，保持响应性
 const { user } = storeToRefs(store);
 
@@ -61,28 +62,15 @@ const toMyDevicePage = () => {
   }
 };
 
-const toAddDevicePage = () => {
-  if (isLogin()) {
-    uni.navigateTo({
-      url: "/pages/add-device",
-    });
-  }
-};
-
-// 获取全局配置
-const getConfig = async () => {
+onMounted(async () => {
   try {
     const config = await getAppConfig();
     console.log("全局配置：", config);
+    updateConfig(config);
     // 这里可以处理配置数据
   } catch (error) {
     console.error("获取配置失败：", error);
   }
-};
-
-// 页面加载完成后检查本地存储的用户信息并获取配置
-onMounted(() => {
-  getConfig();
 });
 </script>
 
diff --git a/src/pages/user.vue b/src/pages/user.vue
index 07d3da2..a5bf989 100644
--- a/src/pages/user.vue
+++ b/src/pages/user.vue
@@ -59,7 +59,10 @@ const toRankIntroPage = () => {
         }"
         :onClick="toOrderPage"
       />
-      <UserItem title="新手试炼场" :onClick="toFristTryPage">
+      <UserItem
+        title="新手试炼场"
+        :onClick="user.trio > 1 ? null : toFristTryPage"
+      >
         <text v-if="user.trio > 1" :style="{ color: '#259249' }">已完成</text>
         <text v-else :style="{ color: '#CC311F' }">未完成</text>
       </UserItem>
diff --git a/src/store.js b/src/store.js
index ea2f1e2..a698800 100644
--- a/src/store.js
+++ b/src/store.js
@@ -14,6 +14,7 @@ export default defineStore("store", {
       id: "",
       deviceName: "",
     },
+    config: {},
   }),
 
   // 计算属性
@@ -32,6 +33,9 @@ export default defineStore("store", {
       this.device.id = deviceId;
       this.device.deviceName = deviceName;
     },
+    updateConfig(config) {
+      this.config = config;
+    },
   },
 
   // 开启数据持久化
@@ -40,7 +44,7 @@ export default defineStore("store", {
     strategies: [
       {
         storage: uni.getStorageSync,
-        paths: ["user", "device"], // 只持久化用户信息
+        paths: ["user", "device", "config"], // 只持久化用户信息
       },
     ],
   },