From 9f43b24c217319fbfe3a29ba583778f00ca5bb7a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 5 Feb 2019 23:23:47 +0800
Subject: [PATCH] =?UTF-8?q?account=20=E6=A8=A1=E5=9D=97=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=20vm=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 26d007bd6cb5a19203ba9fce0d49fb8aa2368de5 [formerly 26d007bd6cb5a19203ba9fce0d49fb8aa2368de5 [formerly 26d007bd6cb5a19203ba9fce0d49fb8aa2368de5 [formerly 26d007bd6cb5a19203ba9fce0d49fb8aa2368de5 [formerly f2729da3de3bd855ef3d3b644b3498e60be87a7f [formerly 7b041873081adf6cea66f8a8ca45312b5c153c24]]]]]
Former-commit-id: a950931df2b7422c7474cff9fe1ccd747fff631b
Former-commit-id: 714cff69949a49d5964a7b79b2409d01ba624826
Former-commit-id: ba7b43968e0ffaac136a0e8c0d8eed50452fa48e [formerly 992801d5467af4aa8f5b3ee62564cf9b24a34a67]
Former-commit-id: e94927b48b3c400c295490e3d73f763f8efdfc4a
Former-commit-id: af4129b6525639cf24bc7b1a5bb1caa6ef0bf7c5
Former-commit-id: c168ef5ddd3c9302695eb24f90d36a99842cd985
Former-commit-id: a81a48723a94cb3a8409090a46fad73e735cb391
Former-commit-id: da614a04e8f7b06d6b264fd6d4a45aa8fc1abc56
---
 .../components/header-user/index.vue            |  1 -
 src/pages/login/page.vue.REMOVED.git-id         |  2 +-
 src/store/modules/d2admin/modules/account.js    | 17 +++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index a8e2bdb5..d9ffa972 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -27,7 +27,6 @@ export default {
      */
     logOff () {
       this.logout({
-        vm: this,
         confirm: true
       })
     }
diff --git a/src/pages/login/page.vue.REMOVED.git-id b/src/pages/login/page.vue.REMOVED.git-id
index 0dcc1eb9..ea09c37d 100644
--- a/src/pages/login/page.vue.REMOVED.git-id
+++ b/src/pages/login/page.vue.REMOVED.git-id
@@ -1 +1 @@
-6c5a0e1b91c5fe254348745d01ffcf909811946f
\ No newline at end of file
+bf433bc08708fd43c3fcf70acb0d3993d9153e7d
\ No newline at end of file
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index c4cc3de0..f704b5d2 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -1,4 +1,6 @@
+import { Message, MessageBox } from 'element-ui'
 import util from '@/libs/util.js'
+import router from '@/router'
 import { AccountLogin } from '@api/sys.login'
 
 export default {
@@ -7,13 +9,11 @@ export default {
     /**
      * @description 登录
      * @param {Object} param context
-     * @param {Object} param vm {Object} vue 实例
      * @param {Object} param username {String} 用户账号
      * @param {Object} param password {String} 密码
      * @param {Object} param route {Object} 登录成功后定向的路由对象 任何 vue-router 支持的格式
      */
     login ({ dispatch }, {
-      vm,
       username,
       password
     }) {
@@ -49,10 +49,9 @@ export default {
     /**
      * @description 注销用户并返回登录页面
      * @param {Object} param context
-     * @param {Object} param vm {Object} vue 实例
      * @param {Object} param confirm {Boolean} 是否需要确认
      */
-    logout ({ commit, dispatch }, { vm, confirm = false }) {
+    logout ({ commit, dispatch }, { confirm = false } = {}) {
       /**
        * @description 注销
        */
@@ -63,14 +62,14 @@ export default {
         // 清空 vuex 用户信息
         await dispatch('d2admin/user/set', {}, { root: true })
         // 跳转路由
-        vm.$router.push({
+        router.push({
           name: 'login'
         })
       }
       // 判断是否需要确认
       if (confirm) {
         commit('d2admin/gray/set', true, { root: true })
-        vm.$confirm('注销当前账户吗?  打开的标签页和用户设置将会被保存。', '确认操作', {
+        MessageBox.confirm('注销当前账户吗?  打开的标签页和用户设置将会被保存。', '确认操作', {
           confirmButtonText: '确定注销',
           cancelButtonText: '放弃',
           type: 'warning'
@@ -81,7 +80,9 @@ export default {
           })
           .catch(() => {
             commit('d2admin/gray/set', false, { root: true })
-            vm.$message('放弃注销用户')
+            Message({
+              message: '放弃注销用户'
+            })
           })
       } else {
         logout()
@@ -91,7 +92,7 @@ export default {
      * @description 用户登录后从持久化数据加载一系列的设置
      * @param {Object} state vuex state
      */
-    load ({ commit, dispatch }) {
+    load ({ dispatch }) {
       return new Promise(async resolve => {
         // DB -> store 加载用户名
         await dispatch('d2admin/user/load', null, { root: true })