Bläddra i källkod

修改bug

修改bug
dangyunlong 3 dagar sedan
förälder
incheckning
e6a0337f41
1 ändrade filer med 17 tillägg och 10 borttagningar
  1. 17 10
      src/permission.js

+ 17 - 10
src/permission.js

@@ -97,24 +97,31 @@ router.beforeEach(async (to, from, next) => {
     } else {
     } else {
         /* has no token*/
         /* has no token*/
         if (whiteList.indexOf(to.path) !== -1) {
         if (whiteList.indexOf(to.path) !== -1) {
-            console.log("####111111111111")
             const userurl = hashParams();
             const userurl = hashParams();
-            if (userurl) {
-                setUserUrl(userurl, 86400)
+            if(userurl){
+            setUserUrl(userurl, 86400) 
             }
             }
             // in the free login whitelist, go directly
             // in the free login whitelist, go directly
             next()
             next()
         } else {
         } else {
-            console.log("####22222222222")
-            // other pages that do not have permission to access are redirected to the login page.
+            const userType = getUseType()
+            if(userType==10000){
             next(`/login?redirect=${to.path}`)
             next(`/login?redirect=${to.path}`)
             NProgress.done()
             NProgress.done()
-            // const userurl = hashParams();
-            // if(userurl){
-            //   setUserUrl(userurl, 86400) 
-            // }else{
             setUserUrl(URL.webUrl, 86400)
             setUserUrl(URL.webUrl, 86400)
-            // }
+            }else{
+            const userurl = getUserUrl();
+            let url=''
+            if (!userurl.startsWith('http://') && !userurl.startsWith('https://')) {
+                // 如果不是,则拼接上 http://
+                url = 'http://' + userurl;
+            }else{
+                url = userurl;
+            }
+            next(`/login?backurl=${url}`)
+            NProgress.done()
+            setUserUrl(userurl, 86400)
+            }
         }
         }
     }
     }
 })
 })