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

ui(site-subscriptions): add return-to-order header in attach order mode

Browse Source
This commit is contained in:
萝卜
2026-03-17 11:20:50 +08:00
parent f0f9ffa24c
commit 072a36fd7e
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,17 @@
</div>
<div class="page-header-actions">
@if($safeBackForLinks !== '')
@if($attachOrderId > 0)
@php
// attach_back 优先（从订单详情跳来），否则 fallback 到订单详情自身
$attachBackUrl = $safeAttachBackForLinks;
if ($attachBackUrl === '') {
$attachBackUrl = '/admin/platform-orders/' . $attachOrderId;
}
@endphp
<span class="badge">绑定订阅到订单：#{{ $attachOrderId }}</span>
<a href="{!! $attachBackUrl !!}" class="btn btn-secondary btn-sm">返回订单详情</a>
@elseif($safeBackForLinks !== '')
<a href="{!! $safeBackForLinks !!}" class="btn btn-secondary btn-sm">返回上一页（保留上下文）</a>
@endif
</div>

7
tests/Feature/AdminSiteSubscriptionIndexAttachOrderIdShouldRenderBindButtonTest.php
View File

@@ -62,8 +62,13 @@ class AdminSiteSubscriptionIndexAttachOrderIdShouldRenderBindButtonTest extends
$html = (string) $res->getContent();
// 去重降噪：处于 attach_order_id 模式时，不应出现“续费下单（先选订阅）”工具入口
// 去重降噪：处于 attach_order_id 模式时，不应出现任何“续费下单”入口（包含工具入口与行内按钮）
$this->assertStringNotContainsString('续费下单（先选订阅）', $html);
$this->assertStringNotContainsString('>续费下单<', $html);
// 顶部应有“返回订单详情”入口，避免运营迷路
$this->assertStringContainsString('返回订单详情', $html);
$this->assertStringContainsString('/admin/platform-orders/1', $html);
$this->assertStringContainsString('绑定到订单 #' . $orderId, $html);
$this->assertStringContainsString('/admin/platform-orders/' . $orderId . '/attach-subscription', $html);