|
@@ -10,7 +10,7 @@ import $api from "@/api/api"
|
|
|
|
|
|
NProgress.configure({ showSpinner: false })
|
|
NProgress.configure({ showSpinner: false })
|
|
let spotCheckData = {}
|
|
let spotCheckData = {}
|
|
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
|
|
|
|
|
|
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/msg']
|
|
router.beforeEach(async (to, from, next) => {
|
|
router.beforeEach(async (to, from, next) => {
|
|
if (to.path !== from.path) {
|
|
if (to.path !== from.path) {
|
|
NProgress.start();
|
|
NProgress.start();
|
|
@@ -48,6 +48,7 @@ router.beforeEach(async (to, from, next) => {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
$api[url]({ data: to.query.data }).then(res => {
|
|
$api[url]({ data: to.query.data }).then(res => {
|
|
|
|
+ console.log(res)
|
|
let data = {
|
|
let data = {
|
|
userId: res.data.userId,
|
|
userId: res.data.userId,
|
|
realName: res.data.realName,
|
|
realName: res.data.realName,
|
|
@@ -71,14 +72,21 @@ router.beforeEach(async (to, from, next) => {
|
|
// console.log("yb",data.token)
|
|
// console.log("yb",data.token)
|
|
resolve()
|
|
resolve()
|
|
}).catch(() => {
|
|
}).catch(() => {
|
|
- Message.error("数据错误,解析失败")
|
|
|
|
|
|
+ // Message.error("数据错误,解析失败")
|
|
store.dispatch('FedLogOut')
|
|
store.dispatch('FedLogOut')
|
|
console.log("执行了FedLogOut")
|
|
console.log("执行了FedLogOut")
|
|
- next(`/login?TenantId=${sessionStorage.TenantId}`)
|
|
|
|
|
|
+ // next(`/login?TenantId=${sessionStorage.TenantId}`)
|
|
|
|
+ next(`/msg`)
|
|
|
|
+ return;
|
|
})
|
|
})
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
+ // if(msgtype==1)
|
|
|
|
+ // {
|
|
|
|
+ // return next(`/error/404`)
|
|
|
|
+ // }
|
|
}
|
|
}
|
|
|
|
+
|
|
if (sessionStorage.TenantId && !store.state.user.companyName) {
|
|
if (sessionStorage.TenantId && !store.state.user.companyName) {
|
|
store.dispatch('footerData')
|
|
store.dispatch('footerData')
|
|
}
|
|
}
|