From 5324861f16ea0316d149856c6273dd875e138e3a Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 10 Feb 2022 20:34:13 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=89=8B=E5=8A=A8=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=8F=90=E7=A4=BA=E2=80=9C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=88=96=E4=B8=8D=E5=9C=A8=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E5=86=85=E2=80=9D=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/pages/manage.vue | 2 +- resources/assets/js/store/actions.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index e33e1e03..4632c10b 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -578,7 +578,7 @@ export default { title: '退出登录', content: '你确定要登出系统？', onOk: () => { - this.$store.dispatch("logout") + this.$store.dispatch("logout", false) } }); return; diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index ee1de82d..70e0a248 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -367,10 +367,14 @@ export default { * 登出（打开登录页面） * @param state * @param dispatch + * @param appendFrom */ - logout({state, dispatch}) { + logout({state, dispatch}, appendFrom = true) { dispatch("handleClearCache", {}).then(() => { - const from = ["/", "/login"].includes(window.location.pathname) ? "" : encodeURIComponent(window.location.href); + let from = ["/", "/login"].includes(window.location.pathname) ? "" : encodeURIComponent(window.location.href); + if (appendFrom === false) { + from = null; + } $A.goForward({name: 'login', query: from ? {from: from} : {}}, true); }); },