From 2824e1325d4b1d5461825868421d63f3935e5498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Tue, 14 Mar 2023 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.BBS.Vue3/src/components/AvatarInfo.vue   | 32 +++++++++++++++++----
 Yi.BBS.Vue3/src/components/DisscussCard.vue |  2 +-
 Yi.BBS.Vue3/src/stores/user.js              |  5 ++--
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Yi.BBS.Vue3/src/components/AvatarInfo.vue b/Yi.BBS.Vue3/src/components/AvatarInfo.vue
index e32fa16a..55adb5a6 100644
--- a/Yi.BBS.Vue3/src/components/AvatarInfo.vue
+++ b/Yi.BBS.Vue3/src/components/AvatarInfo.vue
@@ -1,10 +1,10 @@
 <template >
     <div class="avatar">
         <div class="avatar-left">
-            <el-avatar :size="props.size" :src="props.src ?? '/src/assets/logo.ico'" />
+            <el-avatar :size="props.size" :src="userInfo.icon ?? '/src/assets/logo.ico'" />
 
             <div>
-                <div class="nick" :class="{mt_1: props.time!='undefined'}"> 大白子</div>
+                <div class="nick" :class="{mt_1: props.time!='undefined'}"> {{userInfo.name}}</div>
                 <div class="remarks" v-if="props.time"> {{props.time}}</div>
                 <div class="remarks">  <slot name="bottom" /></div>
             </div>
@@ -22,17 +22,39 @@
 </template>
 <script setup>
 import useUserStore from '@/stores/user'
-import { onMounted } from 'vue';
+import { reactive, watch ,onMounted  } from 'vue';
 //userInfo
 //{icon,name,role,id},根据判断userInfo是否等于未定义，来觉得是当前登录用户信息，还是其他人信息
-const props = defineProps(['size', 'src','showWatching','time','userInfo'])
+const props = defineProps(['size','showWatching','time','userInfo'])
 const userStore=useUserStore();
 const userInfo=reactive({
     icon:"",
     name:"",
-    role:"",
+    role:[],
     id:""
     });
+
+onMounted(() => {
+    //使用传入值
+    if(props.userInfo!= undefined)
+    {
+        console.log(props.userInfo,"props.userInfo333");
+        userInfo.icon=props.userInfo.icon;
+        userInfo.name=props.userInfo.name;
+        userInfo.role=props.userInfo.role;
+        userInfo.id=props.userInfo.id;
+    }
+
+    //使用当前登录用户
+    else
+    { 
+        userInfo.icon=userStore.icon;
+        userInfo.name=userStore.name;
+        userInfo.role=userStore.role;
+        userInfo.id=userStore.id;
+    }
+})
+
 </script>
 <style scoped>
 .mt_1
diff --git a/Yi.BBS.Vue3/src/components/DisscussCard.vue b/Yi.BBS.Vue3/src/components/DisscussCard.vue
index 9a1f1b33..2cfd3938 100644
--- a/Yi.BBS.Vue3/src/components/DisscussCard.vue
+++ b/Yi.BBS.Vue3/src/components/DisscussCard.vue
@@ -2,7 +2,7 @@
     <el-card class="box-card" shadow="never">
 
         <div class="card-header">
-          <AvatarInfo />
+          <AvatarInfo src="asdsadas" :userInfo="{name:'大白子'}" />
         </div>
 
 
diff --git a/Yi.BBS.Vue3/src/stores/user.js b/Yi.BBS.Vue3/src/stores/user.js
index 63370bc6..b281999c 100644
--- a/Yi.BBS.Vue3/src/stores/user.js
+++ b/Yi.BBS.Vue3/src/stores/user.js
@@ -3,9 +3,10 @@ import { defineStore } from 'pinia'
 const useUserStore = defineStore('user', 
 {
     state: () => ({
+      id:'',
       token: '',
-      name: '',
-      avatar: '',
+      name: '登录用户',
+      icon: null,
       roles: ['admin'],
       permissions: ['*:*:*']
       }),