From cbafbc0a3a704cc48e76ef0862ffcf74433186ff Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 25 八月 2025 18:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/ActivityPopup/ActivityPopup.vue | 13 +++++++++++--
pages/tabbar/index/home.vue | 10 +++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pages/ActivityPopup/ActivityPopup.vue b/pages/ActivityPopup/ActivityPopup.vue
index cdfdea5..b411c9c 100644
--- a/pages/ActivityPopup/ActivityPopup.vue
+++ b/pages/ActivityPopup/ActivityPopup.vue
@@ -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() {
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index c0fbd55..fe1fcd6 100644
--- a/pages/tabbar/index/home.vue
+++ b/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){
--
Gitblit v1.8.0