From 267bac2149dd70a1a8566d3ed2f162735632bbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 4 Sep 2025 17:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=B4=E5=81=9C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=92=8C=E5=8C=85=E6=9C=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/park/monthlyPaymentOrder/index.vue | 27 ++++++++++-----------
 packages/park/parkOrder/index.vue           | 10 ++++----
 packages/park/temporaryOrder/index.vue      | 14 +++++------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/packages/park/monthlyPaymentOrder/index.vue b/packages/park/monthlyPaymentOrder/index.vue
index 241edce1..89216dde 100644
--- a/packages/park/monthlyPaymentOrder/index.vue
+++ b/packages/park/monthlyPaymentOrder/index.vue
@@ -11,49 +11,48 @@
         <view class="order-list">
             <view v-for="(order, index) in orders" :key="index" class="order-card">
                 <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="{
-                        'pending': order.order_status == '1',
-                        'using': order.order_status == '2',
-                        'expired': order.order_status == '3'
+                        'pending': order.status == 1,
+                        'using': order.status == 2,
+                        'expired': order.status == 3
                     }">
-                        {{ order.order_status == '1' ? '待支付' : order.order_status == '2' ? '使用中' : order.order_status ==
-                        '3' ? '已过期' : '' }}
+                        {{ order.status == 1 ? '待支付' : order.status == 2 ? '使用中' : order.status == 3 ? '已过期' : '' }}
                     </text>
                 </view>
                 <view class="order-content">
                     <view class="order-item">
                         <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 class="order-item">
                         <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 class="order-item">
                         <text class="order-label">包月月数</text>
-                        <text class="order-value">{{ order.month_count }}个月</text>
+                        <text class="order-value">{{ order.month_num }}个月</text>
                     </view>
                     <view class="order-item">
                         <text class="order-label">开始时间</text>
-                        <text class="order-value">{{ order.start_time }}</text>
+                        <text class="order-value">{{ order.carInfo.enable_time }}</text>
                     </view>
                     <view class="order-item">
                         <text class="order-label">到期时间</text>
-                        <text class="order-value">{{ order.end_time }}</text>
+                        <text class="order-value">{{ order.carInfo.deadline_time }}</text>
                     </view>
                     <view class="order-item amount">
                         <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 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-value">{{ order.pay_time }}</text>
                     </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-value paid">已支付</text>
                     </view>
diff --git a/packages/park/parkOrder/index.vue b/packages/park/parkOrder/index.vue
index 036de7a6..e476539e 100644
--- a/packages/park/parkOrder/index.vue
+++ b/packages/park/parkOrder/index.vue
@@ -21,14 +21,14 @@
                     </view>
 
                     <view class="order-park-info">
-                        <text class="order-park-name">{{ order.parking.parking_name }}</text>
-                        <text class="order-amount">¥{{ order.amount }}</text>
+                        <text class="order-park-name">{{ order.record_info.parking_info.parking_name }}</text>
+                        <text class="order-amount">¥{{ order.amount.toFixed(2) }}</text>
                     </view>
 
                     <view class="order-car-info">
-                        <text class="order-car-number">{{ order.parking_record.car_number }}</text>
-                        <text class="order-car-type">{{ order.parking_record.car_billing_type == 1 ? '贵宾车' :
-                            (order.parking_record.car_billing_type == 2) ? '月租车' : '临时车' }}</text>
+                        <text class="order-car-number">{{ order.record_info.car_number }}</text>
+                        <text class="order-car-type">{{ order.record_info.car_billing_type == 1 ? '月租车' :
+                            (order.record_info.car_billing_type == 2) ? '临时车' : '贵宾车' }}</text>
                     </view>
 
                     <text class="order-time">{{ order.pay_time }}</text>
diff --git a/packages/park/temporaryOrder/index.vue b/packages/park/temporaryOrder/index.vue
index 14b17742..80a631e5 100644
--- a/packages/park/temporaryOrder/index.vue
+++ b/packages/park/temporaryOrder/index.vue
@@ -170,11 +170,11 @@ export default {
             // 停车费相关数据
             showCost1: false,
             showCost2: false,
-            parkingLotName: '上海公馆停车场',
-            costAmount: '280.00',
-            currentCarNumber: '冀T11033',
-            entryTime: '2025-08-05 12:00:00',
-            billingTime: '3天12时37分44秒',
+            parkingLotName: '',
+            costAmount: '',
+            currentCarNumber: '',
+            entryTime: '',
+            billingTime: '',
             paymentMethod: 'wechat',
             // 定时器ID，用于清除定时器
             timerId: null
@@ -326,9 +326,9 @@ export default {
                     }
 
                     if (res.car_billing_type == 1) {
-                        this.billingTime = '免费车';
-                    } else if (res.car_billing_type == 2) {
                         this.billingTime = '月租车';
+                    } else if (res.car_billing_type == 2) {
+                        this.billingTime = '临时车';
                     } else {
                         // 计算并实时更新进场时间到现在的时长
                         this.updateBillingTime();