From f7208aaab0c8aec7da190154d4740461a7b140d0 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 11 May 2020 14:39:18 +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

---
 components/nodata/nodata.wxml                 |  2 +-
 pages/formid/formid.wxml                      |  2 +-
 pages/heart/heart.wxml                        |  2 +-
 pages/indexNew/indexNew.js                    | 20 +++++++++++++++++
 pages/indexNew/indexNew.wxml                  |  4 ++--
 pages/indexNew/indexNew.wxss                  |  2 +-
 .../integralCentre/pages/index/index.wxml     |  4 ++--
 .../integralCentre/pages/index/index.wxss     | 22 +++++++++++++++++--
 8 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/components/nodata/nodata.wxml b/components/nodata/nodata.wxml
index 2c2f61c..b729421 100644
--- a/components/nodata/nodata.wxml
+++ b/components/nodata/nodata.wxml
@@ -1,5 +1,5 @@
 <!--components/nodata/nodata.wxml-->
 <view class="box" wx:if="{{isShow}}">
-    <image src="../../images/nodata.png"  class="image"/>
+    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB71646bOAXiYnAAB-svV4uWY962.png"  class="image"/>
     <text class="text">暂无数据~</text>
 </view>
diff --git a/pages/formid/formid.wxml b/pages/formid/formid.wxml
index 93f05f7..74efad2 100644
--- a/pages/formid/formid.wxml
+++ b/pages/formid/formid.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <view class="card">
-    <image class="bgimg" src="../../images/ig_woyaozhuce.png"  mode="widthFix"/>
+    <image class="bgimg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB71646g-AZYGlAAEUd08fIHA552.png"  mode="widthFix"/>
     <view class="context2">
       <view class="context-title">欢迎加入</view>
       <view class="context-name">
diff --git a/pages/heart/heart.wxml b/pages/heart/heart.wxml
index 0607389..0f7b527 100644
--- a/pages/heart/heart.wxml
+++ b/pages/heart/heart.wxml
@@ -37,7 +37,7 @@
     </wux-tabs>
     <view class="top" bindtap="toLeaderboard">
       <view class="imgtop">
-        <image class="topimg" src="/images/top.png" />
+        <image class="topimg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB71646VqAUpWyAAAC6j5D3pU580.png" />
       </view>
       <view class="toptxt">爱心榜</view>
     </view>
diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index e71b3d9..5c18287 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -381,6 +381,25 @@ Page({
       url: `../association/association`
     })
   },
+  // 积分排名
+  gointegralCentre() {
+    api.getUserInfo().then(res => {
+      console.log('用户信息', res)
+      wx.navigateTo({
+        url: `../../subpages/integralCentre/pages/index/index?points=` + res.data.points
+      })
+    }).catch(err => {
+      console.log(err)
+    })
+
+  },
+
+  // 志愿者去哪
+  goheart() {
+    wx.navigateTo({
+      url: `../heart/heart`
+    })
+  },
   // 跳转我的
   toMine() {
     wx.navigateTo({
@@ -395,6 +414,7 @@ Page({
       duration: 1000
     })
   },
+
   //功能暂未开放
   nofunction() {
     wx.showToast({
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 965eea4..4a422cf 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -87,7 +87,7 @@
       <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BRGARAefAAGNonPzguk041.png'></image>
     </button>
     <view class="weui-btn-right">
-      <button bindtap="nofunction" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
+      <button bindtap="goheart" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
         <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161BqiAGT25AADji64eXU8518.png'></image>
       </button>
       <button bindtap="dqhd" class="weui-btn-top" form-type='submit' plain='true' hover-class="hover-btn">
@@ -115,7 +115,7 @@
   <!-- 九宫格 -->
   <view class="grid-new">
     <view class="grid-new-item">
-      <button bindtap="nofunction" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
+      <button  bindtap="gointegralCentre" class="grid-new-btn" form-type='submit' plain='true' hover-class="hover-btn">
         <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161B_qAe-m2AAChh4x0hS4857.png'></image>
       </button>
       <view class="grid-new-text">积分排名</view>
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index 8833d73..ad508c2 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -518,7 +518,7 @@ page {
 }
 
 .list-all .list-item:last-child {
-  border: none;
+  border-bottom: none;
 }
 
 .list-all .list-item .item-info {
diff --git a/subpages/integralCentre/pages/index/index.wxml b/subpages/integralCentre/pages/index/index.wxml
index cfced3d..fc71bab 100644
--- a/subpages/integralCentre/pages/index/index.wxml
+++ b/subpages/integralCentre/pages/index/index.wxml
@@ -39,13 +39,13 @@
 
     <view class="jf-title">
       <view class="jf-title-item">事件名称</view>
-      <view class="jf-title-item">积分</view>
+      <view class="jf-title-item-two">积分</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}}">
       <view class="jf-list-li color1">{{item.ruleDesc}}</view>
-      <view class="jf-list-li color2">
+      <view class="jf-list-li-two color2">
         <text wx:if="{{item.operationType == 0}}">-</text>
         <text wx:else>+</text>{{item.points}}</view>
       <view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view>
diff --git a/subpages/integralCentre/pages/index/index.wxss b/subpages/integralCentre/pages/index/index.wxss
index 0342351..898a55b 100644
--- a/subpages/integralCentre/pages/index/index.wxss
+++ b/subpages/integralCentre/pages/index/index.wxss
@@ -88,7 +88,17 @@
 }
 
 .jf-title .jf-title-item {
-  width: 30%;
+  width: 40%;
+  height: 80rpx;
+  font-size: 30rpx;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+  line-height: 80rpx;
+}
+
+
+.jf-title .jf-title-item-two {
+  width: 20%;
   height: 80rpx;
   font-size: 30rpx;
   font-weight: bold;
@@ -115,7 +125,15 @@
 }
 
 .jf-list .jf-list-li {
-  width: 30%;
+  width: 40%;
+  height: 80rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  line-height: 80rpx;
+}
+
+.jf-list .jf-list-li-two {
+  width: 20%;
   height: 80rpx;
   font-size: 30rpx;
   font-weight: 500;