lmk-shop-wx.git

			@@ -51,6 +51,10 @@
			export default {
			name: 'ActivityPopup',
			props: {
			prizeActivityId:{
			type:String,
			default:''
			},
			// 控制弹窗显示/隐藏
			show: {
			type: Boolean,
			@@ -170,9 +174,14 @@

			// 点击参与活动
			onJoinActivity() {
			this.$emit('join');

			// this.$emit('join');
			console.log(this.prizeActivityId)
			uni.navigateTo({
			url:'pages/prize/PrizeDetail/PrizeDetail?id='+this.prizeActivityId
			})
			// 可以在这里添加参与活动后的逻辑，比如关闭弹窗
			// this.onClose();
			this.$emit('close');
			}
			},
			beforeDestroy() {

			@@ -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){

	pages/ActivityPopup/ActivityPopup.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/tabbar/index/home.vue	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史