重构
This commit is contained in:
@ -21,16 +21,25 @@ const request = config => {
|
||||
config.url = url
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
const requestUrl = config.baseUrl || baseUrl + config.url
|
||||
const requestMethod = (config.method || 'get').toUpperCase()
|
||||
uni.request({
|
||||
method: config.method || 'get',
|
||||
timeout: config.timeout || timeout,
|
||||
url: config.baseUrl || baseUrl + config.url,
|
||||
url: requestUrl,
|
||||
data: config.data,
|
||||
header: config.header,
|
||||
dataType: 'json'
|
||||
}).then(response => {
|
||||
let [error, res] = response
|
||||
if (error) {
|
||||
const errorType = error?.errMsg || error?.message || 'UNKNOWN_ERROR'
|
||||
console.error('[request:error]', {
|
||||
url: requestUrl,
|
||||
method: requestMethod,
|
||||
errorType,
|
||||
rawError: error
|
||||
})
|
||||
toast('后端接口连接异常')
|
||||
reject('后端接口连接异常')
|
||||
return
|
||||
@ -57,6 +66,15 @@ const request = config => {
|
||||
})
|
||||
.catch(error => {
|
||||
let { message } = error
|
||||
const rawMessage = message || ''
|
||||
let errorType = 'UNKNOWN_ERROR'
|
||||
if (rawMessage === 'Network Error') {
|
||||
errorType = 'NETWORK_ERROR'
|
||||
} else if (rawMessage.includes('timeout')) {
|
||||
errorType = 'TIMEOUT'
|
||||
} else if (rawMessage.includes('Request failed with status code')) {
|
||||
errorType = 'HTTP_STATUS_ERROR'
|
||||
}
|
||||
if (message === 'Network Error') {
|
||||
message = '后端接口连接异常'
|
||||
} else if (message.includes('timeout')) {
|
||||
@ -64,6 +82,13 @@ const request = config => {
|
||||
} else if (message.includes('Request failed with status code')) {
|
||||
message = '系统接口' + message.substr(message.length - 3) + '异常'
|
||||
}
|
||||
console.error('[request:catch]', {
|
||||
url: requestUrl,
|
||||
method: requestMethod,
|
||||
errorType,
|
||||
message: rawMessage,
|
||||
rawError: error
|
||||
})
|
||||
toast(message)
|
||||
reject(error)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user