|
@@ -177,14 +177,8 @@ export const registerBeforeRouter = async (router) => {
|
|
|
// 检查目的地路由是否注册
|
|
|
const hasRoute = hasNecessaryRoute(to, router)
|
|
|
NProgress.inc()
|
|
|
- // console.log(`hasRoute`)
|
|
|
- // console.log(hasRoute)
|
|
|
- // const t = router.getRoutes()
|
|
|
- // console.log(`t`)
|
|
|
- // console.log(JSON.parse(JSON.stringify(t)))
|
|
|
if (hasRoute || to.meta.hidden) {
|
|
|
// 注册了直接进入
|
|
|
- // console.log(`if: to.path`)
|
|
|
if (get(from, 'query.redirect')) {
|
|
|
const redirect = get(from, 'query.redirect')
|
|
|
from.query = {}
|
|
@@ -198,15 +192,6 @@ export const registerBeforeRouter = async (router) => {
|
|
|
// 没注册就先注册再重定向进入直到进入为止
|
|
|
await addUserRoutes(menus, router)
|
|
|
NProgress.inc()
|
|
|
- // const t2 = router.getRoutes()
|
|
|
- // console.log(`t2`)
|
|
|
- // console.log(JSON.parse(JSON.stringify(t2)))
|
|
|
- // const t3 = hasNecessaryRoute(to, router)
|
|
|
- // console.log('t3')
|
|
|
- // console.log(JSON.parse(JSON.stringify(t3)))
|
|
|
- // console.log('to')
|
|
|
- // console.log(JSON.parse(JSON.stringify(to)))
|
|
|
- // console.log(`else: to.path`)
|
|
|
if (get(from, 'query.redirect')) {
|
|
|
const redirect = get(from, 'query.redirect')
|
|
|
from.query = {}
|
|
@@ -218,6 +203,10 @@ export const registerBeforeRouter = async (router) => {
|
|
|
// next({ ...to, replace: true })
|
|
|
}
|
|
|
} catch (error) {
|
|
|
+ await ElMessageBox.alert(i18n.global.t('common.token_error'), i18n.global.t('common.user_confirm'), {
|
|
|
+ confirmButtonText: i18n.global.t('common.re_login'),
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
const fp = from.path
|
|
|
const noneed = dontRedirectList.includes(fp)
|
|
|
if (noneed) next('/login')
|