diff --git a/src/router/index.ts b/src/router/index.ts index ba81de8a..d6e73bac 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,8 +8,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - // redirect: "/login" - redirect: "/Upgrade" + redirect: "/login" + // redirect: "/Upgrade" }, { path: '/login', @@ -70,43 +70,48 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { // 系统维护 - const toName = to.name === 'upgrade'; - if (toName) { - next(); - } else { - next({ name: 'upgrade' }); - } - // 检查路由是否存在 - // 机房用户 - // let murmurStr: any = localStorage.getItem('murmurStr') - // let getIsMurmur: any = getCookie("isMurmur") - // let token = getCookie("token"); - // let isMurmur = JSON.parse(getIsMurmur) - - // const routeExists = router.getRoutes().some(({ name }) =>{ - // if(name){ - // return name === to.name - // }else{ - // return false - // } - // }); - // if (routeExists) { - // if (isMurmur && murmurStr && token) { - // const toName = to.name === 'login'; - // if (toName) { - // next({ name: 'home' }); - // } else { - // next(); - // } - // } else { - // // 如果页面存在,正常跳转 - // next(); - // } + // const toName = to.name === 'upgrade'; + // if (toName) { // next(); // } else { - // // 如果页面不存在,可以跳转到404页面或者其他页面 - // next('/404'); + // next({ name: 'upgrade' }); // } + // 检查路由是否存在 + // 机房用户 + let murmurStr: any = localStorage.getItem('murmurStr') + let getIsMurmur: any = getCookie("isMurmur") + let token = getCookie("token"); + let isMurmur = JSON.parse(getIsMurmur) + + const routeExists = router.getRoutes().some(({ name }) =>{ + if(name){ + return name === to.name + }else{ + return false + } + }); + if (routeExists) { + if (isMurmur && murmurStr && token) { + const toName = to.name === 'login'; + if (toName) { + next({ name: 'home' }); + } else { + next(); + } + } else { + // 如果页面存在,正常跳转 + const toName = to.name === 'upgrade'; + if (toName) { + next({ name: 'home' }); + } else { + next(); + } + } + next(); + } else { + // 如果页面不存在,可以跳转到404页面或者其他页面 + next('/404'); + } });