Merge branch 'dev1.0.0' into develop

3 years ago · 6606270adf
parent 74e5f7ecc4 79fed12828
commit 6606270adf
8 changed files with 9 additions and 9 deletions
--- 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.180a8da6.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.f944be4f.js></script></body></html>
--- a/h5/static/js/index.f944be4f.js
+++ b/h5/static/js/index.f944be4f.js
--- a/h5/static/js/pages-account-address-create.a7498aa5.js
+++ b/h5/static/js/pages-account-address-create.a7498aa5.js
--- a/h5/static/js/pages-account-address-create.ed2cfc7e.js
+++ b/h5/static/js/pages-account-address-create.ed2cfc7e.js
--- a/h5/static/js/pages-account-address-edit.335de6f0.js
+++ b/h5/static/js/pages-account-address-edit.335de6f0.js
--- a/h5/static/js/pages-account-address-edit.6053df82.js
+++ b/h5/static/js/pages-account-address-edit.6053df82.js
--- a/pages/account/address/create.vue
+++ b/pages/account/address/create.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 14:12:18
 * @LastEditors: ch
- * @LastEditTime: 2022-04-22 21:32:46
+ * @LastEditTime: 2022-04-22 22:07:15
 * @Description: file content
 -->
 <template>
@ -104,7 +104,7 @@ page {
 }
 .form{
 	background: $color-grey0;
-	margin-bottom: 20rpx;
+	margin: 20rpx 0;
 	&--item{
 		padding: 0 40rpx;
 		&__last{
--- a/pages/account/address/edit.vue
+++ b/pages/account/address/edit.vue
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-03-22 14:12:18
 * @LastEditors: ch
- * @LastEditTime: 2022-04-22 19:04:16
+ * @LastEditTime: 2022-04-22 22:07:44
 * @Description: file content
 -->
 <template>
@ -118,7 +118,7 @@ page {
 }
 .form{
 	background: $color-grey0;
-	margin-bottom: 20rpx;
+	margin: 20rpx 0;
 	&--item{
 		padding: 0 40rpx;
 		&__last{
@ -141,7 +141,7 @@ page {
 	width: 670rpx;
 }
 /deep/ {
-	.del-address .uiCell--title{
+	.del-address .ui-cell--title{
 		color: $color-yellow3;
 	}
 	.form--city .ui-cell{
`@ -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.180a8da6.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.f944be4f.js></script></body></html>`