From df4377b5d40ab08a980d582da2798248a83a8828 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 27 Jan 2021 19:29:42 +0800
Subject: [PATCH] 修复样式引用问题
---
bases/Fetcher.js | 136 +++++++++++++++++++++++++++++++++++----------
1 files changed, 105 insertions(+), 31 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index f80ee41..777ff95 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -4,7 +4,9 @@
*/
import Taro from '@tarojs/taro';
-import {Tools} from '@components/common/Tools';
+import Qs from 'qs';
+import { Tools } from '@components/common/Tools';
+import project from '@project';
export class Fetcher {
@@ -16,6 +18,18 @@
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;
+ }
+ }
}
/**
@@ -23,14 +37,15 @@
* @private
*/
_defaultConfig = {
- url: window.location.protocol + '//' + window.location.host,
+ url: '',
header: {
'X-Requested-With': 'XMLHttpRequest',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
'Ax-Rq-Type': 'separation',
},
+ credentials: 'same-origin',
dataType: 'json',
- timeout: 10000,
+ timeout: 30 * 1000,
};
/**
@@ -58,20 +73,6 @@
}
/**
- * 显示提示信息
- * @param type
- * @param msg
- */
- message(type, msg) {
- Taro.showToast({
- title: msg,
- icon: 'none',
- mask: true,
- duration: type === 'error' ? 5000 : 3000,
- });
- }
-
- /**
* get 请求
* @param {String} url
* @param {*} data
@@ -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,
@@ -145,7 +160,7 @@
// 旧请求，操作类通讯，响应体转换
if (typeof responseData.status !== 'undefined' && typeof responseData.dataMsg !== 'undefined') {
// 转换数据体
- let data2 = {rows: []};
+ let data2 = { rows: [] };
// 数组类型
if (responseData.dataMsg instanceof Array) {
if (responseData.dataMsg.length > 0) {
@@ -170,7 +185,7 @@
// 旧版请求，数据列表类通讯，响应体转换
if (typeof responseData.data !== 'undefined' && typeof responseData.count !== 'undefined') {
const data = (!!responseData.data && typeof responseData.data !== 'object') ?
- {data: responseData.data} : null;
+ { data: responseData.data } : null;
return {
state: {
code: responseData.code === 0 ? 2000 : 5000,
@@ -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;
@@ -470,21 +485,80 @@
}
/**
+ * 显示提示信息
+ * @param type
+ * @param msg
+ */
+ message(type, msg) {
+ Taro.showToast({
+ title: msg,
+ icon: 'none',
+ mask: true,
+ duration: type === 'error' ? 5000 : 3000,
+ });
+ }
+
+ /**
+ * 转换图片路径（旧版运营平台）
+ * @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 = (() => {
- // 当处于 mock 请求模式，视为本地开发
- if (Tools.getTopUrlParam('query') === 'mock') {
- return true;
+ // 网页
+ 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);
}
- // 强制 real 请求，可在本地使用真实请求
- if (Tools.getTopUrlParam('query') === 'real') {
- return false;
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ // 开发编译
+ if (process.env.NODE_ENV === 'development') {
+ return true;
+ }
+ // 生产编译
+ else if (process.env.NODE_ENV === 'production') {
+ return false;
+ }
}
- // 当没有 url 指定时，只有内网 ip 和 33** 的端口号，视为本地开发模式
- return /^(192|127|localhost).*?:33\d{2}$/i.test(window.location.host);
})();
-
}
\ No newline at end of file
--
Gitblit v1.9.1