代他操作跳转修复

.env.development

@@ -2,12 +2,12 @@
 ENV = 'development'
 
 # 测试地址 API接口
-# VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
-VUE_APP_BASE_API = 'http://192.168.2.68:8012'
+VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.68:8012'
 
 # 文件上传 API接口地址
-# VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
-VUE_APP_UPLOAD_API='http://192.168.2.68:8012'
+VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
+# VUE_APP_UPLOAD_API='http://192.168.2.68:8012'
 
 # 二维码生成链接location
 VUE_APP_BASE_SERVER = 'https://www-b.caimei365.com'
@@ -17,10 +17,11 @@ VUE_APP_BASE_SERVER = 'https://www-b.caimei365.com'
 VUE_APP_SOCKET_SERVER = 'ws://192.168.2.68:8012/websocket?sessionSource=zplm_admin'
 
 # 网站地址
-VUE_APP_LOCAL = 'http://192.168.2.81:9527'
-# VUE_APP_LOCAL = 'http://zplm-b.caimei365.com'
+# VUE_APP_LOCAL = 'http://192.168.2.81:9527'
+VUE_APP_LOCAL = 'http://zplm-b.caimei365.com'
 
 
 # 支付
-VUE_APP_PAY_LOCAL = 'http://192.168.2.68:18014'
+# VUE_APP_PAY_LOCAL = 'http://192.168.2.68:18014'
+VUE_APP_PAY_LOCAL = 'http://zplm-b.caimei365.com
 

src/permission.js

@@ -40,18 +40,20 @@ router.beforeEach(async(to, from, next) => {
       } else {
         try {
           // 代理状态更换时清空全部页面标签
+          console.log('代理状态切换 ', store.getters.isChangeProxy)
           if (store.getters.isChangeProxy) {
             store.commit('tagsView/CLEAR_ALL_VIEW')
+            store.commit('proxy/CHANGE_PROXY_STATE', false)
           }
-          // store.commit('user/SET_ROLES', roles)
           await store.dispatch('user/fetchUserInfo')
           await store.dispatch('user/fetchUserVipInfo')
           // 根据用户角色获取路由配置
           const accessRoutes = await store.dispatch('permission/generateRoutes')
           // 添加路由配置
           router.addRoutes(accessRoutes)
+          console.log(router)
           // debugger
-          console.log(to)
+          console.log(accessRoutes)
           // 放行
           next({ ...to, path: '/', replace: true })
         } catch (err) {

src/utils/auth.js

@@ -1,4 +1,5 @@
 import Cookies from 'js-cookie'
+import store from '@/store'
 
 const TokenKey = 'Admin-Token'
 
@@ -35,11 +36,6 @@ export function removeUserInfo() {
 
 // 跳转页面判定
 export function initGoPage() {
-  const userInfo = getUserInfo()
-  console.log(userInfo)
-  if (!userInfo) {
-    console.log(userInfo)
-    return '/404'
-  }
-  return userInfo.userIdentity === 1 ? '/supplier/list' : '/club'
+  console.log(store.getters.userIdentity)
+  return store.getters.userIdentity === 1 ? '/supplier/list' : '/club'
 }