From 6ef240362727bfb3239142d0b1cb0ee89671cb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= <dev@saasshop.local>
Date: Wed, 18 Mar 2026 13:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2:=20=E6=B2=BB=E7=90=86?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8C=BA=E8=B7=A8=E9=9B=86=E5=90=88=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=B8=85=E7=90=86=E5=86=B2=E7=AA=81=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin/platform_orders/index.blade.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/views/admin/platform_orders/index.blade.php b/resources/views/admin/platform_orders/index.blade.php
index 5d18ba4..35108ca 100644
--- a/resources/views/admin/platform_orders/index.blade.php
+++ b/resources/views/admin/platform_orders/index.blade.php
@@ -952,7 +952,13 @@
                     <a class="btn btn-secondary btn-sm" href="#batch-activate-subscriptions">定位到批量同步订阅工具</a>
                 </div>
                 <div class="mt-6 actions gap-10">
-                    <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery(['sync_status' => 'failed', 'page' => null]) !!}">进入同步失败集合</a>
+                    <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery([
+                        'sync_status' => 'failed',
+                        // 从 BMPA 失败上下文切回同步失败集合时，需清理冲突开关
+                        'bmpa_failed_only' => null,
+                        'bmpa_error_keyword' => null,
+                        'page' => null,
+                    ]) !!}">进入同步失败集合</a>
                     <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery(['syncable_only' => '1', 'sync_status' => 'unsynced', 'fail_only' => null, 'page' => null]) !!}">切到只看可同步（用于批量重试同步）</a>
                 </div>
             </div>
@@ -965,7 +971,14 @@
             <div class="muted governance-block-body">
                 当前筛选包含「批量标记支付并生效失败/失败原因」范围。建议先补齐回执/核对退款/修正状态后，再切到「可BMPA处理」集合重试批量标记支付。
                 <div class="mt-6 actions gap-10">
-                    <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery(['bmpa_failed_only' => '1', 'page' => null]) !!}">进入批量标记支付失败集合</a>
+                    <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery([
+                        'bmpa_failed_only' => '1',
+                        // 从同步失败上下文切到 BMPA 失败集合时，需清理冲突开关
+                        'fail_only' => null,
+                        'sync_status' => null,
+                        'sync_error_keyword' => null,
+                        'page' => null,
+                    ]) !!}">进入批量标记支付失败集合</a>
                     <a class="btn btn-secondary btn-sm" href="{!! $safeFullUrlWithQuery(['bmpa_processable_only' => '1', 'bmpa_failed_only' => null, 'page' => null]) !!}">切到可BMPA处理（用于重试）</a>
                 </div>
             </div>