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

peng

2025-08-25 cbafbc0a3a704cc48e76ef0862ffcf74433186ff

 pages/tabbar/index/home.vue

@@ -270,8 +270,8 @@
         :activityDesc="activityPopup.desc"
         :activityImage="activityPopup.image"
         :endTime="activityPopup.endTime"
        :prizeActivityId="activityPopup.prizeActivityId"
         @close="onClosePopup"
         @join="onJoinActivity"
       />
  </view>
</template>
@@ -519,7 +519,8 @@
                          title: obj.activityName,
                          desc: obj.activityDes,
                          image: obj.activityCoverUrl,
                          endTime:new Date(obj.endTime).getTime()
                          endTime:new Date(obj.endTime).getTime(),
                        prizeActivityId:obj.id
                          })
                       }else{
                          this.hideActivityPopup()
@@ -535,11 +536,6 @@
         },
     ...mapMutations(['showActivityPopup','hideActivityPopup']), // 引入Vuex的方法
      onClosePopup() {
           this.hideActivityPopup()
         },
     onJoinActivity() {
           // 处理参与活动逻辑
           console.log('全局：用户参与活动')
           this.hideActivityPopup()
         },
     replyClick(reply){