样式交互修改

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

@@ -74,32 +74,45 @@ 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<TimeSlot> availableSlots = [];
-    for (int i = 0; i < 48; i++) {
-      final startMinutes = i * 30;
-      final endMinutes = startMinutes + 30;
-      final slotStartTime = TimeOfDay(
-        hour: startMinutes ~/ 60,
-        minute: startMinutes % 60,
-      );
-      final slotEndTime = TimeOfDay(
-        hour: (endMinutes ~/ 60) % 24,
-        minute: endMinutes % 60,
-      );
+    for (int i = 0; i < 24; i++) {
+      // 每次增加 60 分钟
+      final startMinutes = i * 60;
+      final endMinutes = startMinutes + 60;
 
-      final slotStartDateTime = DateTime(
-        selectedDate.value.year,
-        selectedDate.value.month,
-        selectedDate.value.day,
-        slotStartTime.hour,
-        slotStartTime.minute,
-      );
+      final startTime = TimeOfDay(hour: startMinutes ~/ 60, minute: startMinutes % 60);
+      // 注意：endMinutes % 60 始终为 0，因为间隔是整小时
+      final endTime = TimeOfDay(hour: (endMinutes ~/ 60) % 24, minute: endMinutes % 60);
 
-      if (!isToday || slotStartDateTime.isAfter(now)) {
-        availableSlots.add(TimeSlot(slotStartTime, slotEndTime));
+      // 如果不是今天，所有时间段都有效
+      if (!isToday) {
+        availableSlots.add(TimeSlot(startTime, endTime));
+      } else {
+        // 如果是今天，需要判断该时间段是否可选
+        // 创建时间段的结束时间对象
+        final slotEndDateTime = DateTime(
+          selectedDate.value.year,
+          selectedDate.value.month,
+          selectedDate.value.day,
+          endTime.hour,
+          endTime.minute,
+        );
+
+        // 注意：如果是跨天的 00:00 (例如 23:00 - 00:00)，需要将日期加一天，否则 isAfter 判断会出错
+        // 但由于我们用的是 endTime.hour % 24，当变成 0 时，日期还是 selectedDate
+        // 这里做一个特殊处理：如果 endTime 是 00:00，意味着它实际上是明天的开始
+        DateTime realEndDateTime = slotEndDateTime;
+        if (endTime.hour == 0 && endTime.minute == 0) {
+          realEndDateTime = slotEndDateTime.add(const Duration(days: 1));
+        }
+
+        // 只要时间段的结束时间晚于当前时间，这个时间段就是可预约的
+        if (realEndDateTime.isAfter(now)) {
+          availableSlots.add(TimeSlot(startTime, endTime));
+        }
       }
     }
 
@@ -108,17 +121,18 @@ class ReservationEditController extends GetxController with BaseControllerMixin
       return;
     }
 
+    // 查找当前选中的时间对应的新列表中的索引
     int initialItem = availableSlots.indexWhere(
-      (slot) =>
-          slot.start.hour == startTime.value.hour &&
-          (startTime.value.minute < 30
-              ? slot.start.minute == 0
-              : slot.start.minute == 30),
+          (slot) => slot.start.hour == startTime.value.hour,
     );
-    if (initialItem == -1) initialItem = 0;
+
+    if (initialItem == -1) {
+      initialItem = 0;
+    }
 
     TimeSlot tempSlot = availableSlots[initialItem];
 
+
     Get.bottomSheet(
       Container(
         height: 300,