From b52659df6c27ec41c223e0f12ff011df99158b16 Mon Sep 17 00:00:00 2001
From: userGyl <user_gyl@163.com>
Date: Thu, 11 Dec 2025 13:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E9=A2=84=E7=BA=A6=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8B=92=E7=BB=9D=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/pages/b_page/site/controller.dart     | 19 +++++++++++--------
 .../pages/c_page/reservation/controller.dart  | 10 ++++++++--
 .../c_page/reservation_edit/controller.dart   |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ln_jq_app/lib/pages/b_page/site/controller.dart b/ln_jq_app/lib/pages/b_page/site/controller.dart
index 82147ca..720dbe3 100644
--- a/ln_jq_app/lib/pages/b_page/site/controller.dart
+++ b/ln_jq_app/lib/pages/b_page/site/controller.dart
@@ -25,6 +25,7 @@ class ReservationModel {
 
   final String contacts;
   final String phone;
+  final String rejectReason;
   final String stationName;
   final String startTime;
   final String endTime;
@@ -56,6 +57,7 @@ class ReservationModel {
     required this.stateName,
     required this.addStatus,
     required this.addStatusName,
+    required this.rejectReason,
   });
 
   /// 工厂构造函数，用于从JSON创建ReservationModel实例
@@ -113,6 +115,7 @@ class ReservationModel {
       addStatus: statusFromServer.toString(),
       addStatusName: json['addStatusName']?.toString() ?? '',
       stateName: json['stateName']?.toString() ?? '',
+      rejectReason: json['rejectReason']?.toString() ?? '',
       hasEdit: true,
     );
   }
@@ -137,7 +140,8 @@ class SiteController extends GetxController with BaseControllerMixin {
   void onInit() {
     super.onInit();
     renderData();
-
+    //加载列表数据
+    fetchReservationData();
     startAutoRefresh();
   }
 
@@ -530,8 +534,7 @@ class SiteController extends GetxController with BaseControllerMixin {
       } else if (addStatus == 2) {
         item.status = ReservationStatus.unadded;
       }
-
-      updateUi();
+      renderData();
     } catch (e) {
       dismissLoading();
     }
@@ -563,19 +566,19 @@ class SiteController extends GetxController with BaseControllerMixin {
         completedAmount = result.data["completedAmount"].toString();
         name = result.data["name"].toString();
         orderTotalAmount = result.data["orderTotalAmount"].toString();
-        orderUnfinishedAmount = result.data["orderUnfinishedAmount"].toString() ;
+        orderUnfinishedAmount = result.data["orderUnfinishedAmount"].toString();
 
         leftHydrogen = leftHydrogen.isEmpty ? "统计中" : leftHydrogen.toString();
         orderTotalAmount = orderTotalAmount.isEmpty ? "统计中" : orderTotalAmount.toString();
         orderUnfinishedAmount = orderUnfinishedAmount.isEmpty
             ? "统计中"
             : orderUnfinishedAmount.toString();
-
-        //加载列表数据
-        fetchReservationData();
       } catch (e) {
         showToast('数据异常');
       }
-    } catch (e) {}
+    } catch (e) {
+    } finally {
+      updateUi();
+    }
   }
 }
diff --git a/ln_jq_app/lib/pages/c_page/reservation/controller.dart b/ln_jq_app/lib/pages/c_page/reservation/controller.dart
index f2d79f3..fc95862 100644
--- a/ln_jq_app/lib/pages/c_page/reservation/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation/controller.dart
@@ -428,6 +428,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
           stateName: '',
           addStatus: '',
           addStatusName: '',
+          rejectReason: '',
           hasEdit: true,
         );
 
@@ -498,7 +499,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
             final endDateTime = DateTime.parse(reservation.endTime);
 
             // 如果当前时间在结束时间之后，则不能编辑
-            if (now.isAfter(endDateTime)) {
+            if (now.isAfter(endDateTime) ||
+                plateNumber.isEmpty ||
+                reservation.addStatus != "0") {
               reservation.hasEdit = false;
             } else {
               reservation.hasEdit = true;
@@ -612,7 +615,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
                                         ),
                                       ),
                                     ),
-                                    !reservation.hasEdit || plateNumber.isEmpty
+                                    !reservation.hasEdit
                                         ? SizedBox()
                                         : GestureDetector(
                                             onTap: () async {
@@ -664,6 +667,9 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
                                 _buildDetailRow('结束时间:', reservation.endTime),
                                 _buildDetailRow('联系人:', reservation.contacts),
                                 _buildDetailRow('联系电话:', reservation.phone),
+                                reservation.addStatus == "5"
+                                    ? _buildDetailRow('拒绝原因:', reservation.rejectReason)
+                                    : SizedBox(),
                               ],
                             ),
                           ),
diff --git a/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart b/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart
index ba4adfd..1451b7a 100644
--- a/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart
+++ b/ln_jq_app/lib/pages/c_page/reservation_edit/controller.dart
@@ -233,7 +233,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin
         //弹窗刷新数据
         Get.back(result: true);
       } else {
-        showErrorToast(result.message);
+        showToast(result.error);
       }
     } catch (e) {
       showErrorToast("保存失败，请稍后再试");