diff --git a/web/src/permission.js b/web/src/permission.js index 3b48995c..5276aea5 100644 --- a/web/src/permission.js +++ b/web/src/permission.js @@ -115,7 +115,7 @@ router.beforeEach(async (to, from) => { return { name: 'Login', - query: { redirect: to.href } + query: { redirect: to.fullPath } } } @@ -126,7 +126,7 @@ router.beforeEach(async (to, from) => { return { name: 'Login', query: { - redirect: document.location.hash + redirect: to.fullPath } } }) diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js index b103ec79..6f0e57b5 100644 --- a/web/src/pinia/modules/user.js +++ b/web/src/pinia/modules/user.js @@ -88,6 +88,11 @@ export const useUserStore = defineStore('user', () => { router.addRoute(asyncRouter) }) + if(router.currentRoute.value.query.redirect) { + await router.replace(router.currentRoute.value.query.redirect) + return true + } + if (!router.hasRoute(userInfo.value.authority.defaultRouter)) { ElMessage.error('请联系管理员进行授权') } else {