Merge branch 'dev1.0.0' into develop

2 years ago · 479eec7caf
parent 158b972690 30c5b0d7dd
commit 479eec7caf
12 changed files with 14 additions and 14 deletions
--- 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-18 10:04:10
+ * @LastEditTime: 2022-04-19 11:23:58
 * @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' : ''
 };
--- 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.a572362a.js></script><script src=/static/js/index.74f850a0.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.a572362a.js></script><script src=/static/js/index.c845cec7.js></script></body></html>
--- a/h5/static/js/index.c845cec7.js
+++ b/h5/static/js/index.c845cec7.js
--- a/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-address-list~pages-account-set~b5c0a9b8.02740d48.js
+++ b/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-address-list~pages-account-set~b5c0a9b8.02740d48.js
--- a/h5/static/js/pages-account-index.78152298.js
+++ b/h5/static/js/pages-account-index.78152298.js
--- a/h5/static/js/pages-account-setting-setName.bf82ebcc.js
+++ b/h5/static/js/pages-account-setting-setName.bf82ebcc.js
--- a/h5/static/js/pages-goods-detail-index.629ea03b.js
+++ b/h5/static/js/pages-goods-detail-index.629ea03b.js
--- a/h5/static/js/pages-login.0e7ae3ad.js
+++ b/h5/static/js/pages-login.0e7ae3ad.js
--- a/h5/static/js/pages-order-detail-index.bd7ba787.js
+++ b/h5/static/js/pages-order-detail-index.bd7ba787.js
--- a/h5/static/js/pages-order-logisitcsInfo.8d8f162a.js
+++ b/h5/static/js/pages-order-logisitcsInfo.8d8f162a.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterSelect.a5a02f83.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterSelect.a5a02f83.js
--- a/h5/static/js/pages-order-submit.899d4245.js
+++ b/h5/static/js/pages-order-submit.899d4245.js