From 3e17a3767af6e246b433a600a0d3ab33317e6ba0 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 28 Aug 2020 11:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/main-navbar-update-password.vue      | 17 ++++++++++++++---
 src/views/layout/main-navbar.vue                |  7 +++++--
 src/views/layout/main.vue                       | 15 +++++++++------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/layout/main-navbar-update-password.vue b/src/views/layout/main-navbar-update-password.vue
index d8caba6..77c607f 100644
--- a/src/views/layout/main-navbar-update-password.vue
+++ b/src/views/layout/main-navbar-update-password.vue
@@ -56,11 +56,22 @@
     },
     computed: {
       userName: {
-        get () { return this.$store.state.user.name }
+        get () {
+          return this.$store.state.user.username
+        }
+      },
+      realName: {
+        get () {
+          return this.$store.state.user.realName
+        }
       },
       mainTabs: {
-        get () { return this.$store.state.common.mainTabs },
-        set (val) { this.$store.commit('common/updateMainTabs', val) }
+        get () {
+          return this.$store.state.common.mainTabs
+        },
+        set (val) {
+          this.$store.commit('common/updateMainTabs', val)
+        }
       }
     },
     methods: {
diff --git a/src/views/layout/main-navbar.vue b/src/views/layout/main-navbar.vue
index f88307d..4696326 100644
--- a/src/views/layout/main-navbar.vue
+++ b/src/views/layout/main-navbar.vue
@@ -38,7 +38,7 @@
         <el-menu-item class="site-navbar__avatar" index="3">
           <el-dropdown :show-timeout="0" placement="bottom">
             <span class="el-dropdown-link">
-              <img src="~@/assets/img/login/avatar.png" :alt="userName">{{ userName }}
+              <img src="~@/assets/img/login/avatar.png" :alt="realName">{{ realName }}
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="handleUpdatePassword()">修改密码</el-dropdown-item>
@@ -80,7 +80,10 @@
         set (val) { this.$store.commit('common/updateMainTabs', val) }
       },
       userName: {
-        get () { return this.$store.state.user.name }
+        get () { return this.$store.state.user.username }
+      },
+      realName: {
+        get () { return this.$store.state.user.realName }
       }
     },
     methods: {
diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue
index c52cb31..138c088 100644
--- a/src/views/layout/main.vue
+++ b/src/views/layout/main.vue
@@ -19,7 +19,7 @@
   import MainSidebar from './main-sidebar'
   import MainContent from './main-content'
   import { apiGetUserInfo } from '@/api/api_sys'
-  
+
   export default {
     provide () {
       return {
@@ -55,7 +55,9 @@
         set (val) { this.$store.commit('user/updateId', val) }
       },
       userName: {
-        get () { return this.$store.state.user.name },
+        get () {
+          return this.$store.state.user.userName
+        },
         set (val) { this.$store.commit('user/updateName', val) }
       }
     },
@@ -63,9 +65,9 @@
       this.handleGetUserInfo()
     },
     mounted () {
-      
+
         this.resetDocumentClientHeight()
-      
+
     },
     methods: {
       // 重置窗口可视高度
@@ -82,6 +84,7 @@
             this.loading = false
             this.userId = res.user.userId
             this.userName = res.user.username
+            this.$store.state.user = res.user
             this.mobile = res.user.mobile
             this.$watermark.set(this.userName + ' ' + this.mobile.substr(0, 4))
           } else {
@@ -89,8 +92,8 @@
           }
         })
       }
-      
+
     }
   }
-  
+
 </script>