版本1.7.5 志愿者银行增加公益积分记录

pages/toRegister/toRegister.js

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

subpages/heart/pages/leaderboardNew/leaderboardNew.js

@@ -57,6 +57,10 @@ Page({
       {
         id: '2',
         label: '公益积分'
+      },
+      {
+        id: '3',
+        label: '公益积分记录'
       }
     ]
   },
@@ -117,6 +121,10 @@ Page({
   },
   // 加载 爱心互助排行榜
   loadLoveRanking () {
+    if (this.data.rankId == '3') {
+      this.getCharityPoints()
+      return
+    }
     this.setData({
       // loveRankingList: [],
       preloadVisible: true
@@ -317,4 +325,35 @@ Page({
     })
     this.loadLoveRanking()
   },
+  // 加载 公益积分记录
+  getCharityPoints () {
+    this.setData({
+      // loveRankingList: [],
+      preloadVisible: true
+    })
+    const para = {
+      pageIndex: this.data.pageNo,
+      pageSize: this.data.pageSize
+    }
+    api.getCharityPoints(para).then(res => {
+      this.setData({
+        datalenght: res.data.length
+      })
+      // res.data.forEach((item) => {
+      //   this.data.loveRankingList.push(item)
+      // })
+      this.setData({
+        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
+      })
+    })
+  },
 })

subpages/heart/pages/leaderboardNew/leaderboardNew.wxml

@@ -16,17 +16,17 @@
   </view>
   <!-- 积分排行 -->
   <block wx:if="{{selectTab === 'tab1'}}">
-    <view class="bottom padding">
+    <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>
+    <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}}">
-        <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>
+      <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>
@@ -50,7 +50,18 @@
           </view>
         </view>
       </block>
-
+      <block wx:elif="{{loveRankingList.length > 0 && rankId == '3'}}">
+        <view class="list-item-2" wx:for-item="item" wx:key="index" wx:for-index="index" wx:for="{{loveRankingList}}">
+          <view class="act-title">{{item.actName}}</view>
+          <view class="act-desc">
+            <view class="time">{{item.operationTime}}</view>
+            <view class="option {{item.operationType == '0' ? 'option-green' : 'option-red'}}">
+              <view class="type">{{item.operationType == '0' ? '-' : '+'}}</view>
+              <view class="point">{{item.volunteerPoints}}</view>                
+            </view>
+          </view>
+        </view>
+      </block>
       <block wx:if="{{datalenght == 0}}">
         <view class="project-nodata">
           <image class="nodata-image" src="../../../../images/mine/project-nodata.png" />

subpages/heart/pages/leaderboardNew/leaderboardNew.wxss

@@ -100,12 +100,12 @@ button::after {
 .bottom {
     width: 100%;
     box-sizing: border-box;
-    background: #f7f7f7;
+    background: #ffffff;
     /* margin-top: 4rpx; */
     /* padding: 0 30rpx; */
 }
 .padding{
-    /* padding: 0 30rpx; */
+    padding: 0 30rpx;
 }
 
 
@@ -125,12 +125,10 @@ button::after {
     display: flex;
     align-items: center;
     background-color: #fff;
-    box-sizing: border-box;
-    padding: 0 30rpx;
 }
 
 .bottom .list-item+.list-item {
-    border-top: 1rpx solid #e5e5e5;
+    border-top: 1px solid #e5e5e5;
 }
 
 .bottom .list-item .num {
@@ -297,12 +295,52 @@ button::after {
     color: #333333;
     min-width: 140rpx;
     text-align: center;
-    height: 52rpx;
-    line-height: 52rpx;
+    height: 48rpx;
+    line-height: 48rpx;
 }
 .volunteer-tag .sel {
     border: 1px solid #da433d;
     background-color: #da433d;
     color: #fff;
     font-weight: bold;
+}
+.bottom .list-item-2 {
+    width: 100%;
+    height: 160rpx;
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-around;
+    background-color: #fff;
+    flex-direction: column;
+}
+
+.bottom .list-item-2+.list-item-2 {
+    border-top: 1px solid #e5e5e5;
+}
+.bottom .list-item-2 .act-title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-wrap:break-word;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    display: -webkit-box;  
+    font-size: 32rpx;  
+}
+.bottom .list-item-2 .act-desc {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 28rpx;
+    color: #999;
+}
+.bottom .list-item-2 .act-desc .option {
+    display: flex;
+}
+.bottom .list-item-2 .act-desc .option-green {
+    color: #32a332;
+}
+.bottom .list-item-2 .act-desc .option-red {
+    color: #da433d;
 }

utils/api.js

@@ -72,7 +72,8 @@ module.exports = {
   suggestDict: suggestDict,
   suggestDictList: suggestDictList,
   suggestDetail: suggestDetail,
-  getVolunteerDepts: getVolunteerDepts
+  getVolunteerDepts: getVolunteerDepts,
+  getCharityPoints: getCharityPoints
 }
 
 function getToken (wxCode) {
@@ -632,4 +633,8 @@ function suggestDetail (id) {
 //志愿者注册-志愿者部门列表
 function getVolunteerDepts () {
   return fly.get(`app-user/volunteer/depts`)
+}
+//志愿者银行-公益积分记录
+function getCharityPoints (para) {
+  return fly.get(`points/charityPoints`, para)
 }