From 4f51f23da76c53439053f8705f4be1a3fcf9d9af Mon Sep 17 00:00:00 2001
From: jiayu <zheng_jiayu1@163.com>
Date: Sat, 30 Aug 2025 16:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mine/components/mine-user-blue.vue |   9 +++++++--
 src/pages/villager/villager-list.vue         |  12 +++++++++---
 src/static/common/default-avatar.png         | Bin 0 -> 2143 bytes
 src/store/modules/system/user.js             |   1 +
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 src/static/common/default-avatar.png

diff --git a/src/pages/mine/components/mine-user-blue.vue b/src/pages/mine/components/mine-user-blue.vue
index 88fc553..cb68c02 100644
--- a/src/pages/mine/components/mine-user-blue.vue
+++ b/src/pages/mine/components/mine-user-blue.vue
@@ -21,7 +21,7 @@
   <!-- 用户信息 -->
   <view class="user-info-box">
     <view class="user-icon">
-      <image src="https://img.smartadmin.1024lab.net/hexagon/logo.png" class="user-image" />
+      <image :src="avatar || defaultAvatar" class="user-image" />
     </view>
     <view class="user-info">
       <view class="user-name">{{ actualName }}</view>
@@ -51,11 +51,16 @@
   import { onLoad } from '@dcloudio/uni-app';
   import { useUserStore } from '@/store/modules/system/user';
   import { computed, ref } from 'vue';
-
+  import defaultAvatar from '@/static/common/default-avatar.png';
+  
   const isHideVillage = computed(() => {
     return useUserStore().administratorFlag || useUserStore().backAdministratorFlag;
   });
 
+  const avatar = computed(() => {
+    return useUserStore().avatar;
+  });
+
   const actualName = computed(() => {
     return useUserStore().actualName;
   });
diff --git a/src/pages/villager/villager-list.vue b/src/pages/villager/villager-list.vue
index d6b3dbb..923b73c 100644
--- a/src/pages/villager/villager-list.vue
+++ b/src/pages/villager/villager-list.vue
@@ -3,7 +3,12 @@
     <view class="list-item" @click="gotoDetail(item.villagerId)" v-for="item in list" :key="item.villagerId">
       <view class="item-left">
         <!-- mode="widthFix"  -->
-        <image @tap.stop="_previewImage([item.avatar], item.avatar)" class="image" :src="item.avatar" mode="aspectFill" />
+        <image
+          @tap.stop="_previewImage(item.avatar?.[0]?.fileUrl || defaultAvatar)"
+          class="image"
+          :src="item.avatar?.[0]?.fileUrl || defaultAvatar"
+          mode="aspectFill"
+        />
       </view>
       <view class="item-center">
         <view class="title">
@@ -40,6 +45,7 @@
 </template>
 
 <script setup>
+  import defaultAvatar from '@/static/common/default-avatar.png';
   import Navigation from '@/components/navigation.vue';
   const props = defineProps({
     marginTop: {
@@ -52,10 +58,10 @@
     },
   });
 
-  const _previewImage = (images, image) => {
+  const _previewImage = (image) => {
     //预览图片
     uni.previewImage({
-      urls: images,
+      urls: [image],
       current: image,
     });
   };
diff --git a/src/static/common/default-avatar.png b/src/static/common/default-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c3dd6102bf80c7519f7943ae220122150a07e44
GIT binary patch
literal 2143
zcmV-l2%z_gP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000OSNkl<Zcmd2>
z%X1V(82`Fwck^IlvII>~fr$|bqNNf<d{x51N0pD#o0eJ?FFyVPkBK+$LZM!QXA8V~
zTP!c$Ja{*YlmrUMLLQLpW7_`pZck<=lTFWSld0+H{=WYDd;I$Ao}NuOb>X^j;aB_o
zPnTxS|9EK@<=hXK=0Sgd;g@Ojq1JR4-0_*n6aWN=V4K`o5Q63f(HsgfngPu?FQX5&
zrqBI&X#oX*_&m*s$P54-ID(DnyDjBy00JNYqNLT0Oo3iS$OmXyCAu>K;M`A_%P|5E
z3&fTgQbwRyI>;2McUlWddLDh6j#H-&fC^p+*U30e1;*Gi(6S(!qt<03Xk~}U=A2Kp
z*zumJ0)Sbfbb}9#idojIwj&surUX}N0AQ_pW+{P7218Q>ITZj9eA5#12CnZpk;DLC
zJ<5%0L8oNbBXmS1iOoa+VCJzwC2=6>SjK4g0N4v@FNkI+!4*3L)PW?$%_u<(wtD--
zR1g~gc_2xId`y2shb75^SOA=tA2y+$>>g7cj^db)1%MDV8^>6dW7Od&hJnZcVCR>1
z@WCRhJ#-6U<Wtb&$N)H&V|?^1_7;NnvZP}zgUA2~hm1Zx5d3?SN9m+Jl4a07-ElsQ
zA_L&F*nyZF8=;|xOLXSs1buS$1)6@wrlX_#>0qfy07n<_CZ8Bp{Zl6n6WXebKT7YN
zo}e$^IYS@6dZL4+%`Uk&MP3Hc0pQHY$b@~6cs@_e;xu$%h)x_Iqc>i8mOeZ?NuRxa
znm&Ewl&ar+{W&@_d0h2B^YplCgFbWe7#%)xkaGQfG`N3IfwviIdadXH7}$Py@=3D#
z`nE^{3={xk_4X)$wg`nVAp7Fc$5rNpbSGj(2VjSfkE!E_=+L22HS>u)3k=3`!k!Xf
zCnh5UAcXVtc2*Jm)5ne&&+K-3!uZIX(#Qd|A7K9omErVz7{3!QG5|Tsg?@cy8N3ca
zgYf=~6Po3#ou(7&n@=b}L<S%*-X$L&8O~(pT?6d~Kp1$aU%gG*EVtqoH`<`x0kXkm
zNqpl~HZahiSdXa!tEYz!4(>A*?<f};fUm#)a7&s!HCpP*?CVI71rvuxw!9U1lV8y?
zrZqPe^vW?J{S&o1=^d8ud^km2yzo|-93S1Z$k>&z$=MVLZy5tnzk2<(+SO}+)&8kG
z_~NZoU%fE?=rWGEr=K0~>g?+<0QiYxV}vuu!-K`uFWx?F*DF^SYn6Y?qFOcH3yc70
z{CDFcr?LJAInMJ=qtV-})kj}CZa;)$E)FT$sczQ*;qZ~i=z~*7i_ZGG4ZlRQG2K{R
z`P<YNBLJ-4{9A?65akC4C|7K6K5`wv0aHU+$tfS&zQ8~DnHwk;Wfn}E*fauw7;{q!
zGwy<5VxbE%qUorK!4cbIPWkMiLz`v*2;tlLVMzWQ9;$FRnD7TBVB6@8U<Lr^-%8~!
z2rBI)W3Sx2r{H%*h&fg&x&Hb){ge>^N*QBk<zIg;%HdF4Vchytws-v&LM-!K9=<5Q
zq>poKco-9A<eL!y&;$^q;?LRs{bQ<F>^JatyD*~5{E-7ME1%$7gy7-3F#r(u70x4n
zdHKfg5h6YSL`XTKjfS$kIN$d3+{A2b0I($F>oJjW69+rW2ys#Rk!TWP1JHI1#!=d2
zSE~y4q@)%T0U*(@$Sn9=I?-(qD%kX--Nbhy0ASq(LB4xIXIv`kH79rbwCp4X0FD3z
znU3GeY#5Uzi;TFU16OunG^LUX0NNJ?M5%O9rsr7+M0_wDXI1LdK{Mz}J8-FA-Kheg
zG`1f>Fls9+*BYy9)Lh>nr(SPM5#d7yrLlIO(7$neiE7omm$MAoH7*;O0U&j|H^2}Z
z_4^1OLDuiBP&-frt4j01x&p@?)TKsO09ahC+KiFs_p4TPnE6)A|7<cog)x3^HdN*S
zTwAP8%YYWv3j2x(LEzD$IGoc;-@qesO!?a4z1a?;p<Pj#nE_C(KCl;WE`P@uFT<((
zJ^hvpjO51)$k2k|mx{www+i^fBC=-gznjbR&=oo$1!ighz{xw+wb|QuSIc+qt_g=Z
z3r!)u@%p%t@1>=IVM3tbd$XZ#<q5%q?=3=z8R(Ka7w+6!o4;LMP4%C%5(A(Ehm&%8
z=NK{fw>X*2-dI%IVVtU%<wCC%S1elZ>8E@9hFV16X<1BjY!WoX7@OB%z&0hk5&?i2
z*MW!mk+ZBYwv2<QTG&U|n?0&5ab$d`DCKjZE-Emj?J|4_A8E!7)xOhEAdgg+Q#jX2
zHY@|Q{H>)8y79nL<@VCLX8UT4mox6;1qd5HU}*&S#$;pw5WGZwfq7DWJ8N(rK?M72
zb%!=;j>~Q|1zDS^?((<GAXh*)<kG;h&}5W4G5}51oR4B4pWC_&1_%5<V)pe~RLENt
z1S<>_+WxZRWCGt_-_{<ay~)gbM{>@5fg#X(!y)h0Xtdr3=+pe170I>MFl2&!6SWAl
zr?Hh=)s^X}!D|=1S<q=#^^!rI&l|g@&9rJpGgziAV&|u^73tLM&g#M?kOc@_&#<0x
zE$z(+fK`Yad`qG2aL3qJBLI@je#<9PuQPxE+8Z!vZvj{+US8z3AonanJ6wE+e$_2g
z-&TzT51B#k=z6{Bwliwjm^2gJW&m(DWuh#JOsA}fqn8sm^4SOgc^*%k0da!p#uy_2
z(pUoB2*ziFlhLFZ0YE8VHF**Ystmpvg8kdkN%{W+009604fB|N00006Nkl<Z0|4<h
Vk^!79TYvxn002ovPDHLkV1h)<^{oH^

literal 0
HcmV?d00001

diff --git a/src/store/modules/system/user.js b/src/store/modules/system/user.js
index 09e68cd..8b91298 100644
--- a/src/store/modules/system/user.js
+++ b/src/store/modules/system/user.js
@@ -162,6 +162,7 @@ export const useUserStore = defineStore({
       this.lastLoginIpRegion = data.lastLoginIpRegion;
       this.lastLoginUserAgent = data.lastLoginUserAgent;
       this.lastLoginTime = data.lastLoginTime;
+      this.avatar = data.avatar;
 
       uni.setStorageSync(USER_TOKEN, data.token);