From 0b62a0c6486a586e4ed8be509104524366723026 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 8 May 2020 16:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/integralCentre/pages/index/index.js  | 12 +++++++----
 .../integralCentre/pages/index/index.wxml     |  7 +++++--
 .../integralCentre/pages/index/index.wxss     | 21 +++++++++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js
index 57ca0ca..6f1bdba 100644
--- a/subpages/integralCentre/pages/index/index.js
+++ b/subpages/integralCentre/pages/index/index.js
@@ -172,13 +172,17 @@ Page({
       loadMoreVisible: true
     })
     if (this.data.loadMoreType === 'loading') {
-      console.log('加载翻页')
       this.setData({
-        pageNo: this.data.pageNo + 1,
+        pageIndex: this.data.pageIndex + 1,
         pageSize: this.data.pageSize,
-        pageIndex: getTimestamp()
+        timestamp: this.data.timestamp,
       })
-      this.pointsRecordlist()
+
+      if (this.data.selectTab == 'tab1') {
+        this.pointsRecordlist(); //初始化加载积分记录列表
+      } else {
+        this.pointsRankinglist(); //积分排行
+      }
     }
   },
 
diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml
index b7a307d..74fb98b 100644
--- a/subpages/integralCentre/pages/index/index.wxml
+++ b/subpages/integralCentre/pages/index/index.wxml
@@ -14,7 +14,7 @@
     <view class="jf-title">
       <view class="jf-title-item">事件名称</view>
       <view class="jf-title-item">积分</view>
-      <view class="jf-title-item">时间</view>
+      <view class="jf-title-item-last">时间</view>
     </view>
     <!-- 积分记录列表 -->
     <view class="jf-list" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{pointsRecordlist}}" data-id="{{item.id}}">
@@ -22,7 +22,7 @@
       <view class="jf-list-li color2">
         <text wx:if="{{item.operationType == 0}}">-</text>
         <text wx:else>+</text>{{item.points}}</view>
-      <view class="jf-list-li color1">{{item.operationTime}}</view>
+      <view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view>
     </view>
   </block>
   <!-- 积分排行 -->
@@ -48,4 +48,7 @@
       <view class="right">{{item.points}}</view>
     </view>
   </block>
+
+  <!--加载更多提示-->
+  <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 </view>
\ No newline at end of file
diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss
index 7d44319..0342351 100644
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@@ -88,7 +88,16 @@
 }
 
 .jf-title .jf-title-item {
-  width: 33.3333%;
+  width: 30%;
+  height: 80rpx;
+  font-size: 30rpx;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+  line-height: 80rpx;
+}
+
+.jf-title .jf-title-item-last {
+  width: 40%;
   height: 80rpx;
   font-size: 30rpx;
   font-weight: bold;
@@ -106,7 +115,15 @@
 }
 
 .jf-list .jf-list-li {
-  width: 33.3333%;
+  width: 30%;
+  height: 80rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  line-height: 80rpx;
+}
+
+.jf-list .jf-list-li.jf-list-li-last {
+  width: 40%;
   height: 80rpx;
   font-size: 30rpx;
   font-weight: 500;