申请发单按钮移至页面下方悬浮；

pages/heartNew/components/volunteer/volunteer.wxml

@@ -1,6 +1,6 @@
 <view class="item">
-    <image data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
+    <image class="head-logo" data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
-    <view class="name">{{volunteerItemObj.nickname}}</view>
+    <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> -->

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;

pages/heartNew/heartNew.js

@@ -61,7 +61,7 @@ Page({
     detailId: '', // 通过分享进入 团购详情的id
     scanBtn: {}, // 扫码签到改为可配置
     shouye: {}, 
-    // applyBtn: {}, // 申请发单改为可配置
+    applyBtn: {}, // 申请发单改为可配置
   },
 
   /**

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"

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) => {
+      // res.data.forEach((item) => {
-        this.data.loveRankingList.push(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({
+    if(this.data.selectTab == "tab2"){
-          pageNo: this.data.pageNo + 1
+      this.getSignedList()
-        })
+    } else {
-        this.getSignedList()
+      this.loadLoveRanking()
-      }
     }
   },
   // 列表 下拉刷新, 初始化加载

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>

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;

utils/api.js

@@ -337,8 +337,8 @@ function userPointsRankinglist ({
 /**
  * 排行榜
  */
-function leaderboard () {
+function leaderboard (param) {
-  return fly.get("heart/volunteer/leaderboard")
+  return fly.get("heart/volunteer/leaderboard", param)
 }
 /**
  * 活动详情

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
               })
             }
           })