js重构

.gitignore

@@ -2,3 +2,4 @@ unpackage/
 .hbuilderx/
 .idea/
 .vscode/
+node_modules/
\ No newline at end of file

App.vue

@@ -2,6 +2,10 @@
 export default {
     onLaunch: function () {
         uni.hideTabBar()
+		// 获取手机系统信息
+		const info = uni.getSystemInfoSync()
+		// 设置状态栏高度（H5顶部无状态栏小程序有状态栏需要撑起高度）
+		uni.setStorageSync('statusBarHeight',info.statusBarHeight)
     },
     onShow: function () {
         uni.hideHomeButton()

common/api/api.js

-// const baseUrl = 'https://r.ucaret.cn/test-api'; // 开发地址
-const baseUrl = 'http://4v7u6z.natappfree.cc'; // 开发地址
-// const baseUrl = 'https://jduniapp.uzosp.com'; // 线上地址
+const baseUrl = 'https://r.ucaret.cn/test-api'; // 开发地/址
+// const baseUrl = 'http://5thcg5.natappfree.cc'; // 开发地址
+// const baseUrl = 'https://jduniapp.uzosp.com'; // 线上地/址
 const httpRequest = (opts, data) => {
     let httpDefaultOpts = {
         url: baseUrl + opts.url,
@@ -30,6 +30,7 @@ const httpRequest = (opts, data) => {
     })
     return promise
 };
+let requestNumber = 0;
 //带Token请求
 const httpTokenRequest = (opts, data) => {
     let token = uni.getStorageSync('userToken');
@@ -61,13 +62,26 @@ const httpTokenRequest = (opts, data) => {
     let promise = new Promise(function(resolve, reject) {
         uni.request(httpDefaultOpts).then(
             (res) => {
-                console.log(33333333333,res[1])
+                console.log(33333333333,requestNumber,baseUrl,res[1])
 				if(res[1].data.code == 401){
+					if(requestNumber <= 0){
+						requestNumber ++
 						uni.removeStorageSync('userToken')
+						let returnPage= '/pages/main';
+						let pageType = "reLaunch"
 						uni.navigateTo({
-						url:"/pages/login/index/index?failure=401"
+							url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType,
+							success:()=>{
+								requestNumber = 0
+							}
 						})
+					}
 					return;
+				}else if(res[1].data.code == 500){
+					// uni.showToast({
+					// 	title:res[1].data.msg,
+					// 	icon:"none"
+					// })
 				}
                 resolve(res[1])
             }

common/zhouWei-request/request/core/request.js

+import { mergeConfig, dispatchRequest, jsonpRequest} from "./utils.js";
+export default class request {
+	constructor(options) {
+		//请求公共地址
+		this.baseUrl = options.baseUrl || "";
+		//公共文件上传请求地址
+		this.fileUrl = options.fileUrl || "";
+		// 超时时间
+		this.timeout = options.timeout || 6000;
+		// 服务器上传图片默认url
+		this.defaultUploadUrl = options.defaultUploadUrl || "";
+		// 服务器上传文件名称
+		this.defaultFileName = options.defaultFileName || "";
+		//默认请求头
+		this.header = options.header || {};
+		//默认配置
+		this.config = options.config || {
+			isPrompt: true,
+			load: true,
+			isFactory: true,
+            resend: 0
+		};
+	}
+	//post请求
+	post(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "POST",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//get请求
+	get(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "GET",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//put请求
+	put(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "PUT",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//delete请求
+	delete(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "DELETE",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+	//jsonp请求(只限于H5使用)
+	jsonp(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "JSONP",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+	//接口请求方法
+	async request(data) {
+		// 请求数据
+		let requestInfo,
+		// 是否运行过请求开始钩子
+		runRequestStart = false;
+		try {
+			if (!data.url) {
+				throw { errMsg: "【request】缺失数据url", statusCode: 0}
+			}
+			// 数据合并
+			requestInfo = mergeConfig(this, data);
+			// 代表之前运行到这里
+			runRequestStart = true;
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					let changekeys = ["data", "header", "isPrompt", "load", "isFactory"];
+					changekeys.forEach(key => {
+						requestInfo[key] = requestStart[key];
+					});
+				} else {
+					throw {
+						errMsg: "【request】请求开始拦截器未通过",
+						statusCode: 0,
+						data: requestInfo.data,
+						method: requestInfo.method,
+						header: requestInfo.header,
+						url: requestInfo.url,
+					}
+				}
+			}
+			let requestResult = {};
+			if(requestInfo.method == "JSONP"){
+				requestResult = await jsonpRequest(requestInfo);
+			} else {
+				requestResult = await dispatchRequest(requestInfo);
+			}
+			//是否用外部的数据处理方法
+			if (requestInfo.isFactory && this.dataFactory) {
+				//数据处理
+				let result = await this.dataFactory({
+					...requestInfo,
+					response: requestResult
+				});
+				return Promise.resolve(result);
+			} else {
+				return Promise.resolve(requestResult);
+			}
+		} catch (err){
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		} finally {
+			// 如果请求开始未运行到，请求结束也不运行
+			if(runRequestStart){
+				this.requestEnd && this.requestEnd(requestInfo);
+			}
+		}
+	}
+}

common/zhouWei-request/request/core/utils.js

+// 获取合并的数据
+export const mergeConfig = function(_this, options) {
+	//判断url是不是链接
+	let urlType = /^(http|https):\/\//.test(options.url);
+	let config = Object.assign({
+		timeout: _this.timeout
+	}, _this.config, options);
+	if (options.method == "FILE") {
+		config.url = urlType ? options.url : _this.fileUrl + options.url;
+	} else {
+		config.url = urlType ? options.url : _this.baseUrl + options.url;
+	}
+	//请求头
+	if (options.header) {
+		config.header = Object.assign({}, _this.header, options.header);
+	} else {
+		config.header = Object.assign({}, _this.header);
+	}
+	return config;
+}
+// 请求
+export const dispatchRequest = function(requestInfo) {
+	return new Promise((resolve, reject) => {
+		let requestAbort = true;
+		let requestData = {
+			url: requestInfo.url,
+			header: requestInfo.header, //加入请求头
+			success: (res) => {
+				requestAbort = false;
+				resolve(res);
+			},
+			fail: (err) => {
+				requestAbort = false;
+				if(err.errMsg == "request:fail abort"){
+					reject({
+						errMsg: "请求超时，请重新尝试",
+						statusCode: 0,
+					});
+				} else {
+					reject(err);
+				}
+			}
+		};
+		//请求类型
+		if (requestInfo.method) {
+			requestData.method = requestInfo.method;
+		}
+		if (requestInfo.data) {
+			requestData.data = requestInfo.data;
+		}
+		// #ifdef MP-WEIXIN || MP-ALIPAY
+		if (requestInfo.timeout) {
+			requestData.timeout = requestInfo.timeout;
+		}
+		// #endif
+		if (requestInfo.dataType) {
+			requestData.dataType = requestInfo.dataType;
+		}
+		// #ifndef APP-PLUS || MP-ALIPAY
+		if (requestInfo.responseType) {
+			requestData.responseType = requestInfo.responseType;
+		}
+		// #endif
+		// #ifdef H5
+		if (requestInfo.withCredentials) {
+			requestData.withCredentials = requestInfo.withCredentials;
+		}
+		// #endif
+		let requestTask = uni.request(requestData);
+		setTimeout(() => {
+			if(requestAbort){
+				requestTask.abort();
+			}
+		}, requestInfo.timeout)
+	})
+}
+// jsonp请求
+export const jsonpRequest = function(requestInfo) {
+	return new Promise((resolve, reject) => {
+		let dataStr = '';
+		Object.keys(requestInfo.data).forEach(key => {
+			dataStr += key + '=' + requestInfo.data[key] + '&';
+		});
+		//匹配最后一个&并去除
+		if (dataStr !== '') {
+			dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
+		}
+		requestInfo.url = requestInfo.url + '?' + dataStr;
+		let callbackName = "callback" + Math.ceil(Math.random() * 1000000);
+		// #ifdef H5
+		window[callbackName] = function(data) {
+			resolve(data);
+		}
+		let script = document.createElement("script");
+		script.src = requestInfo.url + "&callback=" + callbackName;
+		document.head.appendChild(script);
+		// 及时删除，防止加载过多的JS
+		document.head.removeChild(script);
+		// #endif
+	});
+}
\ No newline at end of file

common/zhouWei-request/request/index.js

+/***************纯粹的数据请求（如果使用这种可以删除掉fileUpload.js）******************/
+// import request from "./core/request.js";
+// export default request;
+
+/********数据请求同时继承了文件上传（包括七牛云上传）************/
+import upload from "./upload/upload.js";
+export default upload;
\ No newline at end of file

common/zhouWei-request/request/upload/Base64.js

+const Base64 = {
+
+    // private property
+    _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+    // public method for encoding
+    encode: function (input) {
+        var output = "";
+        var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = Base64._utf8_encode(input);
+
+        while (i < input.length) {
+
+            chr1 = input.charCodeAt(i++);
+            chr2 = input.charCodeAt(i++);
+            chr3 = input.charCodeAt(i++);
+
+            enc1 = chr1 >> 2;
+            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+            enc4 = chr3 & 63;
+
+            if (isNaN(chr2)) {
+                enc3 = enc4 = 64;
+            } else if (isNaN(chr3)) {
+                enc4 = 64;
+            }
+
+            output = output +
+                this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+                this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+        }
+
+        return output;
+    },
+
+    // public method for decoding
+    decode: function (input) {
+        var output = "";
+        var chr1, chr2, chr3;
+        var enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+        while (i < input.length) {
+
+            enc1 = this._keyStr.indexOf(input.charAt(i++));
+            enc2 = this._keyStr.indexOf(input.charAt(i++));
+            enc3 = this._keyStr.indexOf(input.charAt(i++));
+            enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+            chr1 = (enc1 << 2) | (enc2 >> 4);
+            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+            chr3 = ((enc3 & 3) << 6) | enc4;
+
+            output = output + String.fromCharCode(chr1);
+
+            if (enc3 != 64) {
+                output = output + String.fromCharCode(chr2);
+            }
+            if (enc4 != 64) {
+                output = output + String.fromCharCode(chr3);
+            }
+
+        }
+
+        output = Base64._utf8_decode(output);
+
+        return output;
+
+    },
+
+    // private method for UTF-8 encoding
+    _utf8_encode: function (string) {
+        string = string.replace(/\r\n/g, "\n");
+        var utftext = "";
+
+        for (var n = 0; n < string.length; n++) {
+
+            var c = string.charCodeAt(n);
+
+            if (c < 128) {
+                utftext += String.fromCharCode(c);
+            } else if ((c > 127) && (c < 2048)) {
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+            } else {
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+
+        }
+
+        return utftext;
+    },
+
+    // private method for UTF-8 decoding
+    _utf8_decode: function (utftext) {
+        var string = "";
+        var i = 0;
+        var c = c1 = c2 = 0;
+
+        while (i < utftext.length) {
+
+            c = utftext.charCodeAt(i);
+
+            if (c < 128) {
+                string += String.fromCharCode(c);
+                i++;
+            } else if ((c > 191) && (c < 224)) {
+                c2 = utftext.charCodeAt(i + 1);
+                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+                i += 2;
+            } else {
+                c2 = utftext.charCodeAt(i + 1);
+                c3 = utftext.charCodeAt(i + 2);
+                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+                i += 3;
+            }
+
+        }
+
+        return string;
+    }
+}
+
+module.exports = Base64;
\ No newline at end of file

common/zhouWei-request/request/upload/aliUploader.js

+const Base64 = require('./Base64.js');
+require('./hmac.js');
+require('./sha1.js');
+const Crypto = require('./crypto.js');
+// 获取policy
+const getPolicyBase64 = function (timeout) {
+    let dateTime = new Date().getTime();
+	let date = new Date(dateTime + (timeout || 1800000));
+    let srcT = date.toISOString();
+    const policyText = {
+        "expiration": srcT, //设置该Policy的失效时间
+        "conditions": [
+            ["content-length-range", 0, 100 * 1024 * 1024] // 设置上传文件的大小限制,100mb
+        ]
+    };
+    const policyBase64 = Base64.encode(JSON.stringify(policyText));
+    return policyBase64;
+}
+// 获取签名
+const getSignature = function (policyBase64, AccessKeySecret) {
+    const bytes = Crypto.HMAC(Crypto.SHA1, policyBase64, AccessKeySecret, {
+        asBytes: true
+    });
+    const signature = Crypto.util.bytesToBase64(bytes);
+    return signature;
+}
+// 获取阿里云token信息
+const getAliyunOssKey = function (options) {
+	const policyBase64 = getPolicyBase64(options.timeout);
+	const signature = getSignature(policyBase64, options.accessKeySecret);
+	return {
+		policy: policyBase64,
+		accessKeyId: options.accessKeyId,
+		accessKeySecret: options.accessKeySecret,
+		signature: signature,
+		success_action_status: '200'
+	}
+}
+
+module.exports = getAliyunOssKey;
\ No newline at end of file

common/zhouWei-request/request/upload/crypto.js

+/*!
+ * Crypto-JS v1.1.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2009, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+
+const Crypto = {};
+
+(function(){
+
+var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+
+// Crypto utilities
+var util = Crypto.util = {
+
+	// Bit-wise rotate left
+	rotl: function (n, b) {
+		return (n << b) | (n >>> (32 - b));
+	},
+
+	// Bit-wise rotate right
+	rotr: function (n, b) {
+		return (n << (32 - b)) | (n >>> b);
+	},
+
+	// Swap big-endian to little-endian and vice versa
+	endian: function (n) {
+
+		// If number given, swap endian
+		if (n.constructor == Number) {
+			return util.rotl(n,  8) & 0x00FF00FF |
+			       util.rotl(n, 24) & 0xFF00FF00;
+		}
+
+		// Else, assume array and swap all items
+		for (var i = 0; i < n.length; i++)
+			n[i] = util.endian(n[i]);
+		return n;
+
+	},
+
+	// Generate an array of any length of random bytes
+	randomBytes: function (n) {
+		for (var bytes = []; n > 0; n--)
+			bytes.push(Math.floor(Math.random() * 256));
+		return bytes;
+	},
+
+	// Convert a string to a byte array
+	stringToBytes: function (str) {
+		var bytes = [];
+		for (var i = 0; i < str.length; i++)
+			bytes.push(str.charCodeAt(i));
+		return bytes;
+	},
+
+	// Convert a byte array to a string
+	bytesToString: function (bytes) {
+		var str = [];
+		for (var i = 0; i < bytes.length; i++)
+			str.push(String.fromCharCode(bytes[i]));
+		return str.join("");
+	},
+
+	// Convert a string to big-endian 32-bit words
+	stringToWords: function (str) {
+		var words = [];
+		for (var c = 0, b = 0; c < str.length; c++, b += 8)
+			words[b >>> 5] |= str.charCodeAt(c) << (24 - b % 32);
+		return words;
+	},
+
+	// Convert a byte array to big-endian 32-bits words
+	bytesToWords: function (bytes) {
+		var words = [];
+		for (var i = 0, b = 0; i < bytes.length; i++, b += 8)
+			words[b >>> 5] |= bytes[i] << (24 - b % 32);
+		return words;
+	},
+
+	// Convert big-endian 32-bit words to a byte array
+	wordsToBytes: function (words) {
+		var bytes = [];
+		for (var b = 0; b < words.length * 32; b += 8)
+			bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+		return bytes;
+	},
+
+	// Convert a byte array to a hex string
+	bytesToHex: function (bytes) {
+		var hex = [];
+		for (var i = 0; i < bytes.length; i++) {
+			hex.push((bytes[i] >>> 4).toString(16));
+			hex.push((bytes[i] & 0xF).toString(16));
+		}
+		return hex.join("");
+	},
+
+	// Convert a hex string to a byte array
+	hexToBytes: function (hex) {
+		var bytes = [];
+		for (var c = 0; c < hex.length; c += 2)
+			bytes.push(parseInt(hex.substr(c, 2), 16));
+		return bytes;
+	},
+
+	// Convert a byte array to a base-64 string
+	bytesToBase64: function (bytes) {
+
+		// Use browser-native function if it exists
+		// if (typeof btoa == "function") return btoa(util.bytesToString(bytes));
+
+		var base64 = [],
+		    overflow;
+
+		for (var i = 0; i < bytes.length; i++) {
+			switch (i % 3) {
+				case 0:
+					base64.push(base64map.charAt(bytes[i] >>> 2));
+					overflow = (bytes[i] & 0x3) << 4;
+					break;
+				case 1:
+					base64.push(base64map.charAt(overflow | (bytes[i] >>> 4)));
+					overflow = (bytes[i] & 0xF) << 2;
+					break;
+				case 2:
+					base64.push(base64map.charAt(overflow | (bytes[i] >>> 6)));
+					base64.push(base64map.charAt(bytes[i] & 0x3F));
+					overflow = -1;
+			}
+		}
+
+		// Encode overflow bits, if there are any
+		if (overflow != undefined && overflow != -1)
+			base64.push(base64map.charAt(overflow));
+
+		// Add padding
+		while (base64.length % 4 != 0) base64.push("=");
+
+		return base64.join("");
+
+	},
+
+	// Convert a base-64 string to a byte array
+	base64ToBytes: function (base64) {
+
+		// Use browser-native function if it exists
+		if (typeof atob == "function") return util.stringToBytes(atob(base64));
+
+		// Remove non-base-64 characters
+		base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
+
+		var bytes = [];
+
+		for (var i = 0; i < base64.length; i++) {
+			switch (i % 4) {
+				case 1:
+					bytes.push((base64map.indexOf(base64.charAt(i - 1)) << 2) |
+					           (base64map.indexOf(base64.charAt(i)) >>> 4));
+					break;
+				case 2:
+					bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0xF) << 4) |
+					           (base64map.indexOf(base64.charAt(i)) >>> 2));
+					break;
+				case 3:
+					bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & 0x3) << 6) |
+					           (base64map.indexOf(base64.charAt(i))));
+					break;
+			}
+		}
+
+		return bytes;
+
+	}
+
+};
+
+// Crypto mode namespace
+Crypto.mode = {};
+
+})();
+
+module.exports = Crypto;
\ No newline at end of file

common/zhouWei-request/request/upload/hmac.js

+/*!
+ * Crypto-JS v1.1.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2009, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+
+const Crypto = require('./crypto.js');
+
+(function(){
+
+// Shortcut
+var util = Crypto.util;
+
+Crypto.HMAC = function (hasher, message, key, options) {
+
+	// Allow arbitrary length keys
+	key = key.length > hasher._blocksize * 4 ?
+	      hasher(key, { asBytes: true }) :
+	      util.stringToBytes(key);
+
+	// XOR keys with pad constants
+	var okey = key,
+	    ikey = key.slice(0);
+	for (var i = 0; i < hasher._blocksize * 4; i++) {
+		okey[i] ^= 0x5C;
+		ikey[i] ^= 0x36;
+	}
+
+	var hmacbytes = hasher(util.bytesToString(okey) +
+	                       hasher(util.bytesToString(ikey) + message, { asString: true }),
+	                       { asBytes: true });
+	return options && options.asBytes ? hmacbytes :
+	       options && options.asString ? util.bytesToString(hmacbytes) :
+	       util.bytesToHex(hmacbytes);
+
+};
+
+})();
+
+module.exports = Crypto;
\ No newline at end of file

common/zhouWei-request/request/upload/qiniuUploader.js

+// created by gpake
+(function () {
+
+  var config = {
+    qiniuRegion: '',
+    qiniuImageURLPrefix: '',
+    qiniuUploadToken: '',
+    qiniuUploadTokenURL: '',
+    qiniuUploadTokenFunction: null,
+    qiniuShouldUseQiniuFileName: false
+  }
+
+  module.exports = {
+    init: init,
+    upload: upload,
+  }
+
+  // 在整个程序生命周期中，只需要 init 一次即可
+  // 如果需要变更参数，再调用 init 即可
+  function init(options) {
+    config = {
+      qiniuRegion: '',
+      qiniuImageURLPrefix: '',
+      qiniuUploadToken: '',
+      qiniuUploadTokenURL: '',
+      qiniuUploadTokenFunction: null,
+      qiniuShouldUseQiniuFileName: false
+    };
+    updateConfigWithOptions(options);
+  }
+
+  function updateConfigWithOptions(options) {
+    if (options.region) {
+      config.qiniuRegion = options.region;
+    } else {
+      console.error('qiniu uploader need your bucket region');
+    }
+    if (options.uptoken) {
+      config.qiniuUploadToken = options.uptoken;
+    } else if (options.uptokenURL) {
+      config.qiniuUploadTokenURL = options.uptokenURL;
+    } else if (options.uptokenFunc) {
+      config.qiniuUploadTokenFunction = options.uptokenFunc;
+    }
+    if (options.domain) {
+      config.qiniuImageURLPrefix = options.domain;
+    }
+    config.qiniuShouldUseQiniuFileName = options.shouldUseQiniuFileName
+  }
+
+  function upload(filePath, success, fail, options, progress, cancelTask) {
+    if (null == filePath) {
+      console.error('qiniu uploader need filePath to upload');
+      return;
+    }
+    if (options) {
+      updateConfigWithOptions(options);
+    }
+    if (config.qiniuUploadToken) {
+      doUpload(filePath, success, fail, options, progress, cancelTask);
+    } else if (config.qiniuUploadTokenURL) {
+      getQiniuToken(function () {
+        doUpload(filePath, success, fail, options, progress, cancelTask);
+      });
+    } else if (config.qiniuUploadTokenFunction) {
+      config.qiniuUploadToken = config.qiniuUploadTokenFunction();
+      if (null == config.qiniuUploadToken && config.qiniuUploadToken.length > 0) {
+        console.error('qiniu UploadTokenFunction result is null, please check the return value');
+        return
+      }
+      doUpload(filePath, success, fail, options, progress, cancelTask);
+    } else {
+      console.error('qiniu uploader need one of [uptoken, uptokenURL, uptokenFunc]');
+      return;
+    }
+  }
+
+  function doUpload(filePath, success, fail, options, progress, cancelTask) {
+    if (null == config.qiniuUploadToken && config.qiniuUploadToken.length > 0) {
+      console.error('qiniu UploadToken is null, please check the init config or networking');
+      return
+    }
+    var url = uploadURLFromRegionCode(config.qiniuRegion);
+    var fileName = filePath.split('//')[1];
+    if (options && options.key) {
+      fileName = options.key;
+    }
+    var formData = {
+      'token': config.qiniuUploadToken
+    };
+    if (!config.qiniuShouldUseQiniuFileName) {
+      formData['key'] = fileName
+    }
+    var uploadTask = wx.uploadFile({
+      url: url,
+      filePath: filePath,
+      name: 'file',
+      formData: formData,
+      success: function (res) {
+        var dataString = res.data
+        if (res.data.hasOwnProperty('type') && res.data.type === 'Buffer') {
+          dataString = String.fromCharCode.apply(null, res.data.data)
+        }
+        try {
+          var dataObject = JSON.parse(dataString);
+          //do something
+          var imageUrl = config.qiniuImageURLPrefix + '/' + dataObject.key;
+          dataObject.imageURL = imageUrl;
+          if (success) {
+            success(dataObject);
+          }
+        } catch (e) {
+          console.log('parse JSON failed, origin String is: ' + dataString)
+          if (fail) {
+            fail(e);
+          }
+        }
+      },
+      fail: function (error) {
+        console.error(error);
+        if (fail) {
+          fail(error);
+        }
+      }
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      progress && progress(res)
+    })
+
+    cancelTask && cancelTask(() => {
+      uploadTask.abort()
+    })
+  }
+
+  function getQiniuToken(callback) {
+    wx.request({
+      url: config.qiniuUploadTokenURL,
+      success: function (res) {
+        var token = res.data.uptoken;
+        if (token && token.length > 0) {
+          config.qiniuUploadToken = token;
+          if (callback) {
+            callback();
+          }
+        } else {
+          console.error('qiniuUploader cannot get your token, please check the uptokenURL or server')
+        }
+      },
+      fail: function (error) {
+        console.error('qiniu UploadToken is null, please check the init config or networking: ' + error);
+      }
+    })
+  }
+
+  function uploadURLFromRegionCode(code) {
+    var uploadURL = null;
+    switch (code) {
+      case 'ECN': uploadURL = 'https://up.qbox.me'; break;
+      case 'NCN': uploadURL = 'https://up-z1.qbox.me'; break;
+      case 'SCN': uploadURL = 'https://up-z2.qbox.me'; break;
+      case 'NA': uploadURL = 'https://up-na0.qbox.me'; break;
+      case 'ASG': uploadURL = 'https://up-as0.qbox.me'; break;
+      default: console.error('please make the region is with one of [ECN, SCN, NCN, NA, ASG]');
+    }
+    return uploadURL;
+  }
+
+})();
\ No newline at end of file

common/zhouWei-request/request/upload/sha1.js

+/*!
+ * Crypto-JS v1.1.0
+ * http://code.google.com/p/crypto-js/
+ * Copyright (c) 2009, Jeff Mott. All rights reserved.
+ * http://code.google.com/p/crypto-js/wiki/License
+ */
+
+const Crypto = require('./crypto.js');
+
+(function(){
+
+// Shortcut
+var util = Crypto.util;
+
+// Public API
+var SHA1 = Crypto.SHA1 = function (message, options) {
+	var digestbytes = util.wordsToBytes(SHA1._sha1(message));
+	return options && options.asBytes ? digestbytes :
+	       options && options.asString ? util.bytesToString(digestbytes) :
+	       util.bytesToHex(digestbytes);
+};
+
+// The core
+SHA1._sha1 = function (message) {
+
+	var m  = util.stringToWords(message),
+	    l  = message.length * 8,
+	    w  =  [],
+	    H0 =  1732584193,
+	    H1 = -271733879,
+	    H2 = -1732584194,
+	    H3 =  271733878,
+	    H4 = -1009589776;
+
+	// Padding
+	m[l >> 5] |= 0x80 << (24 - l % 32);
+	m[((l + 64 >>> 9) << 4) + 15] = l;
+
+	for (var i = 0; i < m.length; i += 16) {
+
+		var a = H0,
+		    b = H1,
+		    c = H2,
+		    d = H3,
+		    e = H4;
+
+		for (var j = 0; j < 80; j++) {
+
+			if (j < 16) w[j] = m[i + j];
+			else {
+				var n = w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16];
+				w[j] = (n << 1) | (n >>> 31);
+			}
+
+			var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
+			         j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
+			         j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
+			         j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
+			                  (H1 ^ H2 ^ H3) - 899497514);
+
+			H4 =  H3;
+			H3 =  H2;
+			H2 = (H1 << 30) | (H1 >>> 2);
+			H1 =  H0;
+			H0 =  t;
+
+		}
+
+		H0 += a;
+		H1 += b;
+		H2 += c;
+		H3 += d;
+		H4 += e;
+
+	}
+
+	return [H0, H1, H2, H3, H4];
+
+};
+
+// Package private blocksize
+SHA1._blocksize = 16;
+
+})();
+
+module.exports = Crypto;
\ No newline at end of file

common/zhouWei-request/request/upload/upload.js

+import request from "./../core/request.js";
+const {
+	chooseImage,
+	chooseVideo,
+	qiniuUpload,
+	aliUpload,
+	urlUpload
+} = require("./utils");
+import {
+	mergeConfig
+} from "./../core/utils.js";
+export default class fileUpload extends request {
+	constructor(props) {
+		// 调用实现父类的构造函数
+		super(props);
+	}
+	//七牛云上传图片
+	async qnImgUpload(options = {}) {
+		let files;
+		try {
+			files = await chooseImage(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (files) {
+			return this.qnFileUpload({
+				...options,
+				files: files
+			});
+		}
+	}
+	//七牛云上传视频
+	async qnVideoUpload(options = {}) {
+		let files;
+		try {
+			files = await chooseVideo(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (files) {
+			return this.qnFileUpload({
+				...options,
+				files: files
+			});
+		}
+	}
+
+	//七牛云文件上传（支持多张上传）
+	async qnFileUpload(options = {}) {
+		let requestInfo;
+		try {
+			// 数据合并
+			requestInfo = {
+				...this.config,
+				...options,
+				header: {},
+				method: "FILE"
+			};
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					let changekeys = ["load", "files"];
+					changekeys.forEach(key => {
+						requestInfo[key] = requestStart[key];
+					});
+				} else {
+					throw {
+						errMsg: "【request】请求开始拦截器未通过",
+						statusCode: 0,
+						data: requestInfo.data,
+						method: requestInfo.method,
+						header: requestInfo.header,
+						url: requestInfo.url,
+					}
+				}
+			}
+			let requestResult = await qiniuUpload(requestInfo, this.getQnToken);
+			return Promise.resolve(requestResult);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		} finally {
+			this.requestEnd && this.requestEnd(requestInfo);
+		}
+	}
+	//阿里云上传图片
+	async aliImgUpload(options = {}) {
+		let files;
+		try {
+			files = await chooseImage(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (files) {
+			return this.aliFileUpload({
+				...options,
+				files: files
+			});
+		}
+	}
+	//阿里云上传视频
+	async aliVideoUpload(options = {}) {
+		let files;
+		try {
+			files = await chooseVideo(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (files) {
+			return this.aliFileUpload({
+				...options,
+				files: files
+			});
+		}
+	}
+	//阿里云文件上传（支持多张上传）
+	async aliFileUpload(options = {}) {
+		let requestInfo;
+		try {
+			// 数据合并
+			requestInfo = {
+				...this.config,
+				...options,
+				header: {},
+				method: "FILE"
+			};
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					let changekeys = ["load", "files"];
+					changekeys.forEach(key => {
+						requestInfo[key] = requestStart[key];
+					});
+				} else {
+					throw {
+						errMsg: "【request】请求开始拦截器未通过",
+						statusCode: 0,
+						data: requestInfo.data,
+						method: requestInfo.method,
+						header: requestInfo.header,
+						url: requestInfo.url,
+					}
+				}
+			}
+			let requestResult = await aliUpload(requestInfo, this.getAliToken);
+			return Promise.resolve(requestResult);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		} finally {
+			this.requestEnd && this.requestEnd(requestInfo);
+		}
+	}
+	//本地服务器图片上传
+	async urlImgUpload() {
+		let options = {};
+		if (arguments[0]) {
+			if (typeof(arguments[0]) == "string") {
+				options.url = arguments[0];
+			} else if (typeof(arguments[0]) == "object") {
+				options = Object.assign(options, arguments[0]);
+			}
+		}
+		if (arguments[1] && typeof(arguments[1]) == "object") {
+			options = Object.assign(options, arguments[1]);
+		}
+		try {
+			options.files = await chooseImage(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(options.files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (options.files) {
+			return this.urlFileUpload(options);
+		}
+	}
+	//本地服务器上传视频
+	async urlVideoUpload() {
+		let options = {};
+		if (arguments[0]) {
+			if (typeof(arguments[0]) == "string") {
+				options.url = arguments[0];
+			} else if (typeof(arguments[0]) == "object") {
+				options = Object.assign(options, arguments[0]);
+			}
+		}
+		if (arguments[1] && typeof(arguments[1]) == "object") {
+			options = Object.assign(options, arguments[1]);
+		}
+		try {
+			options.files = await chooseVideo(options);
+			// 选择完成回调
+			options.onSelectComplete && options.onSelectComplete(options.files);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		}
+		if (options.files) {
+			return this.urlFileUpload(options);
+		}
+	}
+	//本地服务器文件上传方法
+	async urlFileUpload() {
+		let requestInfo = {
+			method: "FILE"
+		};
+		if (arguments[0]) {
+			if (typeof(arguments[0]) == "string") {
+				requestInfo.url = arguments[0];
+			} else if (typeof(arguments[0]) == "object") {
+				requestInfo = Object.assign(requestInfo, arguments[0]);
+			}
+		}
+		if (arguments[1] && typeof(arguments[1]) == "object") {
+			requestInfo = Object.assign(requestInfo, arguments[1]);
+		}
+		if (!requestInfo.url && this.defaultUploadUrl) {
+			requestInfo.url = this.defaultUploadUrl;
+		}
+		if (!requestInfo.name && this.defaultFileName) {
+			requestInfo.name = this.defaultFileName;
+		}
+		// 请求数据
+		// 是否运行过请求开始钩子
+		let runRequestStart = false;
+		try {
+			if (!requestInfo.url) {
+				throw {
+					errMsg: "【request】文件上传缺失数据url",
+					statusCode: 0,
+					data: requestInfo.data,
+					method: requestInfo.method,
+					header: requestInfo.header,
+					url: requestInfo.url,
+				}
+			}
+			// 数据合并
+			requestInfo = mergeConfig(this, requestInfo);
+			// 代表之前运行到这里
+			runRequestStart = true;
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					let changekeys = ["data", "header", "isPrompt", "load", "isFactory", "files"];
+					changekeys.forEach(key => {
+						requestInfo[key] = requestStart[key];
+					});
+				} else {
+					throw {
+						errMsg: "【request】请求开始拦截器未通过",
+						statusCode: 0,
+						data: requestInfo.data,
+						method: requestInfo.method,
+						header: requestInfo.header,
+						url: requestInfo.url,
+					}
+				}
+			}
+			let requestResult = await urlUpload(requestInfo, this.dataFactory);
+			return Promise.resolve(requestResult);
+		} catch (err) {
+			this.requestError && this.requestError(err);
+			return Promise.reject(err);
+		} finally {
+			if (runRequestStart) {
+				this.requestEnd && this.requestEnd(requestInfo);
+			}
+		}
+	}
+}

common/zhouWei-request/requestConfig.js

+import request from "./request";
+// 全局配置的请求域名
+
+
+// let baseUrl = 'https://jdorder.uzosp.com/'; // 正式服务域名接口
+
+let baseUrl = 'https://r.ucaret.cn/test-api'; // 测试服务域名接口
+
+
+//可以new多个request来支持多个域名请求
+let $http = new request({
+	//接口请求地址
+	baseUrl: baseUrl,
+	//服务器本地上传文件地址
+	fileUrl: baseUrl,
+	// 服务器上传图片默认url
+	defaultUploadUrl: "api/Upload/upload",
+	//设置请求头（如果使用报错跨域问题，可能是content-type请求类型和后台那边设置的不一致）
+	header: {
+		'Content-Type': 'application/json;charset=UTF-8'
+	},
+	timeout: 30000,
+	// 默认配置（可不写）
+	config: {
+		// 是否自动提示错误
+		isPrompt: true,
+		// 是否显示加载动画
+		load: true,
+		// 是否使用数据工厂
+		isFactory: true
+	}
+});
+
+// 添加获取七牛云token的方法
+$http.getQnToken = function(callback) {
+	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
+	$http.get("api/Upload/getoss_parame").then(data => {
+		//console.log(data);
+		/*
+		 *接口返回参数：
+		 *visitPrefix:访问文件的域名
+		 *token:七牛云上传token
+		 *folderPath:上传的文件夹
+		 *region: 地区 默认为：SCN
+		 */
+		callback({
+			visitPrefix: data.domain,
+			token: data.token,
+			folderPath: 'imgupload/',
+			region: "SCN"
+		});
+	});
+}
+// 添加获取阿里云token的方法
+$http.getAliToken = function(callback) {
+	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
+	$http.get("api/open/v1/ali_oss_upload").then(data => {
+		/*
+		 *接口返回参数：
+		 *visitPrefix: 访问文件的域名
+		 *folderPath: 上传的文件夹
+		 *region: 地区 
+		 *bucket: 阿里云的 bucket
+		 *accessKeyId: 阿里云的访问ID
+		 *accessKeySecret: 阿里云的访问密钥
+		 *stsToken: 阿里云的访问token
+		 */
+		callback({
+			accessKeyId: data.accessKeyId,
+			accessKeySecret: data.accessKeySecret,
+			bucket: data.bucket,
+			region: data.region,
+			visitPrefix: data.visitPrefix,
+			token: data.token,
+			folderPath: data.folderPath,
+			stsToken: data.securityToken,
+		});
+	});
+}
+//当前接口请求数
+let requestNum = 0;
+//请求开始拦截器
+$http.requestStart = function(options) {
+	if (options.load) {
+		if (requestNum <= 0) {
+			//打开加载动画
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			});
+		}
+		requestNum += 1;
+	}
+	// 图片、视频上传大小限制
+	if (options.method == "FILE") {
+		// 文件最大字节: options.maxSize 可以在调用方法的时候加入参数
+		let maxSize = options.maxSize || '';
+		for (let item of options.files) {
+			if (item.fileType == 'image') {
+				if (maxSize && item.size > maxSize) {
+					setTimeout(() => {
+						uni.showToast({
+							title: "图片过大，请重新上传",
+							icon: "none"
+						});
+					}, 500);
+					return false;
+				}
+			} else if (item.fileType == "video") {
+				if (item.duration < 3) {
+					setTimeout(() => {
+						uni.showToast({
+							title: "视频长度不足3秒，请重新上传",
+							icon: "none"
+						});
+					}, 500);
+					return false;
+				}
+			}
+		}
+	}
+	//请求前加入token
+	options.header['Authorization'] ='Bearer '+ uni.getStorageSync('userToken');
+	return options;
+}
+//请求结束
+$http.requestEnd = function(options) {
+	//判断当前接口是否需要加载动画
+	if (options.load) {
+		requestNum = requestNum - 1;
+		if (requestNum <= 0) {
+			uni.hideLoading();
+		}
+	}
+}
+//登录弹窗次数
+let loginPopupNum = 0;
+//所有接口数据处理（可在接口里设置不调用此方法）
+//此方法需要开发者根据各自的接口返回类型修改，以下只是模板
+$http.dataFactory = async function(res) {
+	// console.log("接口请求数据", {
+	// 	url: res.url,
+	// 	resolve: res.response,
+	// 	header: res.header,
+	// 	data: res.data,
+	// 	method: res.method,
+	// });
+	uni.hideLoading()
+	if (res.response.statusCode && res.response.statusCode == 200) {
+		let httpData = res.response.data;
+		console.log(httpData,"封装请求响应数据55555");
+		let currentRoutes = getCurrentPages();
+		let currentRoute = currentRoutes[currentRoutes.length - 1].route
+		if (typeof(httpData) == "string") {
+			httpData = JSON.parse(httpData);
+		}
+		//判断数据是否请求成功
+		if (httpData.code == 200) {
+			// 返回正确的结果(then接受数据)
+			return Promise.resolve(httpData.data);
+		} else if (httpData.code == 101) {
+			// uni.showToast({
+			// 	title: '请重新登录',
+			// 	icon: 'none',
+			// 	duration: 1000
+			// })
+			// #ifdef APP-PLUS
+			setTimeout(() => {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			}, 800)
+			// #endif
+
+		} else if (httpData.code == 401) {
+			uni.showToast({
+				title: '登录过期,请重新登录',
+				icon: 'none',
+				duration: 1000
+			})
+			setTimeout(() => {
+				if(loginPopupNum <= 0){
+					loginPopupNum ++ 
+					uni.removeStorageSync('userToken')
+					let returnPage= '/pages/main';
+					let pageType = "reLaunch"
+					uni.navigateTo({
+						url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType,
+					})
+				}
+			}, 800)
+		} else { //其他错误提示
+			if (res.isPrompt) {
+				uni.showToast({
+					title: httpData.info || httpData.msg,
+					icon: "none",
+					duration: 2000
+				});
+			}
+			// 返回错误的结果(catch接受数据)
+			return Promise.reject({
+				statusCode: 0,
+				errMsg: httpData.info || httpData.msg,
+				status: httpData.code
+			});
+		}
+
+		/*********以上只是模板(及共参考)，需要开发者根据各自的接口返回类型修改*********/
+
+	} else {
+		// 返回错误的结果(catch接受数据)
+		return Promise.reject({
+			statusCode: res.response.statusCode,
+			errMsg: "【request】数据工厂验证不通过"
+		});
+	}
+};
+// 错误回调
+$http.requestError = function(e) {
+	if (e.statusCode === 0) {
+		throw e;
+	} else {
+		uni.showToast({
+			title: "网络错误，请检查一下网络",
+			icon: "none",
+			duration: 2000
+		});
+	}
+}
+export default $http;

main.js

@@ -5,12 +5,15 @@ import store from "./store";
 Vue.prototype.$store = store;
 
 import http from "./common/api/api.js"
+import $http from '@/common/zhouWei-request/requestConfig';
 
 Vue.config.productionTip = false
 import ActiveForm from "@/common/active-form/active-form";
 import scrollList from "@/common/scroll-list/scroll-list";
 Vue.use(uView);
 Vue.prototype.http = http
+Vue.prototype.$http = $http
+
 // 订阅消息模板id
 Vue.prototype.nc_templateid = '59-hfHg3CnDvgVEnjqxiHRFwpABehc5lZxHQeUctlrg'
 App.mpType = 'app'

manifest.json

@@ -59,7 +59,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx237e45bea2220a37",
+        "appid" : "wx8fd4dc1c4b9f6f41",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -67,11 +67,7 @@
             "postcss" : false
         },
         "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于定位"
-            }
-        },
+        "permission" : {},
         "plugins" : {
             "loginPlugin" : {
                 "version" : "1.5.4",

package.json

@@ -9,5 +9,8 @@
         "表单校验",
         "快速生成表单",
         "全端"
-    ]
+    ],
+    "dependencies": {
+        "crypto-js": "^4.1.1"
+    }
 }

pages/moveCar.vue

@@ -87,29 +87,19 @@
 									if (path) {
 										let paths = path.split('?')[1]
 										let scene = paths.split("=")[1]
-										let param = {
+										this.$http.request({
+											url:'/app/user/check/move/code',
+											method:'post',
+											data:{
 												code: scene
-										}
-										let opts = {
-											url: '/app/user/check/move/code',
-											method: 'post'
-										}
-
-										that.http.httpTokenRequest(opts, param).then(res => {
+											},
+										}).then(res => {
 											console.log(res, "扫码通知车主")
-											if (res.data.code == 200) {
-												if (res.data.data.bindFlag) {
+											if (res.bindFlag) {
 												that.gotoMoveCar(scene)
 											} else {
 												that.gotoBindMoveCar(scene)
 											}
-											} else {
-												uni.showToast({
-													title: res.data.msg,
-													icon: 'none',
-													icon: 'error',
-												})
-											}
 										})
 									} else {
 										uni.showToast({

pages/personal.vue

@@ -127,12 +127,11 @@ export default {
     },
     methods: {
         loginOut() {
-            let opts = {
-                url: '/logout',
-                method: 'post'
-            };
-            this.http.httpTokenRequest(opts, {}).then(res => {
-                if (res.data.code == 200) {
+			this.$http.request({
+				url:'/logout',
+				method:'post',
+				data:{},
+			}).then(res => {
 				this.token = null
 				uni.removeStorageSync('userToken')
 				uni.removeStorageSync('xcxIndexPath')
@@ -143,15 +142,7 @@ export default {
 					    url: '/pages/main'
 					});
 				});
-                }else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
 			})
-
         },
         goOrder(current) {
             let token = uni.getStorageSync('userToken');
@@ -226,17 +217,15 @@ export default {
                 this.logoutFlag = false
                 return
             }
-            let opts = {
-                url: '/app/user/info',
-                method: 'get'
-            };
-           await this.http.httpTokenRequest(opts, {}).then(res => {
-                if (res.data.code == 200) {
-                    this.userInfo = res.data.data
+			await this.$http.request({
+				url:'/app/user/info',
+				method:'get',
+				data:{},
+			}).then(res => {
+				this.userInfo = res || {}
 				if(this.userInfo.avatar){
 				    this.avatar = this.userInfo.avatar
 				}
-                }
 			})
         },
         openMsg() {

pages/shop.vue

@@ -96,64 +96,6 @@ export default {
                 this.scrollTop = 0
             });
         },
-        // 加载数据
-        load(paging) {
-            setTimeout(() => {
-                let opts = {
-                    url: '/app/index/mall/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-                    method: 'get'
-                };
-                this.http.httpRequest(opts, {
-                    classification: "2"
-                }).then(res => {
-                    if (res.data.code == 200) {
-                        let list = res.data.data.rows || []
-                        this.boutiqueMallList = [...this.boutiqueMallList, ...list];
-
-                        // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
-                        this.$refs.list.loadSuccess({
-                            list: this.boutiqueMallList,
-                            total: res.data.data.total
-                        });
-                    } else {
-                        // 加载失败
-                        this.$refs.list.loadFail()
-                    }
-                })
-            }, this.$u.random(100, 1000));
-        },
-        // 刷新
-        refresh(paging) {
-            setTimeout(() => {
-                let opts = {
-                    url: '/app/index/mall/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-                    method: 'get'
-                };
-                this.http.httpRequest(opts, {
-                    classification: "2"
-                }).then(res => {
-                    if (res.data.code == 200) {
-                        let list = res.data.data.rows || []
-                        this.boutiqueMallList = list;
-                
-                        // 加载成功  参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
-                        this.$refs.list.refreshSuccess({
-                            list: this.boutiqueMallList,
-                            total: res.data.data.total
-                        });
-                        // 加载失败
-                        // this.$refs.list.loadFail()
-                    } else {
-                         this.$refs.list.refreshFail()
-						 uni.showToast({
-						 	title: res.data.msg,
-						 	icon: 'none',
-						 	duration: 2000
-						 });
-                    }
-                })
-            }, this.$u.random(100, 1000));
-        },
         goSearch() {
             uni.navigateTo({
                 url: '/pagesC/pages/shop/search'
@@ -193,36 +135,27 @@ export default {
             // })
         },
         getMallList() {
-            let opts = {
-                url: '/app/index/mall/list',
-                method: 'get'
-            };
-            this.http.httpTokenRequest(opts, {
+			this.$http.request({
+				url:'/app/index/mall/list',
+				method:'get',
+				data:{
 					classification: "1"
+				},
 			}).then(res => {
-                if (res.data.code == 200) {
-                    this.mallList = res.data.data.rows || []
-                }else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
+				this.mallList = res.rows || []
 			})
         },
         getBoutiqueMallList() {
-            let opts = {
-                url: '/app/index/mall/list',
-                method: 'get'
-            };
-            this.http.httpTokenRequest(opts, {
+			this.$http.request({
+				url:'/app/index/mall/list',
+				method:'get',
+				data:{
 					classification: "2",
 					pageSize:10,
 					pageNum:this.page
+				},
 			}).then(res => {
-                if (res.data.code == 200) {
-					let data = res.data.data.rows || [];
+				let data = res.rows || [];
 				data.forEach(elem=>{
 					this.boutiqueMallList.push(elem)
 				})
@@ -233,39 +166,28 @@ export default {
 					uni.setStorageSync('refresh',0)
 					this.loading = "loadmore"
 				}
-                }else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
 			})
         },
         getImage(imageUrl) {
             return imageUrl;
         },
         getRotationList() {
-            let opts = {
-                url: '/app/index/carouse/2',
-                method: 'get'
-            };
-            this.http.httpTokenRequest(opts, {}).then(res => {
-                if (res.data.code == 200) {
-                    let data = res.data.data || []
+			this.$http.request({
+				url:'/app/index/carouse/2',
+				method:'get',
+				data:{},
+			}).then(res => {
+				let data = res || []
 				let imgList = []
 				data.forEach(e => {
 				    imgList.push(e)
 				})
 				this.list3 = imgList
-                }else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
 			})
+            let opts = {
+                url: '/app/index/carouse/2',
+                method: 'get'
+            };
         },
 		// 轮播跳转其他页面
 		goOtherLink(index){

pagesB/pages/move-car/callDetail.vue

@@ -71,14 +71,12 @@
 				})
 			},
 			getApplyMoveLog() {
-				let opts = {
-					url: '/app/moveLog/apply/' + this.id,
-					method: 'get'
-				};
-				let that = this
-				this.http.httpTokenRequest(opts, {}).then(res => {
-					if (res.data.code == 200) {
-						this.moveLog = res.data.data
+				this.$http.request({
+					url:'/app/moveLog/apply/' + this.id,
+					method:'get',
+					data:{},
+				}).then(res => {
+					this.moveLog = res || {}
 					let moveLogInfo = []
 					moveLogInfo.push({
 						title: "车主车牌号:",
@@ -126,7 +124,6 @@
 						value: "请求他人挪车"
 					})
 					this.items = moveLogInfo
-					}
 				})
 			},
 		},

pagesB/pages/move-car/loveCar.vue

@@ -110,16 +110,24 @@ export default {
 			this.deleteShow = false
 		},
 		getCarList(){
-			uni.showLoading({
-				title: '加载中',
-				mask:true
-			});
-			let opts = { url: '/app/vehicleAdmin/list', method: 'get' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
-				if (res.statusCode == 200) {
-					uni.hideLoading()
+			// uni.showLoading({
+			// 	title: '加载中',
+			// 	mask:true
+			// });
+			// let opts = { url: '/app/vehicleAdmin/list', method: 'get' };
+			// this.http.httpTokenRequest(opts, {}).then(res => {
+			// 	if (res.statusCode == 200) {
+			// 		uni.hideLoading()
+			// 		this.carList = res.data || []
+			// 	}
+			// })
+			this.$http.request({
+				url:'/app/vehicleAdmin/list',
+				method:'get',
+				data:{},
+				isFactory:false,
+			}).then(res => {
 				this.carList = res.data || []
-				}
 			})
 		},
 		goGetPrice(id){

pagesB/pages/move-car/moveCarDetail.vue

@@ -51,15 +51,12 @@ export default {
             })
         },
 		getMoveCode(){
-			uni.showLoading({
-				title: '加载中',
-				mask:true
-			});
-			let opts = { url: '/app/moveCode/' + this.id, method: 'get' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
-				uni.hideLoading()
-				if (res.data.code == 200) {
-                    let data = res.data.data
+			this.$http.request({
+				url:'/app/moveCode/' + this.id,
+				method:'get',
+				data:{},
+			}).then(res => {
+				let data = res || []
 				let list = []
 				list.push({title: "挪车码编号", value: data.moveCode})
 				list.push({title: "车牌号", value: data.carNo})
@@ -75,30 +72,26 @@ export default {
 				}
 				list.push({title: "绑定手机号", value: data.userMobile})
 				this.items = list
-				}
 			})
 		},
         openUnbindModal(){
         	this.unbindShow = true
         },
         unbind(){
-        	let opts = { url: '/app/moveCode/edit/' + this.id, method: 'put' };
-        	this.http.httpTokenRequest(opts, {}).then(res => {
-        		if (res.data.code == 200) {
+			this.$http.request({
+				url:'/app/moveCode/edit/' + this.id,
+				method:'put',
+				data:{},
+			}).then(res => {
 				uni.showToast({
 					title: '解绑成功',
 					icon: "success",
 				});
-        		}else{
-                    uni.showToast({
-                    	title: res.data.msg,
-                    	icon: "error",
-                    });
-                }
 				this.unbindShow = false
+				setTimeout(()=>{
 					this.goBack()
+				},500)
 			})
-        	
         },
         cancelModal(){
             this.unbindShow = false

pagesB/pages/move-car/myCall.vue

@@ -54,11 +54,12 @@
 			load(paging) {
 				setTimeout(() => {
 					let list = [];
-					let opts = {
+					this.$http.request({
 						url: '/app/moveLog/apply/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-						method: 'get'
-					};
-					this.http.httpTokenRequest(opts, {}).then(res => {
+						method:'get',
+						data:{},
+						isFactory:false,
+					}).then(res => {
 						if (res.data.code == 200) {
 							list = res.data.rows || []
 							this.items = [...this.items, ...list]
@@ -84,11 +85,12 @@
 			refresh(paging) {
 				setTimeout(() => {
 					let list = [];
-					let opts = {
-						url: '/app/moveLog/apply/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-						method: 'get'
-					};
-					this.http.httpTokenRequest(opts, {}).then(res => {
+					this.$http.request({
+						url:'/app/moveLog/apply/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
+						method:'get',
+						data:{},
+						isFactory:false,
+					}).then(res => {
 						if (res.data.code == 200) {
 							list = res.data.rows || []
 							this.items = list

pagesB/pages/move-car/myMoveCar.vue

@@ -91,9 +91,12 @@ export default {
             })
         },
 		getMyMoveCodeList(){
-			
-			let opts = { url: '/app/moveCode/list?carNo=' + this.keyword, method: 'get' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
+			this.$http.request({
+				url:'/app/moveCode/list?carNo=' + this.keyword,
+				method:'get',
+				data:{},
+				isFactory:false,
+			}).then(res => {
 				if (res.data.code == 200) {
 					this.items = res.data.rows || []
 				} else {
@@ -109,8 +112,12 @@ export default {
 			this.unbindShow = true
 		},
 		unbind(){
-			let opts = { url: '/app/moveCode/edit/' + this.id, method: 'put' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
+			this.$http.request({
+				url:'/app/moveCode/edit/' + this.id,
+				method:'put',
+				data:{},
+				isFactory:false,
+			}).then(res => {
 				if (res.data.code == 200) {
 					uni.showToast({
 						title: '解绑成功',

pagesB/pages/move-car/myRecord.vue

@@ -3,7 +3,7 @@
  * @Description: 我的挪车记录
 -->
 <template>
-<view class="appCotent">
+	<view class="appCotent">
 		<div class="myRecord">
 			<scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
 				<div class="record__item" v-for="(vo,inx) in items" :key="inx">
@@ -34,11 +34,11 @@
 				</div>
 			</scroll-list>
 		</div>
-</view>
+	</view>
 </template>
 
 <script>
-export default {
+	export default {
 		data() {
 			return {
 				option: {
@@ -54,11 +54,12 @@ export default {
 			load(paging) {
 				setTimeout(() => {
 					let list = [];
-                let opts = {
+					this.$http.request({
 						url: '/app/moveLog/my/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-                    method: 'get'
-                };
-                this.http.httpTokenRequest(opts, {}).then(res => {
+						method: 'get',
+						data: {},
+						isFactory: false,
+					}).then(res => {
 						if (res.data.code == 200) {
 							list = res.data.rows || []
 					 	this.items = [...this.items, ...list]
@@ -84,11 +85,12 @@ export default {
 				setTimeout(() => {
 					this.items = []
 					let list = [];
-            let opts = {
+					this.$http.request({
 						url: '/app/moveLog/my/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
-              method: 'get'
-            };
-            this.http.httpTokenRequest(opts, {}).then(res => {
+						method: 'get',
+						data: {},
+						isFactory: false,
+					}).then(res => {
 						if (res.data.code == 200) {
 							list = res.data.rows || []
 							this.items = [...this.items, ...list]
@@ -123,7 +125,7 @@ export default {
 				this.http.httpTokenRequest(opts, {}).then(res => {
 					if (res.data.code == 200) {
 						this.items = res.data.rows
-                }else{
+					} else {
 						uni.showToast({
 							title: res.data.msg,
 							icon: 'none',
@@ -136,11 +138,11 @@ export default {
 		created() {
 			//this.getMyMoveLogList()
 		},
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-.myRecord {
+	.myRecord {
 		padding: 40rpx 0rpx;
 
 		.record__item {
@@ -179,10 +181,11 @@ export default {
 					border-radius: 4rpx;
 				}
 
-			.vx_state{
+				.vx_state {
 					background: #D0FFE2;
-				color:#00AD42;
+					color: #00AD42;
 				}
+
 				.phone__state {
 					background: #ffebd8;
 					color: rgba(248, 141, 40, 1);
@@ -241,5 +244,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

pagesB/pages/move-car/oneMoveCar.vue

@@ -148,15 +148,15 @@
             },
 			call() {
 				this.appBo.moveCode = this.moveCode
-				let opts = {
-					url: '/app/contact/phone/notice',
-					method: 'post'
-				};
-				this.http.httpTokenRequest(opts, this.appBo).then(res => {
+				this.$http.request({
+					url:'/app/contact/phone/notice',
+					method:'post',
+					data:this.appBo,
+					isFactory:false,
+				}).then(res => {
 					if (res.data.code == 200) {
 						//请求成功逻辑，修改
 						this.noticeResult = res.data.data
-						uni.hideLoading()
 						if (this.noticeResult.allowPhone) {
 							// this.list[0].name = this.noticeResult.secretPhone
 							// this.show = true;
@@ -166,7 +166,6 @@
 						}
 					} else {
 						this.noticeResult = res.data.data
-						uni.hideLoading()
 						if (this.noticeResult) {
 							uni.showModal({
 								content: this.noticeResult.notAllowPhoneReason,
@@ -183,11 +182,12 @@
 			},
 			wechat() {
 				this.appBo.moveCode = this.moveCode
-				let opts = {
-					url: '/app/contact/wechat/notice',
-					method: 'post'
-				};
-				this.http.httpTokenRequest(opts, this.appBo).then(res => {
+				this.$http.request({
+					url:'/app/contact/wechat/notice',
+					method:'post',
+					data:this.appBo,
+					isFactory:false,
+				}).then(res => {
 					if (res.data.code == 200) {
 						uni.showModal({
 							content: "微信消息发送成功",
@@ -232,32 +232,22 @@
 			},
 			// 获取微信通知次数
 			getMoveCode() {
-				let opts = {
-					url: '/app/moveCode/notice/config',
-					method: 'get'
-				};
-				this.http.httpTokenRequest(opts, {}).then(res => {
-					if (res.data.code == 200) {
-						this.wxMaxNum = res.data.data.wxMaxNum
-					} else{
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
+				this.$http.request({
+					url:'/app/moveCode/notice/config',
+					method:'get',
+					data:{},
+				}).then(res => {
+					this.wxMaxNum = res.wxMaxNum
 				})
 			},
 			getCarNumber() {
-				let opts = {
-					url: '/app/moveCode/owner/' + this.moveCode,
-					method: 'get'
-				};
-				//let opts = { url: '/app/moveCode/owner/MV123', method: 'get' };
-				this.http.httpTokenRequest(opts, {}).then(res => {
-					if (res.data.code == 200) {
-						if (JSON.stringify(res.data.data) != "{}") {
-                            let carData = res.data.data
+				this.$http.request({
+					url:'/app/moveCode/owner/' + this.moveCode,
+					method:'get',
+					data:{},
+				}).then(res => {
+					if (JSON.stringify(res) != "{}") {
+					    let carData = res
 						this.appBo.carNo = carData.carNo
 					    this.appBo.brand = carData.brand
 					    this.appBo.carModel = carData.carModel
@@ -266,13 +256,6 @@
 							url: '/pagesB/pages/move-car/scan?moveCode=' + this.moveCode
 						})
 					}
-					} else {
-						//查询挪车码失败
-						uni.showToast({
-							title: res.data.msg,
-							icon: "error",
-						});
-					}
 				})
 			},
 			getMoveLogInit() {

pagesB/pages/move-car/recordDetail.vue

@@ -38,14 +38,12 @@
 				})
 			},
 			getMyMoveLog() {
-				let opts = {
-					url: '/app/moveLog/my/' + this.id,
-					method: 'get'
-				};
-				let that = this
-				this.http.httpTokenRequest(opts, {}).then(res => {
-					if (res.data.code == 200) {
-						this.moveLog = res.data.data
+				this.$http.request({
+					url:'/app/moveLog/my/' + this.id,
+					method:'get',
+					data:{},
+				}).then(res => {
+					this.moveLog = res
 					let moveLogInfo = []
 					moveLogInfo.push({
 						title: "车主车牌号:",
@@ -93,13 +91,6 @@
 						value: "他人请求挪车"
 					})
 					this.items = moveLogInfo
-					}else{
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
 				})
 			},
 		},

pagesB/pages/move-car/scan.vue

@@ -63,44 +63,7 @@
 					<car-number class="car__input" v-model="model1.carNo"></car-number>
 				</view>
 			</view>
-			<!-- <view class="info_list">
-				<view class="left">
-					行驶里程：
-				</view>
-				<view class="right">
-					{{carInfo.mileage || 0}}KM
-				</view>
-			</view> -->
-            <!-- <div class="scan__tips">
-                <div>请填写以下信息</div>
-                <div @click="goLoveCar">从爱车选择<span>
-                        <image src="@/static/move-car/scan_right.png" /></span></div>
-            </div>
-            <div class="car__num__self">
-                <div class="car__num">车牌号：</div>
-                <car-number class="car__input" v-model="model1.carInfo.carNo"></car-number>
-            </div>
-            <active-form :formDate.sync="formData"></active-form>
-			
-			<div class="add__user">
-			    <u-checkbox-group placement="row">
-			        <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
-			    </u-checkbox-group>
-			    请先阅读并同意<span @click="goArticle(2)">《京东汽车挪车牌隐私权政策》</span>
-			</div> -->
         </div>
-		<!-- <view class="no-car-info">
-			<view class="title">
-				请完成以下操作
-			</view>
-			<image src="../../../static/move-car/none.png"></image>
-			<view class="no-content">
-				暂无爱车信息，请先添加爱车
-			</view>
-			<view class="no-car-btn" @click="getCarList">
-				从爱车选择
-			</view>
-		</view> -->
 		
 		<view class="form-data">
 			<view class="form-item">
@@ -175,6 +138,7 @@
 
 <script>
 import CarNumber from "@/common/codecook-carnumber/codecook-carnumber.vue";
+import tools from "@/static/js/crypto-js.js";
 export default {
     components: {
         CarNumber,
@@ -189,69 +153,6 @@ export default {
 				carId:""
             },
 			carInfo: null,
-            formData: [
-                // {
-                //     id: "kjjns", //id必须唯一 可以是数字
-                //     placeholder: "请输入",
-                //     label: "车牌号", // 提示输入名
-                //     type: "text", //类型
-                //     rules: {
-                //         name: "carNo", //字段名 即提交给后端的字段
-                //         value: "",
-                //         verify: false, //是否开启校验
-                //         errMess: "车牌号未填写", //校验不通过的错误提示
-                //     },
-                // },
-                // {
-                //     id: "kjjns", //id必须唯一 可以是数字
-                //     placeholder: "请输入",
-                //     label: "品牌：", // 提示输入名
-                //     type: "text", //类型
-                //     rules: {
-                //         name: "brand", //字段名 即提交给后端的字段
-                //         value: "",
-                //         verify: false, //是否开启校验
-                //         errMess: "品牌未填写", //校验不通过的错误提示
-                //     },
-                // },
-                // {
-                //     id: "kjjns", //id必须唯一 可以是数字
-                //     placeholder: "请输入",
-                //     label: "车型：", // 提示输入名
-                //     type: "text", //类型
-                //     rules: {
-                //         name: "carModel", //字段名 即提交给后端的字段
-                //         value: "",
-                //         verify: false, //是否开启校验
-                //         errMess: "车型未填写", //校验不通过的错误提示
-                //     },
-                // },
-                {
-                    id: "kjjns", //id必须唯一 可以是数字
-                    placeholder: "请输入",
-                    label: "手机号：", // 提示输入名
-                    type: "text", //类型
-                    rules: {
-                        name: "phone", //字段名 即提交给后端的字段userMobile
-                        value: "",
-                        verify: false, //是否开启校验
-                        errMess: "手机号未填写", //校验不通过的错误提示
-                    },
-                },
-                {
-                    id: "uisdfjks",
-                    placeholder: "请输入验证码",
-                    label: "验证码：",
-                    type: "text",
-                    //   oneKeyPhone:true,
-                    rules: {
-                        name: "yzm",
-                        value: "", //字段值
-                        verify: false,
-                        errMess: "验证码未填写",
-                    },
-                },
-            ],
             //挪车码
             moveCode: '',
             //绑定挪车码信息
@@ -295,17 +196,14 @@ export default {
 		},
 		// 获取爱车列表
 		getCarList(){
-			uni.showLoading({
-				title: '加载中',
-				mask:true
-			});
-			let opts = { url: '/app/vehicleAdmin/list', method: 'get' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
-				if (res.statusCode == 200) {
-					uni.hideLoading()
+			this.$http.request({
+				url:'/app/vehicleAdmin/list',
+				method:'get',
+				data:{},
+				isFactory:false,
+			}).then(res => {
 				this.carList = res.data || []
 				this.selectCar = true
-				}
 			})
 		},
 		// 添加车辆
@@ -332,19 +230,20 @@ export default {
 				});
 				return;
 			}
-			uni.showLoading({
-				title: '加载中',
-				mask:true
-			});
-			let opts = { url: '/app/smsCode/binding/', method: 'post' };
-			this.http.httpTokenRequest(opts,{phone: this.model1.userMobile}).then(res => {
+			this.$http.request({
+				url:'/app/smsCode/binding',
+				method:'post',
+				data:{
+					phone: this.model1.userMobile
+				},
+				isFactory:false,
+			}).then(res => {
 				if (res.statusCode == 200) {
 					uni.showToast({
 						title: "别着急！短信已经发送了~",
 						icon: 'none',
 						duration: 1500
 					});
-					uni.hideLoading()
 					if(this.clickStatus == false){
 						this.clickStatus = true
 						let timer = setInterval(() => {
@@ -365,7 +264,6 @@ export default {
 			})
 		},
         confirmBinding() {
-			console.log(this.model1,22222222222)
 			if(!this.carInfo){
 				uni.showToast({
 				    title: "请选择绑定的爱车!",
@@ -387,78 +285,48 @@ export default {
 				});
 				return;
 			}
-			uni.showLoading({
-				title: '加载中',
-				mask:true
-			});
-            let opts = {
-                url: '/app/moveCode/binding/',
-                method: 'put'
-            };
-            this.http.httpTokenRequest(opts, this.model1).then(res => {
-                if (res.data.code == 200) {
-                    //展示绑定成功
+			this.$http.request({
+				url:'/app/moveCode/binding',
+				method:'put',
+				data:this.model1,
+			}).then(res => {
 				uni.showToast({
 				    title: "绑定成功",
 				    icon: "success",
 				});
-					uni.hideLoading()
+				setTimeout(()=>{
 					uni.navigateTo({
 					    url: '/pagesB/pages/move-car/myMoveCar'
 					})
-                } else {
-                    //绑定失败，展示失败信息
-					uni.hideLoading()
-                    uni.showToast({
-                        title: res.data.msg,
-                        icon: "none",
-                    });
-                }
+				},500)
 			})
         },
         getCarInfo() {
             if (this.carId) {
-                uni.showLoading({
-                    title:"加载中",
-					mask:true
-                })
-                let opts = {
-                    url: '/app/vehicleAdmin/' + this.carId,
-                    method: 'get'
-                };
-                this.http.httpTokenRequest(opts, {}).then(res => {
-                    if (res.data.code == 200) {
-                        this.model1.carInfo = res.data.data
-                        uni.hideLoading()
-                        this.formData.forEach(e => {
-                            if (e.label == '品牌：') {
-                                e.rules.value = this.model1.carInfo.brand
-                            } else if (e.label == '车型：') {
-                                e.rules.value = this.model1.carInfo.carModel
-                            }
-                        })
-                    }else{
-						uni.hideLoading()
-						uni.showToast({
-						    title: res.data.msg,
-						    icon: "none",
-						});
-					}
+				this.$http.request({
+					url:'/app/vehicleAdmin/' + this.carId,
+					method:'get',
+					data:{},
+					isFactory:false,
+				}).then(res => {
+					this.model1.carInfo = res
 				})
             }
         },
 		// 跳转协议政策页面
 		goArticle(index) {
-			let opts = {
-				url: '',
-				method: 'get'
-			};
+			let url="";
 			if (index == 1) {
-				opts.url = "/app/user/registerAgreement"
+				url = "/app/user/registerAgreement"
 			} else {
-				opts.url = "/app/user/ofPrivacy"
-			}
-			this.http.httpTokenRequest(opts, {}).then(res => {
+				url = "/app/user/ofPrivacy"
+			}
+			this.$http.request({
+				url:url,
+				method:'get',
+				data:{},
+				isFactory:false,
+			}).then(res => {
 				if (res.data.code == 200) {
 					let data = res.data.msg
 					uni.setStorageSync("articelContent", data)
@@ -477,6 +345,9 @@ export default {
     onLoad(option) {
 		this.moveCode = option.moveCode
 		this.model1.moveCode = option.moveCode
+		
+		let datajAes = tools.setAES('69703333');
+		console.log(datajAes,88888888888888)
     },
     onShow:function(){
         this.getCarInfo()

pagesC/pages/shop/detail.vue

@@ -58,18 +58,13 @@ export default {
             })
         },
 		getMallInfo(){
-			let opts = { url: '/app/index/mall/' + this.id, method: 'get' };
-			this.http.httpRequest(opts, {}).then(res => {
-				if (res.data.code == 200) {
-					this.mallInfo = res.data.data
+			this.$http.request({
+				url:'/app/index/mall/' + this.id,
+				method:'get',
+				data:{}
+			}).then(res => {
+				this.mallInfo = res || {}
 				this.list6 = this.mallInfo.imageUrls
-				}else{
-					uni.showToast({
-						title: res.data.msg,
-						icon: 'none',
-						duration: 2000
-					});
-				}
 			})
 		},
     },

pagesC/pages/shop/search.vue

@@ -3,10 +3,11 @@
  * @Description: 搜索商品
 -->
 <template>
-<view class="appCotent">
-<div class="myMoveCar">
+	<view class="appCotent">
+		<div class="myMoveCar">
 			<div class="my__search">
-        <u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword" @change="searchCommodity"></u-search>
+				<u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword"
+					@change="searchCommodity"></u-search>
 			</div>
 			<div class="list">
 				<div class="list__item" v-for="(vo,inx) in items" :key="inx" @click="goDetail(vo.id,vo.link)">
@@ -28,17 +29,17 @@
 					</div>
 				</div>
 			</div>
-</div>
-</view>
+		</div>
+	</view>
 </template>
 
 <script>
-export default {
+	export default {
 		data() {
 			return {
 				keyword: '',
 				items: [],
-			timer:null
+				timer: null
 			};
 		},
 		methods: {
@@ -47,7 +48,7 @@ export default {
 					url: '/pagesB/pages/move-car/moveCarDetail'
 				})
 			},
-        searchCommodity(){
+			searchCommodity() {
 				if (this.timer) {
 					clearTimeout(this.timer);
 				}
@@ -55,32 +56,27 @@ export default {
 					let searchCondition = {
 						searchVal: this.keyword
 					}
-			  console.log(searchCondition,222222222)
-			  let opts = { url: '/app/index/mall/list', method: 'get' };
-			  this.http.httpRequest(opts, searchCondition).then(res => {
-			      if (res.data.code == 200) {
-			          this.items = res.data.data.rows
-			      }else{
-					  uni.showToast({
-					  	title: res.data.msg,
-					  	icon: 'none',
-					  	duration: 2000
-					  });
-				  }
+					console.log(searchCondition, 222222222)
+					this.$http.request({
+						url: '/app/index/mall/list',
+						method: 'get',
+						data: searchCondition,
+					}).then(res => {
+						this.items = res.rows
 					})
 				}, 300)
 			},
-        goDetail(id,link) {
+			goDetail(id, link) {
 				let token = uni.getStorageSync('userToken');
-			if(!token){
-				let returnPage= '/pages/main';
+				if (!token) {
+					let returnPage = '/pages/main';
 					let pageType = "reLaunch"
 					uni.navigateTo({
-					url:"/pages/login/index/index?returnPage="+returnPage+'&pageType='+pageType
+						url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
 					})
 					return;
 				}
-			if(link){
+				if (link) {
 					// uni.navigateTo({
 					//     url: '/pages/webview/webview?url=' + link
 					// })
@@ -89,7 +85,7 @@ export default {
 						path: link, // 目标小程序的页面路径
 						extraData: { // 需要携带的参数
 						},
-					success(res) {// 打开成功
+						success(res) { // 打开成功
 						}
 					})
 					return
@@ -104,11 +100,11 @@ export default {
 				// })
 			},
 		},
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-.myMoveCar {
+	.myMoveCar {
 		padding: 40rpx 30rpx;
 
 		.list {
@@ -117,6 +113,7 @@ export default {
 			flex-wrap: wrap;
 			justify-content: flex-end;
 			padding-top: 30rpx;
+
 			.list__item {
 				padding: 28rpx;
 				box-sizing: border-box;
@@ -195,5 +192,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

pagesD/pages/personal/ask.vue

@@ -55,16 +55,19 @@ export default {
                     })
                 return;
             }
-            let opts = {
-                url: '/app/user/feedback',
-                method: 'post'
-            };
-            this.http.httpTokenRequest(opts, this.feedback).then(res => {
+			this.$http.request({
+				url:'/app/user/feedback',
+				method:'post',
+				data:this.feedback,
+				isFactory:false,
+			}).then(res => {
 				if (res.data.code == 200) {
 				    uni.showToast({
 				        title: '提交成功',
 				        icon: 'success',
 				    })
+					this.feedback.fbContent = ""
+					this.feedback.contact = ""
 				} else {
 				    uni.showToast({
 				        title: '提交失败',

pagesD/pages/personal/asking.vue

@@ -41,11 +41,12 @@ export default {
     },
 	methods: {
 	    getAskingList(){
-			let opts = { url: '/app/user/problem/list', method: 'get' };
-			this.http.httpTokenRequest(opts, {}).then(res => {
-				if (res.data.code == 200) {
-					this.askingList = res.data.data
-				}
+			this.$http.request({
+				url:'/app/user/problem/list',
+				method:'get',
+				data:{}
+			}).then(res => {
+				this.askingList = res || []
 			})
 		},
 	},

pagesD/pages/personal/help.vue

@@ -9,13 +9,13 @@
         <u-cell title="设置消息订阅" :isLink="true" @click="openMsg()"></u-cell>
       </u-cell-group> -->
 			<image v-if="image" :src="image" />
-      <image v-else src="@/static/my/help.png"/>
+			<image v-else src="@/static/my/help.png" />
 		</div>
 	</view>
 </template>
 
 <script>
-export default {
+	export default {
 		data() {
 			return {
 				image: '',
@@ -25,12 +25,13 @@ export default {
 		},
 		methods: {
 			getHelpInfo() {
-      let opts = {url: '/app/user/help', method: 'get'};
-      this.http.httpTokenRequest(opts, {}).then(res => {
-        if (res.data.code == 200) {
-          if (res.data.data.imgPath != '') {
-            this.image = res.data.data.imgPath
-          }
+				this.$http.request({
+					url: '/app/user/help',
+					method: 'get',
+					data: {}
+				}).then(res => {
+					if (res.imgPath != '') {
+						this.image = res.imgPath
 					}
 				})
 			},
@@ -50,7 +51,7 @@ export default {
 								wx.showModal({
 									title: "温馨提示",
 									content: "检测到您没有开启订阅消息的权限，是否去设置？",
-                success: function (modal) {
+									success: function(modal) {
 										if (modal.confirm) {
 											// 点击肯定
 											wx.openSetting({
@@ -93,14 +94,15 @@ export default {
 										wx.showModal({
 											title: "温馨提示",
 											content: "检测到您没有开启订阅消息的权限，是否去设置？",
-                    success: function (modal) {
+											success: function(modal) {
 												if (modal.confirm) {
 													// 点击肯定
 													wx.openSetting({
 														withSubscriptions: true,
 													});
 													that.is_authorization = true;
-                        uni.setStorageSync("is_authorization", true);
+													uni.setStorageSync("is_authorization",
+														true);
 												} else {
 													uni.showToast({
 														title: "您已拒绝订阅消息授权，无法接收通知",
@@ -142,12 +144,11 @@ export default {
 			this.getHelpInfo()
 			//this.openMsg()
 		},
-}
-
+	}
 </script>
 
 <style lang="scss" scoped>
-.hlep {
+	.hlep {
 		padding: 0rpx 0;
 		height: 3260rpx;
 
@@ -155,5 +156,5 @@ export default {
 			height: 100%;
 			width: 100%;
 		}
-}
+	}
 </style>

pagesD/pages/personal/userInfo.vue

@@ -173,19 +173,20 @@ export default {
             this.formData.forEach(element => {
                 if (element.label === '性别') {
                     element.rules.label = val
-                    let opts = {
-                        url: '/app/user/update',
-                        method: 'post'
-                    };
                     let sex = (val == '男' ? "0" : "1")
                     let userInfoItem = {
                         type: 3,
                         val: sex
                     };
-                    this.http.httpTokenRequest(opts, userInfoItem).then(response => {
-                        if (response.data.code == 200) {
-
-                        }
+					this.$http.request({
+						url:'/app/user/update',
+						method:'post',
+						data:userInfoItem,
+					}).then(res => {
+						uni.showToast({
+						    title: '修改成功',
+						    icon: 'success',
+						})
 					})
                 }
             });
@@ -197,18 +198,20 @@ export default {
             this.formData.forEach(element => {
                 if (element.label === '昵称') {
                     element.rules.value = this.user__nikename
-                    let opts = {
-                        url: '/app/user/update',
-                        method: 'post'
-                    };
                     let userInfoItem = {
                         type: 2,
                         val: this.user__nikename
                     };
-                    that.http.httpTokenRequest(opts, userInfoItem).then(response => {
-                        if (response.data.code == 200) {
+					this.$http.request({
+						url:'/app/user/update',
+						method:'post',
+						data:userInfoItem,
+					}).then(res => {
+						uni.showToast({
+						    title: '修改成功',
+						    icon: 'success',
+						})
 						this.getUserInfo()
-                        }
 					})
                 }
             });

static/js/crypto-js.js

+import CryptoJS from "crypto-js";
+import $http from '@/common/zhouWei-request/requestConfig';
+// import CryptoJS from "../../node_modules/crypto-js/crypto-js.js";//一般npm以后都是这个位置
+let KEY = '自己的key'
+let IV = '';//我感觉可以不写，反正我没有写（看你们需求）
+let tools = {
+	/*aes加密*/
+	setAES(str) {
+		const data = CryptoJS.enc.Hex.parse(str);
+		const key = CryptoJS.enc.Hex.parse(KEY);
+		const iv = CryptoJS.enc.Hex.parse(IV);
+		var option = {
+			iv: iv,
+			mode: CryptoJS.mode['CBC'],//看需求变“CBC”
+			padding: CryptoJS.pad['ZeroPadding']//看需求变“ZeroPadding”
+		};
+		var encrypted = CryptoJS.AES.encrypt(data, key, option);
+		const words = encrypted.ciphertext;
+		var hex = CryptoJS.enc.Hex.stringify(words);
+		return hex
+	},
+	/*aes解密*/
+	decryptAES(str) {
+		console.log("str", str)
+		let data = CryptoJS.enc.Hex.parse(str);
+		const key = CryptoJS.enc.Hex.parse(KEY);
+		const iv = CryptoJS.enc.Hex.parse(IV);
+		var option = {
+			iv: iv,
+			mode: CryptoJS.mode['CBC'],//看需求变“CBC”
+			padding: CryptoJS.pad['ZeroPadding']//看需求变“ZeroPadding”
+		};
+		data = CryptoJS.enc.Base64.stringify(data);
+		const words = CryptoJS.AES.decrypt(data, key, option);
+		var hex = CryptoJS.enc.Hex.stringify(words);
+		return hex
+	}
+
+};
+
+export default tools;
\ No newline at end of file