From 7519a00ada89966f9caf93d315830dd628253d73 Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Sun, 23 May 2021 09:02:47 +0800
Subject: [PATCH] fix(avatar): show current user's avatar (#640)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在显示头像的地方正确显示当前登录用户的头像，已补充mock接口返回的avatar字段。
---
 mock/sys/user.ts                              |  2 ++
 src/api/sys/model/userModel.ts                |  2 ++
 .../header/components/lock/LockModal.vue      |  9 ++++--
 .../header/components/user-dropdown/index.vue |  7 ++---
 .../workbench/components/WorkbenchHeader.vue  | 11 ++++---
 src/views/demo/page/account/center/index.vue  |  9 ++++--
 .../demo/page/account/setting/BaseSetting.vue | 13 +++++++--
 src/views/sys/lock/LockPage.vue               | 29 ++++++++++++++-----
 types/store.ts                                |  1 +
 9 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/mock/sys/user.ts b/mock/sys/user.ts
index a3346c66b5e..6c1a9849567 100644
--- a/mock/sys/user.ts
+++ b/mock/sys/user.ts
@@ -7,6 +7,7 @@ function createFakeUserList() {
       userId: '1',
       username: 'vben',
       realName: 'Vben Admin',
+      avatar: 'http://q1.qlogo.cn/g?b=qq&nk=190848757&s=640',
       desc: 'manager',
       password: '123456',
       token: 'fakeToken1',
@@ -22,6 +23,7 @@ function createFakeUserList() {
       username: 'test',
       password: '123456',
       realName: 'test user',
+      avatar: 'http://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
       desc: 'tester',
       token: 'fakeToken2',
       roles: [
diff --git a/src/api/sys/model/userModel.ts b/src/api/sys/model/userModel.ts
index 170430c5ce8..a7a74442c59 100644
--- a/src/api/sys/model/userModel.ts
+++ b/src/api/sys/model/userModel.ts
@@ -38,6 +38,8 @@ export interface GetUserInfoByUserIdModel {
   username: string;
   // 真实名字
   realName: string;
+  // 头像
+  avatar: string;
   // 介绍
   desc?: string;
 }
diff --git a/src/layouts/default/header/components/lock/LockModal.vue b/src/layouts/default/header/components/lock/LockModal.vue
index 698b7629f81..fb13f08570d 100644
--- a/src/layouts/default/header/components/lock/LockModal.vue
+++ b/src/layouts/default/header/components/lock/LockModal.vue
@@ -8,7 +8,7 @@
   >
     <div :class="`${prefixCls}__entry`">
       <div :class="`${prefixCls}__header`">
-        <img :src="headerImg" :class="`${prefixCls}__header-img`" />
+        <img :src="avatar" :class="`${prefixCls}__header-img`" />
         <p :class="`${prefixCls}__header-name`">
           {{ getRealName }}
         </p>
@@ -71,6 +71,11 @@
         await resetFields();
       }
 
+      const avatar = computed(() => {
+        const { avatar } = userStore.getUserInfo;
+        return avatar || headerImg;
+      });
+
       return {
         t,
         prefixCls,
@@ -78,7 +83,7 @@
         register,
         registerForm,
         handleLock,
-        headerImg,
+        avatar,
       };
     },
   });
diff --git a/src/layouts/default/header/components/user-dropdown/index.vue b/src/layouts/default/header/components/user-dropdown/index.vue
index e51d931c220..2c3669a4334 100644
--- a/src/layouts/default/header/components/user-dropdown/index.vue
+++ b/src/layouts/default/header/components/user-dropdown/index.vue
@@ -1,7 +1,7 @@
 <template>
   <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`">
     <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex">
-      <img :class="`${prefixCls}__header`" :src="headerImg" />
+      <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" />
       <span :class="`${prefixCls}__info hidden md:block`">
         <span :class="`${prefixCls}__name  `" class="truncate">
           {{ getUserInfo.realName }}
@@ -75,8 +75,8 @@
       const userStore = useUserStore();
 
       const getUserInfo = computed(() => {
-        const { realName = '', desc } = userStore.getUserInfo || {};
-        return { realName, desc };
+        const { realName = '', avatar, desc } = userStore.getUserInfo || {};
+        return { realName, avatar: avatar || headerImg, desc };
       });
 
       const [register, { openModal }] = useModal();
@@ -115,7 +115,6 @@
         getUserInfo,
         handleMenuClick,
         getShowDoc,
-        headerImg,
         register,
         getUseLockPage,
       };
diff --git a/src/views/dashboard/workbench/components/WorkbenchHeader.vue b/src/views/dashboard/workbench/components/WorkbenchHeader.vue
index 464253ffae2..e9dde3275c0 100644
--- a/src/views/dashboard/workbench/components/WorkbenchHeader.vue
+++ b/src/views/dashboard/workbench/components/WorkbenchHeader.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="lg:flex">
-    <Avatar :src="headerImg" :size="72" class="!mx-auto !block" />
+    <Avatar :src="userinfo.avatar || headerImg" :size="72" class="!mx-auto !block" />
     <div class="md:ml-6 flex flex-col justify-center md:mt-0 mt-2">
-      <h1 class="md:text-lg text-md">早安, Vben, 开始您一天的工作吧！</h1>
+      <h1 class="md:text-lg text-md">早安, {{ userinfo.realName }}, 开始您一天的工作吧！</h1>
       <span class="text-secondary"> 今日晴，20℃ - 32℃！ </span>
     </div>
     <div class="flex flex-1 justify-end md:mt-0 mt-4">
@@ -23,15 +23,18 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { computed, defineComponent } from 'vue';
 
   import { Avatar } from 'ant-design-vue';
+  import { useUserStore } from '/@/store/modules/user';
 
   import headerImg from '/@/assets/images/header.jpg';
   export default defineComponent({
     components: { Avatar },
     setup() {
-      return { headerImg };
+      const userStore = useUserStore();
+      const userinfo = computed(() => userStore.getUserInfo);
+      return { userinfo, headerImg };
     },
   });
 </script>
diff --git a/src/views/demo/page/account/center/index.vue b/src/views/demo/page/account/center/index.vue
index 3bcdedc0e6c..27b899a88c6 100644
--- a/src/views/demo/page/account/center/index.vue
+++ b/src/views/demo/page/account/center/index.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="8">
             <div :class="`${prefixCls}-top__avatar`">
-              <img width="70" :src="headerImg" />
+              <img width="70" :src="avatar" />
               <span>Vben</span>
               <div>海纳百川，有容乃大</div>
             </div>
@@ -54,7 +54,7 @@
 
 <script lang="ts">
   import { Tag, Tabs, Row, Col } from 'ant-design-vue';
-  import { defineComponent } from 'vue';
+  import { defineComponent, computed } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import Icon from '/@/components/Icon/index';
   import Article from './Article.vue';
@@ -63,6 +63,7 @@
 
   import headerImg from '/@/assets/images/header.jpg';
   import { tags, teams, details, achieveList } from './data';
+  import { useUserStore } from '/@/store/modules/user';
 
   export default defineComponent({
     components: {
@@ -78,9 +79,11 @@
       [Col.name]: Col,
     },
     setup() {
+      const userStore = useUserStore();
+      const avatar = computed(() => userStore.getUserInfo.avatar || headerImg);
       return {
         prefixCls: 'account-center',
-        headerImg,
+        avatar,
         tags,
         teams,
         details,
diff --git a/src/views/demo/page/account/setting/BaseSetting.vue b/src/views/demo/page/account/setting/BaseSetting.vue
index 965aed94dbc..87c546bbd64 100644
--- a/src/views/demo/page/account/setting/BaseSetting.vue
+++ b/src/views/demo/page/account/setting/BaseSetting.vue
@@ -7,7 +7,7 @@
       <a-col :span="10">
         <div class="change-avatar">
           <div class="mb-2"> 头像 </div>
-          <img width="140" :src="headerImg" />
+          <img width="140" :src="avatar" />
           <Upload :showUploadList="false">
             <Button class="ml-5"> <Icon icon="feather:upload" />更换头像 </Button>
           </Upload>
@@ -19,7 +19,7 @@
 </template>
 <script lang="ts">
   import { Button, Upload, Row, Col } from 'ant-design-vue';
-  import { defineComponent, onMounted } from 'vue';
+  import { computed, defineComponent, onMounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { CollapseContainer } from '/@/components/Container/index';
   import Icon from '/@/components/Icon/index';
@@ -29,6 +29,7 @@
   import headerImg from '/@/assets/images/header.jpg';
   import { accountInfoApi } from '/@/api/demo/account';
   import { baseSetschemas } from './data';
+  import { useUserStore } from '/@/store/modules/user';
 
   export default defineComponent({
     components: {
@@ -42,6 +43,7 @@
     },
     setup() {
       const { createMessage } = useMessage();
+      const userStore = useUserStore();
 
       const [register, { setFieldsValue }] = useForm({
         labelWidth: 120,
@@ -54,8 +56,13 @@
         setFieldsValue(data);
       });
 
+      const avatar = computed(() => {
+        const { avatar } = userStore.getUserInfo;
+        return avatar || headerImg;
+      });
+
       return {
-        headerImg,
+        avatar,
         register,
         handleSubmit: () => {
           createMessage.success('更新成功！');
diff --git a/src/views/sys/lock/LockPage.vue b/src/views/sys/lock/LockPage.vue
index e72b6ea714a..e34323d82b5 100644
--- a/src/views/sys/lock/LockPage.vue
+++ b/src/views/sys/lock/LockPage.vue
@@ -5,7 +5,23 @@
   >
     <div
       :class="`${prefixCls}__unlock`"
-      class="absolute top-0 left-1/2 flex pt-5 h-16 items-center justify-center sm:text-md xl:text-xl text-white flex-col cursor-pointer transform translate-x-1/2"
+      class="
+        absolute
+        top-0
+        left-1/2
+        flex
+        pt-5
+        h-16
+        items-center
+        justify-center
+        sm:text-md
+        xl:text-xl
+        text-white
+        flex-col
+        cursor-pointer
+        transform
+        translate-x-1/2
+      "
       @click="handleShowForm(false)"
       v-show="showDate"
     >
@@ -28,9 +44,9 @@
       <div :class="`${prefixCls}-entry`" v-show="!showDate">
         <div :class="`${prefixCls}-entry-content`">
           <div :class="`${prefixCls}-entry__header enter-x`">
-            <img :src="headerImg" :class="`${prefixCls}-entry__header-img`" />
+            <img :src="userinfo.avatar || headerImg" :class="`${prefixCls}-entry__header-img`" />
             <p :class="`${prefixCls}-entry__header-name`">
-              {{ realName }}
+              {{ userinfo.realName }}
             </p>
           </div>
           <InputPassword
@@ -108,9 +124,8 @@
 
       const { t } = useI18n();
 
-      const realName = computed(() => {
-        const { realName } = userStore.getUserInfo || {};
-        return realName;
+      const userinfo = computed(() => {
+        return userStore.getUserInfo || {};
       });
 
       /**
@@ -141,7 +156,7 @@
 
       return {
         goLogin,
-        realName,
+        userinfo,
         unLock,
         errMsg,
         loading,
diff --git a/types/store.ts b/types/store.ts
index 3e0c4e7ec96..0f34d06b7bb 100644
--- a/types/store.ts
+++ b/types/store.ts
@@ -33,6 +33,7 @@ export interface UserInfo {
   userId: string | number;
   username: string;
   realName: string;
+  avatar: string;
   desc?: string;
 }