diff --git a/bookings.php b/bookings.php index 7f0fcbf..074d43f 100644 --- a/bookings.php +++ b/bookings.php @@ -20,7 +20,7 @@ if (isset($_POST['action']) && isset($_POST['booking_id'])) { // 获取所有预约 try { - $stmt = $pdo->query("SELECT * FROM bookings ORDER BY appointment_date DESC, appointment_time DESC"); + $stmt = $pdo->query("SELECT b.*, p.package_name FROM bookings b LEFT JOIN packages p ON b.package_id = p.id ORDER BY b.start_time DESC"); $bookings = $stmt->fetchAll(); } catch (Exception $e) { $error_message = '获取预约列表失败:' . $e->getMessage(); @@ -95,13 +95,13 @@ try { 车牌号:
- 服务类型: + 服务套餐:
- 预约日期: + 预约日期:
- 预约时间: + 预约时间: -
diff --git a/index.php b/index.php index 7798a76..32872a3 100644 --- a/index.php +++ b/index.php @@ -306,8 +306,12 @@ $packages_json = json_encode(array_map(function($package) { document.addEventListener('DOMContentLoaded', function() { const today = new Date(); today.setDate(today.getDate()); - document.getElementById('appointment_date').value = today.toISOString().split('T')[0]; - selectedDate = today.toISOString().split('T')[0]; + const todayStr = today.toISOString().split('T')[0]; + document.getElementById('appointment_date').value = todayStr; + selectedDate = todayStr; + + // 默认选择今天的日期并显示时间段 + selectDate(todayStr); // 移动端优化 if (/Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)) { diff --git a/packages.php b/packages.php index 45b6d6d..ed5d9a7 100644 --- a/packages.php +++ b/packages.php @@ -1,13 +1,6 @@