Merge branch 'dev1.0.0' into develop

2 years ago · 61a94dc2fc
parent 9f5f5fdb43 562a8cdbae
commit 61a94dc2fc
17 changed files with 24 additions and 21 deletions
--- a/common/plugins/msbUniRequest.js
+++ b/common/plugins/msbUniRequest.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-17 16:36:59
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 10:41:17
+ * @LastEditTime: 2022-04-20 11:57:58
 * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
 * 
 * 
@ -59,9 +59,10 @@ class MsbUniRequest {
 	method(option){
 		option.header = {...this.header,...option.header};
 		option.url = this.baseUrl + option.url;
-		if(this.hook.request && !option.header){
+		if(this.hook.request){
 			option = this.hook.request(option);
-		}
+		};
+
 		if(!option){
 			throw new Error('没有请求配置，或是request拦截未做return');
 		}
@ -69,6 +70,7 @@ class MsbUniRequest {
 			return option
 		}
 		return new Promise((resolve, reject)=>{
+			console.log(option);
 			uni.request({
 				...option,
 				success: res => {
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-17 17:42:32
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 11:03:08
+ * @LastEditTime: 2022-04-20 11:52:43
 * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
 */

@ -11,8 +11,8 @@ import $store from '@/common/store';

 const ENV = 'test';
 const BASE_URL = {
-	'test' : 'http://k8s-horse-gateway.mashibing.cn',
-	// 'test' : '',
+	// 'test' : 'http://k8s-horse-gateway.mashibing.cn',
+	'test' : '',
 	'release' : '',
 	'prod' : ''
 };
@ -102,7 +102,7 @@ MsbRequestTk.use('request', (option) => {
 		page.$Router.replace('/login');
 		return Promise.reject({message:'要先登录才能操作哦~'});
 	}else{
-		option.header = {...option.header, Authorization:$store.state.token};
+		option.header = {...option.header, Authorization:token};
 		
 		if(option.header.repeat){
 			// 如果当前请求不允许重复调用，则检查重复请求，当前接口有正在请求则不发起请求
@ -111,6 +111,7 @@ MsbRequestTk.use('request', (option) => {
 				return isRepeatVerify;
 			}
 		}
+		console.log(option);
 		return option;
 	}
 })
--- a/h5/index.html
+++ b/h5/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.70f3e4b8.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.f2ba7ba9.js></script></body></html>
--- a/h5/static/js/index.f2ba7ba9.js
+++ b/h5/static/js/index.f2ba7ba9.js
--- a/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.7473f8b1.js
+++ b/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.7473f8b1.js
--- a/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.982d4b88.js
+++ b/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.982d4b88.js
--- a/h5/static/js/pages-account-index.606a0016.js
+++ b/h5/static/js/pages-account-index.606a0016.js
--- a/h5/static/js/pages-account-setting-setName.c5273ae6.js
+++ b/h5/static/js/pages-account-setting-setName.c5273ae6.js
--- a/h5/static/js/pages-goods-detail-index.219fc095.js
+++ b/h5/static/js/pages-goods-detail-index.219fc095.js
--- a/h5/static/js/pages-login.dddb55b7.js
+++ b/h5/static/js/pages-login.dddb55b7.js
--- a/h5/static/js/pages-order-detail-index.04c5950e.js
+++ b/h5/static/js/pages-order-detail-index.04c5950e.js
--- a/h5/static/js/pages-order-logisitcsInfo.85b1801d.js
+++ b/h5/static/js/pages-order-logisitcsInfo.85b1801d.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterApply.89a55ee6.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterApply.89a55ee6.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterApply.ac1aa539.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterApply.ac1aa539.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterEdit.254f6eb1.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterEdit.254f6eb1.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterSelect.eacf1061.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterSelect.eacf1061.js
--- a/h5/static/js/pages-order-submit.438ce29e.js
+++ b/h5/static/js/pages-order-submit.438ce29e.js