优惠券订单

pages/parking/pay.vue

@@ -11,12 +11,19 @@
 			
 		</view>
 		<view class="wrap"  v-if="!kongResult"  >
-			<u-navbar title="停车缴费" :is-back="false">
-				
-			</u-navbar>
-			
 			<view >
+			
 				<view class="">
+					<h2 style="
+										    text-align: center;
+										    font-size: 36px;
+										      padding-top: 30px;
+										"> 停车缴费</h2>
+										<h2 style="
+					    text-align: center;
+					    font-size: 46px;
+					    color: #53b56b;
+					"> {{detail.price}}<span style="font-size: 16px;">元</span></h2>
 					<view class="cartitle"> 缴费信息</view>
 					<view class="info" >
 						<view class="info-name">
@@ -33,11 +40,28 @@
 							停车费
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							 			
- 					{{detail.price}}元
+							{{detail.total}}元
 						</view>
 					</view>
+					<view class="info"   >
+						<view class="info-name"  style="font-size: 16px;">
+							折扣
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							 {{detail.discountMoney}}元
+						</view>
+					</view>
+					
 					<view class="cartitle"> 停车详情</view>
+					<view class="info" >
+						<view class="info-name">
+							每小时费用
+						</view>
+						<view class="info-text">
+							 			
+							{{detail.hourCost}}元
+						</view>
+					</view>
 					<view class="info" >
 						<view class="info-name">
 							停车位置

pages/parking/search.vue

@@ -22,12 +22,20 @@
 		</view>
 		
 		<view class="wrap"  v-if="kongResult">
-			<u-navbar title="停车缴费">
-				
-			</u-navbar>
+			 
 			
 			<view >
 				<view class="">
+					<h2 style="
+					    text-align: center;
+					    font-size: 36px;
+					      padding-top: 30px;
+					"> 停车缴费</h2>
+					<h2 style="
+    text-align: center;
+    font-size: 46px;
+    color: #53b56b;
+"> {{detail.price}}<span style="font-size: 16px;">元</span></h2>
 					<view class="cartitle"> 缴费信息</view>
 					<view class="info" >
 						<view class="info-name">
@@ -45,18 +53,37 @@
 							停车费
 						</view>
 						<view class="info-text" style="font-size: 16px;">
-							 			
- 					{{detail.price}}元
+							{{detail.total}}元
+						</view>
+					</view>
+					<view class="info"   >
+						<view class="info-name"  style="font-size: 16px;">
+							折扣
+						</view>
+						<view class="info-text" style="font-size: 16px;">
+							 {{detail.discountMoney}}元
 						</view>
 					</view>
+					
+					
 					<view class="cartitle"> 停车详情</view>
+					
+					<view class="info" >
+						<view class="info-name">
+							每小时费用
+						</view>
+						<view class="info-text">
+							 			
+							{{detail.hourCost}}元
+						</view>
+					</view>
 					<view class="info" >
 						<view class="info-name">
 							停车位置
 						</view>
 						<view class="info-text">
 							 			
-					{{detail.parkingName}}
+							{{detail.parkingName}}
 						</view>
 					</view>
 					<view class="info" >
@@ -275,8 +302,10 @@
 		 margin-top: 5px;
 	}
 	.color4fc5f7{
-		color:#4fc5f7;
+		color:#53b56b;
+	
 		margin-left: 5px;
+		 font-weight: bold;
 	}
 	.info {
 		    font-size: 14px;

pages/record/details.vue

@@ -14,8 +14,11 @@
 			</view>
 			<view class="oldTextjp2" oldstyle="font-size: 18px;">
 				<view class="details-row"><p>电费</p><span>{{chargeDetail.totalElecMoney != null ? chargeDetail.totalElecMoney : '0.00'}}元</span></view>
-				<view class="details-row"><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney : '0.00'}}元</span></view>
-				<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.text : '未使用'}}</span></view>
+				<view class="details-row" v-if="!chargeDetail.discountAmount"><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney : '0.00'}}元</span></view>
+				
+				<view class="details-row" v-if="chargeDetail.discountAmount" ><p>服务费</p><span>{{chargeDetail.totalServiceMoney != null ? chargeDetail.totalServiceMoney-chargeDetail.discountAmount : '0.00'}}元({{chargeDetail.totalServiceMoney}}-{{chargeDetail.discountAmount}})</span></view>
+				
+				<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.useText : '未使用'}}</span></view>
 			</view>
 		</view>
 		<view class="details">