版本 1.7.1 替换党标；

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="faceImg" data-src="{{volunteerItemObj.faceImg}}" bindtap="preViewImage" src="{{volunteerItemObj.faceImg}}" />
-    <view class="name">{{volunteerItemObj.nickname}}</view>
+    <view class="name"><view>{{volunteerItemObj.nickname}}</view><image 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 .faceImg {
   width: 110rpx;
   height: 110rpx;
   border-radius: 50%;
@@ -22,6 +22,13 @@
   font-size: 30rpx;
   font-weight: bold;
   color: rgba(51, 51, 51, 1);
+  display: flex;
+  align-items: center;
+}
+.item .name image {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
 }
 
 .item .autograph {

pages/heartNew/heartNew.js

@@ -53,7 +53,7 @@ Page({
     btnLeft: 0,
     shouye: {}, 
     scanBtn: {}, // 扫码签到改为可配置
-    // applyBtn: {}, // 申请发单按钮改为可配置,
+    applyBtn: {}, // 申请发单按钮改为可配置,
   },
 
   /**

pages/heartNew/heartNew.wxml

@@ -116,7 +116,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%"
@@ -125,7 +125,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"

pages/mine/components/topicItemNew/topicItemNew.wxml

@@ -2,7 +2,7 @@
 	<view class="user-info">
 		<image src="{{topicObj.userFace}}"></image>
 		<view class="name-date">
-			<view class="name">{{topicObj.nickname}}</view>
+			<view class="name"><view>{{topicObj.nickname}}</view><image src="../../../../images/mine/ic_dangbiaoqian.png" wx:if="{{topicObj.partyMember == '1'}}" /></view>
 			<view class="date">{{topicObj.createdTime}}</view>
 		</view>
 	</view>

pages/mine/components/topicItemNew/topicItemNew.wxss

@@ -30,8 +30,14 @@
   font-size: 28rpx;
   font-weight: bold;
   color: rgba(51, 51, 51, 1);
+  display: flex;
+  align-items: center;
+}
+.user-info .name-date .name image {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
 }
-
 .user-info .name-date .date {
   font-size: 20rpx;
   font-weight: 500;

pages/mine/mine.wxml

@@ -10,11 +10,14 @@
               <image class="avatar-content" src="{{userInfo.faceImg}}" />
             </view>
             <view class="right">
-              <view class="nickname">{{userInfo.nickname}}</view>
+              <view class="nickname">
-              <view class="party-flag" wx:if="{{userInfo.partyFlag == '1'}}">
+                <view>{{userInfo.nickname}}</view>
+                <image src="../../images/mine/ic_dangbiaoqian.png" class="dangbiao" wx:if="{{userInfo.partyFlag == '1'}}"/>
+              </view>
+              <!-- <view class="party-flag" wx:if="{{userInfo.partyFlag == '1'}}">
                 <view>党员</view>
                 <image src="../../images/mine/ic_dangbiaoqian.png" />
-              </view>
+              </view> -->
             </view>
           </view>
           <view class="right-enter">

pages/mine/mine.wxss

@@ -92,6 +92,8 @@ page {
 .personal-info .box .content .top .right .nickname {
   font-size: 30rpx;
   color: #fff;
+  display: flex;
+  align-items: center;
 }
 .personal-info .box .content .top .right .party-flag {
   width: 72rpx;
@@ -103,6 +105,11 @@ page {
   align-items: center;
   margin-top: 10rpx;
 }
+.personal-info .box .content .top .right .dangbiao {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 8rpx;
+}
 .personal-info .box .content .top .right .party-flag view {
   color: #FD1D11;
   font-size: 18rpx;

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.42"
+    const versionNum = "1.7.1"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

subpages/association/pages/topicDetail/topicDetail.wxml

@@ -63,7 +63,7 @@
       <view class="identify">
         <view class="identify-top">
           <view class="nickname">{{detailInfo.nickname}}</view>
-          <!-- <image class="party-flag" wx:if="{{detailInfo.partyFlag == '1'}}" src="../../images/ic_dangbiaoqian.png" /> -->
+          <image class="party-flag" wx:if="{{detailInfo.partyMember == '1'}}" src="../../images/ic_dangbiaoqian.png" />
         </view>
         <view class="identify-bottom">{{detailInfo.createdTime}}</view>
       </view>

subpages/associationNew/components/membersList/membersList.wxml

@@ -9,6 +9,7 @@
     <view class="item-top">
       <image class="head-icon" src="{{item.userAvatar}}"></image>
       <text class="user-name">{{item.nickname}}</text>
+      <image wx:if="{{item.partyMember === '1'}}" class="identity-logo dangbiao" src="../../images/ic_dangbiaoqian.png"></image>
       <image wx:if="{{item.identityFlag === '0'}}" class="identity-logo identity0" src="../../images/leader-logo@2x.png"></image>
       <image wx:if="{{item.identityFlag === '1'}}" class="identity-logo identity1" src="../../images/leader2-logo@2x.png"></image>
       <image wx:if="{{item.thisCommunity === '1'}}" class="identity-logo this-community" src="../../images/resident@2x.png"></image>

subpages/associationNew/components/membersList/membersList.wxss

@@ -37,6 +37,9 @@
     height: 28rpx;
     margin-left: 8rpx;
 }
+.members-item .item-top .dangbiao {
+    width: 28rpx;
+}
 .members-item .item-top .identity0{
     width: 59rpx;
 }

subpages/associationNew/components/membersListNew/membersListNew.wxml

@@ -3,7 +3,7 @@
     <block wx:for="{{gOfficialsList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
       <view class="item" wx:if="{{index%2==0}}">
         <image class="photo" data-src="{{item.faceImg}}" bindtap="preViewImage" src="{{item.faceImg}}" />
-        <view class="name">{{item.name}}</view>
+        <view class="name"><view>{{item.name}}</view><image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}" /></view>
         <view class="autograph-all">
   
           <view class="autograph">格言：{{item.motto}}</view>
@@ -26,7 +26,7 @@
     <block wx:for="{{gOfficialsList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
       <view class="item" wx:if="{{index%2==1}}">
         <image class="photo" data-src="{{item.faceImg}}" bindtap="preViewImage" src="{{item.faceImg}}" />
-        <view class="name">{{item.name}}</view>
+        <view class="name"><view>{{item.name}}</view><image src="../../images/ic_dangbiaoqian.png" wx:if="{{item.partyFlag == '1'}}" /></view>
         <view class="autograph-all">
   
           <view class="autograph">格言：{{item.motto}}</view>

subpages/associationNew/components/membersListNew/membersListNew.wxss

@@ -23,8 +23,14 @@
   line-height: 30rpx;
   font-weight: bold;
   color: rgba(51, 51, 51, 1);
+  display: flex;
+  align-items: center;
+}
+.item .name image {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
 }
-
 .item .autograph-all {
   margin-top: 13rpx;
   width: 100%;

subpages/associationNew/pages/eventlist/eventlist.wxml

@@ -4,9 +4,11 @@
 </view>
 <view class="item-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{topiclist}}">
 	<view class="user-info">
-		<image src="{{item.userFace}}"></image>
+		<image class="head-logo" src="{{item.userFace}}"></image>
 		<view class="name-date">
-			<view class="name">{{item.nickname}}
+			<view class="name">
+				{{item.nickname}}
+				<image class="dang-logo" wx:if="{{item.partyMember == '1'}}" src="../../images/ic_dangbiaoqian.png"></image>
 				<image class="community-logo" wx:if="{{item.thisCommunity == '1'}}" src="../../images/resident@2x.png"></image>
 				<image class="top-logo" wx:if="{{item.topFlag == '1'}}" src="../../images/top-flag.png"></image>
 			</view>
@@ -82,7 +84,7 @@
 <no-data isShow="{{nodata}}"></no-data>
 <!-- 是否禁言 0：否 1：是 -->
 
-<move-btn wx:if="{{bannedFlag == '0'}}" button-width="178" button-height="178" button-top="650" button-left="560"
+<move-btn wx:if="{{bannedFlag != '1'}}" button-width="178" button-height="178" button-top="650" button-left="560"
 		img-url="/subpages/associationNew/images/new_topic.png"
 		bindmovebtnCallBack="navigateToAddTopic"></move-btn>
 			 

subpages/associationNew/pages/eventlist/eventlist.wxss

@@ -12,12 +12,12 @@ page {
 
 .user-info {
   /* width: calc(100% - 58rpx); */
-  height: 64rpx;
+  /* height: 64rpx; */
   display: flex;
   align-items: center;
 }
 
-.user-info image {
+.user-info .head-logo {
   border-radius: 50rpx;
   width: 64rpx;
   height: 64rpx;
@@ -34,8 +34,7 @@ page {
   font-size: 28rpx;
   /* font-weight: bold; */
   color: rgba(51, 51, 51, 1);
-  display: flex;
+  width: 600rpx;
-  align-items: center;
 }
 
 .user-info .name-date .community-logo {
@@ -51,6 +50,11 @@ page {
   margin-left: 8rpx;
   border-radius: 0px;
 }
+.user-info .name-date .dang-logo {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 8rpx;
+}
 .user-info .name-date .date {
   font-size: 20rpx;
   font-weight: 500;

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,6 +171,13 @@ 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 {

utils/api.js

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

utils/config.js

@@ -8,7 +8,7 @@ module.exports = {
 function BASEURL() {
   // return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境
   return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
-  // return 'http://10.10.10.91:9094/epdc-api/api/'
+  // return 'http://192.168.43.49:9094/epdc-api/api/'
   // return 'https://nei.netease.com/api/apimock-v2/068b11343b2a993a9292d11f4b3fa8a8/api/'
 }
 

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