From e98e91659647692a3d3711734c9de8be0c1a19ed Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 30 Dec 2020 15:53:46 +0800
Subject: [PATCH] 延长请求超时设定，更改事件名称
---
bases/Fetcher.js | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index d9b9e76..96b61aa 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -4,6 +4,7 @@
*/
import Taro from '@tarojs/taro';
+import Qs from 'qs';
import {Tools} from '@components/common/Tools';
export class Fetcher {
@@ -30,7 +31,7 @@
'Ax-Rq-Type': 'separation',
},
dataType: 'json',
- timeout: 10000,
+ timeout: 30 * 1000,
};
/**
@@ -80,6 +81,12 @@
* @return {Promise<any>}
*/
get(url, data, remap = [], options = null) {
+ const params = Qs.stringify(data);
+ if (url.indexOf('?') >= 0) {
+ url += '&' + params;
+ } else {
+ url += '?' + params;
+ }
return this.query('get', url, null, remap, options);
}
@@ -92,7 +99,15 @@
* @return {Promise<any>}
*/
post(url, data, remap = [], options = null) {
- return this.query('post', url, data, remap, options);
+ const params = Qs.stringify(data);
+ const data2 = {};
+ params.split('&').forEach(param => {
+ if (param) {
+ const item = param.split('=');
+ data2[decodeURIComponent(item[0])] = decodeURIComponent(item[1]);
+ }
+ });
+ return this.query('post', url, data2, remap, options);
}
/**
@@ -104,7 +119,7 @@
* @param {object} [options]
* @return {Promise<any>|}
*/
- query(type, url, data = null, remap, options) {
+ query(type, url, data = null, remap, options = {}) {
return new Promise((resolve, reject) => {
Taro.request({
...this._defaultConfig,
@@ -426,7 +441,7 @@
} else {
// 修复补齐
if (type === 'fix') {
- if (!path || /^\/(upload|static)/.test(path)) {
+ if (!path || /^(http|\/upload|\/static)/.test(path)) {
return path;
} else {
return '/upload/' + path;
@@ -482,8 +497,8 @@
if (Tools.getTopUrlParam('query') === 'real') {
return false;
}
- // 当没有 url 指定时，只有内网 ip 和 35** 的端口号，视为本地开发模式
- return /^(192|127|localhost).*?:35\d{2}$/i.test(window.location.host);
+ // 当没有 url 指定时，只有内网 ip 和 33** 的端口号，视为本地开发模式
+ return /^(192|127|localhost).*?:33\d{2}$/i.test(window.location.host);
})();
--
Gitblit v1.9.1