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

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

Browse Source
This commit is contained in:
zhangyu
2023-03-10 09:58:47 +08:00
parent 03299279de 12d8f3f5b4
commit d992955f3a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,6 @@ export default {
this.$router.replace({ path: '/', query: {} }).catch(err => {})
this.logoutSuccess()
window.location.href = '/'
// this.$router.push('/login')
})
},
showPinDialog () {

4
nezha-fronted/src/http.js
View File

@@ -103,11 +103,11 @@ axios.interceptors.response.use(
return response
}
if (licenceErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.pathname) == -1) {
sessionStorage.setItem('nz-previous-page', router.currentRoute.fullPath + '1')
sessionStorage.setItem('nz-previous-page', router.currentRoute.fullPath)
window.location.href = '/'
} else if (response.status === 200) {
if (accountErrorCode.indexOf(response.data.code) !== -1 && noJumpPath.indexOf(window.location.pathname) == -1) {
sessionStorage.setItem('nz-previous-page', router.currentRoute.fullPath + '2')
sessionStorage.setItem('nz-previous-page', router.currentRoute.fullPath)
window.location.href = '/'
}
} else {

4
nezha-fronted/src/permission.js
View File

@@ -149,7 +149,7 @@ router.beforeEach((to, from, next) => {
resolve()
} else {
localStorage.removeItem('nz-token')
sessionStorage.setItem('nz-previous-page', to.fullPath + '5')
sessionStorage.setItem('nz-previous-page', to.fullPath)
next({ path: '/login' })
}
})
@@ -180,7 +180,7 @@ router.beforeEach((to, from, next) => {
if (loginWhiteList.indexOf(to.path) !== -1) {
next()
} else {
sessionStorage.setItem('nz-previous-page', to.fullPath + '6')
sessionStorage.setItem('nz-previous-page', to.fullPath)
next({ path: '/login' })
}
}

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

@@ -152,12 +152,13 @@ const user = {
sessionStorage.removeItem('nz-previous-page')
})
} else {
sessionStorage.removeItem('nz-previous-page')
router.push({
path: path[0],
query: {
t: +new Date()
}
}).then(() => {
sessionStorage.removeItem('nz-previous-page')
})
}
})