Merge remote-tracking branch 'origin/dev' into dev

peng

2025-06-27 7673b8272cfd9fc21161b70e35c263e455b59966

 pages/mine/activity/detail.vue

@@ -7,11 +7,11 @@
         <block v-if="activityInfo.coverType === 'image'">
            <image :src="activityInfo.url" class="activity-cover" />
         </block>
         <block v-if=" activityInfo.coverType === 'video'">
         <block v-else-if=" activityInfo.coverType === 'video'">
            <video :src="activityInfo.url" @play="handleVideoPlay" class="activity-cover"></video>
         </block>
         <!-- 文字类型 -->
         <block v-if="activityInfo.coverType === 'text'">
         <block v-else-if="activityInfo.coverType === 'text'">
            <view class="text-cover">
               <text class="cover-text">{{ activityInfo.cover }}</text>
            </view>
@@ -55,8 +55,8 @@
         <rich-text :nodes="activityInfo.activityContent" class="rich-text-content"></rich-text>
      </view>
      <!-- 报名状态 -->
      <view class="status-bar" :style="{ backgroundColor: statusBarColor }">
         <u-button class="signup-btn" @click.stop="activityReport()"
      <view class="status-bar">
         <u-button type="success" class="signup-btn" @click.stop="activityReport()"
            :disabled="reportBtn">{{ reportBtn ? '已报名': '立即报名'}}</u-button>
         <view class="collect-icon" @click.stop="collect()">
            <u-icon :name="isCollect ? 'star-fill' : 'star'" size="52"
@@ -208,7 +208,6 @@
      width: 100%;
      height: 400rpx;
      overflow: hidden;
      background-color: #f5f5f5;
   }

   /* 图片/视频封面样式 */
@@ -226,12 +225,12 @@
      display: flex;
      align-items: center;
      justify-content: center;
      background: linear-gradient(135deg, #6a11cb 0%, #2575fc 100%);
      // background: linear-gradient(135deg, #38a169 0%, #48bb78 100%);
      padding: 40rpx;
   }

   .cover-text {
      color: #fff;
      color: #0c6343;
      font-size: 36rpx;
      font-weight: bold;
      text-align: center;
@@ -283,6 +282,9 @@
   }

   .status-bar {
      position: absolute;
      bottom: 40rpx;
      width: 100%;
      display: flex;
      align-items: center;
      padding: 10px 15px;
@@ -347,7 +349,7 @@
   .rich-text-content {
      line-height: 1.6;
      color: #333;
      font-size: 16px;
      font-size: 28rpx;
   }

   .rich-text-content img {