From a74fd1e744b9547ac92f7cb5c18dfc9a288dca23 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Tue, 17 Jun 2025 13:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=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/BowData.vue    |  2 +-
 src/components/ImageShare.vue |  2 +-
 src/components/UserHeader.vue | 17 +++++------------
 src/pages/battle-room.vue     |  9 ++++++++-
 src/pages/be-vip.vue          |  2 +-
 src/pages/first-try.vue       |  2 +-
 src/pages/index.vue           |  2 +-
 src/pages/melee-match.vue     |  2 +-
 src/pages/my-device.vue       |  4 ++--
 src/pages/practise-one.vue    |  2 +-
 src/pages/practise-two.vue    |  2 +-
 src/pages/ranking.vue         |  2 +-
 src/pages/user.vue            |  2 +-
 src/store.js                  |  2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/components/BowData.vue b/src/components/BowData.vue
index a0715db..01f90bd 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.avatarUrl" frame :size="50" />
+        <Avatar :src="user.avatar" frame :size="50" />
         <view>
           <text>{{ user.nickName }}</text>
           <text>砖石1级</text>
diff --git a/src/components/ImageShare.vue b/src/components/ImageShare.vue
index ffaf51a..32350f2 100644
--- a/src/components/ImageShare.vue
+++ b/src/components/ImageShare.vue
@@ -67,7 +67,7 @@ const saveImage = () => {
     <view class="content">
       <image src="../static/share-bg.png" mode="widthFix" />
       <view>
-        <Avatar :src="user.avatarUrl" :size="40" frame />
+        <Avatar :src="user.avatar" :size="40" frame />
         <view>
           <text>{{ user.nickName }}</text>
           <text>砖石1级</text>
diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue
index 4bdd888..4ffe451 100644
--- a/src/components/UserHeader.vue
+++ b/src/components/UserHeader.vue
@@ -1,22 +1,15 @@
 <script setup>
 import { computed } from "vue";
 import Avatar from "@/components/Avatar.vue";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
 const props = defineProps({
   showRank: {
     type: Boolean,
     default: false,
   },
-  user: {
-    type: Object,
-    default: () => ({
-      nickName: "",
-      avatarUrl: "",
-      lvl: 0,
-      points: 0,
-      rankLvl: 0,
-      lvlPoints: 0,
-    }),
-  },
 });
 const containerWidth = computed(() => (props.showRank ? "72vw" : "100vw"));
 const toUserPage = () => {
@@ -37,7 +30,7 @@ const toUserPage = () => {
   <view class="container" :style="{ width: containerWidth }">
     <Avatar
       :frame="true"
-      :src="user.avatarUrl"
+      :src="user.avatar"
       :onClick="toUserPage"
       :size="42"
     />
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index 2fd4e69..481eee7 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -61,7 +61,7 @@ onLoad(async (options) => {
         opponent.value = {
           id: user.value.id,
           name: user.value.nickName,
-          avatar: user.value.avatarUrl,
+          avatar: user.value.avatar,
         };
       } else if (result.members.length > 1) {
         result.members.some((m) => {
@@ -397,6 +397,13 @@ onUnmounted(() => {
   background-color: #ccc;
   margin-bottom: 5px;
 }
+.player > text {
+  width: 100px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+}
 .team-mode > view > image:nth-child(2) {
   width: 120px;
 }
diff --git a/src/pages/be-vip.vue b/src/pages/be-vip.vue
index 9148a8a..beb9d79 100644
--- a/src/pages/be-vip.vue
+++ b/src/pages/be-vip.vue
@@ -21,7 +21,7 @@ const chooseVip = (index) => {
   <Container title="会员说明">
     <view class="header">
       <view>
-        <Avatar :src="user.avatarUrl" :size="35" :border="true" />
+        <Avatar :src="user.avatar" :size="35" :border="true" />
         <text>{{ user.nickName }}</text>
       </view>
       <text>5月5号到期</text>
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index ca21a71..9da819a 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -177,7 +177,7 @@ const onClose = () => {
         :start="start"
       />
       <BowTarget
-        :avatar="user.avatarUrl"
+        :avatar="user.avatar"
         :power="power"
         :debug="step === 2"
         v-if="step === 2 || step === 4"
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 8c1f7f8..169182f 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -71,7 +71,7 @@ onMounted(async () => {
     <AppBackground />
     <!-- 根据登录状态显示用户信息或登录按钮 -->
     <block v-if="user.id">
-      <UserHeader :user="user" showRank />
+      <UserHeader showRank />
     </block>
     <block v-else>
       <view class="signin-btn" @click="() => (showModal = true)">
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 6fca600..69b388a 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -129,7 +129,7 @@ onUnmounted(() => {
       </Guide>
       <ShootProgress v-if="start" :seq="seq" :start="start" :tips="tips" />
       <BowTarget
-        :avatar="user.avatarUrl"
+        :avatar="user.avatar"
         :power="power"
         :currentRound="currentRound"
         :totalRound="totalRounds"
diff --git a/src/pages/my-device.vue b/src/pages/my-device.vue
index 371158e..f3fc95f 100644
--- a/src/pages/my-device.vue
+++ b/src/pages/my-device.vue
@@ -134,7 +134,7 @@ const backToHome = () => {
         <image src="../static/bind-success.png" mode="widthFix" />
         <view>
           <image
-            :src="user.avatarUrl"
+            :src="user.avatar"
             mode="widthFix"
             :style="{ borderRadius: '50%' }"
           />
@@ -162,7 +162,7 @@ const backToHome = () => {
         <image src="../static/bind.png" mode="widthFix" />
         <view>
           <image
-            :src="user.avatarUrl"
+            :src="user.avatar"
             mode="widthFix"
             :style="{ borderRadius: '50%' }"
           />
diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue
index dcc6769..78d241e 100644
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -78,7 +78,7 @@ onUnmounted(() => {
         :total="120"
       />
       <view class="infos">
-        <Avatar :src="user.avatarUrl" :size="35" />
+        <Avatar :src="user.avatar" :size="35" />
         <BowPower :power="power" />
       </view>
       <BowTarget
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index aafbcdf..192ce90 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -69,7 +69,7 @@ onUnmounted(() => {
       <BowTarget
         :totalRound="total"
         :currentRound="scores.length + 1"
-        :avatar="user.avatarUrl"
+        :avatar="user.avatar"
         :power="power"
         :scores="scores"
         :tips="
diff --git a/src/pages/ranking.vue b/src/pages/ranking.vue
index c1fd18f..1750b45 100644
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -44,7 +44,7 @@ const toMeleeMatchPage = (gameType, teamSize) => {
       <view class="ranking-my-data">
         <view>
           <view class="user-info">
-            <Avatar :src="user.avatarUrl" frame :size="30" />
+            <Avatar :src="user.avatar" frame :size="30" />
             <text>{{ user.nickName }}</text>
           </view>
           <view class="ranking-season">
diff --git a/src/pages/user.vue b/src/pages/user.vue
index 2a36d45..60f6834 100644
--- a/src/pages/user.vue
+++ b/src/pages/user.vue
@@ -62,7 +62,7 @@ const logout = () => {
     <view class="container">
       <UserItem title="用户名">{{ user.nickName }}</UserItem>
       <UserItem title="头像">
-        <Avatar :src="user.avatarUrl" :size="35" />
+        <Avatar :src="user.avatar" :size="35" />
       </UserItem>
       <UserItem
         title="订单"
diff --git a/src/store.js b/src/store.js
index 57c5cf2..cf3d2ca 100644
--- a/src/store.js
+++ b/src/store.js
@@ -3,7 +3,7 @@ import { defineStore } from "pinia";
 const defaultUser = {
   id: "",
   nickName: "游客",
-  avatarUrl: "../static/avatar.png",
+  avatar: "../static/avatar.png",
   trio: 0, // 大于1表示完成了新手引导
 };