diff --git a/images/mine/ic_dangbiaoqian.png b/images/mine/ic_dangbiaoqian.png
index 4103137..f2997d4 100644
Binary files a/images/mine/ic_dangbiaoqian.png and b/images/mine/ic_dangbiaoqian.png differ
diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml
index 93d9683..451c0f2 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxml
+++ b/pages/heartNew/components/volunteer/volunteer.wxml
@@ -1,6 +1,6 @@
-
- {{volunteerItemObj.nickname}}
+
+ {{volunteerItemObj.nickname}}
{{volunteerItemObj.volunteerSignature}}
\ No newline at end of file
diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss
index 8975c93..8031136 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxss
+++ b/pages/heartNew/components/volunteer/volunteer.wxss
@@ -10,7 +10,7 @@
align-items: center;
}
-.item image {
+.item .head-logo {
width: 110rpx;
height: 110rpx;
border-radius: 50%;
@@ -22,8 +22,14 @@
font-size: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
+ display: flex;
+ align-items: center;
+}
+.item .name .dangbiao {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
-
.item .autograph {
margin-top: 10rpx;
font-size:26rpx;
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 644b290..1785ada 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -61,7 +61,7 @@ Page({
detailId: '', // 通过分享进入 团购详情的id
scanBtn: {}, // 扫码签到改为可配置
shouye: {},
- // applyBtn: {}, // 申请发单改为可配置
+ applyBtn: {}, // 申请发单改为可配置
},
/**
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index c7794d0..3b3c3db 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -117,7 +117,7 @@
-
+ bindmovebtnCallBack="myApply">
{
+ const para = {
+ pageIndex: this.data.pageNo,
+ pageSize: this.data.pageSize
+ }
+ api.leaderboard(para).then(res => {
this.setData({
datalenght: res.data.length
})
- res.data.forEach((item) => {
- this.data.loveRankingList.push(item)
- })
+ // res.data.forEach((item) => {
+ // this.data.loveRankingList.push(item)
+ // })
this.setData({
- loveRankingList: this.data.loveRankingList,
+ loveRankingList: [ ...this.data.loveRankingList, ...res.data ],
+ loadMoreType: res.data.length === 10 ? "loading" : "none",
preloadVisible: false
})
}).catch(() => {
this.setData({
datalenght:0,
loveRankingList: [],
+ loadMoreType: "none",
preloadVisible: false
})
})
@@ -182,16 +190,18 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
- if(this.data.selectTab == "tab2"){
+ this.setData({
+ loadMoreVisible: true
+ })
+ if (this.data.loadMoreType === "loading") {
this.setData({
- loadMoreVisible: true
+ pageNo: this.data.pageNo + 1
})
- if (this.data.loadMoreType === "loading") {
- this.setData({
- pageNo: this.data.pageNo + 1
- })
- this.getSignedList()
- }
+ }
+ if(this.data.selectTab == "tab2"){
+ this.getSignedList()
+ } else {
+ this.loadLoveRanking()
}
},
// 列表 下拉刷新, 初始化加载
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index e3d1969..e0ad357 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -27,7 +27,7 @@
{{index + 1}}
- {{item.nickname}}
+ {{item.nickname}}
爱心时长 {{item.kindnessTime}}小时
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 67a7db2..faa2181 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -171,8 +171,14 @@ button::after {
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
+ display: flex;
+ align-items: center;
+}
+.bottom .list-item .info .name image {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 10rpx;
}
-
.bottom .list-item .info .info-detail {
font-size: 24rpx;
color: #999;
diff --git a/utils/api.js b/utils/api.js
index 1fe14ee..bb8a2ec 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -337,8 +337,8 @@ function userPointsRankinglist ({
/**
* 排行榜
*/
-function leaderboard () {
- return fly.get("heart/volunteer/leaderboard")
+function leaderboard (param) {
+ return fly.get("heart/volunteer/leaderboard", param)
}
/**
* 活动详情
diff --git a/utils/heartBehavior.js b/utils/heartBehavior.js
index 1d55407..6c84cac 100644
--- a/utils/heartBehavior.js
+++ b/utils/heartBehavior.js
@@ -84,9 +84,10 @@ module.exports = Behavior ({
scanBtn: item
})
} else if (item.imgType == '9') {
- this.data.tabList.push(item)
+ // this.data.tabList.push(item)
this.setData({
- tabList: this.data.tabList
+ // tabList: this.data.tabList
+ applyBtn: item
})
}
})