Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

pages/user/coupon/chooseCoupons.vue

@@ -289,19 +289,20 @@
 			padding: 19px 10px 18px 0;
 			
 			.price{
-				height: 38px;
+				// height: 38px;
 				color: rgba(0, 185, 98, 100);
 				font-size: 32px;
 				text-align: right;
 			}
 			.price2{
-				height: 38px;
+				// height: 38px;
 				color: rgba(0, 185, 98, 100);
 				font-size: 20px;
 				text-align: right;
+				white-space: pre;
 			}
 			.contidion{
-				height: 22px;
+				// height: 22px;
 				color: rgba(51, 51, 51, 100);
 				font-size: 16px;
 				text-align: right;

pages/user/coupon/myCoupon.vue

@@ -29,13 +29,13 @@
 
 						<view class="price2" v-if="item.classify == '2'">
 							
-							<span style="font-size: 12px;" v-if="item.value">服务费</span>
+							<span style="font-size: 24rpx;" v-if="item.value">服务费</span>
 							
-															<span v-if="item.value"> {{item.value}}<span style="font-size: 12px;">折</span></span>
+															<span v-if="item.value"> {{item.value}}<span style="font-size: 24rpx;">折</span></span>
 															<span v-else>免服务费</span>
 							
 							</view>
-						<view class="price" v-else >{{item.value}}<span style="font-size: 12px;">元</span></view>
+						<view class="price" v-else >{{item.value}}<span style="font-size: 24rpx;">元</span></view>
 						
 						
 						<view class="price-condition oldTextjp2" oldstyle="font-size: 16px;">
@@ -221,14 +221,14 @@
 			   .content-left{
 				   .text{
 					 
-					   height: 22px;
+					   
 					   line-height: 22px;
 					   color: rgba(16, 16, 16, 100);
 					   font-size: 16px;
 				   }
 				
 				   .useful-life{
-					   height: 17px;
+					   
 					   line-height: 17px;
 					   color: rgba(153, 153, 153, 100);
 					   font-size: 12px;
@@ -239,18 +239,20 @@
 				   margin-top: -8px;
 				   text-align: right;
 				   .price{
-					   height: 38px;
+					 
 					   color: rgba(0, 185, 98, 100);
-					   font-size: 34px;
+					   font-size: 68rpx;
+					   white-space: pre;
 					   
 				   }
 				   .price2{
-				   			 height: 38px;
+					   white-space: pre;
+				   			 
 				   			   color: rgba(0, 185, 98, 100);
-				   			 font-size: 24px;
+				   			 font-size: 48rpx;
 				   }
 				   .price-condition{
-					   height: 17px;
+					    
 					   color: rgba(102, 102, 102, 100);
 					   font-size: 12px;
 					   text-align: center;