出场状态

pages/ownersQuery/queryList/queryList.vue

@@ -15,7 +15,13 @@
 				<view class="owelist-item" v-for="(item,index) in dataList" :key="item.id">
 					<view class="item-header u-flex u-row-between">
 						<view class="vehicle-no">{{item.vehicleNo}}</view>
-						<view class="order-status" :class="{'order-status-0':item.orderStatus=='0','order-status-1':item.orderStatus=='1','order-status-2':item.orderStatus=='2','order-status-3':item.orderStatus=='3','order-status-4':item.orderStatus=='4'}">{{item.orderStatus|filterOrderStatus}}</view>
+						<view v-if="item.orderStatus==2" 
+						class="order-status" 
+						:class="{'order-status-0':item.orderStatus=='0','order-status-1':item.orderStatus=='1','order-status-2':item.orderStatus=='2','order-status-3':item.orderStatus=='3','order-status-4':item.orderStatus=='4'}">
+							{{item.orderStatus|filterOrderStatus}}
+							{{item.payStatus|filterPayStatus}}
+						</view>
+						<view v-else class="order-status" :class="{'order-status-0':item.orderStatus=='0','order-status-1':item.orderStatus=='1','order-status-2':item.orderStatus=='2','order-status-3':item.orderStatus=='3','order-status-4':item.orderStatus=='4'}">{{item.orderStatus|filterOrderStatus}}</view>
 					</view>
 						<view class="road-name u-flex">
 							<u-icon name="map-fill" color="#3397FA" size="36"></u-icon>
@@ -28,7 +34,7 @@
 						<view v-if="item.orderStatus != 1" class="info-item">免费时长：{{item.freeDuration}}</view>
 						<view v-if="item.orderStatus != 1" class="info-item">计费时长：{{item.billinDuration}}</view>
 						<view v-if="item.orderStatus != 1" class="info-item">应缴金额：{{item.payAmount}}</view>
-						<view v-if="item.orderStatus != 1" class="info-item">实缴金额：<span class="amount">{{item.payAmount}}元</span></view>
+						<view v-if="item.orderStatus != 1" class="info-item">实缴金额：<span class="amount">{{item.actualAmount||'0'}}元</span></view>
 				</view>
 			</view>
 		</mescroll-uni>

utils/filter.js

@@ -71,7 +71,7 @@ Vue.filter("filterOrderStatus",function(status){
 			return '停放中'
 			break;
 		case 2:
-			return '出场中'
+			return '出场'
 			break;
 		case 3:
 			return '欠费'