样式修改

pages/address/address.vue

@@ -19,14 +19,18 @@
             </app-button>
             <!-- #endif -->
             <!-- #ifndef MP-ALIPAY -->
-            <app-button :background="manual_btn_bg" arrangement="row" @click="manual" type="important" round width="346">
+           <app-button :background="manual_btn_bg" arrangement="row" @click="manual" type="important" round width="700">
                 <icon class="app-icon app-manual-icon"></icon>
                 <text class="app-text">手动添加</text>
             </app-button>
-            <app-button background="#08c303" arrangement="row" @click="getauto" type="important" round width="346">
+			<!--       <app-button :background="manual_btn_bg" arrangement="row" @click="manual" type="important" round width="346">
+                <icon class="app-icon app-manual-icon"></icon>
+                <text class="app-text">手动添加</text>
+            </app-button> -->
+<!--            <app-button background="#08c303" arrangement="row" @click="getauto" type="important" round width="346">
                 <icon class="app-icon app-auth-icon"></icon>
                 <text class="app-text">自动获取</text>
-            </app-button>
+            </app-button> -->
             <!-- #endif -->
 	    </view>
     </app-layout>

pages/cart/components/app-add-subtract/app-add-subtract.vue

@@ -110,7 +110,7 @@
 			background-image: url("../../../../static/image/cart/unreducible.png");
 		}
 		.app-not-add {
-			background-image: url("../../../../static/image/cart/can't-add.png");
+			background-image: url("../../../../static/image/cart/cant-add.png");
 		}
 		.app-can-add {
 			background-image: url("../../../../static/image/cart/can-be-added.png");

pages/order-submit/order-submit.vue

@@ -47,29 +47,29 @@
                             </view> -->
 							<view class="felx-three">
 								<view class="box-grow-2">
-									参训人: 诸葛村夫
+									参训人: {{verifyUndefined(previewData.address.name)}}
 								</view>	
 								<view class="box-grow-3">
-									性别: 男
+									性别: {{verifyUndefined(previewData.address.sex) == ''? '':previewData.address.sex == 0 ?'未知':previewData.address.sex == 1? '男':'女'}}
 								</view>	
 								<view class="box-grow-4">
-									联系电话: 13985840801
+									联系电话: {{verifyUndefined(previewData.address.mobile)}}
 								</view>
 							</view>
 							<view class="felx-three">
 								<view class="box-grow-2">
-									年龄: 100
+									年龄: {{verifyUndefined(previewData.address.age)}}
 								</view>	
 								<view class="box-grow-3">
-									体重: 男
+									体重: {{verifyUndefined(previewData.address.weight)}}
 								</view>	
 								<view class="box-grow-4">
-									身高: 13985840801
+									身高: {{verifyUndefined(previewData.address.height)}}
 								</view>
 							</view>
 							<view class="felx-three">
 								<view class="box-grow-5">
-									身份证号码: 51300198808080018
+									身份证号码:{{previewData.address.idcard}}
 								</view>	
 							</view>
                         </view>
@@ -400,6 +400,13 @@
             },
         },
         methods: {
+			verifyUndefined(value){
+				if(value == 'undefined' || value == ''){
+					return ''
+				}else{
+					return value
+				}
+			},
             updateList(e,index) {
                 this.previewData.mch_list[index] = e;
                 console.log(this.previewData.mch_list)
@@ -827,6 +834,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
+		padding-bottom: 23rpx;
 		.box-grow-2, .box-grow-3, .box-grow-4{
 			font-size: 24rpx;
 			font-family: Source Han Sans CN;
@@ -892,6 +900,7 @@
 
         .mch-list {
             .mch-name {
+				background-color: #fff;
                 padding: $yWidth $xWidth;
             }
 
@@ -990,7 +999,7 @@
                     }
 
                     .goods-name {
-						font-size:24rpx !important;
+						font-size:24rpx;
 						font-family:Source Han Sans CN;
 						font-weight:400;
 						color:rgba(72,72,72,1);
@@ -1060,7 +1069,6 @@
             }
 
             .remark {
-				height: 339rpx;
                 background: #fff;
                 border-bottom: #{1rpx} solid $borderColor;
                 padding: 0 #{12rpx};