caichengyu 11 月之前
父節點
當前提交
f074a0d69f
共有 3 個文件被更改,包括 11 次插入2 次删除
  1. 2 0
      src/permission.js
  2. 8 1
      src/utils/auth.js
  3. 1 1
      src/utils/request.js

+ 2 - 0
src/permission.js

@@ -68,10 +68,12 @@ router.beforeEach(async (to, from, next) => {
           setToken(data.token)
           store.commit('SET_TOKEN', data.token)
           spotCheckData = data
+          // console.log("yb",data.token)
           resolve()
         }).catch(() => {
           Message.error("数据错误,解析失败")
           store.dispatch('FedLogOut')
+          console.log("执行了FedLogOut")
           next(`/login?TenantId=${sessionStorage.TenantId}`)
         })
       })

+ 8 - 1
src/utils/auth.js

@@ -3,13 +3,20 @@ import Cookies from 'js-cookie'
 const TokenKey = 'Admin-Token'
 
 export function getToken() {
-  return Cookies.get(TokenKey)
+  var tk=Cookies.get(TokenKey);
+  if(!tk){
+  tk=sessionStorage.getItem(TokenKey);
+  console.log("cookie丢失后获取Storage,",tk)
+  }
+  return tk
 }
 
 export function setToken(token) {
+  sessionStorage.setItem(TokenKey, token);
   return Cookies.set(TokenKey, token)
 }
 
 export function removeToken() {
+  sessionStorage.removeItem(TokenKey);
   return Cookies.remove(TokenKey)
 }

+ 1 - 1
src/utils/request.js

@@ -15,7 +15,7 @@ export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 // export const BASE_IMG_URL = 'https://file.xyyxt.net'
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: baseURL,
+  baseURL: baseURL, 
   // 超时
   timeout: 600000
 })