linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(site-subscriptions): ends_at 快捷日期范围由 controller 注入

Browse Source
This commit is contained in:
萝卜
2026-03-17 06:41:15 +08:00
parent 3408b13e44
commit 96f19ecdf2
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Admin/SiteSubscriptionController.php
View File

@@ -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,
]);
}

7
resources/views/admin/site_subscriptions/index.blade.php
View File

@@ -276,9 +276,10 @@
<input type="date" name="ends_from" data-role="sub-ends-from" placeholder="到期时间从" value="{{ $filters['ends_from'] ?? '' }}" class="w-180">
<div class="muted muted-xs mt-6">
@php
$endsToday = now()->format('Y-m-d');
$ends7d = now()->addDays(7)->format('Y-m-d');
$ends30d = now()->addDays(30)->format('Y-m-d');
// 到期区间快捷入口：日期范围由 Controller 注入，避免 Blade 内多次 now() 调用导致跨天漂移。
$endsToday = (string) ($endsRangeToday ?? now()->format('Y-m-d'));
$ends7d = (string) ($endsRange7d ?? now()->addDays(7)->format('Y-m-d'));
$ends30d = (string) ($endsRange30d ?? now()->addDays(30)->format('Y-m-d'));
// 到期区间快捷入口：应保留当前筛选上下文（status/expiry/merchant/plan/keyword/back），仅覆盖 ends_from/ends_to，并清空 page。
$endsQuickTodayUrl = $safeFullUrlWithQuery(['ends_from' => $endsToday, 'ends_to' => $endsToday, 'page' => null]);