平台订单列表：快捷筛选链接保留上下文并清空 page
This commit is contained in:
萝卜
@@ -35,40 +35,74 @@
|
||||
<div class="card mb-20">
|
||||
<h3>快捷筛选</h3>
|
||||
<div class="muted mb-10">用于运营快速定位当前需要处理的订单集合（口径基于筛选条件组合）。</div>
|
||||
|
||||
@php
|
||||
// 快捷筛选：尽量保留当前筛选（站点/套餐/订阅ID/back 等），仅覆盖目标筛选字段，并清空 page。
|
||||
$buildQuickFilterUrl = function (array $overrides) {
|
||||
$path = '/' . ltrim(request()->path(), '/');
|
||||
$q = request()->query();
|
||||
|
||||
// 强制清页码，避免“切筛选但还停留在老 page=xxx”导致空页
|
||||
unset($q['page']);
|
||||
|
||||
foreach ($overrides as $k => $v) {
|
||||
if ($v === null) {
|
||||
unset($q[$k]);
|
||||
continue;
|
||||
}
|
||||
$q[$k] = $v;
|
||||
}
|
||||
|
||||
if (count($q) === 0) {
|
||||
return $path;
|
||||
}
|
||||
|
||||
return $path . '?' . \Illuminate\Support\Arr::query($q);
|
||||
};
|
||||
|
||||
// “全部”：清空筛选，但保留 back（用于返回来源页）
|
||||
$incomingBack = (string) request()->query('back', '');
|
||||
$safeBack = str_starts_with($incomingBack, '/') ? $incomingBack : '';
|
||||
$allUrl = '/admin/platform-orders';
|
||||
if ($safeBack !== '') {
|
||||
$allUrl .= '?' . \Illuminate\Support\Arr::query(['back' => $safeBack]);
|
||||
}
|
||||
@endphp
|
||||
|
||||
<div>
|
||||
<a href="/admin/platform-orders" class="muted">全部</a>
|
||||
<a href="{!! $allUrl !!}" class="muted">全部</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?payment_status=unpaid" class="muted">待支付</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'unpaid']) !!}" class="muted">待支付</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?status=pending&payment_status=unpaid" class="muted">可BMPA处理</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['status' => 'pending', 'payment_status' => 'unpaid']) !!}" class="muted">可BMPA处理</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?payment_status=paid&status=pending" class="muted">待生效</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'paid', 'status' => 'pending']) !!}" class="muted">待生效</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?syncable_only=1" class="muted">可同步订阅</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['syncable_only' => '1']) !!}" class="muted">可同步订阅</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?payment_status=partially_refunded" class="muted">部分退款</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'partially_refunded']) !!}" class="muted">部分退款</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?payment_status=refunded" class="muted">已退款</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['payment_status' => 'refunded']) !!}" class="muted">已退款</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?receipt_status=has" class="muted">有回执</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['receipt_status' => 'has']) !!}" class="muted">有回执</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?receipt_status=none" class="muted">无回执</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['receipt_status' => 'none']) !!}" class="muted">无回执</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?refund_status=has" class="muted">有退款</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['refund_status' => 'has']) !!}" class="muted">有退款</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?refund_status=none" class="muted">无退款</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['refund_status' => 'none']) !!}" class="muted">无退款</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?reconcile_mismatch=1" class="muted">对账不一致</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['reconcile_mismatch' => '1']) !!}" class="muted">对账不一致</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?refund_inconsistent=1" class="muted">退款不一致</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['refund_inconsistent' => '1']) !!}" class="muted">退款不一致</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?bmpa_failed_only=1" class="muted">BMPA失败</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['bmpa_failed_only' => '1']) !!}" class="muted">BMPA失败</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?batch_synced_24h=1" class="muted">近24小时批量同步</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['batch_synced_24h' => '1']) !!}" class="muted">近24小时批量同步</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?batch_mark_paid_and_activate_24h=1" class="muted">近24小时批量BMPA</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['batch_mark_paid_and_activate_24h' => '1']) !!}" class="muted">近24小时批量BMPA</a>
|
||||
<span class="muted">｜</span>
|
||||
<a href="/admin/platform-orders?batch_mark_activated_24h=1" class="muted">近24小时批量生效</a>
|
||||
<a href="{!! $buildQuickFilterUrl(['batch_mark_activated_24h' => '1']) !!}" class="muted">近24小时批量生效</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
class AdminPlatformOrderIndexQuickFilterLinksKeepContextTest 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_quick_filter_links_should_keep_context_and_clear_page(): void
|
||||
{
|
||||
$this->loginAsPlatformAdmin();
|
||||
|
||||
// 模拟：当前已筛选站点/套餐/订阅ID，并且带 page/back
|
||||
$res = $this->get('/admin/platform-orders?merchant_id=2&plan_id=3&site_subscription_id=4&page=9&back=%2Fadmin%2Fplans');
|
||||
$res->assertOk();
|
||||
|
||||
// 以“待支付”为例：应保留 merchant_id/plan_id/site_subscription_id/back，同时覆盖 payment_status=unpaid，并清除 page
|
||||
$res->assertSee('/admin/platform-orders?merchant_id=2&plan_id=3&site_subscription_id=4&back=%2Fadmin%2Fplans&payment_status=unpaid', false);
|
||||
$res->assertDontSee('page=9', false);
|
||||
|
||||
// “全部”应清空筛选，仅保留 back
|
||||
$res->assertSee('/admin/platform-orders?back=%2Fadmin%2Fplans', false);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user