image/tdesign-vue-next-starter
1
0
Fork 1
mirror of https://github.com/Tencent/tdesign-vue-next-starter.git synced 2024-12-22 23:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 先验证token，再获取菜单 (#487)

Browse Source
This commit is contained in:
liweijie0812 2023-05-08 22:15:59 +08:00 committed by GitHub
parent a0c67b05d9
commit 0d70db425d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/permission.ts
View File

@ -23,6 +23,16 @@ router.beforeEach(async (to, from, next) => {
next();
return;
}
try {
await userStore.getUserInfo();
} catch (error) {
MessagePlugin.error(error);
next({
path: '/login',
query: { redirect: encodeURIComponent(to.fullPath) },
});
NProgress.done();
}
const { asyncRoutes } = permissionStore;
@ -42,21 +52,10 @@ router.beforeEach(async (to, from, next) => {
}
}
try {
await userStore.getUserInfo();
if (router.hasRoute(to.name)) {
next();
} else {
next(`/`);
}
} catch (error) {
MessagePlugin.error(error);
next({
path: '/login',
query: { redirect: encodeURIComponent(to.fullPath) },
});
NProgress.done();
if (router.hasRoute(to.name)) {
next();
} else {
next(`/`);
}
} else {
/* white list router */