Merge branch 'dev1.0.0' into develop

2 years ago · ec0a19ca4d
parent 6755fcf206 4650f597dd
commit ec0a19ca4d
16 changed files with 17 additions and 17 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-26 17:57:57
+ * @LastEditTime: 2022-04-26 18:13:01
 * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
 */

@ -14,7 +14,7 @@ const BASE_URL = {
 	'test' : 'https://like-app.mashibing.com/test',
 	// 'test' : '',
 	'release' : '',
-	'prod' : 'https://like-app.mashibing.com'
+	'prod' : '//like-gateway.mashibing.com'
 };
 /**
 * 接口返回成功结果统一处理
--- 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.ba63d6c6.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.07ea43cf.js></script></body></html>
--- a/h5/static/js/index.07ea43cf.js
+++ b/h5/static/js/index.07ea43cf.js
--- a/h5/static/js/pages-account-address-create~pages-account-address-edit.c39c5cf7.js
+++ b/h5/static/js/pages-account-address-create~pages-account-address-edit.c39c5cf7.js
--- a/h5/static/js/pages-account-address-list.ee618747.js
+++ b/h5/static/js/pages-account-address-list.ee618747.js
--- a/h5/static/js/pages-account-index.4869bf25.js
+++ b/h5/static/js/pages-account-index.4869bf25.js
--- a/h5/static/js/pages-account-setting-setName.1fff9f3e.js
+++ b/h5/static/js/pages-account-setting-setName.1fff9f3e.js
--- a/h5/static/js/pages-account-setting-setUserInfo.b33a9151.js
+++ b/h5/static/js/pages-account-setting-setUserInfo.b33a9151.js
--- a/h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-detail-in~2e94cc65.2672f27f.js
+++ b/h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-detail-in~2e94cc65.2672f27f.js
--- a/h5/static/js/pages-goods-category.22b3470b.js
+++ b/h5/static/js/pages-goods-category.22b3470b.js
--- a/h5/static/js/pages-goods-detail-index.8314c1b6.js
+++ b/h5/static/js/pages-goods-detail-index.8314c1b6.js
--- a/h5/static/js/pages-login.24d0bbb0.js
+++ b/h5/static/js/pages-login.24d0bbb0.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterApply.335e584c.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterApply.335e584c.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterEdit.6fc38b20.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterEdit.6fc38b20.js
--- a/h5/static/js/pages-order-submit.f61b5384.js
+++ b/h5/static/js/pages-order-submit.f61b5384.js
--- a/h5/static/js/pages-seckill.4284525d.js
+++ b/h5/static/js/pages-seckill.4284525d.js