修改临停订单列表和包月订单列表的数据格式

This commit is contained in:
赵毅 2025-09-04 17:44:45 +08:00
parent 3fb0454731
commit 267bac2149
3 changed files with 25 additions and 26 deletions

View File

@ -11,49 +11,48 @@
<view class="order-list"> <view class="order-list">
<view v-for="(order, index) in orders" :key="index" class="order-card"> <view v-for="(order, index) in orders" :key="index" class="order-card">
<view class="order-header"> <view class="order-header">
<text class="order-number">订单编号{{ order.order_no }}</text> <text class="order-number">订单编号{{ order.order_sn }}</text>
<text class="order-status" :class="{ <text class="order-status" :class="{
'pending': order.order_status == '1', 'pending': order.status == 1,
'using': order.order_status == '2', 'using': order.status == 2,
'expired': order.order_status == '3' 'expired': order.status == 3
}"> }">
{{ order.order_status == '1' ? '待支付' : order.order_status == '2' ? '使用中' : order.order_status == {{ order.status == 1 ? '待支付' : order.status == 2 ? '使用中' : order.status == 3 ? '已过期' : '' }}
'3' ? '已过期' : '' }}
</text> </text>
</view> </view>
<view class="order-content"> <view class="order-content">
<view class="order-item"> <view class="order-item">
<text class="order-label">车场名称</text> <text class="order-label">车场名称</text>
<text class="order-value">{{ order.Parking.parking_name }}</text> <text class="order-value">{{ order.parkingInfo.parking_name }}</text>
</view> </view>
<view class="order-item"> <view class="order-item">
<text class="order-label">车牌号</text> <text class="order-label">车牌号</text>
<text class="order-value">{{ order.community_car.car_number }}</text> <text class="order-value">{{ order.carInfo.car_no }}</text>
</view> </view>
<view class="order-item"> <view class="order-item">
<text class="order-label">包月月数</text> <text class="order-label">包月月数</text>
<text class="order-value">{{ order.month_count }}个月</text> <text class="order-value">{{ order.month_num }}个月</text>
</view> </view>
<view class="order-item"> <view class="order-item">
<text class="order-label">开始时间</text> <text class="order-label">开始时间</text>
<text class="order-value">{{ order.start_time }}</text> <text class="order-value">{{ order.carInfo.enable_time }}</text>
</view> </view>
<view class="order-item"> <view class="order-item">
<text class="order-label">到期时间</text> <text class="order-label">到期时间</text>
<text class="order-value">{{ order.end_time }}</text> <text class="order-value">{{ order.carInfo.deadline_time }}</text>
</view> </view>
<view class="order-item amount"> <view class="order-item amount">
<text class="order-label">订单金额</text> <text class="order-label">订单金额</text>
<text class="order-value amount-value">¥{{ order.total_amount }}</text> <text class="order-value amount-value">¥{{ order.amount }}</text>
</view> </view>
<!-- 根据订单状态显示不同内容 --> <!-- 根据订单状态显示不同内容 -->
<view v-if="order.order_status == '2' || order.order_status === '3'" class="order-item"> <view v-if="order.status == '2' || order.status === '3'" class="order-item">
<text class="order-label">付款时间</text> <text class="order-label">付款时间</text>
<text class="order-value">{{ order.pay_time }}</text> <text class="order-value">{{ order.pay_time }}</text>
</view> </view>
<view v-if="order.order_status == '2'" class="order-item"> <view v-if="order.status == '2'" class="order-item">
<text class="order-label">支付状态</text> <text class="order-label">支付状态</text>
<text class="order-value paid">已支付</text> <text class="order-value paid">已支付</text>
</view> </view>

View File

@ -21,14 +21,14 @@
</view> </view>
<view class="order-park-info"> <view class="order-park-info">
<text class="order-park-name">{{ order.parking.parking_name }}</text> <text class="order-park-name">{{ order.record_info.parking_info.parking_name }}</text>
<text class="order-amount">¥{{ order.amount }}</text> <text class="order-amount">¥{{ order.amount.toFixed(2) }}</text>
</view> </view>
<view class="order-car-info"> <view class="order-car-info">
<text class="order-car-number">{{ order.parking_record.car_number }}</text> <text class="order-car-number">{{ order.record_info.car_number }}</text>
<text class="order-car-type">{{ order.parking_record.car_billing_type == 1 ? '贵宾车' : <text class="order-car-type">{{ order.record_info.car_billing_type == 1 ? '月租车' :
(order.parking_record.car_billing_type == 2) ? '月租车' : '临时车' }}</text> (order.record_info.car_billing_type == 2) ? '临时车' : '贵宾车' }}</text>
</view> </view>
<text class="order-time">{{ order.pay_time }}</text> <text class="order-time">{{ order.pay_time }}</text>

View File

@ -170,11 +170,11 @@ export default {
// //
showCost1: false, showCost1: false,
showCost2: false, showCost2: false,
parkingLotName: '上海公馆停车场', parkingLotName: '',
costAmount: '280.00', costAmount: '',
currentCarNumber: '冀T11033', currentCarNumber: '',
entryTime: '2025-08-05 12:00:00', entryTime: '',
billingTime: '3天12时37分44秒', billingTime: '',
paymentMethod: 'wechat', paymentMethod: 'wechat',
// ID // ID
timerId: null timerId: null
@ -326,9 +326,9 @@ export default {
} }
if (res.car_billing_type == 1) { if (res.car_billing_type == 1) {
this.billingTime = '免费车';
} else if (res.car_billing_type == 2) {
this.billingTime = '月租车'; this.billingTime = '月租车';
} else if (res.car_billing_type == 2) {
this.billingTime = '临时车';
} else { } else {
// //
this.updateBillingTime(); this.updateBillingTime();