hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-21 20:36:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

上传文件调整：接口超时处理调整未30秒 --提交人：阳华祥

Browse Source
This commit is contained in:
yang.huaxiang
2020-12-03 13:09:44 +08:00
parent f0972cc9cf
commit 20e20b1a0f
2 changed files with 85 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ebiz/sale/sale.js
View File

@@ -61,7 +61,7 @@ export function getOrderDetail(data) {
}) })
} }
export function getOrderDetail1(data) { export function getOrderDetail1(data) {
return request1({ return request({
url: getUrl('/sale/order/orderDetail', 1), url: getUrl('/sale/order/orderDetail', 1),
method: 'post', method: 'post',
data data
@@ -85,7 +85,7 @@ export function autchCodeCheck(data) {
} }
// 上传图片 // 上传图片
export function uploadImg(data) { export function uploadImg(data) {
return request({ return request1({
url: getUrl('/uploadImage', 1, 2), url: getUrl('/uploadImage', 1, 2),
method: 'post', method: 'post',
data data

47
src/assets/js/utils/request1.js
View File

@@ -1,18 +1,19 @@
import axios from 'axios' import axios from 'axios'
import { Dialog, Toast } from 'vant' import { Dialog, Toast } from 'vant'
import CacheUtils from '@/assets/js/utils/cacheUtils' import CacheUtils from '@/assets/js/utils/cacheUtils'
import configApp from "@/config"; import configApp from '@/config'
import AESTools from "@/assets/js/utils/cryptoJsUtil"; import AESTools from '@/assets/js/utils/cryptoJsUtil'
import MD5 from 'js-md5'; import MD5 from 'js-md5'
let sale = ['/sale/order/orderDetail'] //在线投保 let sale = ['/sale/order/orderDetail'] //在线投保
// 卡单 // 卡单
// eslint-disable-next-line no-unused-vars
let cardList = [] let cardList = []
let whiteList = [...sale] let whiteList = [...sale]
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
timeout: 66666666 // 请求超时时间 timeout: 1000 * 30 // 请求超时时间 30 秒
}) })
// request拦截器 // request拦截器
@@ -30,20 +31,20 @@ service.interceptors.request.use(
/** /**
* 请求拦截处理(待添加 判断走统一网关处理) * 请求拦截处理(待添加 判断走统一网关处理)
*/ */
if(config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0]) && configApp.API_VERSION == 'v2'){ if (config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0]) && configApp.API_VERSION == 'v2') {
if(!config.data || config.data == null){ if (!config.data || config.data == null) {
config.data = {} config.data = {}
} }
if(!!config.data && config.data != null){ if (!!config.data && config.data != null) {
let encrypt = AESTools.AESEncrypt(JSON.stringify(config.data),configApp.REQ_PWD) let encrypt = AESTools.AESEncrypt(JSON.stringify(config.data), configApp.REQ_PWD)
config.data = {"data": encrypt } config.data = { data: encrypt }
} }
} }
config.headers['token'] = CacheUtils.getLocItem('token') config.headers['token'] = CacheUtils.getLocItem('token')
// 添加请时间戳 // 添加请时间戳
let timeStr = new Date().getTime() + ''; let timeStr = new Date().getTime() + ''
config.headers['timeStr'] = timeStr; config.headers['timeStr'] = timeStr
config.headers['signature'] = MD5(timeStr + CacheUtils.getLocItem('token')); config.headers['signature'] = MD5(timeStr + CacheUtils.getLocItem('token'))
return config return config
}, },
error => { error => {
@@ -55,12 +56,16 @@ service.interceptors.request.use(
// respone拦截器 // respone拦截器
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
console.log(response)
console.log('----------------')
let res = response.data let res = response.data
if( configApp.API_VERSION == 'v2' && response.config.url && response.headers['content-type'].match(/application\/json/) && /api\/$/.test(response.config.url.split(configApp.API_VERSION)[0])){ if (
if(res.response){// 正常情況返回必有response 节点 configApp.API_VERSION == 'v2' &&
res = JSON.parse(AESTools.AESDecrypt(res.response,configApp.REQ_PWD)) response.config.url &&
response.headers['content-type'].match(/application\/json/) &&
/api\/$/.test(response.config.url.split(configApp.API_VERSION)[0])
) {
if (res.response) {
// 正常情況返回必有response 节点
res = JSON.parse(AESTools.AESDecrypt(res.response, configApp.REQ_PWD))
} }
} }
Toast.clear() Toast.clear()
@@ -85,6 +90,14 @@ service.interceptors.response.use(
}, },
error => { error => {
Toast.clear() Toast.clear()
if (error.code == 'ECONNABORTED ') {
Toast.loading({
duration: 2000, // 持续展示 toast
forbidClick: true, // 禁用背景点击
loadingType: 'spinner',
message: '请求超时，请稍后重试'
})
}
console.log('err' + error) // for debug console.log('err' + error) // for debug
//Toast.fail(error.message) //Toast.fail(error.message)
return Promise.reject(error) return Promise.reject(error)