From 7133cf90254ee9b432d6c90cdcec40e2d4b313e1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 29 Aug 2018 10:44:35 +0800
Subject: [PATCH] =?UTF-8?q?push=E6=94=B9=E4=B8=BA=E9=87=8D=E5=AE=9A?=
 =?UTF-8?q?=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 8e2befb4fb631a6796f993b6a0e5be2982d7c5d0 [formerly 963356adf3eebbd2b542e7636b44459ca6261f37] [formerly 8e2befb4fb631a6796f993b6a0e5be2982d7c5d0 [formerly 963356adf3eebbd2b542e7636b44459ca6261f37] [formerly 8e2befb4fb631a6796f993b6a0e5be2982d7c5d0 [formerly 963356adf3eebbd2b542e7636b44459ca6261f37] [formerly 963356adf3eebbd2b542e7636b44459ca6261f37 [formerly ab70aea31232443bd2d3635da7829ef14c183ca5 [formerly 7ac0ee3fdb349b2bec20eaace948480f8017cbc4]]]]]
Former-commit-id: feef344ca48315bbf9cea4012446d2c42d599dca
Former-commit-id: 059f8e6768ed05a01b6ec74874aa78915081b61a
Former-commit-id: 441801bca13f3da8b63fb91d48004b9dc2cfb874 [formerly fd761d5aae6a05ad701d9c92931c35ccf1b3c632]
Former-commit-id: e1ee84688390a87a35f5b93ce74529300530b619
Former-commit-id: b40f188d795d6025e2365757e173e32a4b691918
Former-commit-id: e2e185b7a92c428072785398d5ff65dca1a53a18
Former-commit-id: aca1d0fa7b35ac32eb9a602ace391f9aa484a7e9
Former-commit-id: 3f24f6995d60a0f1922bc9c2383ebb4959974b64
---
 docs/zh/sys-vuex/README.md.REMOVED.git-id    | 2 +-
 src/router/index.js                          | 1 +
 src/store/modules/d2admin/modules/account.js | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id
index f4ce7403..dfb7911a 100644
--- a/docs/zh/sys-vuex/README.md.REMOVED.git-id
+++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id
@@ -1 +1 @@
-cfb93cb80f11e2905965d26af505cb4f45f7d0be
\ No newline at end of file
+20b34160b34da04b0c323ab176f02fafec3c294d
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index b3766ab0..d5a6d886 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -26,6 +26,7 @@ router.beforeEach((to, from, next) => {
     if (token && token !== 'undefined') {
       next()
     } else {
+      util.cookies.set('redirect', to.fullPath)
       // 没有登陆的时候跳转到登陆界面
       next({
         name: 'login'
diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js
index 84fcf6b0..ce545d01 100644
--- a/src/store/modules/d2admin/modules/account.js
+++ b/src/store/modules/d2admin/modules/account.js
@@ -41,8 +41,8 @@ export default {
           }, { root: true })
           // 用户登陆后从持久化数据加载一系列的设置
           commit('load')
-          // 跳转路由
-          vm.$router.push(route)
+          // 更新路由
+          vm.$router.replace(route)
         })
         .catch(err => {
           console.group('登陆结果')