diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss index dff1d31..f1b6da8 100644 --- a/pages/heartNew/components/volunteer/volunteer.wxss +++ b/pages/heartNew/components/volunteer/volunteer.wxss @@ -25,10 +25,11 @@ } .item .autograph { - margin-top: 18rpx; + margin-top: 10rpx; font-size:26rpx; font-weight:500; color:rgba(193,193,193,1); + padding: 0 20rpx; } .show { diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index f3d757e..8e66213 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -177,10 +177,15 @@ Page({ volunteerlist(params){ let that = this api.volunteerlist(params).then(function (res) { - console.log(res.data.length) + if (res.data.length !== that.data.pageSize) { + that.setData({ + loadMoreVisible: true, + loadMoreType: 'none', + }) + } that.setData({ listLength:res.data.length, - volunteerlist: res.data + volunteerlist:that.data.volunteerlist.concat(res.data) }) }) }, @@ -275,6 +280,15 @@ Page({ actType: 0 } this.selectComponent("#state-0").getActivityList(parms) + }else if(this.data.selectedTab == 'tab1'){ + this.setData({ + indexPage: this.data.indexPage + 1 + }) + let parms = { + pageIndex: this.data.indexPage, + pageSize: this.data.pageSize, + } + this.volunteerlist(parms) } else if (this.data.selectedTab == 'tab2') { this.setData({ indexPage: this.data.indexPage + 1 diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 0279174..552992b 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js @@ -154,14 +154,16 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - this.setData({ - loadMoreVisible: true - }) - if (this.data.loadMoreType === 'loading') { + if(this.data.selectTab == 'tab2'){ this.setData({ - pageNo: this.data.pageNo + 1 + loadMoreVisible: true }) - this.getSignedList() + if (this.data.loadMoreType === 'loading') { + this.setData({ + pageNo: this.data.pageNo + 1 + }) + this.getSignedList() + } } }, // 列表 下拉刷新, 初始化加载 diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss index 06b04c3..56b7be3 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss @@ -101,7 +101,7 @@ button::after { box-sizing: border-box; background: #fff; margin-top: 17rpx; - padding: 0 30rpx; + /* padding: 0 30rpx; */ } diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml index 9136f1c..abb61cf 100644 --- a/subpages/heart/pages/volunteer/volunteer.wxml +++ b/subpages/heart/pages/volunteer/volunteer.wxml @@ -74,7 +74,7 @@ 昵称 - +