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

ui(site-subscriptions): ends_at 快捷区间链接保留筛选上下文

Browse Source
This commit is contained in:
萝卜
2026-03-17 06:39:06 +08:00
parent 74a2f01651
commit 3408b13e44
2 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,10 +279,12 @@
$endsToday = now()->format('Y-m-d'); $endsToday = now()->format('Y-m-d');
$ends7d = now()->addDays(7)->format('Y-m-d'); $ends7d = now()->addDays(7)->format('Y-m-d');
$ends30d = now()->addDays(30)->format('Y-m-d'); $ends30d = now()->addDays(30)->format('Y-m-d');
$endsQuickTodayUrl = $buildQuickFilterUrl(['ends_from' => $endsToday, 'ends_to' => $endsToday, 'page' => null]);
$endsQuick7dUrl = $buildQuickFilterUrl(['ends_from' => $endsToday, 'ends_to' => $ends7d, 'page' => null]); // 到期区间快捷入口：应保留当前筛选上下文（status/expiry/merchant/plan/keyword/back），仅覆盖 ends_from/ends_to，并清空 page。
$endsQuick30dUrl = $buildQuickFilterUrl(['ends_from' => $endsToday, 'ends_to' => $ends30d, 'page' => null]); $endsQuickTodayUrl = $safeFullUrlWithQuery(['ends_from' => $endsToday, 'ends_to' => $endsToday, 'page' => null]);
$endsQuickClearUrl = $buildQuickFilterUrl(['ends_from' => null, 'ends_to' => null, 'page' => null]); $endsQuick7dUrl = $safeFullUrlWithQuery(['ends_from' => $endsToday, 'ends_to' => $ends7d, 'page' => null]);
$endsQuick30dUrl = $safeFullUrlWithQuery(['ends_from' => $endsToday, 'ends_to' => $ends30d, 'page' => null]);
$endsQuickClearUrl = $safeFullUrlWithQuery(['ends_from' => null, 'ends_to' => null, 'page' => null]);
@endphp @endphp
<a class="link" href="{!! $endsQuickTodayUrl !!}">今天到期</a> <a class="link" href="{!! $endsQuickTodayUrl !!}">今天到期</a>
<span class="muted">｜</span> <span class="muted">｜</span>

59
tests/Feature/AdminSiteSubscriptionIndexEndsAtRangeQuickLinksShouldKeepContextTest.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
namespace Tests\Feature;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminSiteSubscriptionIndexEndsAtRangeQuickLinksShouldKeepContextTest extends TestCase
{
use RefreshDatabase;
protected function loginAsPlatformAdmin(): void
{
$this->seed();
$this->post('/admin/login', [
'email' => 'platform.admin@demo.local',
'password' => 'Platform@123456',
])->assertRedirect('/admin');
}
public function test_ends_at_range_quick_links_should_keep_context_and_safe_back(): void
{
$this->loginAsPlatformAdmin();
$res = $this->get('/admin/site-subscriptions?merchant_id=2&plan_id=3&keyword=abc&status=pending&expiry=expired&back=%2Fadmin%2Fplatform-orders');
$res->assertOk();
$html = (string) $res->getContent();
// 抓取“近7天到期”链接
preg_match_all('/href="([^"]+)"/', $html, $m);
$hrefs = $m[1] ?? [];
$links = array_values(array_filter($hrefs, fn ($u) => str_contains($u, '近7天到期') === false));
// 上面这行没意义（文案不在 href），我们直接按 ends_from/ends_to+merchant_id 来筛
$rangeLinks = array_values(array_filter($hrefs, fn ($u) => str_contains($u, '/admin/site-subscriptions') && str_contains($u, 'ends_from=') && str_contains($u, 'ends_to=') && str_contains($u, 'merchant_id=2') && str_contains($u, 'plan_id=3')));
$this->assertGreaterThanOrEqual(1, count($rangeLinks));
$parts = parse_url($rangeLinks[0]);
parse_str($parts['query'] ?? '', $q);
$this->assertSame('2', (string) ($q['merchant_id'] ?? ''));
$this->assertSame('3', (string) ($q['plan_id'] ?? ''));
$this->assertSame('abc', (string) ($q['keyword'] ?? ''));
$this->assertSame('pending', (string) ($q['status'] ?? ''));
$this->assertSame('expired', (string) ($q['expiry'] ?? ''));
$this->assertSame('/admin/platform-orders', (string) ($q['back'] ?? ''));
// 应清空分页，避免停留在旧页码导致空结果错觉
$this->assertArrayNotHasKey('page', $q);
// ends_from/ends_to 必须存在（具体日期值不在本测试锁死）
$this->assertArrayHasKey('ends_from', $q);
$this->assertArrayHasKey('ends_to', $q);
$this->assertNotSame('', (string) ($q['ends_from'] ?? ''));
$this->assertNotSame('', (string) ($q['ends_to'] ?? ''));
}
}