From c613e1e9a93e8c94908a4adc9ce1a38a401c383c Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 20 Jul 2021 17:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.6=20=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E8=87=B31.7.3=20leaderboardNew.wxml/voluntee?=
 =?UTF-8?q?r.wxml=20=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                |  2 +-
 .../pages/leaderboardNew/leaderboardNew.wxml  | 29 ++++++++++++++++---
 subpages/heart/pages/volunteer/volunteer.wxml |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index abfe8ca..68f02a2 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.7.5"
+    const versionNum = "1.7.6"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index c43a647..7526b5f 100755
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -16,17 +16,38 @@
   </view>
   <!-- 积分排行 -->
   <block wx:if="{{selectTab === 'tab1'}}">
-    <scroll-view scroll-x="{{true}}" class="scroll-tag">
+    <!-- <scroll-view scroll-x="{{true}}" class="scroll-tag">
       <view class="volunteer-tag">
         <view class="tag {{rankId == item.id ? 'sel' : ''}}" wx:for="{{rankTabList}}" wx:key="index" data-id="{{item.id}}" bindtap="changeTag">{{item.label}}</view>
       </view>
-    </scroll-view>
+    </scroll-view> -->
     <view class="bottom {{loveRankingList.length > 0 ? 'padding' : ''}}">
       <block wx:if="{{loveRankingList.length === 0 && preloadVisible}}">
         <preload-loveranking-item wx:for="{{[1,2,3,4]}}" wx:for-index="index" wx:key="index">
         </preload-loveranking-item>
       </block>
-      <block wx:elif="{{loveRankingList.length > 0 && rankId != '3'}}">
+      
+      <block wx:elif="{{loveRankingList.length > 0 }}">
+        <view class="list-item" wx:for-item="item" wx:key="index" wx:for-index="index" wx:for="{{loveRankingList}}">
+          <view class="num {{index === 0 ? 'color1' : index === 1 ? 'color2' : index === 2 ? 'color3' : ''}}">
+            {{index + 1}}</view>
+          <image class="avatar" src="{{item.faceImg}}" />
+          <view class="info">
+            <view class="name"><view>{{item.nickname}}</view><image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}"/></view>
+            <view class="info-detail">
+              <block>
+                <image class="heart-time" src="../../images/aixin.png"></image>
+                <view> 爱心时长 {{item.kindnessTime}}小时</view>
+              </block>
+              <block>
+                <image class="enter-times" style="margin-left: 20rpx;" src="../../images/bofangcishu.png"></image>
+                <view> 参加次数 {{item.participationNum}}次</view>
+              </block>
+            </view>
+          </view>
+        </view>
+      </block>
+      <!-- <block wx:elif="{{loveRankingList.length > 0 && rankId != '3'}}">
         <view class="list-item" wx:for-item="item" wx:key="index" wx:for-index="index" wx:for="{{loveRankingList}}">
           <view class="num {{index === 0 ? 'color1' : index === 1 ? 'color2' : index === 2 ? 'color3' : ''}}">
             {{index + 1}}</view>
@@ -61,7 +82,7 @@
             </view>
           </view>
         </view>
-      </block>
+      </block> -->
       <block wx:if="{{datalenght == 0}}">
         <view class="project-nodata">
           <image class="nodata-image" src="../../../../images/mine/project-nodata.png" />
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index 9d1efbd..9439760 100755
--- a/subpages/heart/pages/volunteer/volunteer.wxml
+++ b/subpages/heart/pages/volunteer/volunteer.wxml
@@ -98,7 +98,7 @@
           </view>
         </picker>
       </view>
-      <view class="head-portrait">
+      <view class="head-portrait" wx:if="{{false}}"> <!-- 2021.07.20 暂时不上线该功能 -->
         <view class="head-portrait-name">选择部门</view>
         <!-- <view class="time">{{volunteerTag.tag}}</view> -->
         <picker bindchange="choosePicker2" value="{{deptIndex}}" range="{{deptList}}" range-key="deptName">