1

src/permission.js

@@ -3,7 +3,7 @@ import store from './store'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
-import { getToken,setUserUrl, setUseType,setWebSiteId,hashParams,getUseType} from '@/utils/auth' // get token from cookie
+import { getToken,setUserUrl, setUseType,setWebSiteId,hashParams,getUseType,getUserUrl} from '@/utils/auth' // get token from cookie
 import getPageTitle from '@/utils/get-page-title'
 import URL from '@/utils/baseUrl';
 import {getInfo} from '@/api/user'
@@ -35,7 +35,6 @@ router.beforeEach(async(to, from, next) => {
       const userInfo = await getInfo();
       console.log("User Info:", userInfo);
       if (userInfo.code === 200) {
-        console.log("####")
         setUseType(userInfo.data.userType, 86400)
         setWebSiteId(userInfo.data.siteId, 86400)
         next({ path: '/' })
@@ -71,9 +70,7 @@ router.beforeEach(async(to, from, next) => {
           // Call getInfo to fetch user information
           const userInfo = await getInfo();
           console.log("User Info:", userInfo);
-          console.log("33333333333")
         } catch (error) {
-          console.log("444444444444")
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
           Message.error(error || 'Has Error')
@@ -85,7 +82,6 @@ router.beforeEach(async(to, from, next) => {
   } else {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
-      console.log("####111111111111")
       const userurl = hashParams();
       if(userurl){
         setUserUrl(userurl, 86400) 
@@ -95,14 +91,19 @@ router.beforeEach(async(to, from, next) => {
     } else {
       const userType = getUseType()
       if(userType==10000){
-        console.log("1000000000000000")
         next(`/login?redirect=${to.path}`)
         NProgress.done()
         setUserUrl(URL.webUrl, 86400)
       }else{
-        console.log("!======1000000000000000")
-        const userurl = hashParams();
-        next(`/login?backurl=${userurl}`)
+        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)
       }