From f61b3f6c80ff27663836e568c04414c8e301fc5f Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Fri, 19 Sep 2025 16:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96-=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E6=8A=A5=E5=90=8D-=E5=8D=A1=E7=89=87=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/activity-card/activity-card.vue | 5 ++---
 pages/activity/activityDetail.vue          | 9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/activity-card/activity-card.vue b/components/activity-card/activity-card.vue
index 98ab76a..3a7f9d8 100644
--- a/components/activity-card/activity-card.vue
+++ b/components/activity-card/activity-card.vue
@@ -46,8 +46,7 @@
           <!-- 报名按钮 -->
           <view
             v-if="
-              showRegisterButton &&
-              activity.status === ACTIVITY_STATUS.REGISTERING
+              showRegisterButton && activity.status !== ACTIVITY_STATUS.FINISHED
             "
             class="register-button"
             @click.stop="handleRegister"
@@ -160,7 +159,7 @@ export default {
 
 .activity-card {
   width: 684rpx;
-  height: 370rpx;
+  height: 400rpx;
   border-radius: 24rpx;
   overflow: hidden;
   position: relative;
diff --git a/pages/activity/activityDetail.vue b/pages/activity/activityDetail.vue
index 2c595e2..58d59fd 100644
--- a/pages/activity/activityDetail.vue
+++ b/pages/activity/activityDetail.vue
@@ -67,7 +67,10 @@
         </view>
 
         <!-- 底部操作按钮 -->
-        <view class="bottom-actions">
+        <view
+          v-if="formattedActivity.status !== 'finished'"
+          class="bottom-actions"
+        >
           <view class="action-button phone-button" @click="handlePhoneCall">
             <image
               :src="CommonEnum.PHONE"
@@ -116,6 +119,7 @@ export default {
       error: "",
       activityData: null,
       actId: "",
+      activityHasFinished: false,
     };
   },
   computed: {
@@ -183,6 +187,9 @@ export default {
     // 处理卡片点击
     handleCardClick(activity) {
       console.log("点击活动卡片:", activity);
+      if (activity.status === "finished") {
+        this.activityHasFinished = true;
+      }
       // 在详情页中点击卡片不执行任何操作
     },