From e8fefc86afa2ef5fa1e6cfeecc0d686a9a6f7f22 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 7 Jul 2021 14:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=91=E5=8D=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=A7=BB=E8=87=B3=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=96=B9?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/mine/ic_dangbiaoqian.png               | Bin 1426 -> 17178 bytes
 .../components/volunteer/volunteer.wxml       |   4 +-
 .../components/volunteer/volunteer.wxss       |  10 ++++-
 pages/heartNew/heartNew.js                    |   2 +-
 pages/heartNew/heartNew.wxml                  |   4 +-
 subpages/heart/images/ic_dangbiaoqian.png     | Bin 0 -> 17178 bytes
 .../pages/leaderboardNew/leaderboardNew.js    |  38 +++++++++++-------
 .../pages/leaderboardNew/leaderboardNew.wxml  |   2 +-
 .../pages/leaderboardNew/leaderboardNew.wxss  |   8 +++-
 utils/api.js                                  |   4 +-
 utils/heartBehavior.js                        |   5 ++-
 11 files changed, 50 insertions(+), 27 deletions(-)
 create mode 100644 subpages/heart/images/ic_dangbiaoqian.png

diff --git a/images/mine/ic_dangbiaoqian.png b/images/mine/ic_dangbiaoqian.png
index 4103137f56cdbee267679cf192cacb37a86e2283..f2997d4e44c45cc5ae384fa4e6551bba6250a7fc 100644
GIT binary patch
literal 17178
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
P1i;;8HK)`$aQnXjWLPTB

literal 1426
zcmY+Cdr%Wc9LFyY67#r6Lc(1x1fd0s2x?JKw4;Lx7^{>5TBzbEDri#`A4Th{Dn16$
zL2Vt7wiXoY3#qnNd@-m{tTc+14k1{^8AWt>jetZ+Zg;yE{_4%%-fw^V`+a`j-`?gY
zB_@z+UQG}LX`MYQ8GkwP9U;TB<J^M=f{@-!nwuJzkTVzXw4ES2cmf;1%m4!;8a#~%
zLR^Z21_s(=Cb3g6QJ8=|h!tZ*4-VjIkJonjs(^{aDX&;U;2FV$1H@fq&<Gg9Gf!}?
z*YnOuc}x_>dLaz1C5Y8ApB^-*hgdBbO9Ga5@uXlPVI=t!Cq|NQc^&5T>U22XW6}y{
zsz)!1@t7DlOJTChtU`J{;;4R_@bDC(v1|&H5vN5KwWyQRid8rYVW~WWj7GeLm3X@t
zmO;7w#d8=Ij8g=bMt&NPS>xeJV4_8xCc1_odh~j?n20^NG>rl<cDNlHundj?c<Ds}
zBLjTJ?!>|B@C?ULAdDK|w76e54r7@iRwL@UAO}I-M9kzwo#OdVB;Ob{Zm~28M$&?T
z!A3tx4xhZ6SBsJ`kfYIE8LE?_JJR7=*bk2>&~+I)FGm$})G7h<G;pyBW~x902|_8r
zFt9)&mcTzH*ee@L9Y+B_27Ew+iI~ZNKpOZmU^EQ^XfT07_oUFK0`XdqtQ859Ncg=E
z@Mqxe5x5J8clRsdBPsk!1(&PQpHgU-qPGO9mcarguxddV4I(LcSb=_%gPA0JB7sMh
z@VEkuqEVRwmHQxv1Ozd-9rQ$knj|n^i5eyFpb|Zkz#;|2UA!b<r5xUn&-^UZf$!q2
zjme2AM5m8hcntxRyl5X1VxKOO^aLHWpY-hQGOvf4y5u*n$oqZD!Dk^WKx@0K-hIOq
z4zevDgAp*Gf%ch}L3QU%>i4IjRJ(PBe}(azr?<{AKi3)y%RJJwEZ4DtjqkBDrxg7H
z<kZ@Wmz=uPP3JoI0HFhdw=IKR02nVo7$HFD`Odi*0B&VcZ+WKSc5`Hv`!R&D_v{%w
zLkIwVAw>Uw;FzH?69_`mV4W448rryQ{F^0@eymuU_1LlYAKM*5a=z(j+XTB~VpLaB
zN7nN8l9<2i&MwYRk8ZqTQy22Ji!8FihA3O}ml-vy>-Rj|m$?e1R+scfrI<SUa)`Z-
zHEmx%7p{NX)oM(ezj^1j+?ajVgMoeXSl34_RWG~quj+HD!!x$a_H~4nzB^Lj=(V)n
z{N_&hhKO80zf$cd(RoYD-jxhat(?BYCEPxLTC;U?OpDVQ(_DAp!|~adE1g%K-!C{r
z)0K<XH61O=lLhNW-U}?gTb=dbA@FRn+^X5)Jel!%cz1Vrw=FG%<I3AhuJ%-~&-Sz>
zR2A9REMLYdOMZ_J-L)$yrF=`<<)$K+C2hx`y{}$Pm8SdKf|qezWPd@kW!jd`{)>NX
z$gOJb|1~e<TKle`Q%AP09H@_2Xn%0%P}iI$XKcW_{Mqt3drn`jczS7jts*-5>iWYk
zo6q)5y&f+KDL$PZ`>&s|J~GZ4lrYw&o2twS+%RQ-Mf&@vic<oA@((Uu)tJ4aRz>a@
z9dms4i&w$v8H&VF^B2Y{Cg%(+c)cz=^R|4hbjpbUZOhJaHO1@#)$~tSFRjp*={vXm
q&=NdZcCGf<r7x^n0~zltC00&5F?P)=dmz4@gf%X4R^^N(yZ-~JB#aUO

diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml
index 93d9683..451c0f2 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxml
+++ b/pages/heartNew/components/volunteer/volunteer.wxml
@@ -1,6 +1,6 @@
 <view class="item">
-    <image data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
-    <view class="name">{{volunteerItemObj.nickname}}</view>
+    <image class="head-logo" data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
+    <view class="name"><view>{{volunteerItemObj.nickname}}</view><image class="dangbiao" src="../../../../images/mine/ic_dangbiaoqian.png" wx:if="{{volunteerItemObj.partyFlag == '1'}}"  /></view>
     <view class="autograph">{{volunteerItemObj.volunteerSignature}}</view>
 </view>
 <!-- <view class="show">*按姓氏拼音排序</view> -->
\ No newline at end of file
diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss
index 8975c93..8031136 100644
--- a/pages/heartNew/components/volunteer/volunteer.wxss
+++ b/pages/heartNew/components/volunteer/volunteer.wxss
@@ -10,7 +10,7 @@
   align-items: center;
 }
 
-.item image {
+.item .head-logo {
   width: 110rpx;
   height: 110rpx;
   border-radius: 50%;
@@ -22,8 +22,14 @@
   font-size: 30rpx;
   font-weight: bold;
   color: rgba(51, 51, 51, 1);
+  display: flex;
+  align-items: center;
+}
+.item .name .dangbiao {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
 }
-
 .item .autograph {
   margin-top: 10rpx;
   font-size:26rpx;
diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index 644b290..1785ada 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -61,7 +61,7 @@ Page({
     detailId: '', // 通过分享进入 团购详情的id
     scanBtn: {}, // 扫码签到改为可配置
     shouye: {}, 
-    // applyBtn: {}, // 申请发单改为可配置
+    applyBtn: {}, // 申请发单改为可配置
   },
 
   /**
diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml
index c7794d0..3b3c3db 100644
--- a/pages/heartNew/heartNew.wxml
+++ b/pages/heartNew/heartNew.wxml
@@ -117,7 +117,7 @@
 <view class="details-top" hidden="{{jingcai}}">
   <activity bind:toActDetail="toActDetailDown" id="state-2" state="2"></activity>
 </view>
-<!-- <move-btn 
+<move-btn 
         wx:if="{{applyBtn.imgUrl}}"
         area-top="120"
         area-height="90%"
@@ -126,7 +126,7 @@
         button-top="850" 
         button-left="520" 
         img-url="{{applyBtn.imgUrl}}" 
-        bindmovebtnCallBack="myApply"></move-btn> -->
+        bindmovebtnCallBack="myApply"></move-btn>
 <move-btn 
         wx:if="{{scanBtn.imgUrl && btnTop!=0}}"
         area-top="120"
diff --git a/subpages/heart/images/ic_dangbiaoqian.png b/subpages/heart/images/ic_dangbiaoqian.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2997d4e44c45cc5ae384fa4e6551bba6250a7fc
GIT binary patch
literal 17178
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
P1i;;8HK)`$aQnXjWLPTB

literal 0
HcmV?d00001

diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
index 63b17df..af153c2 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js
@@ -49,6 +49,7 @@ Page({
   onTabChange (e) {
     this.setData({
       selectTab: e.currentTarget.dataset.tab,
+      pageNo: 1
     })
 
     if (e.currentTarget.dataset.tab == "tab2") {
@@ -59,6 +60,7 @@ Page({
     } else {
       this.setData({
         jilu: true,
+        loveRankingList: [],
       })
       this.loadLoveRanking()
     }
@@ -100,24 +102,30 @@ Page({
   // 加载 爱心互助排行榜
   loadLoveRanking () {
     this.setData({
-      loveRankingList: [],
+      // loveRankingList: [],
       preloadVisible: true
     })
-    api.leaderboard().then(res => {
+    const para = {
+      pageIndex: this.data.pageNo,
+      pageSize: this.data.pageSize
+    }
+    api.leaderboard(para).then(res => {
       this.setData({
         datalenght: res.data.length
       })
-      res.data.forEach((item) => {
-        this.data.loveRankingList.push(item)
-      })
+      // res.data.forEach((item) => {
+      //   this.data.loveRankingList.push(item)
+      // })
       this.setData({
-        loveRankingList: this.data.loveRankingList,
+        loveRankingList: [ ...this.data.loveRankingList, ...res.data ],
+        loadMoreType: res.data.length === 10 ? "loading" : "none",
         preloadVisible: false
       })
     }).catch(() => {
       this.setData({
         datalenght:0,
         loveRankingList: [],
+        loadMoreType: "none",
         preloadVisible: false
       })
     })
@@ -182,16 +190,18 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    if(this.data.selectTab == "tab2"){
+    this.setData({
+      loadMoreVisible: true
+    })
+    if (this.data.loadMoreType === "loading") {
       this.setData({
-        loadMoreVisible: true
+        pageNo: this.data.pageNo + 1
       })
-      if (this.data.loadMoreType === "loading") {
-        this.setData({
-          pageNo: this.data.pageNo + 1
-        })
-        this.getSignedList()
-      }
+    }
+    if(this.data.selectTab == "tab2"){
+      this.getSignedList()
+    } else {
+      this.loadLoveRanking()
     }
   },
   // 列表 下拉刷新, 初始化加载
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
index e3d1969..e0ad357 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
@@ -27,7 +27,7 @@
             {{index + 1}}</view>
           <image class="avatar" src="{{item.faceImg}}" />
           <view class="info">
-            <view class="name">{{item.nickname}}</view>
+            <view class="name"><view>{{item.nickname}}</view><image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}"/></view>
             <view class="info-detail">
               <image class="heart-time" src="../../images/aixin.png"></image>
               <view> 爱心时长 {{item.kindnessTime}}小时</view>
diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
index 67a7db2..faa2181 100644
--- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
+++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
@@ -171,8 +171,14 @@ button::after {
     display: -webkit-box;
     -webkit-line-clamp: 1;
     -webkit-box-orient: vertical;
+    display: flex;
+    align-items: center;
+}
+.bottom .list-item .info .name image {
+    width: 30rpx;
+    height: 30rpx;
+    margin-left: 10rpx;
 }
-
 .bottom .list-item .info .info-detail {
     font-size: 24rpx;
     color: #999;
diff --git a/utils/api.js b/utils/api.js
index 1fe14ee..bb8a2ec 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -337,8 +337,8 @@ function userPointsRankinglist ({
 /**
  * 排行榜
  */
-function leaderboard () {
-  return fly.get("heart/volunteer/leaderboard")
+function leaderboard (param) {
+  return fly.get("heart/volunteer/leaderboard", param)
 }
 /**
  * 活动详情
diff --git a/utils/heartBehavior.js b/utils/heartBehavior.js
index 1d55407..6c84cac 100644
--- a/utils/heartBehavior.js
+++ b/utils/heartBehavior.js
@@ -84,9 +84,10 @@ module.exports = Behavior ({
                 scanBtn: item
               })
             } else if (item.imgType == '9') {
-              this.data.tabList.push(item)
+              // this.data.tabList.push(item)
               this.setData({
-                tabList: this.data.tabList
+                // tabList: this.data.tabList
+                applyBtn: item
               })
             }
           })