From 9f06cd2c6ffc8f2dc38aac1e4a9b0c3662ca2c55 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 8 Aug 2018 16:42:02 +0800
Subject: [PATCH] =?UTF-8?q?user=20=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly abe0d077e22e8bf23c532bc8d9b7048d13d65a96 [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067] [formerly 94b9166307c815a1481440a6cb4c4d0eb1efb067 [formerly 103e140145dc6124294568692de9a49f6455e10c [formerly 85e8b7e28529e4d632005906ad535c892cf37271]]]]]
Former-commit-id: 0337a7a21b785454f950bebf1c31f876854af4cf
Former-commit-id: 3e6ec221d7250dbb97b48f71cb1b296b859fc68f
Former-commit-id: 8b3c41abdf815b1ccc30893dd8552127da50e4cf [formerly 8b9e779beb974176130dd68c9a134774438ec699]
Former-commit-id: 8eef9fa291d08656d6a85504802c1d816158011c
Former-commit-id: 7ae6a8418781674243e70696cf35e0ac91d18dfe
Former-commit-id: 1e4be2f1623b7d3c7b1a5d54723f655a3d594f36
Former-commit-id: 0d04496116e5cfd45075a18c5c05bae80a8dfef1
Former-commit-id: 3bf321fea766617190e93eabe816143464ab5f1a
---
 .../components/header-user/index.vue          |  2 +-
 src/libs/db.js                                |  1 -
 src/pages/demo/playground/store/sys/index.vue |  2 +-
 .../modules/d2admin/index.js.REMOVED.git-id   |  2 +-
 src/store/modules/d2admin/modules/menu.js     |  3 +++
 src/store/modules/d2admin/modules/releases.js |  2 ++
 src/store/modules/d2admin/modules/user.js     | 20 ++++++++++---------
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index d2f53ccc..44f81b14 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -15,7 +15,7 @@ import { mapState, mapActions } from 'vuex'
 export default {
   computed: {
     ...mapState('d2admin', {
-      userInfo: state => state.user.userInfo
+      userInfo: state => state.user.info
     })
   },
   methods: {
diff --git a/src/libs/db.js b/src/libs/db.js
index 26b09863..4d0afbce 100644
--- a/src/libs/db.js
+++ b/src/libs/db.js
@@ -12,7 +12,6 @@ db.defaults({
   // 旧
   themeActiveName: [],
   pageOpenedList: [],
-  userInfo: [],
   isMenuAsideCollapse: [],
   database: [],
   databasePublic: {}
diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue
index 3d5aaf3e..c3b9b258 100644
--- a/src/pages/demo/playground/store/sys/index.vue
+++ b/src/pages/demo/playground/store/sys/index.vue
@@ -110,7 +110,7 @@ export default {
   computed: {
     ...mapState('d2admin', {
       // 用户信息
-      userInfo: state => state.user.userInfo,
+      userInfo: state => state.user.info,
       // 版本
       releasesVersion: state => state.releases.version,
       releasesLatest: state => state.releases.latest,
diff --git a/src/store/modules/d2admin/index.js.REMOVED.git-id b/src/store/modules/d2admin/index.js.REMOVED.git-id
index 4fd95d9e..897868d1 100644
--- a/src/store/modules/d2admin/index.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/index.js.REMOVED.git-id
@@ -1 +1 @@
-a1c3d72ea5edb20e160908b56adff479dbc3446c
\ No newline at end of file
+e0ff5bbbd75335a8ba226e4922c3653e3627d0c8
\ No newline at end of file
diff --git a/src/store/modules/d2admin/modules/menu.js b/src/store/modules/d2admin/modules/menu.js
index 9954a250..c940f08f 100644
--- a/src/store/modules/d2admin/modules/menu.js
+++ b/src/store/modules/d2admin/modules/menu.js
@@ -14,6 +14,7 @@ export default {
      * @param {Array} menu menu setting
      */
     headerSet (state, menu) {
+      // store 赋值
       state.header = menu
     },
     /**
@@ -21,6 +22,7 @@ export default {
      * @param {Array} menu menu setting
      */
     asideSet (state, menu) {
+      // store 赋值
       state.aside = menu
     },
     /**
@@ -43,6 +45,7 @@ export default {
      * @param {Object} state vuex state
      */
     asideCollapseToggle (state) {
+      // store 赋值
       state.asideCollapse = !state.asideCollapse
       // 持久化
       this.commit('d2admin/util/dbValueSetByUser', {
diff --git a/src/store/modules/d2admin/modules/releases.js b/src/store/modules/d2admin/modules/releases.js
index edfe6804..dfba87ee 100644
--- a/src/store/modules/d2admin/modules/releases.js
+++ b/src/store/modules/d2admin/modules/releases.js
@@ -17,6 +17,7 @@ export default {
      * @param {Boolean} update can update
      */
     updateSet (state, update) {
+      // store 赋值
       state.update = update
     },
     /**
@@ -25,6 +26,7 @@ export default {
      * @param {Object}} latest releases value
      */
     latestSet (state, latest) {
+      // store 赋值
       state.latest = latest
     }
   }
diff --git a/src/store/modules/d2admin/modules/user.js b/src/store/modules/d2admin/modules/user.js
index 61a51943..22e53678 100644
--- a/src/store/modules/d2admin/modules/user.js
+++ b/src/store/modules/d2admin/modules/user.js
@@ -1,6 +1,8 @@
 export default {
+  namespaced: true,
   state: {
-    userInfo: {
+    // 用户信息
+    info: {
       name: ''
     }
   },
@@ -8,27 +10,27 @@ export default {
     /**
      * @description 设置用户数据
      * @param {Object} state vuex state
-     * @param {*} userInfo userInfo
+     * @param {*} info info
      */
-    userInfoSet (state, userInfo) {
+    infoSet (state, info) {
       // store 赋值
-      state.userInfo = userInfo
+      state.info = info
       // 持久化
       this.commit('d2admin/util/dbValueSetByUser', {
         dbName: 'sys',
-        path: 'user.userInfo',
-        value: userInfo
+        path: 'user.info',
+        value: info
       })
     },
     /**
      * @description 从数据库取用户数据
      * @param {Object} state vuex state
      */
-    async userInfoLoad (state) {
+    async infoLoad (state) {
       // store 赋值
-      state.userInfo = await this.dispatch('d2admin/util/dbValueGetByUser', {
+      state.info = await this.dispatch('d2admin/util/dbValueGetByUser', {
         dbName: 'sys',
-        path: 'user.userInfo',
+        path: 'user.info',
         defaultValue: '请重新登陆'
       })
     }