From efd9228cc9f16ef90e70c8627d610224abb3e995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 28 May 2022 00:32:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E5=8F=91=E9=80=81=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/constant.ts          |  3 ++-
 src/api/axios.ts           | 17 +++++++++--------
 src/api/path/system.api.ts |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build/constant.ts b/build/constant.ts
index dfa2f491..d7cda99c 100644
--- a/build/constant.ts
+++ b/build/constant.ts
@@ -1,4 +1,5 @@
-export const OUTPUT_DIR = 'dist';
+// 打包路径
+export const OUTPUT_DIR = 'dist'
 
 // chunk 警告大小
 export const chunkSizeWarningLimit = 2000
diff --git a/src/api/axios.ts b/src/api/axios.ts
index d84b4d67..52b932fc 100644
--- a/src/api/axios.ts
+++ b/src/api/axios.ts
@@ -15,7 +15,7 @@ interface MyResponseType {
 }
 
 const axiosInstance = axios.create({
-  baseURL: axiosPre,
+  baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`,
   timeout: ResultEnum.TIMEOUT,
 })
 
@@ -26,14 +26,17 @@ axiosInstance.interceptors.request.use(
     // 获取 token
     const info = getLocalStorage(StorageEnum.GO_SYSTEM_STORE)
     // 重新登录
-    if (!info) return routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+    if (!info) {
+      routerTurnByName(PageEnum.BASE_LOGIN_NAME)
+      return config
+    } 
     config.headers = {
       [RequestHttpHeaderEnum.TOKEN]: info[SystemStoreEnum.USER_INFO][SystemStoreUserInfoEnum.USER_TOKEN] || ''
     }
     return config
   },
-  (error: AxiosRequestConfig) => {
-    Promise.reject(error)
+  (err: AxiosRequestConfig) => {
+    Promise.reject(err)
   }
 )
 
@@ -51,13 +54,13 @@ axiosInstance.interceptors.response.use(
     if (code === ResultEnum.TOKEN_OVERDUE) {
       window['$message'].error(window['$t']('http.token_overdue_message'))
       routerTurnByName(PageEnum.BASE_LOGIN_NAME)
-      return
+      return Promise.resolve(res.data)
     }
 
     // 固定错误码重定向
     if (ErrorPageNameMap.get(code)) {
       redirectErrorPage(code)
-      return
+      return Promise.resolve(res.data)
     }
     
     // 提示错误
@@ -65,8 +68,6 @@ axiosInstance.interceptors.response.use(
     return Promise.resolve(res.data)
   },
   (err: AxiosResponse) => {
-    const { code } = err.data as { code: number }
-    if (ErrorPageNameMap.get(code)) redirectErrorPage(code)
     httpErrorHandle()
     Promise.reject(err)
   }
diff --git a/src/api/path/system.api.ts b/src/api/path/system.api.ts
index eaf0f9a9..522c17c9 100644
--- a/src/api/path/system.api.ts
+++ b/src/api/path/system.api.ts
@@ -7,7 +7,7 @@ export const loginApi = async (data: object) => {
   try {
     const res = await http(RequestHttpEnum.POST)(`/api/goview/${ModuleTypeEnum.SYSTEM}/login`, data);
     return res;
-  } catch {
+  } catch(err) {
     httpErrorHandle();
   }
 }