From 87d8b28193c9e89c8b90e75c14abe5e1b5bf9388 Mon Sep 17 00:00:00 2001
From: minimaxagent1 <minimaxagent1@gmail.com>
Date: Tue, 12 Aug 2025 09:01:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E7=BB=86=E5=92=8C?=
 =?UTF-8?q?=E4=BE=9B=E5=A5=89=E9=83=BD=E4=B8=80=E6=A0=B7=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=BE=9B=E5=A5=89?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/memorial/compositons/statusBar.vue |  7 +++++-
 pages/memorial/memorial.vue              | 28 ++++++++++++++----------
 pages/memorial/memorialHall.vue          |  5 +++++
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pages/memorial/compositons/statusBar.vue b/pages/memorial/compositons/statusBar.vue
index bc66c10..03dd079 100644
--- a/pages/memorial/compositons/statusBar.vue
+++ b/pages/memorial/compositons/statusBar.vue
@@ -11,7 +11,7 @@
           <text class="status-value">{{ remainingTime }}</text>
         </view>
       </view>
-      <view class="detail-link" @click="viewDetails">
+      <view class="detail-link" @click="viewDetails" v-if="showDetailLink">
         <text>查看详情></text>
       </view>
     </view>
@@ -28,6 +28,11 @@ export default {
     unitId: {
       type: String,
       default: ''
+    },
+    // 是否显示查看详情链接
+    showDetailLink: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/pages/memorial/memorial.vue b/pages/memorial/memorial.vue
index 124daa5..b17a781 100644
--- a/pages/memorial/memorial.vue
+++ b/pages/memorial/memorial.vue
@@ -153,20 +153,12 @@ export default {
       }
     },
 
-    // 处理查看详情
-    handleViewDetails(unitData) {
-      console.log('查看单元详情:', unitData)
+    // 跳转到往生大殿页面的通用方法
+    navigateToMemorialHall(unitId) {
+      console.log('跳转到往生大殿页面，ID:', unitId)
       
-
-    },
-
-    // 提交供奉 - 跳转到往生大殿页面
-    submitPrayer() {
-      console.log('提交供奉，跳转到往生大殿页面，ID:', this.selectedUnitId)
-      
-      // 跳转到往生大殿页面，传递往生殿ID
       uni.navigateTo({
-        url: `/pages/memorial/memorialHall?id=${this.selectedUnitId}`,
+        url: `/pages/memorial/memorialHall?id=${unitId}`,
         success: () => {
           console.log('跳转成功')
         },
@@ -178,6 +170,18 @@ export default {
           })
         }
       })
+    },
+
+    // 处理查看详情
+    handleViewDetails(unitData) {
+      console.log('查看单元详情:', unitData)
+      this.navigateToMemorialHall(unitData.id)
+    },
+
+    // 提交供奉 - 跳转到往生大殿页面
+    submitPrayer() {
+      console.log('提交供奉，跳转到往生大殿页面，ID:', this.selectedUnitId)
+      this.navigateToMemorialHall(this.selectedUnitId)
     }
     
   }
diff --git a/pages/memorial/memorialHall.vue b/pages/memorial/memorialHall.vue
index 97fed70..50d4f80 100644
--- a/pages/memorial/memorialHall.vue
+++ b/pages/memorial/memorialHall.vue
@@ -97,6 +97,7 @@
           v-if="selectedUnitId"
           :unit-id="selectedUnitId"
           @view-details="handleViewDetails"
+          :showDetailLink="false"
       />
       <view class="placeholder"></view>
       <!-- 供奉列表 -->
@@ -531,4 +532,8 @@ export default {
   background: #FFFBF5;
   height: 180rpx;
 }
+
+.placeholder{
+  height: 20rpx;
+}
 </style>
\ No newline at end of file