From 0ceaf0d5d87c29d5b23fcefcd8d6a7fd628ce145 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Mon, 28 Aug 2023 23:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/request.ts               | 27 +++++++++++++++++++++++++++
 src/utils/request.ts               | 23 +++--------------------
 src/utils/{upload.js => upload.ts} |  7 ++++++-
 3 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 src/types/request.ts
 rename src/utils/{upload.js => upload.ts} (93%)

diff --git a/src/types/request.ts b/src/types/request.ts
new file mode 100644
index 0000000..6c129e5
--- /dev/null
+++ b/src/types/request.ts
@@ -0,0 +1,27 @@
+interface BaseRequestConfig {
+    headers?: {
+        isToken: boolean
+    },
+    header?: any,
+    url: string,
+    params?: any,
+    timeout?: number | undefined,
+}
+
+export interface RequestConfig extends BaseRequestConfig {
+    method?: "OPTIONS" | "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "TRACE" | "CONNECT" | undefined
+    baseUrl?: string,
+    data?: any
+}
+
+export interface RequestUploadConfig extends BaseRequestConfig {
+    filePath: string,
+    name?: string,
+    formData: any
+}
+
+export interface ResponseData {
+    code: number,
+    data: any,
+    msg: string
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index aca2a39..224ceb2 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -3,28 +3,11 @@ import config from '@/config'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { toast, showConfirm, tansParams } from '@/utils/common'
+import { RequestConfig, ResponseData } from '@/types/request'
 
+let timeout = 10000
 const baseUrl = config.baseUrl
 
-interface RequestConfig{
-  headers?:{
-    isToken:boolean
-  },
-  header?:any,
-  params?:any,
-  url:string,
-  method?:"OPTIONS" | "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "TRACE" | "CONNECT" | undefined
-  baseUrl?:string,
-  timeout?:number | undefined,
-  data?:any
-}
-
-interface ResponseData{
-  code:number,
-  data:any,
-  msg:string
-}
-
 const request = (config:RequestConfig) => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
@@ -41,7 +24,7 @@ const request = (config:RequestConfig) => {
   return new Promise((resolve, reject) => {
     uni.request({
       method: config.method || 'GET',
-      timeout: config.timeout || 10000,
+      timeout: config.timeout || timeout,
       url: config.baseUrl || baseUrl + config.url,
       data: config.data,
       header: config.header,
diff --git a/src/utils/upload.js b/src/utils/upload.ts
similarity index 93%
rename from src/utils/upload.js
rename to src/utils/upload.ts
index 0547883..364d7f1 100644
--- a/src/utils/upload.js
+++ b/src/utils/upload.ts
@@ -3,11 +3,14 @@ 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'
 
 let timeout = 10000
 const baseUrl = config.baseUrl
 
-const upload = config => {
+
+
+const upload = (config:RequestUploadConfig) => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
@@ -31,6 +34,7 @@ const upload = config => {
         success: (res) => {
           let result = JSON.parse(res.data)
           const code = result.code || 200
+          // @ts-ignore
           const msg = errorCode[code] || result.msg || errorCode['default']
           if (code === 200) {
             resolve(result)
@@ -52,6 +56,7 @@ const upload = config => {
           }
         },
         fail: (error) => {
+          // @ts-ignore
           let { message } = error
           if (message == 'Network Error') {
             message = '后端接口连接异常'