diff --git a/app/Http/Controllers/Admin/SiteSubscriptionController.php b/app/Http/Controllers/Admin/SiteSubscriptionController.php index d1b929f..4b27f5b 100644 --- a/app/Http/Controllers/Admin/SiteSubscriptionController.php +++ b/app/Http/Controllers/Admin/SiteSubscriptionController.php @@ -386,6 +386,12 @@ class SiteSubscriptionController extends Controller ->all(); } + // ends_at 快捷入口日期范围:由 Controller 统一注入,避免 Blade 内多次 now() 调用跨天漂移。 + $baseToday = now(); + $endsRangeToday = $baseToday->format('Y-m-d'); + $endsRange7d = $baseToday->copy()->addDays(7)->format('Y-m-d'); + $endsRange30d = $baseToday->copy()->addDays(30)->format('Y-m-d'); + return view('admin.site_subscriptions.index', [ 'subscriptions' => $subscriptions, 'filters' => $filters, @@ -413,6 +419,11 @@ class SiteSubscriptionController extends Controller ], 'expiryMerchantRows' => $expiryMerchantRows, 'expiryMerchantPlanRows' => $expiryMerchantPlanRows, + + // ends_at 快捷入口日期范围 + 'endsRangeToday' => $endsRangeToday, + 'endsRange7d' => $endsRange7d, + 'endsRange30d' => $endsRange30d, ]); } diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php index 5378fde..b224900 100644 --- a/resources/views/admin/site_subscriptions/index.blade.php +++ b/resources/views/admin/site_subscriptions/index.blade.php @@ -276,9 +276,10 @@