From 621ce56da2be6f4589e0f84110ab5fc27295a83d Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 29 Aug 2018 09:13:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20vuex=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=8F=82=E6=95=B0=E5=B9=B6=E4=B8=94=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 852291ea8b976be25e156f53ce0b81faef742913 [formerly 852291ea8b976be25e156f53ce0b81faef742913 [formerly 852291ea8b976be25e156f53ce0b81faef742913 [formerly 852291ea8b976be25e156f53ce0b81faef742913 [formerly e6a9f047da58f161e6bccd8838524b7245a0e76b [formerly 9307a072e2187be9106f82f8d3340c7e6f927910]]]]] Former-commit-id: 352a2e620fc06b1beb9bbdcfefacb1a7e37ae55f Former-commit-id: 7d55b4293f852eeb95c236ceb5d934d71afe0627 Former-commit-id: 2532af0dc63f6f5cd84ce055bbb1fb286d36216f [formerly 104ffc097898b5825fa71dd6242d6d1733971d1f] Former-commit-id: f342740b49ba9a6c1aaf1b4cbcc6e22203d671b3 Former-commit-id: be20972bb932dc5e2ff35c617c7a55ce570e31b9 Former-commit-id: e3e8d3adbe3d832c212d56095ccce7efcce8a519 Former-commit-id: f57d76130736d2ba8a7c099602c92ff9817b8702 Former-commit-id: f29cdf9cbc9f6523cea164ebc13c01c80d493043 --- docs/zh/sys-vuex/README.md.REMOVED.git-id | 2 +- src/store/modules/d2admin/modules/account.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id index a901b125..209db591 100644 --- a/docs/zh/sys-vuex/README.md.REMOVED.git-id +++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id @@ -1 +1 @@ -33948f39bdcc1391fd42429bd95b3b98c167fb23 \ No newline at end of file +bbc8c6b753f56e87bba30fa4d54dfce9db8fdbc3 \ 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 aafbf581..84fcf6b0 100644 --- a/src/store/modules/d2admin/modules/account.js +++ b/src/store/modules/d2admin/modules/account.js @@ -10,8 +10,18 @@ export default { * @param {Object} param vm {Object} vue 实例 * @param {Object} param username {String} 用户账号 * @param {Object} param password {String} 密码 + * @param {Object} param route {Object} 登陆成功后定向的路由对象 */ - login ({ commit }, { vm, username, password }) { + login ({ + commit + }, { + vm, + username, + password, + route = { + name: 'index' + } + }) { // 开始请求登录接口 AccountLogin({ username, @@ -32,9 +42,7 @@ export default { // 用户登陆后从持久化数据加载一系列的设置 commit('load') // 跳转路由 - vm.$router.push({ - name: 'index' - }) + vm.$router.push(route) }) .catch(err => { console.group('登陆结果') From 71485b2146b88ea5a83a28c869ed99b8df2695d4 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 29 Aug 2018 09:15:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ddc27bd79171dd20c58e8fb31d9f52e77ec37527 [formerly ddc27bd79171dd20c58e8fb31d9f52e77ec37527 [formerly ddc27bd79171dd20c58e8fb31d9f52e77ec37527 [formerly ddc27bd79171dd20c58e8fb31d9f52e77ec37527 [formerly 05c7e79491d72bff1646a33fb8ecab334bc87a9c [formerly 0b7e209f3effdd3f5d6e957848ef075332771d79]]]]] Former-commit-id: c7f06a9b831ba251878a648119a1e7db9c027de7 Former-commit-id: a3dc9964a3977530dd60e22a7cfe422998c97872 Former-commit-id: 3af64bab2ca21cdfc4d2c28957fba806722f43c5 [formerly 7749efe39270d58d9e428108ccf2a8c6ef010643] Former-commit-id: b5e379ab711a63da1395c8b1ec5f62e3cc6b9567 Former-commit-id: 10713e1a5e8139fd1c2e55325fbce2f12b2ccc0b Former-commit-id: 2263e685913a906bbde50ef7730f3d125c96b8cd Former-commit-id: ecf394a8b05dcea76fe03e77a2e4a782528b099f Former-commit-id: 33a29df0093a23418b646d8b95e295a84beb53df --- docs/zh/sys-vuex/README.md.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id index 209db591..47a35f92 100644 --- a/docs/zh/sys-vuex/README.md.REMOVED.git-id +++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id @@ -1 +1 @@ -bbc8c6b753f56e87bba30fa4d54dfce9db8fdbc3 \ No newline at end of file +3b8325af12f399750c0f3a4b0a984cf14d4c259d \ No newline at end of file From 753a440c7419e2f667b0286dba85a9d92828bf05 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 29 Aug 2018 10:18:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E8=AF=A6=E7=BB=86=E7=9A=84?= =?UTF-8?q?=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4d8d27873ee15c583bf4c57d4a39012f1546449b [formerly 372a0f6444c430c314bbeeffabf1b9ce89dedfe0] [formerly 4d8d27873ee15c583bf4c57d4a39012f1546449b [formerly 372a0f6444c430c314bbeeffabf1b9ce89dedfe0] [formerly 4d8d27873ee15c583bf4c57d4a39012f1546449b [formerly 372a0f6444c430c314bbeeffabf1b9ce89dedfe0] [formerly 372a0f6444c430c314bbeeffabf1b9ce89dedfe0 [formerly 1fe88ddcd93f0087043eb811b8c295120650e88b [formerly ddd05b67dbfc08a63de5072457668f4c45e03ab3]]]]] Former-commit-id: e40508e3fca73fcd4fdaa2601b0450d265f212f6 Former-commit-id: b4abebb9ea97cb8417333c64244fab5530a51fe8 Former-commit-id: 40cd4bc2ab1d1e2e2bbd1498dbb212c08912a004 [formerly 5cc79ccc86a4457f7722d7b2719975255949d38d] Former-commit-id: e72b44ceb0ab5d59454a0b18d60ce00418093b18 Former-commit-id: 5e3c5857b4b873545e4beb5773d0159663edc7e3 Former-commit-id: 3551ea056c38be4d5b092459daf01a1bbfb2840e Former-commit-id: b559d00e1f8493a9238e8b07b8ecbf823ca6b40a Former-commit-id: 1a8ab4d7541efae5efb69f022c3b15910e707a31 --- docs/zh/sys-vuex/README.md.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id index 47a35f92..f4ce7403 100644 --- a/docs/zh/sys-vuex/README.md.REMOVED.git-id +++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id @@ -1 +1 @@ -3b8325af12f399750c0f3a4b0a984cf14d4c259d \ No newline at end of file +cfb93cb80f11e2905965d26af505cb4f45f7d0be \ No newline at end of file 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 4/6] =?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('登陆结果') From b92529a63e301fecd3c95c3455786057a58fcdd4 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 29 Aug 2018 11:23:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=99=BB=E9=99=86=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=87=8D=E5=AE=9A=E5=90=91=E5=88=B0=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 21da16e18630a8b3064f6bdd1b8cdd2c1b760439 [formerly 21da16e18630a8b3064f6bdd1b8cdd2c1b760439 [formerly 21da16e18630a8b3064f6bdd1b8cdd2c1b760439 [formerly 21da16e18630a8b3064f6bdd1b8cdd2c1b760439 [formerly 80fff8f10f84df7860d79293a4203c93c835ab7d [formerly 4058e66ecf06d1121f63f05950c7eba795ef4f43]]]]] Former-commit-id: 193dfc5044ad4be16c9de7ee233eb98a0b7d5090 Former-commit-id: 81588f7befd8834d0a908a0a21c8d51f4f64b0c5 Former-commit-id: 7175bd2c811fb738e3698d0d120e4292363e2315 [formerly e5dbd4dfdb31f6a8474843f57d3242d9d5d6734b] Former-commit-id: a9776650ed2f81a32d47389a04e0d914b6dab62b Former-commit-id: 983a77dffbfbd6c10b6943d953552333ac34f276 Former-commit-id: d582b38c28027aa7caa1a165c5ea457dbba97f8d Former-commit-id: 0b5c23c4b6ac208cc9dfe36b76211351a4b2de06 Former-commit-id: 584fa36572a92cabbb07640ed8ec741cc7a50bf4 --- src/router/index.js | 2 ++ src/store/modules/d2admin/modules/account.js | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index d5a6d886..38fc6878 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,6 +26,8 @@ router.beforeEach((to, from, next) => { if (token && token !== 'undefined') { next() } else { + // 将当前预计打开的页面完整地址临时存储 登陆后继续跳转 + // 这个 cookie(redirect) 会在登陆后自动删除 util.cookies.set('redirect', to.fullPath) // 没有登陆的时候跳转到登陆界面 next({ diff --git a/src/store/modules/d2admin/modules/account.js b/src/store/modules/d2admin/modules/account.js index ce545d01..3e28d6c2 100644 --- a/src/store/modules/d2admin/modules/account.js +++ b/src/store/modules/d2admin/modules/account.js @@ -41,8 +41,12 @@ export default { }, { root: true }) // 用户登陆后从持久化数据加载一系列的设置 commit('load') - // 更新路由 - vm.$router.replace(route) + // 更新路由 尝试去获取 cookie 里保存的需要重定向的页面完整地址 + const path = util.cookies.get('redirect') + // 根据是否存有重定向页面判断如何重定向 + vm.$router.replace(path ? { path } : route) + // 删除 cookie 中保存的重定向页面 + util.cookies.remove('redirect') }) .catch(err => { console.group('登陆结果') From 2f805d49004ea98f6d5d30d8ad90503216de1066 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 29 Aug 2018 11:29:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 043ce121840b528859a95cf35d0c977a5d6416cd [formerly 404b3277596f869d99b28b7b22777006381a4004] [formerly 043ce121840b528859a95cf35d0c977a5d6416cd [formerly 404b3277596f869d99b28b7b22777006381a4004] [formerly 043ce121840b528859a95cf35d0c977a5d6416cd [formerly 404b3277596f869d99b28b7b22777006381a4004] [formerly 404b3277596f869d99b28b7b22777006381a4004 [formerly 17e3d3eeb4148add37bbd7c1a9f98fc24b19cf62 [formerly d5b63336482b6f45112735ef5c32b9ca90aca7c8]]]]] Former-commit-id: 1f74c4109cede343a3ea4084410d41b2d0744fce Former-commit-id: 7ce8ed74b1a1146f7fabbbdf754d24900d938c5a Former-commit-id: 0dcdc80e7395e7a10ba978d0dc85ca4e63b05e2f [formerly e942840456b7d782fd2fc6ce6220f6b6bf8014ba] Former-commit-id: 6350997a858113c7c6aa9e0238421d5d661d4907 Former-commit-id: e258f542872d1ba354a823fc600e345a457fb9fc Former-commit-id: 0ae40a78fd31c8475a43244a5cbfa7839ed60168 Former-commit-id: 675a523795398d17cf787e571d2857fd6c457163 Former-commit-id: c9ee9556557cbb1484cf0f79182447eaf3b8fa25 --- docs/zh/sys-vuex/README.md.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/sys-vuex/README.md.REMOVED.git-id b/docs/zh/sys-vuex/README.md.REMOVED.git-id index dfb7911a..7db055cd 100644 --- a/docs/zh/sys-vuex/README.md.REMOVED.git-id +++ b/docs/zh/sys-vuex/README.md.REMOVED.git-id @@ -1 +1 @@ -20b34160b34da04b0c323ab176f02fafec3c294d \ No newline at end of file +28e37c79429114aea200a5e2a7bcc6f8707ab39d \ No newline at end of file