From 162e94aea4cc9c4a487700f06a214068f5681607 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Tue, 3 Aug 2021 09:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/leaderboardNew/leaderboardNew.wxml  | 21 ++++++++++++-------
 .../pages/leaderboardNew/leaderboardNew.wxss  |  4 ++--
 subpages/heart/pages/volunteer/volunteer.wxml |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index d47b9f7..99d1553 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -16,18 +16,18 @@
   </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 }}">
+      <!-- <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>
@@ -50,8 +50,8 @@
             </view>
           </view>
         </view>
-      </block>
-      <!-- <block wx:elif="{{loveRankingList.length > 0 && rankId != '3'}}">
+      </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>
@@ -86,12 +86,17 @@
             </view>
           </view>
         </view>
-      </block> -->
+      </block>
       <block wx:if="{{datalenght == 0}}">
         <view class="project-nodata">
           <image class="nodata-image" src="../../../../images/mine/project-nodata.png" />
-          <view class="nodata-tip">暂无排名</view>
-          <view class="nodata-tip">快来参加吧</view>
+          <block wx:if="{{rankId == '3'}}">
+            <view class="nodata-tip">暂无记录</view>
+          </block>
+          <block wx:else>
+            <view class="nodata-tip">暂无排名</view>
+            <view class="nodata-tip">快来参加吧</view>            
+          </block>
         </view>
       </block>
     </view>
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index feb9e37..e44b9bb 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -280,7 +280,7 @@ button::after {
       white-space: nowrap;
       flex-direction: row;
       align-items: center;
-      justify-content: center;
+      justify-content: flex-start;
       height: 80rpx;
   }
   .volunteer-tag .tag {
@@ -292,7 +292,7 @@ button::after {
       font-family: PingFang SC;
       font-weight: 500;
       color: #333333;
-      min-width: 140rpx;
+      min-width: 180rpx;
       text-align: center;
       height: 48rpx;
       line-height: 48rpx;
diff --git a/subpages/heart/pages/volunteer/volunteer.wxml b/subpages/heart/pages/volunteer/volunteer.wxml
index 75c2993..18d1648 100644
--- 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" wx:if="{{false}}"> <!-- 2021.07.20 暂时不上线该功能 -->
+      <view class="head-portrait"> <!-- 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">