diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 2297401..6f36cdc 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.7.24" + const versionNum = "1.7.25" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1' diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 56efd5c..17080cb 100755 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js @@ -48,19 +48,19 @@ Page({ rankTabList: [ { id: '0', - label: '爱心时长' - }, - { - id: '1', - label: '参与次数' - }, - { - id: '2', - label: '公益积分' + label: '公益排名' }, + // { + // id: '1', + // label: '参与次数' + // }, + // { + // id: '2', + // label: '公益积分' + // }, { id: '3', - label: '公益积分记录' + label: '公益积分' } ], pioneerList: [] diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index c68d6bb..380d8bc 100755 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -87,16 +87,16 @@ - 爱心时长 {{item.kindnessTime}}小时 + 爱心时长 {{item.kindnessTime}}小时, 参加 {{item.participationNum}} 次 - + diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss index df67bcc..4f88812 100755 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss @@ -288,7 +288,7 @@ button::after { white-space: nowrap; flex-direction: row; align-items: center; - justify-content: flex-start; + justify-content: space-around; height: 80rpx; } .volunteer-tag .tag { diff --git a/subpages/heart/pages/volunteerTeam/volunteerTeam.js b/subpages/heart/pages/volunteerTeam/volunteerTeam.js index d7fc74c..0d995cb 100644 --- a/subpages/heart/pages/volunteerTeam/volunteerTeam.js +++ b/subpages/heart/pages/volunteerTeam/volunteerTeam.js @@ -4,7 +4,7 @@ const typePageIndex = 1 Page({ data: { pageIndex: 1, - pageSize: 10, + pageSize: 20, nodata: false, loadMoreType: 'none', loadMoreVisible: false,