From 1de8ba6d9d90ba84e458206eb78cbeeab5cc70d2 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Mon, 14 Jul 2025 15:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=A1=86=E8=8E=B7=E5=8F=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Avatar.vue       |  8 ++++----
 src/components/BattleHeader.vue |  4 ++--
 src/components/BowData.vue      |  2 +-
 src/components/UserHeader.vue   |  4 ++--
 src/pages/my-growth.vue         |  8 ++++----
 src/pages/ranking.vue           |  2 +-
 src/store.js                    | 34 +++++++++++++++------------------
 7 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue
index 9d623d8..dc8290b 100644
--- a/src/components/Avatar.vue
+++ b/src/components/Avatar.vue
@@ -10,7 +10,7 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  score: {
+  rankLvl: {
     type: Number,
     default: undefined,
   },
@@ -33,10 +33,10 @@ const props = defineProps({
 });
 const avatarFrame = ref("");
 watch(
-  () => [config.value, props.score],
+  () => [config.value, props.rankLvl],
   () => {
-    if (props.score !== undefined) {
-      avatarFrame.value = getLvlImage(props.score);
+    if (props.rankLvl !== undefined) {
+      avatarFrame.value = getLvlImage(props.rankLvl);
     }
   },
   {
diff --git a/src/components/BattleHeader.vue b/src/components/BattleHeader.vue
index bce855b..ef3090c 100644
--- a/src/components/BattleHeader.vue
+++ b/src/components/BattleHeader.vue
@@ -50,7 +50,7 @@ defineProps({
     </view>
     <view v-if="blueTeam.length && redTeam.length" class="players">
       <view>
-        <Avatar :src="blueTeam[0].avatar" :score="blueTeam[0].totalScore" />
+        <Avatar :src="blueTeam[0].avatar" :rankLvl="blueTeam[0].rankLvl" />
         <text class="player-name">{{ blueTeam[0].name }}</text>
         <image
           v-if="winner === 1"
@@ -62,7 +62,7 @@ defineProps({
         <Avatar
           v-if="redTeam[0]"
           :src="redTeam[0].avatar"
-          :score="redTeam[0].totalScore"
+          :rankLvl="redTeam[0].rankLvl"
         />
         <text class="player-name">{{ redTeam[0].name }}</text>
         <image
diff --git a/src/components/BowData.vue b/src/components/BowData.vue
index bd9d1e2..2124a84 100644
--- a/src/components/BowData.vue
+++ b/src/components/BowData.vue
@@ -29,7 +29,7 @@ const props = defineProps({
     <AppBackground :type="1" />
     <view class="header">
       <view>
-        <Avatar :src="user.avatar" :score="user.scores" :size="45" />
+        <Avatar :src="user.avatar" :rankLvl="user.rankLvl" :size="45" />
         <view>
           <text>{{ user.nickName }}</text>
           <text>{{ user.lvlName }}</text>
diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue
index 9e9e0cd..28a9049 100644
--- a/src/components/UserHeader.vue
+++ b/src/components/UserHeader.vue
@@ -58,7 +58,7 @@ watch(
   <view class="container" :style="{ width: containerWidth }">
     <block v-if="user.id">
       <Avatar
-        :score="user.scores"
+        :rankLvl="user.rankLvl"
         :src="user.avatar"
         :onClick="toUserPage"
         :size="42"
@@ -203,7 +203,7 @@ watch(
 }
 
 .rank-info {
-  width: 68px;
+  width: 70px;
   text-align: left;
   font-size: 12px;
   position: relative;
diff --git a/src/pages/my-growth.vue b/src/pages/my-growth.vue
index 6e405f8..45183f1 100644
--- a/src/pages/my-growth.vue
+++ b/src/pages/my-growth.vue
@@ -86,7 +86,7 @@ const onPractiseLoading = async (page) => {
             <block v-if="item.bluePlayers[0]">
               <view class="player">
                 <Avatar
-                  :score="item.bluePlayers[0].totalScore"
+                  :rankLvl="item.bluePlayers[0].rankLvl"
                   :src="item.bluePlayers[0].avatar"
                 />
                 <text>{{ item.bluePlayers[0].name }}</text>
@@ -100,7 +100,7 @@ const onPractiseLoading = async (page) => {
             <block v-if="item.redPlayers[0]">
               <view class="player">
                 <Avatar
-                  :score="item.redPlayers[0].totalScore"
+                  :rankLvl="item.redPlayers[0].rankLvl"
                   :src="item.redPlayers[0].avatar"
                 />
                 <text>{{ item.redPlayers[0].name }}</text>
@@ -143,7 +143,7 @@ const onPractiseLoading = async (page) => {
             <block v-if="item.bluePlayers[0]">
               <view class="player">
                 <Avatar
-                  :score="item.bluePlayers[0].totalScore"
+                  :rankLvl="item.bluePlayers[0].rankLvl"
                   :src="item.bluePlayers[0].avatar"
                 />
                 <text>{{ item.bluePlayers[0].name }}</text>
@@ -157,7 +157,7 @@ const onPractiseLoading = async (page) => {
             <block v-if="item.redPlayers[0]">
               <view class="player">
                 <Avatar
-                  :score="item.redPlayers[0].totalScore"
+                  :rankLvl="item.redPlayers[0].rankLvl"
                   :src="item.redPlayers[0].avatar"
                 />
                 <text>{{ item.redPlayers[0].name }}</text>
diff --git a/src/pages/ranking.vue b/src/pages/ranking.vue
index 5737a59..f4b123d 100644
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -150,7 +150,7 @@ onHide(() => {
           <view class="user-info">
             <Avatar
               :src="user.avatar"
-              :score="rankData.user.scores"
+              :rankLvl="rankData.user.rankLvl"
               :size="30"
             />
             <text>{{ user.nickName }}</text>
diff --git a/src/store.js b/src/store.js
index c085363..ae5b6a5 100644
--- a/src/store.js
+++ b/src/store.js
@@ -23,15 +23,11 @@ const getLvlName = (score, rankList = []) => {
   return lvlName;
 };
 
-const getLvlImage = (score, rankList = []) => {
-  // 先保存到本地，分享只能用本地图片
+const getLvlImage = (rankLvl, rankList = []) => {
   let lvlImage = "";
   rankList.some((r, index) => {
-    lvlImage = rankList[index].icoin;
-    if (r.upgrade_scores > score) {
-      if (rankList[index - 1]) {
-        lvlImage = rankList[index - 1].icoin;
-      }
+    if (r.rank_id === rankLvl) {
+      lvlImage = rankList[index].icoin;
       return true;
     }
     return false;
@@ -67,8 +63,8 @@ export default defineStore("store", {
     getLvlName(score) {
       return getLvlName(score, this.config.randInfos);
     },
-    getLvlImage(score) {
-      return getLvlImage(score, this.config.randInfos);
+    getLvlImage(rankLvl) {
+      return getLvlImage(rankLvl, this.config.randInfos);
     },
     updateRank(data = {}) {
       this.rankData = { rank: data.rank || [], ringRank: data.ringRank || [] };
@@ -82,11 +78,11 @@ export default defineStore("store", {
       }
       if (this.user.scores !== undefined) {
         this.user.lvlName = getLvlName(this.user.scores, this.config.randInfos);
-        const lvlImage = getLvlImage(this.user.scores, this.config.randInfos);
-        if (lvlImage) {
-          const imageInfo = await uni.getImageInfo({ src: lvlImage });
-          this.user.lvlImage = imageInfo.path;
-        }
+      }
+      const lvlImage = getLvlImage(this.user.rankLvl, this.config.randInfos);
+      if (lvlImage) {
+        const imageInfo = await uni.getImageInfo({ src: lvlImage });
+        this.user.lvlImage = imageInfo.path;
       }
     },
     updateDevice(deviceId, deviceName) {
@@ -97,11 +93,11 @@ export default defineStore("store", {
       this.config = config;
       if (this.user.scores !== undefined) {
         this.user.lvlName = getLvlName(this.user.scores, this.config.randInfos);
-        const lvlImage = getLvlImage(this.user.scores, this.config.randInfos);
-        if (lvlImage) {
-          const imageInfo = await uni.getImageInfo({ src: lvlImage });
-          this.user.lvlImage = imageInfo.path;
-        }
+      }
+      const lvlImage = getLvlImage(this.user.rankLvl, this.config.randInfos);
+      if (lvlImage) {
+        const imageInfo = await uni.getImageInfo({ src: lvlImage });
+        this.user.lvlImage = imageInfo.path;
       }
     },
   },