Merge pull request 'fix : 简化模板' (#2) from dj into master
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/2
This commit is contained in:
@@ -175,36 +175,36 @@ const router = createRouter({
|
|||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
// router.beforeEach(async (to, form, next) => {
|
router.beforeEach(async (to, form, next) => {
|
||||||
// const permisstionStore = usePermisstionStroe();
|
const permisstionStore = usePermisstionStroe();
|
||||||
// const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
// NProgress.start();
|
NProgress.start();
|
||||||
// if (!getToken()) {
|
if (!getToken()) {
|
||||||
// if (to.path === "/login" || to.path === "/forbidden") {
|
if (to.path === "/login" || to.path === "/forbidden") {
|
||||||
// next();
|
next();
|
||||||
// NProgress.done();
|
NProgress.done();
|
||||||
// } else {
|
} else {
|
||||||
// next({ path: "/login" });
|
next({ path: "/login" });
|
||||||
// }
|
}
|
||||||
// } else {
|
} else {
|
||||||
// if (to.path === "/login") {
|
if (to.path === "/login") {
|
||||||
// next("/");
|
next("/");
|
||||||
// NProgress.done();
|
NProgress.done();
|
||||||
// } else {
|
} else {
|
||||||
// permisstionStore.setIsLoadRoutes(true);
|
permisstionStore.setIsLoadRoutes(true);
|
||||||
// if (
|
if (
|
||||||
// permisstionStore.isLoadRoutes &&
|
permisstionStore.isLoadRoutes &&
|
||||||
// permisstionStore.asyncRouters.length == 0
|
permisstionStore.asyncRouters.length == 0
|
||||||
// ) {
|
) {
|
||||||
// await permisstionStore.setAsyncRouters();
|
await permisstionStore.setAsyncRouters();
|
||||||
// await authStore.setUserInfo();
|
await authStore.setUserInfo();
|
||||||
// next({ ...to, replace: true });
|
next({ ...to, replace: true });
|
||||||
// } else {
|
} else {
|
||||||
// next();
|
next();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
|
|
||||||
router.afterEach(() => {
|
router.afterEach(() => {
|
||||||
NProgress.done();
|
NProgress.done();
|
||||||
|
|||||||
Reference in New Issue
Block a user