From c6c566bb56441868d82cd0f2e0246b92b6722a51 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 28 八月 2025 17:17:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/tabbar/index/home.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index c0fbd55..de30f61 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){
@@ -1005,7 +1001,9 @@
this.videoNoMore = true;
return;
}
+ if(res.data.code===200){
this.videoQuery.pageNumber++;
+ }
})
}else{
@@ -1033,7 +1031,9 @@
this.videoNoMore = true;
return;
}
- this.videoQuery.pageNumber++;
+ if(res.data.code===200){
+ this.videoQuery.pageNumber++;
+ }
})
}
--
Gitblit v1.8.0