Merge branch 'dev1.0.0' into develop

3 years ago · 02e5bc5dbd
parent 8265d1f136 cc8a0478f0
commit 02e5bc5dbd
17 changed files with 8 additions and 8 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-20 14:18:43
+ * @LastEditTime: 2022-04-20 14:23:33
 * @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' : 'http://k8s-horse-gateway.mashibing.cn',
-	'test' : '',
+	// '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.b5602bf5.js></script><script src=/static/js/index.b70ccc7e.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.e59dbb6b.js></script></body></html>
--- a/h5/static/js/index.e59dbb6b.js
+++ b/h5/static/js/index.e59dbb6b.js
--- a/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.61b7571a.js
+++ b/h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.61b7571a.js
--- a/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.3380bb27.js
+++ b/h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.3380bb27.js
--- a/h5/static/js/pages-account-index.234daa34.js
+++ b/h5/static/js/pages-account-index.234daa34.js
--- a/h5/static/js/pages-account-setting-setName.befe07ee.js
+++ b/h5/static/js/pages-account-setting-setName.befe07ee.js
--- a/h5/static/js/pages-goods-detail-index.57bf8a7d.js
+++ b/h5/static/js/pages-goods-detail-index.57bf8a7d.js
--- a/h5/static/js/pages-login.eddbaaea.js
+++ b/h5/static/js/pages-login.eddbaaea.js
--- a/h5/static/js/pages-order-detail-index.fac31420.js
+++ b/h5/static/js/pages-order-detail-index.fac31420.js
--- a/h5/static/js/pages-order-logisitcsInfo.3a990f64.js
+++ b/h5/static/js/pages-order-logisitcsInfo.3a990f64.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterApply.12296b9a.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterApply.12296b9a.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterEdit.0ba19d83.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterEdit.0ba19d83.js
--- a/h5/static/js/pages-order-saleAfter-saleAfterSelect.3f5261f7.js
+++ b/h5/static/js/pages-order-saleAfter-saleAfterSelect.3f5261f7.js
--- a/h5/static/js/pages-order-submit.064e4f84.js
+++ b/h5/static/js/pages-order-submit.064e4f84.js
--- a/h5/static/js/pages-order-submit.0f16d373.js
+++ b/h5/static/js/pages-order-submit.0f16d373.js
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-20 14:14:53
 * @LastEditors: ch
- * @LastEditTime: 2022-04-20 14:16:18
+ * @LastEditTime: 2022-04-20 14:22:52
 * @Description: file content
 -->
 <template>
@ -97,7 +97,7 @@ export default {
 			}
 		});
 		// 默认选择设为默认的地址
-		this.address = this.$store.state.address.find(i => i.isDefault);
+		this.address = this.$store.state.address.find(i => i.isDefault) || {};
 	},
 	methods:{
 		/**
`@ -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)'))`	`<!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.b70ccc7e.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.e59dbb6b.js></script></body></html>`