From b24154ec0d0863457f253ff20a87c8ff6de1b839 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 4 Jun 2020 18:18:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/home/pages/noticeNew/noticeNew.js    |  5 +++-
 subpages/integralCentre/pages/index/index.js  |  2 +-
 .../integralCentre/pages/index/index.wxml     | 13 +++++-----
 .../integralCentre/pages/index/index.wxss     | 25 ++++++++++++++++++-
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/subpages/home/pages/noticeNew/noticeNew.js b/subpages/home/pages/noticeNew/noticeNew.js
index 8c315aa..2308345 100644
--- a/subpages/home/pages/noticeNew/noticeNew.js
+++ b/subpages/home/pages/noticeNew/noticeNew.js
@@ -68,9 +68,12 @@ Page({
     }
     this.setData({
       selectTab: e.currentTarget.dataset.tab,
+      pageIndex: 1,
+      pageSize: 10,
       noticelist: [],
       loadMoreType: 'loading',
       loadMoreVisible: true,
+      nodata: false,
     })
 
     this.noticelist();
@@ -123,7 +126,7 @@ Page({
         pageIndex: this.data.pageIndex + 1,
         pageSize: this.data.pageSize,
       })
-      this.deptinfolist();
+      this.noticelist();
     }
   },
 
diff --git a/subpages/integralCentre/pages/index/index.js b/subpages/integralCentre/pages/index/index.js
index b5b0c36..e48561f 100644
--- a/subpages/integralCentre/pages/index/index.js
+++ b/subpages/integralCentre/pages/index/index.js
@@ -97,7 +97,7 @@ Page({
     let that = this
     const para = {
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       timestamp: this.data.timestamp,
       rankingType: this.data.rankingType, //排名方式：0-周，1-月
     }
diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml
index 34a1657..a69f7e4 100644
--- a/subpages/integralCentre/pages/index/index.wxml
+++ b/subpages/integralCentre/pages/index/index.wxml
@@ -17,11 +17,11 @@
         {{item.name}}
       </button>
     </view>
-    <view class="ph-list">
+    <view class="ph-list" wx:if="{{pointsRankingUser}}">
       <view class="left">
         <!-- 左边图片 -->
         <view class="left-img">
-          <view class="list-number_">{{pointsRankingUser.rank}}</view>
+          <view class="list-list-number_frist">{{pointsRankingUser.rank}}</view>
         </view>
         <!-- 名字 -->
         <view class="list-name">{{pointsRankingUser.realName}}</view>
@@ -34,12 +34,13 @@
       <view class="left">
         <!-- 左边图片 -->
         <view class="left-img">
-          <image class="img-bg" wx:if="{{index == 0}}" src="../../images/first.png"></image>
+          <!-- <image class="img-bg" wx:if="{{index == 0}}" src="../../images/first.png"></image>
           <image class="img-bg" wx:elif="{{index == 1}}" src="../../images/second.png"></image>
-          <image class="img-bg" wx:elif="{{index == 2}}" src="../../images/third.png"></image>
+          <image class="img-bg" wx:elif="{{index == 2}}" src="../../images/third.png"></image> -->
           <!-- <image class="img-bg" wx:else src="../../images/fourth.png"></image> -->
-          <view wx:if="{{index < 3}}" class="list-number">{{item.rank}}</view>
-          <view wx:else class="list-number_">{{item.rank}}</view>
+          <!-- <view wx:if="{{index < 3}}" class="list-number">{{item.rank}}</view> -->
+
+          <view class="{{index < 3 ? 'list-list-number_frist' : 'list-number_'}} {{index===0 ? 'color1_' : index===1 ? 'color2_' : index===2 ? 'color2_' : ''}}">{{item.rank}}</view>
         </view>
         <!-- 名字 -->
         <view class="list-name">{{item.realName}}</view>
diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss
index 1a72390..6b09a26 100644
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@@ -263,7 +263,30 @@ button::after {
   margin-top: 3rpx;
   margin-left: 1rpx;
 }
-
+.list-number_frist{
+  position: relative;
+  z-index: 100;
+  width: 100%;
+  height: 38rpx;
+  line-height: 38rpx;
+  text-align: center;
+  font-size:38rpx;
+  font-weight:bold;
+  font-style:italic;
+  color:rgba(51,51,51,1);
+}
+.color1_{
+  color:#d42e31;
+  text-align: center;
+}
+.color2_{
+  color:#dd5800;
+  text-align: center;
+}
+.color3_{
+  color:#ffa800;
+  text-align: center;
+}
 .list-number_ {
   position: relative;
   z-index: 100;