From 87ccbf1c74ddc14605937e6373560040c22cabb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Fri, 13 Mar 2026 19:43:53 +0000
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=9A=E8=AE=A2=E9=98=85=E5=8F=B7=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=20back=20=E5=8E=BB=E5=B5=8C=E5=A5=97=E5=B9=B6=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A4=E6=A0=8F=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/platform_orders/index.blade.php     |  7 +-
 ...oLinkContainsBackToSelfWithoutBackTest.php | 92 +++++++++++++++++++
 2 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 tests/Feature/AdminPlatformOrderIndexSubscriptionNoLinkContainsBackToSelfWithoutBackTest.php

diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php
index 99dfc5d..043a0b2 100644
--- a/resources/views/admin/platform_orders/index.blade.php
+++ b/resources/views/admin/platform_orders/index.blade.php
@@ -802,10 +802,11 @@
                     @if($order->siteSubscription)
                         <div>
                             @php
-                                $backUri = request()->getRequestUri();
-                                $subLink = '/admin/site-subscriptions/' . $order->siteSubscription->id . '?' . \Illuminate\Support\Arr::query(['back' => $backUri]);
+                                // 与本页“订单号 -> 详情页 back”口径一致：订阅详情 back 回到本页自身（剔除 back query，避免嵌套）
+                                $subBack = $selfWithoutBack;
+                                $subLink = '/admin/site-subscriptions/' . $order->siteSubscription->id . '?' . \Illuminate\Support\Arr::query(['back' => $subBack]);
                             @endphp
-                            <a href="{{ $subLink }}">{{ $order->siteSubscription->subscription_no }}</a>
+                            <a href="{!! $subLink !!}">{{ $order->siteSubscription->subscription_no }}</a>
                         </div>
                         <div class="muted muted-xs">
                             订阅ID：<a href="{!! request()->fullUrlWithQuery(['site_subscription_id' => $order->siteSubscription->id, 'page' => null]) !!}" class="muted">{{ $order->siteSubscription->id }}</a>
diff --git a/tests/Feature/AdminPlatformOrderIndexSubscriptionNoLinkContainsBackToSelfWithoutBackTest.php b/tests/Feature/AdminPlatformOrderIndexSubscriptionNoLinkContainsBackToSelfWithoutBackTest.php
new file mode 100644
index 0000000..f830633
--- /dev/null
+++ b/tests/Feature/AdminPlatformOrderIndexSubscriptionNoLinkContainsBackToSelfWithoutBackTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\PlatformOrder;
+use App\Models\SiteSubscription;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Arr;
+use Tests\TestCase;
+
+class AdminPlatformOrderIndexSubscriptionNoLinkContainsBackToSelfWithoutBackTest 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_subscription_no_link_should_carry_back_to_platform_orders_index_without_nested_back(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+        $plan = Plan::query()->create([
+            'code' => 'po_index_sub_no_back_plan',
+            'name' => '平台订单列表订阅号 back 口径测试套餐',
+            'billing_cycle' => 'monthly',
+            'price' => 10,
+            'list_price' => 10,
+            'status' => 'active',
+            'sort' => 10,
+            'published_at' => now(),
+        ]);
+
+        $sub = SiteSubscription::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'status' => 'activated',
+            'source' => 'manual',
+            'subscription_no' => 'SUB_PO_INDEX_BACK_0001',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'amount' => 10,
+            'starts_at' => now()->subDay(),
+            'ends_at' => now()->addMonth(),
+            'activated_at' => now()->subDay(),
+        ]);
+
+        PlatformOrder::query()->create([
+            'merchant_id' => $merchant->id,
+            'plan_id' => $plan->id,
+            'site_subscription_id' => $sub->id,
+            'order_no' => 'PO_INDEX_BACK_0001',
+            'order_type' => 'new_purchase',
+            'status' => 'pending',
+            'payment_status' => 'unpaid',
+            'plan_name' => $plan->name,
+            'billing_cycle' => $plan->billing_cycle,
+            'period_months' => 1,
+            'quantity' => 1,
+            'payable_amount' => 10,
+            'paid_amount' => 0,
+            'placed_at' => now(),
+            'meta' => [],
+        ]);
+
+        // 带 back 访问列表页（模拟从其它页面跳回）
+        $res = $this->get('/admin/platform-orders?status=pending&back=' . urlencode('/admin/plans'));
+        $res->assertOk();
+
+        // 订阅号链接的 back 应该回到列表页自身（去掉 back query），不应包含嵌套 back
+        $expectedBack = '/admin/platform-orders?' . Arr::query([
+            'status' => 'pending',
+        ]);
+
+        $expectedSubUrl = '/admin/site-subscriptions/' . $sub->id . '?' . Arr::query([
+            'back' => $expectedBack,
+        ]);
+
+        $res->assertSee($expectedSubUrl, false);
+        $res->assertDontSee('back%3D', false);
+    }
+}