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); }); },