diff --git a/common/request.js b/common/request.js index 22854ec..129510f 100644 --- a/common/request.js +++ b/common/request.js @@ -14,7 +14,8 @@ const coreRequestBase = (url, reqParams, options = {}, methodType = "POST", core url, data: reqParams, header: options, - method: methodType, + method: methodType, + timeout: 10*60*1000, // 请求超时 ...coreParams, success: (res) => { resolve(res) @@ -80,28 +81,28 @@ let coreRequest = function(url, params = {}, options = {}, methodType, coreParam // emoUnicode(res, 2) return res }) +} + +const coreDownloadRequest = (url, params = {}, options = {}, methodType = 'GET', coreParams = {})=> { + let comReqData = getCommonReqData() + // 统一把emo转unicode + // emoUnicode(params) + const reqParams = { + ...baseParam, + ...params, + } + url = `${host}${url}` + options = { + ...comReqData.header, + ...options, + } + + // get请求 需要转成query参 + url = url + (url.indexOf('?') == -1 ? '?': '') + tansGetParamsToQuery(reqParams) + return { url, header: options } } -const coreDownloadRequest = (url, params = {}, options = {}, methodType = 'GET', coreParams = {})=> { - let comReqData = getCommonReqData() - // 统一把emo转unicode - // emoUnicode(params) - const reqParams = { - ...baseParam, - ...params, - } - url = `${host}${url}` - options = { - ...comReqData.header, - ...options, - } - - // get请求 需要转成query参 - url = url + (url.indexOf('?') == -1 ? '?': '') + tansGetParamsToQuery(reqParams) - return { url, header: options } -} - -export { +export { coreDownloadRequest, coreRequest } \ No newline at end of file