From 6bd5cf1365d09461161bfdd2f74342c54c505acc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 18 Mar 2021 15:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/layout/components/Navbar.vue |  4 ++--
 client/src/store/modules/user.js        | 29 ++++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/client/src/layout/components/Navbar.vue b/client/src/layout/components/Navbar.vue
index efc0ac3..247b6c7 100644
--- a/client/src/layout/components/Navbar.vue
+++ b/client/src/layout/components/Navbar.vue
@@ -19,11 +19,11 @@
               首页
             </el-dropdown-item>
           </router-link>
-          <router-link to="/myinfo">
+          <!-- <router-link to="/myinfo">
             <el-dropdown-item divided>
               个人中心
             </el-dropdown-item>
-          </router-link>
+          </router-link> -->
           <!-- <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
             <el-dropdown-item>Github</el-dropdown-item>
           </a>
diff --git a/client/src/store/modules/user.js b/client/src/store/modules/user.js
index 440887b..5e790c4 100644
--- a/client/src/store/modules/user.js
+++ b/client/src/store/modules/user.js
@@ -95,16 +95,29 @@ const actions = {
     return new Promise((resolve, reject) => {
       getInfo(state.token).then(response => {
         const { data } = response
-        const { perms, name, avatar } = data
-        // perms must be a non-empty array
-        if (!perms || perms.length <= 0) {
-          reject('没有任何权限!')
+        if(data){
+          const { perms, name, avatar } = data
+          // perms must be a non-empty array
+          if (!perms || perms.length <= 0) {
+            reject('没有任何权限!')
+          }
+          commit('SET_PERMS', perms)
+          commit('SET_NAME', name)
+          commit('SET_AVATAR', avatar)
+          resolve(data)
+        }else{
+          getInfo(state.token).then(res=>{
+            const { data } = response
+            if (!perms || perms.length <= 0) {
+              reject('没有任何权限!')
+            }
+            commit('SET_PERMS', perms)
+            commit('SET_NAME', name)
+            commit('SET_AVATAR', avatar)
+            resolve(data)
+          })
         }
         
-        commit('SET_PERMS', perms)
-        commit('SET_NAME', name)
-        commit('SET_AVATAR', avatar)
-        resolve(data)