blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-04-06 03:57:53 +08:00
Code Issues Releases Wiki Activity

Merge 71c8ca441192ff660e6bfade83d199a6f27c497f into 6858a9ad67483025f6a9432a926beb9327037be3

Browse Source
This commit is contained in:
tao 2024-11-28 00:29:09 +00:00 committed by GitHub
commit 2118981962
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/layout/components/Navbar.vue
View File

@ -76,7 +76,8 @@ export default {
},
async logout() {
await this.$store.dispatch('user/logout')
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
const { path, query } = this.$route
this.$router.push({ path: '/login', query: { redirect: path, ...query }})
}
}
}

4
src/permission.js
View File

@ -49,7 +49,7 @@ router.beforeEach(async(to, from, next) => {
// remove token and go to login page to re-login
await store.dispatch('user/resetToken')
Message.error(error || 'Has Error')
next(`/login?redirect=${to.path}`)
next({ path: '/login', query: { redirect: to.path, ...to.query }})
NProgress.done()
}
}
@ -62,7 +62,7 @@ router.beforeEach(async(to, from, next) => {
next()
} else {
// other pages that do not have permission to access are redirected to the login page.
next(`/login?redirect=${to.path}`)
next({ path: '/login', query: { redirect: to.path, ...to.query }})
NProgress.done()
}
}