diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js index 15911a0..d85bc40 100644 --- a/subpages/integralCentre/pages/index/index.js +++ b/subpages/integralCentre/pages/index/index.js @@ -2,7 +2,8 @@ import { pointsRecordlist, pointsRankinglist, - userPointsRankinglist + userPointsRankinglist, + gradeRankinglist } from '../../../../utils/api' import { getTimestamp @@ -40,7 +41,7 @@ Page({ ], timestamp: getTimestamp(), loadMoreType: 'none', - loadMoreVisible: false, + loadMoreVisible: false }, /** * 生命周期函数--监听页面加载 @@ -93,8 +94,11 @@ Page({ loadMoreType: 'loading', loadMoreVisible: true, }) - - that.pointsRankinglist() + if ( e.currentTarget.dataset.type == '2') { + that.gradeRankinglist() + } else { + that.pointsRankinglist() + } }, // 积分记录-积分排行接口 @@ -211,11 +215,9 @@ Page({ this.setData({ loadMoreVisible: true }) - if (this.data.selectTab == 'tab1') { // this.pointsRankinglist(); //积分排行 } else { - if (this.data.loadMoreType === 'loading') { this.setData({ pageIndex: this.data.pageIndex + 1, @@ -228,6 +230,41 @@ Page({ } }, + //6.28 等级排行榜 + gradeRankinglist () { + let that = this + const para = { + pageIndex: 1, + pageSize: 20, + timestamp: getTimestamp() + } + gradeRankinglist(para).then(res => { + that.setData({ + pointsRankingUser: res.data.currentUser, + pointsRankinglist: that.data.pointsRankinglist.concat(res.data.rank), + }) + if (that.data.pointsRankinglist.length > 0) { + that.setData({ + nodatapointsRanking: false, + loadMoreType: 'none', + }) + } else { + that.setData({ + nodatapointsRanking: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + } + }).catch(err => { + that.setData({ + pointsRankinglist: [], + nodatapointsRanking: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + console.log(err) + }) + }, /** * 用户点击右上角分享 */ diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml index 67aaec3..98bdfc8 100644 --- a/subpages/integralCentre/pages/index/index.wxml +++ b/subpages/integralCentre/pages/index/index.wxml @@ -1,73 +1,73 @@ - - - {{points}} - 积分 - - - - 积分排行 - 积分记录 - - - - - - - - - - - - - {{pointsRankingUser.rank}} - - - {{pointsRankingUser.realName}} - - {{pointsRankingUser.points}} - - 注:该排行仅显示已完善信息用户 - - - - - - - - - - {{item.rank}} - - - {{item.realName}} - - {{item.points}} - - - - - - - - - 事件名称 - 积分 - 时间 - - - - {{item.ruleDesc}} - - - - +{{item.points}} - {{item.operationTime}} - - - - - + + + {{points}} + 积分 + + + + 积分排行 + 积分记录 + + + + + + + + + + + + + {{pointsRankingUser.rank}} + + + {{pointsRankingUser.realName||pointsRankingUser.nickName}} + + {{pointsRankingUser.points||pointsRankingUser.grade}} + + 注:该排行仅显示已完善信息用户 + + + + + + + + + + {{item.rank}} + + + {{item.realName||item.nickName}} + + {{item.points||item.grade}} + + + + + + + + + 事件名称 + 积分 + 时间 + + + + {{item.ruleDesc}} + + - + +{{item.points}} + {{item.operationTime}} + + + + + \ No newline at end of file diff --git a/utils/api.js b/utils/api.js index 2786565..96f380c 100644 --- a/utils/api.js +++ b/utils/api.js @@ -54,7 +54,8 @@ module.exports = { getDefaultGridInfo:getDefaultGridInfo, getResidentConfig:getResidentConfig, getScrip:getScrip, - getHomePhone:getHomePhone + getHomePhone:getHomePhone, + gradeRankinglist:gradeRankinglist } function getToken(wxCode) { @@ -512,4 +513,23 @@ function getScrip() { // 获取首页电话 function getHomePhone() { return fly.get('imgConfig/getImgUrl/3') +} + +/** + * 积分记录-等级排行接口 6.28 + * timestamp String 第一页查询发起时的时间 + * pageIndex Number 页码 + * pageSize Number 页容量 + */ + +function gradeRankinglist({ + timestamp, + pageIndex, + pageSize +}) { + return fly.get('app-user/user/gradeRanking/list', { + timestamp, + pageIndex, + pageSize + }) } \ No newline at end of file