gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/store/user.js
This commit is contained in:
zhangyu
2023-03-10 13:48:00 +08:00
parent 284904848e f6b3def6b4
commit bb7a7f120f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/layout/header.vue
View File

@@ -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 () {

5
nezha-fronted/src/store/user.js
View File

@@ -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: {