From 8302d7c179744ec79259f3aace81a93ebc584842 Mon Sep 17 00:00:00 2001 From: userGyl Date: Thu, 15 Jan 2026 16:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ln_jq_app/lib/pages/b_page/history/view.dart | 4 ++++ ln_jq_app/lib/pages/b_page/site/controller.dart | 8 ++++++++ ln_jq_app/lib/pages/b_page/site/view.dart | 6 +++++- ln_jq_app/lib/pages/c_page/message/controller.dart | 6 ++++-- ln_jq_app/lib/pages/c_page/reservation/controller.dart | 1 + .../lib/pages/c_page/reservation_edit/controller.dart | 8 ++++---- ln_jq_app/lib/pages/home/controller.dart | 2 ++ 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ln_jq_app/lib/pages/b_page/history/view.dart b/ln_jq_app/lib/pages/b_page/history/view.dart index fb3d9c4..7832f5c 100644 --- a/ln_jq_app/lib/pages/b_page/history/view.dart +++ b/ln_jq_app/lib/pages/b_page/history/view.dart @@ -173,6 +173,10 @@ class HistoryPage extends GetView { text = '未加氢'; color = Colors.red; break; + case ReservationStatus.cancel: + text = '已取消'; + color = Colors.red; + break; default: text = '未知状态'; color = Colors.grey; 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 bdc16be..2f5e351 100644 --- a/ln_jq_app/lib/pages/b_page/site/controller.dart +++ b/ln_jq_app/lib/pages/b_page/site/controller.dart @@ -12,11 +12,13 @@ enum ReservationStatus { completed, // 完成 ( addStatus: 1) rejected, // 拒绝 ( -1) unadded, // 未加 ( 2) + cancel, // 取消预约 unknown, // 未知状态 } class ReservationModel { final String id; + final String stationId; final String plateNumber; String amount; final String time; @@ -40,6 +42,7 @@ class ReservationModel { ReservationModel({ required this.id, + required this.stationId, required this.plateNumber, required this.amount, required this.time, @@ -80,6 +83,9 @@ class ReservationModel { case 2: currentStatus = ReservationStatus.unadded; break; + case 6: + currentStatus = ReservationStatus.cancel; + break; default: currentStatus = ReservationStatus.unknown; } @@ -97,6 +103,7 @@ class ReservationModel { return ReservationModel( // 原始字段，用于UI兼容 id: json['id']?.toString() ?? '', + stationId: json['stationId']?.toString() ?? '', plateNumber: json['plateNumber']?.toString() ?? '未知车牌', amount: '${json['hydAmount']?.toString() ?? '0'}kg', time: timeRange, @@ -193,6 +200,7 @@ class SiteController extends GetxController with BaseControllerMixin { 'pageNum': 1, 'pageSize': 50, // 暂时不考虑分页，一次获取30条 'keyword': searchText, // 加氢站名称、手机号 + 'stationId': StorageService.to.userId }, ); diff --git a/ln_jq_app/lib/pages/b_page/site/view.dart b/ln_jq_app/lib/pages/b_page/site/view.dart index dd64d9e..16fe9e6 100644 --- a/ln_jq_app/lib/pages/b_page/site/view.dart +++ b/ln_jq_app/lib/pages/b_page/site/view.dart @@ -132,7 +132,7 @@ class SitePage extends GetView { child: Row( children: [ Text( - '今日预约信息', + '预约信息', style: TextStyle( fontSize: 16, fontWeight: FontWeight.bold, @@ -465,6 +465,10 @@ class SitePage extends GetView { text = '未加氢'; color = Colors.red; break; + case ReservationStatus.cancel: + text = '已取消'; + color = Colors.red; + break; default: text = '未知状态'; color = Colors.grey; diff --git a/ln_jq_app/lib/pages/c_page/message/controller.dart b/ln_jq_app/lib/pages/c_page/message/controller.dart index f9fc7cc..a2293da 100644 --- a/ln_jq_app/lib/pages/c_page/message/controller.dart +++ b/ln_jq_app/lib/pages/c_page/message/controller.dart @@ -19,6 +19,10 @@ class MessageController extends GetxController { _loadData(isRefresh: true); } + void onRefresh() => _loadData(isRefresh: true); + + void onLoading() => _loadData(isRefresh: false); + Future _loadData({bool isRefresh = false}) async { final int targetPage = isRefresh ? 1 : _pageNum + 1; @@ -100,9 +104,7 @@ class MessageController extends GetxController { } } - void onRefresh() => _loadData(isRefresh: true); - void onLoading() => _loadData(isRefresh: false); // 标记全部已读 void markAllRead() async { 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 45b22a6..c7173c5 100644 --- a/ln_jq_app/lib/pages/c_page/reservation/controller.dart +++ b/ln_jq_app/lib/pages/c_page/reservation/controller.dart @@ -401,6 +401,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin { lastSuccessfulReservation = ReservationModel( id: selectedStationId.value!, + stationId: '', hydAmount: ampuntStr, startTime: startTimeStr, endTime: endTimeStr, 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 584edf7..19fc65e 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 @@ -74,8 +74,8 @@ class ReservationEditController extends GetxController with BaseControllerMixin final now = DateTime.now(); final isToday = selectedDate.value.year == now.year && - selectedDate.value.month == now.month && - selectedDate.value.day == now.day; + selectedDate.value.month == now.month && + selectedDate.value.day == now.day; final List availableSlots = []; for (int i = 0; i < 24; i++) { @@ -123,7 +123,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin // 查找当前选中的时间对应的新列表中的索引 int initialItem = availableSlots.indexWhere( - (slot) => slot.start.hour == startTime.value.hour, + (slot) => slot.start.hour == startTime.value.hour, ); if (initialItem == -1) { @@ -132,7 +132,6 @@ class ReservationEditController extends GetxController with BaseControllerMixin TimeSlot tempSlot = availableSlots[initialItem]; - Get.bottomSheet( Container( height: 300, @@ -228,6 +227,7 @@ class ReservationEditController extends GetxController with BaseControllerMixin 'appointment/orderAddHyd/saveOrUpdate', data: { 'id': reservation.id, + 'stationId': reservation.stationId, 'startTime': startTimeStr, 'endTime': endTimeStr, 'hydAmount': amountStr, diff --git a/ln_jq_app/lib/pages/home/controller.dart b/ln_jq_app/lib/pages/home/controller.dart index 8f7a2c2..7c339cb 100644 --- a/ln_jq_app/lib/pages/home/controller.dart +++ b/ln_jq_app/lib/pages/home/controller.dart @@ -7,6 +7,7 @@ import 'package:getx_scaffold/getx_scaffold.dart'; import 'package:ln_jq_app/common/styles/theme.dart'; import 'package:ln_jq_app/pages/b_page/base_widgets/view.dart'; import 'package:ln_jq_app/pages/c_page/base_widgets/view.dart'; +import 'package:ln_jq_app/pages/c_page/message/view.dart'; import 'package:ln_jq_app/pages/login/view.dart'; import '../../storage_service.dart'; @@ -156,6 +157,7 @@ class HomeController extends GetxController with BaseControllerMixin { Future _onNotificationOpened(Map message) async { Logger.d('onNotificationOpened ====> $message'); + await Get.to(() => const MessagePage()); } Future _onNotificationRemoved(Map message) async {