From 80c68f9e5ef0cfdc7a9ac79b085170319c2f70f7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 16 Jan 2019 10:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E9=99=86=E5=92=8C?=
 =?UTF-8?q?=E6=B3=A8=E9=94=80=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f423b58687a0d65ce70a95ce1593b429704775f5 [formerly 664e42ad888903b010ec1a8e7cbda762b17cdc4a] [formerly f423b58687a0d65ce70a95ce1593b429704775f5 [formerly 664e42ad888903b010ec1a8e7cbda762b17cdc4a] [formerly f423b58687a0d65ce70a95ce1593b429704775f5 [formerly 664e42ad888903b010ec1a8e7cbda762b17cdc4a] [formerly 664e42ad888903b010ec1a8e7cbda762b17cdc4a [formerly a3bbfc1f94606188ed35a2457ad9c151f2a4cedd [formerly ed00257f4f4147114d7aeea450a2d6945b4e7545]]]]]
Former-commit-id: 3c329a9dabe00f428051d837e130c1ce71b26036
Former-commit-id: e04dd339ec94fde93518c07ba78374faad70efba
Former-commit-id: 4a4af4b9bf562edd65993d9d0eff80116da621fc [formerly 4b8c811d1b2ab5e5bedf583eb374c0819d918d48]
Former-commit-id: 67b88726e79a45834e33b9c92a68685da3e6127d
Former-commit-id: f6b13db93efe29cea7ad6870f8f8db323ad9898a
Former-commit-id: 440e1db752d5dbe6d1a069a7b2a7711d82f640cf
Former-commit-id: 19dbd962aa57656bcf29310761b4505ce8df7031
Former-commit-id: 053b5d58aaa43c007bad159603ec7966e99c53cf
---
 package.json                                             | 2 +-
 src/layout/header-aside/components/header-user/index.vue | 2 +-
 src/router/routes.js                                     | 6 +++---
 src/setting.js                                           | 6 ------
 src/store/modules/d2admin/modules/account.js             | 6 ++++--
 src/store/modules/d2admin/modules/user.js                | 7 ++-----
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index a1bb8364..f1b4fba8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 9ad21d2b..a8e2bdb5 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown size="small" class="d2-mr">
-    <span class="btn-text">你好 {{info.name}}</span>
+    <span class="btn-text">{{info.name ? `你好 ${info.name}` : '未登录'}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff">
         <d2-icon name="power-off" class="d2-mr-5"/>
diff --git a/src/router/routes.js b/src/router/routes.js
index 544380a4..43aa16a7 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,8 +10,6 @@ import business from './modules/business'
 
 import layoutHeaderAside from '@/layout/header-aside'
 
-const meta = { auth: true }
-
 /**
  * 在主框架内显示
  */
@@ -25,7 +23,9 @@ const frameIn = [
       {
         path: 'index',
         name: 'index',
-        meta,
+        meta: {
+          auth: true
+        },
         component: () => import('@/pages/index')
       },
       // 刷新页面 必须保留
diff --git a/src/setting.js b/src/setting.js
index 4e5a3534..3d159379 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -63,11 +63,5 @@ export default {
   // 是否默认开启页面切换动画
   transition: {
     active: true
-  },
-  // 在读取持久化数据失败时默认用户信息
-  user: {
-    info: {
-      name: 'Ghost'
-    }
   }
 }
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 7c10e436..c4cc3de0 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -52,14 +52,16 @@ export default {
      * @param {Object} param vm {Object} vue 实例
      * @param {Object} param confirm {Boolean} 是否需要确认
      */
-    logout ({ commit }, { vm, confirm = false }) {
+    logout ({ commit, dispatch }, { vm, confirm = false }) {
       /**
        * @description 注销
        */
-      function logout () {
+      async function logout () {
         // 删除cookie
         util.cookies.remove('token')
         util.cookies.remove('uuid')
+        // 清空 vuex 用户信息
+        await dispatch('d2admin/user/set', {}, { root: true })
         // 跳转路由
         vm.$router.push({
           name: 'login'
diff --git a/src/store/modules/d2admin/modules/user.js b/src/store/modules/d2admin/modules/user.js
index ff19e64b..37d3baca 100644
--- a/src/store/modules/d2admin/modules/user.js
+++ b/src/store/modules/d2admin/modules/user.js
@@ -1,11 +1,8 @@
-// 设置文件
-import setting from '@/setting.js'
-
 export default {
   namespaced: true,
   state: {
     // 用户信息
-    info: setting.user.info
+    info: {}
   },
   actions: {
     /**
@@ -38,7 +35,7 @@ export default {
         state.info = await dispatch('d2admin/db/get', {
           dbName: 'sys',
           path: 'user.info',
-          defaultValue: setting.user.info,
+          defaultValue: {},
           user: true
         }, { root: true })
         // end