diff --git a/pages/heartNew/components/volunteer/volunteer.js b/pages/heartNew/components/volunteer/volunteer.js index e5abc46..e18523e 100644 --- a/pages/heartNew/components/volunteer/volunteer.js +++ b/pages/heartNew/components/volunteer/volunteer.js @@ -15,7 +15,7 @@ Component({ * 组件的初始数据 */ data: { - + ifclick:true }, /** @@ -23,7 +23,7 @@ Component({ */ methods: { preViewImage(e) { - console.log(JSON.stringify(e)) + this.triggerEvent('clickImage', this.data.ifclick) wx.previewImage({ urls: [e.currentTarget.dataset.src], current: e.currentTarget.dataset.src diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index edd6153..396e025 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -33,7 +33,8 @@ Page({ actId: '',//判断返回以后是否需要刷新列表 volunteerlist:[],//志愿者列表 listLength:0,//数据长度判断是否需要加载 - getImgUrl:'' + getImgUrl:'', + ifClickImage:false,//因为志友多多点击图片查看大图,会出现列表刷新的bug,所以加这个字段进行控制 }, /** @@ -68,23 +69,30 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + console.log(':::::::::') this.setData({ loadMoreVisible: false, loadMoreType: 'none', indexPage: 1, }) if(this.data.selectedTab == 'tab1'){//刷新志友 - this.setData({ - dingdan: true, - jingcai: true, - volunteerlist:[],//列表置空 - listLength:0 - }) - let parms = { - pageIndex: this.data.indexPage, - pageSize: this.data.pageSize, + if(this.data.ifClickImage){//如果为true就不可以刷新,判断完成以后重新置为false + this.setData({ + ifClickImage: false + }) + }else{ + this.setData({ + dingdan: true, + jingcai: true, + volunteerlist:[],//列表置空 + listLength:0 + }) + let parms = { + pageIndex: this.data.indexPage, + pageSize: this.data.pageSize, + } + this.volunteerlist(parms) } - this.volunteerlist(parms) } if (this.data.actId) { this.updateActivityList() @@ -221,6 +229,12 @@ Page({ }) }, + clickImage(e){ + this.setData({ + ifClickImage: e.detail, + }) + }, + /** * 生命周期函数--监听页面隐藏 @@ -244,7 +258,10 @@ Page({ }, bannerListV2: function () { let that = this - api.bannerList().then(function (res) { + let params = { + bannerType:"0" + } + api.bannerList(params).then(function (res) { that.setData({ banner: res.data }) diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index b5cfb34..56467d8 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -78,7 +78,7 @@ - + diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 9a4250e..b83d918 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js @@ -76,11 +76,13 @@ Page({ }, bannerListV2: function () { let that = this - api_banner.bannerList().then(function (res) { + let params = { + bannerType:"2" + } + api_banner.bannerList(params).then(function (res) { that.setData({ banner: res.data }) - console.log('?'+JSON.stringify(that.data.banner)) }) }, preViewImage(e) { @@ -208,7 +210,7 @@ Page({ } api.getSignedList(para).then(res => { this.pullDownRefresh.stopRefresh() - console.log('已报名活动', res) + // console.log('已报名活动', res) this.setData({ signedList: [...res.data], loadMoreType: res.data.length === 10 ? 'loading' : 'none', @@ -226,7 +228,6 @@ Page({ }, // 列表 上拉加载 getSignedList() { - console.log('+++++++++++++++++++++++++') const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize, @@ -234,7 +235,7 @@ Page({ actType: this.data.selectedTab_B.substr(3, 1) } api.getSignedList(para).then(res => { - console.log('已报名活动', res.data.length) + // console.log('已报名活动', res.data.length) this.setData({ signedList: [...this.data.signedList, ...res.data], loadMoreType: res.data.length === 10 ? 'loading' : 'none', diff --git a/utils/activity.js b/utils/activity.js index 0cd039c..d15ba83 100644 --- a/utils/activity.js +++ b/utils/activity.js @@ -11,8 +11,8 @@ function getActivityList(params) { return fly.get('heart/act/list', params) } -function bannerList() { - return fly.get('heart/act/banner/list') +function bannerList(params) { + return fly.get('heart/act/banner/list',params) } function bannerListV2() {