From 9bd9431c8dc55a9d332427eb0837d248505cc447 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Mon, 29 Nov 2021 14:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.25=20=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=E9=93=B6=E8=A1=8C=E5=88=97=E8=A1=A8tab=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                |  2 +-
 .../pages/leaderboardNew/leaderboardNew.js    | 20 +++++++++----------
 .../pages/leaderboardNew/leaderboardNew.wxml  |  6 +++---
 .../pages/leaderboardNew/leaderboardNew.wxss  |  2 +-
 .../pages/volunteerTeam/volunteerTeam.js      |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

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 @@
             <view class="info-detail">
               <block wx:if="{{rankId == '0'}}">
                 <image class="heart-time" src="../../images/aixin.png"></image>
-                <view> 爱心时长 {{item.kindnessTime}}小时</view>
+                <view> 爱心时长 {{item.kindnessTime}}小时, 参加 {{item.participationNum}} 次</view>
               </block>
-              <block wx:elif="{{rankId == '1'}}">
+              <!-- <block wx:elif="{{rankId == '1'}}">
                 <image class="enter-times" src="../../images/bofangcishu.png"></image>
                 <view> 参加次数 {{item.participationNum}}次</view>
               </block>
               <block wx:elif="{{rankId == '2'}}">
                 <image class="enter-times" src="../../images/aixin.png"></image>
                 <view> 公益积分 {{item.volunteerPoints}}分</view>
-              </block>
+              </block> -->
             </view>
           </view>
         </view>
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,