From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期日, 18 二月 2024 15:22:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- platform/src/utils/request.js | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/src/utils/request.js b/platform/src/utils/request.js index 8416b58..2673a72 100644 --- a/platform/src/utils/request.js +++ b/platform/src/utils/request.js @@ -3,11 +3,11 @@ import pkg from '../../package' import { trim } from './util' import cache from '../plugins/cache' +import { Message, Loading } from 'element-ui' axios.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8' const axiosInstance = axios.create({ baseURL: process.env.VUE_APP_API_PREFIX, - // baseURL: process.env.VUE_APP_API, // 璇锋眰瓒呮椂鏃堕棿 timeout: 60000 }) @@ -30,9 +30,9 @@ // 璁剧疆鎿嶄綔骞冲彴 config.headers['eva-platform'] = `pc-${pkg.version}` // 璁剧疆璁よ瘉澶� - const authToken = Cookies.get('doumee-auth-token') + const authToken = Cookies.get('eva-auth-token') if (authToken != null) { - config.headers['doumee-auth-token'] = authToken + config.headers['eva-auth-token'] = authToken } return config }, function (error) { @@ -41,6 +41,8 @@ // 鏂板缓鍝嶅簲鎷︽埅鍣� axiosInstance.interceptors.response.use((response) => { + // console.log(response.status) + // debugger // 璇锋眰澶辫触 if (response.status !== 200) { return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�')) @@ -52,7 +54,8 @@ // 鏈櫥褰� if (response.data.code === 401) { if (response.config.autoLogin !== false) { - window.location.href = process.env.VUE_APP_ROUTER_MODE === 'history' ? '/#/login' : '/login' + location.reload() + // window.location.href = process.env.VUE_APP_ROUTER_MODE === 'history' ? '/login' : '/#/login' } return Promise.reject(response.data) } -- Gitblit v1.9.3