From 0b53ec55a96c37fe9602c66dd14c061d0301b5c3 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Sun, 5 Jul 2026 12:31:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(offline):=20=E6=9C=8D=E5=8A=A1=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E9=A1=B5=E8=AE=B0=E5=BD=95=E5=8E=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=20=E7=BD=91=E7=BB=9C=E6=81=A2=E5=A4=8D=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E5=9B=9E=E5=88=B0=E5=8E=9F=E9=A1=B5=E8=80=8C?=
 =?UTF-8?q?=E9=9D=9E=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/daxpay-admin/src/router/guard.ts              |  9 ++++++++-
 .../src/views/_core/fallback/offline.vue           | 14 +++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/daxpay-admin/src/router/guard.ts b/apps/daxpay-admin/src/router/guard.ts
index fb670ea33..a85bf1d39 100644
--- a/apps/daxpay-admin/src/router/guard.ts
+++ b/apps/daxpay-admin/src/router/guard.ts
@@ -115,7 +115,14 @@ function setupAccessGuard(router: Router) {
         return { path: LOGIN_PATH, replace: true };
       }
       // 网络错误 / 后端服务不可用: token 仍在, 跳服务不可用提示页, 保留登录态供用户手动刷新重试
-      return { path: '/service-unavailable', replace: true };
+      // 中文注释：记录用户原本想访问的页面，网络恢复后重试可回到该页而非首页；
+      // 排除自身路径，避免 redirect 指向 /service-unavailable 形成循环
+      const redirectPath = to.path === '/service-unavailable' ? HOME_PATH : to.fullPath;
+      return {
+        path: '/service-unavailable',
+        query: { redirect: encodeURIComponent(redirectPath) },
+        replace: true,
+      };
     }
   });
 }
diff --git a/apps/daxpay-admin/src/views/_core/fallback/offline.vue b/apps/daxpay-admin/src/views/_core/fallback/offline.vue
index 9197b0240..aa42b5227 100644
--- a/apps/daxpay-admin/src/views/_core/fallback/offline.vue
+++ b/apps/daxpay-admin/src/views/_core/fallback/offline.vue
@@ -1,18 +1,26 @@
 <script lang="ts" setup>
+  import { useRoute, useRouter } from 'vue-router';
+
   import { Fallback } from '@vben/common-ui';
-  import { useRouter } from 'vue-router';
 
   import { $t } from '#/locales';
   import { HOME_PATH } from '#/router/routes';
 
   defineOptions({ name: 'FallbackOfflineDemo' });
 
+  const route = useRoute();
   const router = useRouter();
 
-  // 重试连接: 跳回首页重新走认证流程
+  // 读取重试后应跳转的路径：优先使用进入本页时记录的原页面（query.redirect），否则回首页
+  function getRedirectPath(): string {
+    const redirect = route.query.redirect;
+    return redirect ? decodeURIComponent(redirect as string) : HOME_PATH;
+  }
+
+  // 重试连接: 回到原页面重新走认证流程
   // (后端已恢复则正常进入系统, 仍不可用则由守卫重新跳回本页, 不会死循环)
   function retry() {
-    router.replace(HOME_PATH);
+    router.replace(getRedirectPath());
   }
 </script>