Merge branch 'alt_04_15_liu' into pre

src/permission.js

@@ -82,20 +82,23 @@ router.beforeEach(async(to, from, next) => {
     }
   } else {
     /* has no token*/
-   
     if (whiteList.indexOf(to.path) !== -1) {
+      const userurl = hashParams();
+      if(userurl){
+        setUserUrl(userurl, 86400) 
+      }
       // in the free login whitelist, go directly
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
       next(`/login?redirect=${to.path}`)
       NProgress.done()
-      const userurl = hashParams();
-      if(userurl){
-        setUserUrl(userurl, 86400) 
-      }else{
+      // const userurl = hashParams();
+      // if(userurl){
+      //   setUserUrl(userurl, 86400) 
+      // }else{
         setUserUrl(URL.webUrl, 86400)
-      }
+      // }
       
     }
   }