调整和修改

ln_jq_app/lib/pages/b_page/history/controller.dart

@@ -32,13 +32,16 @@ class HistoryController extends GetxController {
     final args = Get.arguments as Map<String, dynamic>;
     stationName = args['stationName'] as String;
     fetchHistoryData();
-    getAllOrderCounts();
   }
 
   Future<void> getAllOrderCounts() async {
     var response = await HttpService.to.post(
       "appointment/orderAddHyd/getAllOrderCounts",
       data: {
+        // --- 直接使用 DateFormat 来格式化日期 ---
+        'startTime': _apiDateFormat.format(startDate.value),
+        'endTime': _apiDateFormat.format(endDate.value),
+        'plateNumber': plateNumberController.text,
         'stationName': stationName, // 加氢站名称
       },
     );
@@ -60,6 +63,10 @@ class HistoryController extends GetxController {
 
   Future<void> fetchHistoryData() async {
     isLoading.value = true;
+
+    //获取数据
+    getAllOrderCounts();
+
     try {
       var response = await HttpService.to.post(
         "appointment/orderAddHyd/sitOrderPage",

ln_jq_app/lib/pages/b_page/site/controller.dart

@@ -191,6 +191,7 @@ class SiteController extends GetxController with BaseControllerMixin {
         showToast('暂时无法获取预约数据');
         hasReservationData = false;
         reservationList = [];
+        dismissLoading();
         return;
       }
 

ln_jq_app/lib/pages/c_page/reservation/controller.dart

@@ -657,7 +657,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       return;
     }
 
-    showLoading("加载中");
+    showLoading("加氢站数据加载中");
     final originalHeaders = Map<String, dynamic>.from(HttpService.to.dio.options.headers);
     try {
       HttpService.to.setBaseUrl(AppTheme.jiaqing_service_url);
@@ -670,49 +670,46 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         dismissLoading();
         return;
       }
+      dismissLoading();
+      var result = BaseModel.fromJson(responseData.data);
+      var stationDataList = result.data['data'] as List;
 
-      try {
-        dismissLoading();
-        var result = BaseModel.fromJson(responseData.data);
-        var stationDataList = result.data['data'] as List;
+      // 使用 map 将 List<dynamic> 转换为 List<StationModel>
+      var stations = stationDataList
+          .map((item) => StationModel.fromJson(item as Map<String, dynamic>))
+          .toList();
 
-        // 使用 map 将 List<dynamic> 转换为 List<StationModel>
-        var stations = stationDataList
-            .map((item) => StationModel.fromJson(item as Map<String, dynamic>))
-            .toList();
+      // 去重，确保每个 hydrogenId 唯一
+      var uniqueStationsMap = <String, StationModel>{}; // 使用 Map 来去重
+      for (var station in stations) {
+        uniqueStationsMap[station.hydrogenId] = station; // 使用 hydrogenId 作为键，确保唯一
+      }
 
-        // 去重，确保每个 hydrogenId 唯一
-        var uniqueStationsMap = <String, StationModel>{}; // 使用 Map 来去重
-        for (var station in stations) {
-          uniqueStationsMap[station.hydrogenId] = station; // 使用 hydrogenId 作为键，确保唯一
-        }
+      // 获取去重后的 List<StationModel>
+      var uniqueStations = uniqueStationsMap.values.toList();
 
-        // 获取去重后的 List<StationModel>
-        var uniqueStations = uniqueStationsMap.values.toList();
+      stationOptions.assignAll(uniqueStations);
 
-        stationOptions.assignAll(uniqueStations);
+      if (stationOptions.isEmpty) {
+        showToast('附近暂无可用加氢站');
+      } else {
+        showToast('站点列表已刷新');
+      }
 
-        if (stationOptions.isEmpty) {
-          showToast('附近暂无可用加氢站');
-        } else {
-          showToast('站点列表已刷新');
-        }
-
-        // 找到第一个可选的站点作为默认值
-        if (stationOptions.isNotEmpty) {
-          final firstSelectable = stationOptions.firstWhere(
-            (station) => station.isSelect == 1,
-            orElse: () => stationOptions.first, // 降级：如果没有可选的，就用第一个
-          );
-          selectedStationId.value = firstSelectable.hydrogenId;
-        } else {
-          // 如果列表为空，确保 selectedStationId 也为空
-          selectedStationId.value = null;
-        }
-      } catch (e) {
-        showToast('数据异常');
+      // 找到第一个可选的站点作为默认值
+      if (stationOptions.isNotEmpty) {
+        final firstSelectable = stationOptions.firstWhere(
+          (station) => station.isSelect == 1,
+          orElse: () => stationOptions.first, // 降级：如果没有可选的，就用第一个
+        );
+        selectedStationId.value = firstSelectable.hydrogenId;
+      } else {
+        // 如果列表为空，确保 selectedStationId 也为空
+        selectedStationId.value = null;
       }
     } catch (e) {
+      dismissLoading();
+      showToast('数据异常');
     } finally {
       dismissLoading();
       HttpService.to.setBaseUrl(AppTheme.test_service_url);

ln_jq_app/lib/pages/login/view.dart

@@ -181,6 +181,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
 
                       if (result.code != 0) {
                         showToast(result.error);
+                        dismissLoading();
                         return;
                       }
 
@@ -346,6 +347,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
 
                       if (result.code != 0) {
                         showToast(result.error);
+                        dismissLoading();
                         return;
                       }