From 89cf6ec5708b7b6304b9cd72e1550fac6ccc053e Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Thu, 16 Oct 2025 16:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=AB=E7=A0=81=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/memorial/memorialHall.vue | 19 +++++++++++++++++--
 utils/router.js                 |  3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pages/memorial/memorialHall.vue b/pages/memorial/memorialHall.vue
index f043caa..7f10779 100644
--- a/pages/memorial/memorialHall.vue
+++ b/pages/memorial/memorialHall.vue
@@ -2,7 +2,11 @@
   <view class="page">
     <base-background />
     <!-- 使用自定义导航栏组件 -->
-    <custom-navbar ref="customNavbar" title="往生大殿" />
+    <custom-navbar
+      ref="customNavbar"
+      title="往生大殿"
+      @back="handleNavbarBack"
+    />
     <view class="header">
       <!-- 搜索框 -->
       <search-box
@@ -148,6 +152,7 @@ import OfferingModal from "./compositons/offeringModal.vue";
 import { getIdBySN, getPackageList } from "../../api/memorial/memorial";
 import { ordersEnshrined } from "../../api/order/order";
 import { checkLogin } from "../../composables/goToLogin";
+import { navigateBack } from "../../utils/router.js";
 
 export default {
   components: {
@@ -456,7 +461,10 @@ export default {
         ) {
           await this.$refs.statusBar.loadUnitData(this.selectedUnitId);
         }
-        if (this.$refs.enshrinedList && typeof this.$refs.enshrinedList.refresh === "function") {
+        if (
+          this.$refs.enshrinedList &&
+          typeof this.$refs.enshrinedList.refresh === "function"
+        ) {
           await this.$refs.enshrinedList.refresh();
         }
       }
@@ -499,6 +507,13 @@ export default {
       console.log("滚动位置:", e.detail.scrollTop);
       this.scrollTop = e.detail.scrollTop;
     },
+
+    // 处理导航栏返回事件
+    handleNavbarBack() {
+      console.log("@@@@@如果没有上一页会自动跳转到首页");
+      // 使用路由工具函数，如果没有上一页会自动跳转到首页
+      navigateBack();
+    },
   },
 };
 </script>
diff --git a/utils/router.js b/utils/router.js
index 674e861..3d483bd 100644
--- a/utils/router.js
+++ b/utils/router.js
@@ -136,7 +136,8 @@ export function navigateBack(delta = 1) {
     delta,
     fail: () => {
       // 如果没有上一页，跳转到首页
-      switchToTab("index");
+      // 使用 reLaunch 而不是 switchTab，因为首页不是 tabBar 页面
+      reLaunchToPage("index");
     },
   });
 }