diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index 2c4873bc4..a3a5053ee 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -182,7 +182,9 @@ export default { this.$get('logout').then(() => { this.$router.replace({ path: '/', query: {} }).catch(err => {}) this.logoutSuccess() - window.location.href = '/' + document.location.href = '/' + sessionStorage.setItem('nz-is-logout', '1') + // this.$router.push('/login') }) }, showPinDialog () { diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js index 2ddb86a86..95f236479 100644 --- a/nezha-fronted/src/store/user.js +++ b/nezha-fronted/src/store/user.js @@ -144,7 +144,7 @@ const user = { }) } // 登录成功后跳回到原来页面 - if (sessionStorage.getItem('nz-previous-page') && noJumpPath.indexOf(sessionStorage.getItem('nz-previous-page')) === -1) { + if (sessionStorage.getItem('nz-previous-page') && noJumpPath.indexOf(sessionStorage.getItem('nz-previous-page')) === -1 && !sessionStorage.getItem('nz-is-logout')) { const route = sessionStorage.getItem('nz-previous-page') router.push({ path: route, @@ -153,8 +153,11 @@ const user = { } }).then(() => { sessionStorage.removeItem('nz-previous-page') + sessionStorage.removeItem('nz-is-logout') }) } else { + sessionStorage.removeItem('nz-previous-page') + sessionStorage.removeItem('nz-is-logout') router.push({ path: path[0], query: {