From 6f3d293aaa0e0a7992dbd19fc18968c1cac182b2 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 20:07:00 +0000
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=8F=B7=E9=93=BE=E6=8E=A5=E7=94=A8=20Arr::q?=
 =?UTF-8?q?uery=20=E7=BB=9F=E4=B8=80=20back=20=E4=B8=94=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/site_subscriptions/index.blade.php  |  7 +-
 ...ndexSubscriptionNoLinkContainsBackTest.php | 72 +++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 tests/Feature/AdminSiteSubscriptionIndexSubscriptionNoLinkContainsBackTest.php

diff --git a/resources/views/admin/site_subscriptions/index.blade.php b/resources/views/admin/site_subscriptions/index.blade.php
index 90b4cc2..6c579b1 100644
--- a/resources/views/admin/site_subscriptions/index.blade.php
+++ b/resources/views/admin/site_subscriptions/index.blade.php
@@ -164,7 +164,12 @@
             <tr>
                 <td>{{ $subscription->id }}</td>
                 <td>
-                    <a href="/admin/site-subscriptions/{{ $subscription->id }}?back={{ urlencode($back) }}">{{ $subscription->subscription_no }}</a>
+                    @php
+                        $subShowUrl = '/admin/site-subscriptions/' . $subscription->id . '?' . \Illuminate\Support\Arr::query([
+                            'back' => $back,
+                        ]);
+                    @endphp
+                    <a href="{!! $subShowUrl !!}">{{ $subscription->subscription_no }}</a>
                 </td>
                 <td>
                     @if($subscription->merchant)
diff --git a/tests/Feature/AdminSiteSubscriptionIndexSubscriptionNoLinkContainsBackTest.php b/tests/Feature/AdminSiteSubscriptionIndexSubscriptionNoLinkContainsBackTest.php
new file mode 100644
index 0000000..02a9b0a
--- /dev/null
+++ b/tests/Feature/AdminSiteSubscriptionIndexSubscriptionNoLinkContainsBackTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Merchant;
+use App\Models\Plan;
+use App\Models\SiteSubscription;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Arr;
+use Tests\TestCase;
+
+class AdminSiteSubscriptionIndexSubscriptionNoLinkContainsBackTest 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_index_self_without_back(): void
+    {
+        $this->loginAsPlatformAdmin();
+
+        $merchant = Merchant::query()->firstOrFail();
+        $plan = Plan::query()->create([
+            'code' => 'sub_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_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(),
+        ]);
+
+        // 列表页带 back（模拟从其它页面跳回），index 内 back 口径用 selfWithoutBack（去掉 back）
+        $res = $this->get('/admin/site-subscriptions?status=activated&back=' . urlencode('/admin/plans'));
+        $res->assertOk();
+
+        $expectedBack = '/admin/site-subscriptions?' . Arr::query([
+            'status' => 'activated',
+        ]);
+
+        $expectedUrl = '/admin/site-subscriptions/' . $sub->id . '?' . Arr::query([
+            'back' => $expectedBack,
+        ]);
+
+        $res->assertSee($expectedUrl, false);
+        $res->assertDontSee('back%3D', false);
+    }
+}