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

chore(admin-ui): migrate admin orders index to filters/list card and admin pagination

Browse Source
This commit is contained in:
萝卜
2026-03-16 03:15:32 +08:00
parent b9f59fa442
commit 84fa9eb63a
2 changed files with 114 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
resources/views/admin/orders/index.blade.php
View File

@@ -4,28 +4,38 @@
@section('page_title', '订单监控')
@section('content')
<div class="card mb-20">
<p class="muted muted-tight">当前页面用于总台视角查看全局订单状态，后续商家后台将承接商家侧订单处理动作。</p>
<p class="muted">当前订单列表已接入缓存：{{ $cacheMeta['store'] }} / TTL {{ $cacheMeta['ttl'] }}。</p>
@php
$exportQuery = http_build_query(array_filter($filters, fn ($value) => $value !== null && $value !== ''));
@endphp
<div class="mb-12">
<a class="btn btn-secondary btn-sm" href="{{ '/admin/orders/export' . ($exportQuery ? ('?' . $exportQuery) : '') }}">导出当前筛选结果 CSV</a>
</div>
<h3>筛选条件</h3>
@if(!empty($filters['validation_errors']))
<div class="filter-error">
<strong>筛选条件有误：</strong>
<ul class="list-indent">
@foreach($filters['validation_errors'] as $validationError)
<li>{{ $validationError }}</li>
@endforeach
</ul>
@php
$exportQuery = http_build_query(array_filter($filters, fn ($value) => $value !== null && $value !== ''));
@endphp
<details class="card mb-20 collapsible filters-card" data-role="collapsible" data-storage-key="admin.orders.filters" open>
<summary class="collapsible-summary filters-summary">
<div class="flex-between items-center">
<div>
<h3 class="mb-0">筛选条件</h3>
<div class="muted muted-xs">总台视角全局订单监控（后续商家后台将承接商家侧订单处理动作）。</div>
</div>
<div class="actions gap-10">
<a class="btn btn-secondary btn-sm" href="{{ '/admin/orders/export' . ($exportQuery ? ('?' . $exportQuery) : '') }}">导出当前筛选结果 CSV</a>
<span class="muted muted-xs">点击收起/展开</span>
</div>
</div>
@endif
<form method="get" action="/admin/orders">
<div class="grid-5">
<div class="muted muted-xs mt-6">当前订单列表已接入缓存：{{ $cacheMeta['store'] }} / TTL {{ $cacheMeta['ttl'] }}。</div>
</summary>
<div class="collapsible-body filters-body">
@if(!empty($filters['validation_errors']))
<div class="filter-error">
<strong>筛选条件有误：</strong>
<ul class="list-indent">
@foreach($filters['validation_errors'] as $validationError)
<li>{{ $validationError }}</li>
@endforeach
</ul>
</div>
@endif
<form method="get" action="/admin/orders" class="grid-5 filters-grid">
<select name="status"><option value="">全部状态</option>@foreach($filterOptions['statuses'] as $status)<option value="{{ $statusLabels[$status] ?? $status }}" @selected($filters['status'] === $status)>{{ $statusLabels[$status] ?? $status }}</option>@endforeach</select>
<select name="payment_status"><option value="">全部支付状态</option>@foreach($filterOptions['paymentStatuses'] as $paymentStatus)<option value="{{ $paymentStatusLabels[$paymentStatus] ?? $paymentStatus }}" @selected($filters['payment_status'] === $paymentStatus)>{{ $paymentStatusLabels[$paymentStatus] ?? $paymentStatus }}</option>@endforeach</select>
<select name="platform"><option value="">全部平台</option>@foreach($filterOptions['platforms'] as $platform)<option value="{{ $platformLabels[$platform] ?? $platform }}" @selected($filters['platform'] === $platform)>{{ $platformLabels[$platform] ?? $platform }}</option>@endforeach</select>
@@ -39,9 +49,9 @@
<input type="number" step="0.01" min="0" name="max_pay_amount" placeholder="最高实付金额" value="{{ $filters['max_pay_amount'] }}">
<select name="sort">@foreach($filterOptions['sortOptions'] as $sortValue => $sortLabel)<option value="{{ $sortValue }}" @selected(($filters['sort'] ?? 'latest') === $sortValue)>{{ $sortLabel }}</option>@endforeach</select>
<div class="actions"><button class="btn btn-sm" type="submit">筛选</button><a class="btn btn-secondary btn-sm" href="/admin/orders">重置</a></div>
</div>
</form>
</div>
</form>
</div>
</details>
<div class="card section-dark mb-20">
<h3 class="mt-0">当前筛选摘要</h3>
@@ -139,33 +149,39 @@
</div>
</div>
<div class="card">
<h3>订单列表</h3>
<table>
<thead><tr><th>ID</th><th>商家</th><th>订单号</th><th>平台</th><th>买家</th><th>支付</th><th>金额</th><th>创建时间</th><th>支付时间</th><th>发货时间</th><th>完成时间</th><th>状态</th><th>操作</th></tr></thead>
<tbody>
@forelse($orders as $order)
<tr>
<td>{{ $order->id }}</td>
<td>{{ $order->merchant?->name ?? ('商家#'.$order->merchant_id) }}</td>
<td><a href="/admin/orders/{{ $order->id }}">{{ $order->order_no }}</a></td>
<td>{{ $platformLabels[$order->platform] ?? $order->platform }}</td>
<td>{{ $order->buyer_name }}</td>
<td><div>{{ $paymentChannelLabels[$order->payment_channel] ?? $order->payment_channel }}</div><div class="muted">{{ $paymentStatusLabels[$order->payment_status] ?? $order->payment_status }}</div></td>
<td>¥{{ number_format($order->pay_amount, 2) }}</td>
<td>{{ $order->created_at?->format('Y-m-d H:i') }}</td>
<td>{{ $order->paid_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $order->shipped_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $order->completed_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $statusLabels[$order->status] ?? $order->status }}</td>
<td><form class="inline" method="post" action="/admin/orders/{{ $order->id }}/status">@csrf <select name="status"><option value="pending" @selected($order->status==='pending')>待处理</option><option value="paid" @selected($order->status==='paid')>已支付</option><option value="shipped" @selected($order->status==='shipped')>已发货</option><option value="completed" @selected($order->status==='completed')>已完成</option><option value="cancelled" @selected($order->status==='cancelled')>已取消</option></select><button type="submit">更新</button></form></td>
</tr>
@empty
<tr><td colspan="13" class="muted text-center">暂无订单</td></tr>
@endforelse
</tbody>
</table>
</div>
<div class="card list-card">
<div class="list-card-header">
<div>
<h3 class="list-card-title">订单列表</h3>
</div>
</div>
<div class="list-card-body">
<table class="list-card-table">
<thead><tr><th>ID</th><th>商家</th><th>订单号</th><th>平台</th><th>买家</th><th>支付</th><th>金额</th><th>创建时间</th><th>支付时间</th><th>发货时间</th><th>完成时间</th><th>状态</th><th>操作</th></tr></thead>
<tbody>
@forelse($orders as $order)
<tr>
<td>{{ $order->id }}</td>
<td>{{ $order->merchant?->name ?? ('商家#'.$order->merchant_id) }}</td>
<td><a href="/admin/orders/{{ $order->id }}">{{ $order->order_no }}</a></td>
<td>{{ $platformLabels[$order->platform] ?? $order->platform }}</td>
<td>{{ $order->buyer_name }}</td>
<td><div>{{ $paymentChannelLabels[$order->payment_channel] ?? $order->payment_channel }}</div><div class="muted">{{ $paymentStatusLabels[$order->payment_status] ?? $order->payment_status }}</div></td>
<td>¥{{ number_format($order->pay_amount, 2) }}</td>
<td>{{ $order->created_at?->format('Y-m-d H:i') }}</td>
<td>{{ $order->paid_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $order->shipped_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $order->completed_at?->format('Y-m-d H:i') ?? '-' }}</td>
<td>{{ $statusLabels[$order->status] ?? $order->status }}</td>
<td><form class="inline" method="post" action="/admin/orders/{{ $order->id }}/status">@csrf <select name="status"><option value="pending" @selected($order->status==='pending')>待处理</option><option value="paid" @selected($order->status==='paid')>已支付</option><option value="shipped" @selected($order->status==='shipped')>已发货</option><option value="completed" @selected($order->status==='completed')>已完成</option><option value="cancelled" @selected($order->status==='cancelled')>已取消</option></select><button type="submit">更新</button></form></td>
</tr>
@empty
<tr><td colspan="13" class="muted table-empty">暂无订单</td></tr>
@endforelse
</tbody>
</table>
<div class="pagination-wrap">{{ $orders->links() }}</div>
{{ $orders->links('pagination.admin') }}
</div>
</div>
@endsection

46
tests/Feature/AdminOrdersIndexShouldUseFiltersCardAndListCardStructureTest.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace Tests\Feature;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminOrdersIndexShouldUseFiltersCardAndListCardStructureTest 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_admin_orders_index_should_use_filters_card_and_list_card_structure(): void
{
$this->loginAsPlatformAdmin();
$response = $this->get('/admin/orders');
$response->assertOk();
// 护栏：订单监控页的筛选区/列表区需走统一骨架，便于全站后台观感一致。
$response->assertSee('filters-card', false);
$response->assertSee('filters-summary', false);
$response->assertSee('filters-body', false);
$response->assertSee('filters-grid', false);
$response->assertSee('list-card', false);
$response->assertSee('list-card-header', false);
$response->assertSee('list-card-body', false);
$response->assertSee('list-card-table', false);
// 分页统一：此页可能只有 1 页数据（hasPages=false 时不会渲染 adm-pagination）。
// 因此这里用“扫描型护栏”约束：Blade 必须显式使用 admin pagination view。
$blade = file_get_contents(resource_path('views/admin/orders/index.blade.php'));
$this->assertIsString($blade);
$this->assertStringContainsString("links('pagination.admin')", $blade);
}
}