Quellcode durchsuchen

修改错误提示

ZaiZai vor 1 Jahr
Ursprung
Commit
1b9746bdc0
3 geänderte Dateien mit 14 neuen und 16 gelöschten Zeilen
  1. 1 1
      public/version.json
  2. 9 7
      src/api/request/httpApi.js
  3. 4 8
      src/api/request/index.js

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240119151840"
+  "value": "20240125152622"
 }

+ 9 - 7
src/api/request/httpApi.js

@@ -4,17 +4,19 @@ import { apiErrorMessage, apiWarningMessage } from '~com/message/index.js'
 
 //封装的请求
 export const httpApi = async (obj, message = true) => {
-    return new Promise((resolve) => {
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async (resolve) => {
         //发起请求
-        request(obj).then(async (response) => {
-            resolve(await getResData(response, false))
-        }).catch(async (response) => {
+        const { code, res } = await request(obj)
+        if (code === 200) {
+            resolve(await getResData(res, false))
+        } else {
+            const msg = getMsgVal(res)
             if (message) {
-                const msg = getMsgVal(response)
                 if (msg) window.$message?.error(msg)
             }
-            resolve(await getResData(response, true))
-        })
+            resolve(await getResData(res, true))
+        }
     })
 }
 

+ 4 - 8
src/api/request/index.js

@@ -35,7 +35,7 @@ axios.interceptors.request.use(config => {
     }
     config.metadata = { startTime: new Date() }
     return config
-}, error => {
+}, (error) => {
     return Promise.reject(error)
 })
 
@@ -55,13 +55,9 @@ axios.interceptors.response.use(res => {
             router.push({ name: 'app-auth' }).then()
         }
     }
-    // 如果请求为非200, 自行catch逻辑处理
-    if (status !== 200) {
-        return Promise.reject(res)
-    }
-    return res
-}, error => {
-    return Promise.reject(new Error(error))
+    return { code: status, res }
+}, (error) => {
+    return { code: 0, error }
 })
 
 export default axios