|
@@ -177,14 +177,8 @@ export const registerBeforeRouter = async (router) => {
|
|
|
|
|
|
const hasRoute = hasNecessaryRoute(to, router)
|
|
|
NProgress.inc()
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (hasRoute || to.meta.hidden) {
|
|
|
|
|
|
-
|
|
|
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()
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (get(from, 'query.redirect')) {
|
|
|
const redirect = get(from, 'query.redirect')
|
|
|
from.query = {}
|
|
@@ -218,6 +203,10 @@ export const registerBeforeRouter = async (router) => {
|
|
|
|
|
|
}
|
|
|
} 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')
|