From e70d240522af1aae7eea3b6441596cc0ae61a157 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 30 Dec 2020 17:17:18 +0800
Subject: [PATCH] 修复微信pc端请求没有带cookie的问题
---
bases/Fetcher.js | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index d670dee..689321c 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -3,11 +3,8 @@
* @author Tevin
*/
-// import Axios from 'axios';
-// import Qs from 'qs';
-// import {message, Modal} from 'antd';
-// import { AtToast } from 'taro-ui-vue'
import Taro from '@tarojs/taro';
+import Qs from 'qs';
import {Tools} from '@components/common/Tools';
export class Fetcher {
@@ -33,8 +30,9 @@
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
'Ax-Rq-Type': 'separation',
},
+ credentials: 'same-origin',
dataType: 'json',
- timeout: 10000,
+ timeout: 30 * 1000,
};
/**
@@ -84,6 +82,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);
}
@@ -96,7 +100,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);
}
/**
@@ -108,7 +120,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,
@@ -430,7 +442,7 @@
} else {
// 修复补齐
if (type === 'fix') {
- if (!path || /^\/(upload|static)/.test(path)) {
+ if (!path || /^(http|\/upload|\/static)/.test(path)) {
return path;
} else {
return '/upload/' + path;
@@ -486,8 +498,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