From dfecc5efaa6fa81dbcf307f1e1b6759f3084e0d0 Mon Sep 17 00:00:00 2001
From: YOS-DRVOGPU6U78\Administrator <chenky0613@qq.com>
Date: 星期一, 17 七月 2023 12:20:40 +0800
Subject: [PATCH] 增加utils工具
---
utils/request.js | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/utils/request.js b/utils/request.js
index c2bd291..3cb3c0d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,42 +1,57 @@
-const { error } = require("jquery")
-const { toast } = require("./common")
+import config from '@/config'
+import {
+ getToken
+} from '@/utils/auth'
+import errorCode from '@/utils/errorCode'
+import {
+ toast,
+ showConfirm,
+ tansParams
+} from '@/utils/common'
let timeout = 10000
const baseUrl = config.baseUrl
const request = config => {
- return new Promise((resolve,reject) => {
+ // 鏄惁闇�瑕佽缃� token
+ // const isToken = (config.headers || {}).isToken === false
+ // config.header = config.header || {}
+ // if (getToken() && !isToken) {
+ // config.header['Authorization'] = 'Bearer ' + getToken()
+ // }
+ // get璇锋眰鏄犲皠params鍙傛暟
+ if (config.params) {
+ let url = config.url + '?' + tansParams(config.params)
+ url = url.slice(0, -1)
+ config.url = url
+ }
+ return new Promise((resolve, reject) => {
uni.request({
- method:config.method || 'GET',
- timeout:config.timeoue || timeout,
- url:config.baseUrl || baseUrl + config.url,
- data:config.data,
- header: config.header || {'Content-Type': 'application/json'},
+ method: config.method || 'get',
+ timeout: config.timeout || timeout,
+ url: config.baseUrl || baseUrl + config.url,
+ data: config.data,
+ header: config.header,
dataType: 'json'
}).then(response => {
- let [error,res] = response
- if(error) {
- toast('缃戠粶寮傚父,璇风◢鍚庨噸璇�')
- return
+ if (response.statusCode === 200) {
+ resolve(response.data)
}
- const result = res.data.result || true
- const msg = errorCode[code] || res.data.msg || ErrorCode['defalut']
-
- if(!res) {
- toast(msg)
- return
- }
- resolve(res.data)
}).catch(error => {
- let {message} = error
- if(message === 'Network Error') {
+ let {
+ message
+ } = error
+ if (message === 'Network Error') {
message = '鍚庣鎺ュ彛杩炴帴寮傚父'
- } else if(message.includes('timeout')) {
+ } 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)
})
})
-}
\ No newline at end of file
+}
+
+export default request
\ No newline at end of file
--
Gitblit v1.9.3