From b86676570bd0e9e1539c5a30acbf5c4f8bc66ce9 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Fri, 1 Sep 2023 17:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=8D=E5=BA=94=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/request.ts |  8 +++++++-
 src/utils/request.ts | 29 +++++++++++++++--------------
 src/utils/upload.ts  |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/types/request.ts b/src/types/request.ts
index 67ad475..3396bbb 100644
--- a/src/types/request.ts
+++ b/src/types/request.ts
@@ -30,11 +30,17 @@ export interface RequestUploadConfig extends BaseRequestConfig {
     formData: any
 }
 
-export interface ResponseData {
+export interface ResponseData<T> {
     /** 响应码 */
     code: number,
     /** 响应数据 */
     data: any,
     /** 响应信息 */
     msg: string
+    /** 图片路径 */
+    imgUrl: string,
+    /** 数据总数 */
+    total:number,
+    /** 表格数据 */
+    rows:Array<T>,
 }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 90c83aa..c3c3711 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -8,7 +8,7 @@ import { RequestConfig, ResponseData } from '@/types/request'
 let timeout = 10000
 const baseUrl = config.baseUrl
 
-const request = (config: RequestConfig): Promise<ResponseData> => {
+const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
@@ -37,10 +37,10 @@ const request = (config: RequestConfig): Promise<ResponseData> => {
          return
        } */
       const res = response
-      const data: ResponseData = res.data as ResponseData
+      const data:ResponseData<T> = res.data as ResponseData<T>
       const code = data.code || 200
       // @ts-ignore
-      const msg: string = errorCode[code] || data.msg || errorCode['default']
+      const msg:string = errorCode[code] || data.msg || errorCode['default']
       if (code === 401) {
         showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
           if (res.confirm) {
@@ -58,18 +58,19 @@ const request = (config: RequestConfig): Promise<ResponseData> => {
         reject(code)
       }
       resolve(data)
-    }).catch(error => {
-      let { message } = error
-      if (message === 'Network Error') {
-        message = '后端接口连接异常'
-      } else if (message.includes('timeout')) {
-        message = '系统接口请求超时'
-      } else if (message.includes('Request failed with status code')) {
-        message = '系统接口' + message.substr(message.length - 3) + '异常'
-      }
-      toast(message)
-      reject(error)
     })
+      .catch(error => {
+        let { message } = error
+        if (message === 'Network Error') {
+          message = '后端接口连接异常'
+        } else if (message.includes('timeout')) {
+          message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+          message = '系统接口' + message.substr(message.length - 3) + '异常'
+        }
+        toast(message)
+        reject(error)
+      })
   })
 }
 
diff --git a/src/utils/upload.ts b/src/utils/upload.ts
index e01be47..a616849 100644
--- a/src/utils/upload.ts
+++ b/src/utils/upload.ts
@@ -3,12 +3,12 @@ import config from '@/config'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
-import { RequestUploadConfig } from '@/types/request'
+import { ResponseData, RequestUploadConfig } from '@/types/request'
 
 let timeout = 10000
 const baseUrl = config.baseUrl
 
-const upload = (config:RequestUploadConfig) => {
+const upload = <T>(config:RequestUploadConfig):Promise<ResponseData<T>> => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}