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 @@ {{ remainingTime }} - + 查看详情> @@ -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" /> @@ -531,4 +532,8 @@ export default { background: #FFFBF5; height: 180rpx; } + +.placeholder{ + height: 20rpx; +} \ No newline at end of file