修改停车缴费页面字段和停车记录统一

pages/payLists/payLists.scss

@@ -52,6 +52,9 @@ page {
 				color: #595959;
 				line-height: 37rpx;
 				letter-spacing: 1px;
+				.pay-amount {
+					color: #FA6400;
+				}
 			}
 		}
 		.u-cell_title{

pages/payLists/payLists.vue

@@ -11,23 +11,54 @@
 								<view class="car">{{payItem.vehicleNo}}</view>
 								<view class="addr">{{payItem.roadName}}</view>
 							</view>
-							<view class="pay-top-right">{{payItem.orderStatus | filterOrderStatus}}</view>
+							<view class="pay-top-right">{{ payItem.orderStatus | filterOrderStatus }}</view>
 						</view>
 						<view class="pay-center">
-							<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
+							<view class="pay-center-item">订单编号：{{payItem.orderId}}</view>
+							<view class="pay-center-item" v-if="payItem.deviceType == 1">入场时间：{{payItem.inTime || ''}}
+							</view>
+							<view class="pay-center-item" v-else>开始计费：{{payItem.inTime || ''}}</view>
+							<template v-if="payItem.deviceType == 1">
+								<view class="pay-center-item" v-if="payItem.orderStatus == 1 && payItem.outTime">
+									出场时间：{{ `未出场` }}</view>
+								<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+									出场时间：{{ payItem.outTime }}</view>
+							</template>
+							<template v-else>
+								<view class="pay-center-item" v-if="payItem.orderStatus == 1 && payItem.outTime">
+									结束计费：{{ `未出场` }}</view>
+								<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+									结束计费：{{ payItem.outTime }}</view>
+							</template>
+							<!-- <view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
 							<view class="pay-center-item">入场时间：{{payItem.inTime || 0}}</view>
 							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">出场时间：{{payItem.outTime || 0}}
 							</view>
 							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">停车时长：{{payItem.duration || 0}}
-							</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">免费时长：{{payItem.freeDuration || 0}}
+							</view> -->
+							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+								免费时长：{{ payItem.deviceType == 1 ? payItem.freeDuration : '0天0时15分0秒' }}
 							</view>
 							<!-- 计费时长=停车时长－免费时长 -->
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">计费时长：{{payItem.calcDuration || 0}}
+							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+								计费时长：{{payItem.calcDuration || 0}}
+							</view>
+							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+								累计停车时长：{{payItem.duration || 0}}
+							</view>
+							<view class="pay-center-item" v-if="payItem.orderStatus == 1">预计金额：<span
+									class="pay-amount">{{payItem.payAmount || 0}}</span>
+							</view>
+							<view class="pay-center-item" v-else>应付金额：<span
+									class="pay-amount">{{payItem.payAmount || 0}}</span>
 							</view>
-							<view class="pay-center-item">应付金额：<span class="pay-amount">{{payItem.payAmount || 0}}</span>
+							<view class="pay-center-item"
+								v-if="(payItem.actualAmount || payItem.actualAmount === 0) && payItem.orderStatus !== 2 && payItem.orderStatus !== 1">
+								实缴金额：<span class="pay-amount">{{ payItem.actualAmount || 0}}</span>
 							</view>
-							<view class="pay-center-item" v-if="payItem.deviceType && payItem.deviceType != 1">车位锁设备号：{{payItem.deviceNo}}
+							<view class="pay-center-item">泊位号：{{payItem.spaceName}}</view>
+							<view class="pay-center-item" v-if="payItem.deviceType && payItem.deviceType != 1">
+								车位锁设备号：{{payItem.deviceNo}}
 							</view>
 						</view>
 						<view class="pay-bottom">