|
@@ -97,24 +97,31 @@ router.beforeEach(async (to, from, next) => {
|
|
|
} else {
|
|
|
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
- console.log("####111111111111")
|
|
|
const userurl = hashParams();
|
|
|
- if (userurl) {
|
|
|
- setUserUrl(userurl, 86400)
|
|
|
+ if(userurl){
|
|
|
+ setUserUrl(userurl, 86400)
|
|
|
}
|
|
|
|
|
|
next()
|
|
|
} else {
|
|
|
- console.log("####22222222222")
|
|
|
-
|
|
|
+ const userType = getUseType()
|
|
|
+ if(userType==10000){
|
|
|
next(`/login?redirect=${to.path}`)
|
|
|
NProgress.done()
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
setUserUrl(URL.webUrl, 86400)
|
|
|
-
|
|
|
+ }else{
|
|
|
+ const userurl = getUserUrl();
|
|
|
+ let url=''
|
|
|
+ if (!userurl.startsWith('http://') && !userurl.startsWith('https://')) {
|
|
|
+
|
|
|
+ url = 'http://' + userurl;
|
|
|
+ }else{
|
|
|
+ url = userurl;
|
|
|
+ }
|
|
|
+ next(`/login?backurl=${url}`)
|
|
|
+ NProgress.done()
|
|
|
+ setUserUrl(userurl, 86400)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
})
|