From 5b3486cd4c3199763fd421828c3b76a337c2ebd4 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 13 May 2021 22:05:29 +0800
Subject: [PATCH] 优化公众号 H5 支付
---
bases/Fetcher.js | 188 ++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 66 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index 777ff95..5dce631 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -18,17 +18,10 @@
this._data = {
urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
};
- // 网页
- if (process.env.TARO_ENV === 'h5') {
- this._defaultConfig.url = window.location.protocol + '//' + window.location.host;
- }
- // 小程序
- else if (process.env.TARO_ENV === 'weapp') {
- if (Fetcher.inDevMod) {
- this._defaultConfig.url = project.localHost;
- } else {
- this._defaultConfig.url = project.serverHost;
- }
+ if (project.host.mock === 'on') {
+ this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+ } else {
+ this._defaultConfig.url = Fetcher.host;
}
}
@@ -56,13 +49,24 @@
*/
spellURL(devSuffix, serSuffix) {
let url = '';
- // 开发环境地址
- if (Fetcher.inDevMod) {
- url = this._data.urlPrefix[0] + devSuffix;
+ // mock 模式
+ if (project.host.mock === 'on') {
+ url = this._data.urlPrefix[0].replace('api/', '') + devSuffix + '.json';
}
- // 生产环境地址
- else {
+ // 强制实际请求模式
+ else if (project.host.mock === 'real') {
url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+ }
+ // 正常模式
+ else {
+ // 开发环境地址
+ if (Fetcher.inDevMod) {
+ url = this._data.urlPrefix[0] + devSuffix;
+ }
+ // 生产环境地址
+ else {
+ url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+ }
}
const fixReg = /[a-zA-Z0-9]+\/\.\.\//;
while (url.indexOf('../') >= 0) {
@@ -99,6 +103,9 @@
* @return {Promise<any>}
*/
post(url, data, remap = [], options = null) {
+ if (project.host.mock === 'on') {
+ return this.get(url, data, remap = [], options);
+ }
const params = Qs.stringify(data);
const data2 = {};
params.split('&').forEach(param => {
@@ -121,12 +128,22 @@
*/
query(type, url, data = null, remap, options = {}) {
return new Promise((resolve, reject) => {
+ const header = {
+ ...this._defaultConfig.header,
+ };
+ if (process.env.TARO_ENV === 'weapp') {
+ header['Cookie'] = this._getCookies();
+ }
Taro.request({
...this._defaultConfig,
+ header,
url: this._defaultConfig.url + url,
method: type.toUpperCase(),
data,
success: response => {
+ if (process.env.TARO_ENV === 'weapp') {
+ this._saveCookies(response.cookies);
+ }
/**
* @type {{state: {code, http, msg}, data: Object}}
* @example response.state.code
@@ -146,6 +163,24 @@
},
});
});
+ }
+
+ _saveCookies(cookies) {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ cookies.forEach(cookie => {
+ const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
+ localCookies[mc[1]] = mc[2];
+ });
+ wx.setStorageSync('cookies', JSON.stringify(localCookies));
+ }
+
+ _getCookies() {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ const cookiesArr = [];
+ Object.keys(localCookies).forEach(key => {
+ cookiesArr.push(key + '=' + localCookies[key]);
+ });
+ return cookiesArr.join('; ');
}
/**
@@ -244,7 +279,9 @@
} else {
msg += '解析通讯数据异常！';
}
- this.message('error', msg);
+ setTimeout(() => {
+ this.message('error', msg);
+ }, 20);
}
/**
@@ -277,12 +314,18 @@
return response.data;
}
} else if (response.state.code === 2001) {
- this.message('info', response.state.msg);
+ setTimeout(() => {
+ this.message('info', response.state.msg);
+ }, 20);
return null;
} else if (response.state.code === 9001) {
- // this._showLoginExpired();
+ if (process.env.TARO_ENV === 'weapp') {
+ Taro.navigateTo({ url: '/pages/home/index/index?mode=login' });
+ }
} else {
- this.message('error', response.state.msg);
+ setTimeout(() => {
+ this.message('error', response.state.msg);
+ }, 20);
return null;
}
}
@@ -436,17 +479,29 @@
if (!path) {
return '';
}
+ // 多项时，先拆分转换，再合并
if (path.indexOf(',') >= 0) {
return path.split(',').map(p => this.transImgPath(type, p)).join(',');
- } else {
+ }
+ // 单项时转换
+ else {
// 修复补齐
if (type === 'fix') {
- if (!path || /^(http|\/upload|\/static)/.test(path)) {
+ // 完整 URL，地址不变
+ if (/^http/.test(path)) {
return path;
- } else {
- return '/upload/' + path;
}
- } else if (type === 'cut') {
+ // 绝对路径
+ if (/^(\/upload|\/static)/.test(path)) {
+ return Fetcher.host + path;
+ }
+ // 部分路径
+ else {
+ return Fetcher.host + '/upload/' + path;
+ }
+ }
+ // 裁剪多余部分
+ else if (type === 'cut') {
const pathArr = path.split('upload/');
return pathArr[pathArr.length - 1];
}
@@ -499,52 +554,12 @@
}
/**
- * 转换图片路径（旧版运营平台）
- * @param {String} type - fix or cut
- * @param {String} path
- * @example
- * fix -> '/upload/4/5e6c91eeccedc.jpg'
- * cut -> '4/5e56307c489c7.jpg'
- */
- transImgPath(type, path) {
- if (!path) {
- return '';
- }
- if (path.indexOf(',') >= 0) {
- return path.split(',').map(p => this.transImgPath(type, p)).join(',');
- } else {
- // 修复补齐
- if (type === 'fix') {
- if (!path || /^(http|\/upload|\/static)/.test(path)) {
- return path;
- } else {
- return '/upload/' + path;
- }
- } else if (type === 'cut') {
- const pathArr = path.split('upload/');
- return pathArr[pathArr.length - 1];
- }
- }
- }
-
- /**
* 记录是否为本地开发模式
* @type {Boolean}
*/
static inDevMod = (() => {
// 网页
if (process.env.TARO_ENV === 'h5') {
- const reg = new RegExp('(^|&)query=([^&]*)(&|$)', 'i');
- const match = window.location.search.substr(1).match(reg);
- const param = match !== null ? decodeURIComponent(match[2]) : null;
- // 当处于 mock 请求模式，视为本地开发
- if (param === 'mock') {
- return true;
- }
- // 强制 real 请求，可在本地使用真实请求
- if (param === 'real') {
- return false;
- }
// 当没有 url 指定时，只有内网 ip 和 33**/35** 的端口号，视为本地开发模式
return /^(192|127|localhost).*?:3[35]\d{2}$/i.test(window.location.host);
}
@@ -561,4 +576,45 @@
}
})();
-}
\ No newline at end of file
+ /**
+ * 当前服务器主机地址
+ * @type {String}
+ */
+ static host = (() => {
+ // 网页
+ if (process.env.TARO_ENV === 'h5') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 生产
+ else {
+ // 如果网址参数有指定服务器类型，匹配指定的服务器地址
+ const sever = Tools.getUrlParam('sever');
+ if (sever && typeof project.host.hosts[sever] !== 'undefined') {
+ return project.host.hosts[sever];
+ }
+ // 网页域名提取服务器地址
+ else if (window.location.protocol.indexOf('http') >= 0) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 非 http 协议打开时，使用设置的服务器地址
+ else if (project.host.server) {
+ return project.host.hosts[project.host.serverType];
+ }
+ }
+ }
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return project.host.hosts[project.host.devType];
+ }
+ // 生产
+ else {
+ return project.host.hosts[project.host.serverType];
+ }
+ }
+ })();
+
+}
--
Gitblit v1.9.1