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

ui(dashboard): 活跃付费站点入口对齐未到期口径

Browse Source
This commit is contained in:
萝卜
2026-03-17 07:35:07 +08:00
parent 2602fff01a
commit fb21e069a8
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -326,7 +326,12 @@ class DashboardController extends Controller
'created_from' => $range30From,
'created_to' => $range30To,
]), \App\Support\BackUrl::selfWithoutBack()),
'active_paid_merchants_subscriptions' => \App\Support\BackUrl::withBack('/admin/site-subscriptions?status=activated', \App\Support\BackUrl::selfWithoutBack()),
'active_paid_merchants_subscriptions' => \App\Support\BackUrl::withBack('/admin/site-subscriptions?' . \Illuminate\Support\Arr::query([
'status' => 'activated',
// 口径对齐 active_paid_merchants：已生效且未到期（ends_at >= today）
'ends_from' => (string) $baseNow->format('Y-m-d'),
'page' => null,
]), \App\Support\BackUrl::selfWithoutBack()),
'renewal_orders_30d' => \App\Support\BackUrl::withBack('/admin/platform-orders?' . \Illuminate\Support\Arr::query([
'order_type' => 'renewal',
'created_from' => $range30From,