From 3650c29599cbf2238e31b91b10ac4281bfcb4938 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 9 Sep 2020 16:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/index/components/notice/notice.wxml |  2 +-
 .../pages/index/components/notice/notice.wxss |  4 +--
 .../pages/index/components/sudoku/sudoku.js   |  6 ++--
 .../pages/index/components/sudoku/sudoku.wxml |  6 ++--
 epdc-resident-mp-yushan/pages/index/index.js  | 29 +++++++++++++++----
 .../pages/index/index.wxml                    | 10 +++++--
 .../pages/index/index.wxss                    | 14 ++++++++-
 7 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml
index c43d4ad..e23ea5d 100644
--- a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml
+++ b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxml
@@ -1,7 +1,7 @@
 <view class="notice" bindtap="navigateToInfoList">
   <view class="border-content">
     <image class="notice-logo" src="../../../../images/home/notice-logo.png" />
-    <image class="info-note" src="../../../../images/home/info-note.png" />
+    <image class="info-note" src="../../../../images/home/info-notice.png" />
     <swiper circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" vertical="{{true}}">
       <swiper-item
         wx:for="{{infoList}}"
diff --git a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss
index 9825e8a..e5c835d 100644
--- a/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss
+++ b/epdc-resident-mp-yushan/pages/index/components/notice/notice.wxss
@@ -20,8 +20,8 @@
   margin-left: -80rpx;
 }
 .notice .info-note {
-  width: 58rpx;
-  height: 30rpx;
+  width: 90rpx;
+  height: 23rpx;
   margin: 5rpx 20rpx 0 10rpx;
 }
 .notice swiper {
diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js
index f290db2..d878a30 100644
--- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js
+++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.js
@@ -34,9 +34,9 @@ Component({
     navigateToSafe () {
       this.triggerEvent('navigateToSafe')
     },
-    // 跳转到政策法规
-    navigateToPolicy () {
-      this.triggerEvent('navigateToPolicy')
+    // 跳转到积分排行
+    navigateToIntegral () {
+      this.triggerEvent('navigateToIntegral')
     },
     // 跳转到综合服务
     navigateToSyntheticalService () {
diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
index b309fc9..d370a09 100644
--- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
+++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
@@ -16,9 +16,9 @@
       <image src="../../../../images/home/heart.png" />
       <view class="name">互帮互助</view>
     </view>
-    <view class="item" hover-stay-time="150" bindtap="navigateToPolicy">
-      <image src="../../../../images/home/policy.png" />
-      <view class="name">通知公告</view>
+    <view class="item" hover-stay-time="150" bindtap="navigateToIntegral">
+      <image src="../../../../images/home/integral.png" />
+      <view class="name">积分排行</view>
     </view>
     <view class="item" hover-stay-time="150"  bindtap="navigateToSafe">
       <image src="../../../../images/home/safe.png" />
diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js
index 4330a7b..dfcf7db 100644
--- a/epdc-resident-mp-yushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/pages/index/index.js
@@ -297,10 +297,24 @@ Page({
       url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=project&detailId=${e.detail.itemId}&showClassify=show`
     })
   },
-  // 跳转到消息列表
+  // 跳转到通知公告列表
   navigateToInfoList () {
+    wx.navigateTo({
+      url: '/subpages/home/pages/notice/notice'
+    })
+  },
+  // 跳转到消息页面
+  navigateToNotice(){
     wx.navigateTo({ url: '/subpages/home/pages/info/info' })
   },
+  // 消息没有数据
+  noMore () {
+    wx.showToast({
+      title: "暂无更多消息~",
+      icon: "none",
+      duration: 1000
+    })
+  },
   // 跳转到banner详情
   navigatetoBannerDetail (e) {
     const { id, url, newsFlag } = e.detail
@@ -314,10 +328,15 @@ Page({
       })
     } 
   },
-  //政策法规
-  navigateToPolicy(){
-    wx.navigateTo({
-      url: '/subpages/home/pages/notice/notice'
+  //积分排行
+  navigateToIntegral(){
+    api.getUserInfo().then(res => {
+      // console.log('用户信息', res)
+      wx.navigateTo({
+        url: "/subpages/integralCentre/pages/index/index?points=" + res.data.points
+      })
+    }).catch(err => {
+      console.log(err)
     })
   },
    //社区教育
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml
index 5ba002b..26d1d82 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/pages/index/index.wxml
@@ -13,6 +13,12 @@
       <view class="grid-name">{{departmentName}}</view>
       <image class="more-grid" src="../../images/home/right-sword.png" />
     </view>
+    <!-- 202.9.8 把原消息的入口放在这里了 -->
+    <view class="notice">
+      <image wx:if="{{infoList.length == 0}}" bindtap="noMore" src="../../images/home/no-notice.png"></image>
+      <image wx:elif="{{infoList.length > 0 && unReadNum == 0}}" bindtap="navigateToNotice" src="../../images/home/no-notice.png"></image>
+      <image wx:elif="{{infoList.length > 0 && unReadNum > 0}}" bindtap="navigateToNotice" src="../../images/home/yes-notice.png"></image>
+    </view>
   </view>
 
   <!-- banner列表 -->
@@ -21,7 +27,7 @@
     bannerList="{{bannerList}}">
   </banner>
 
-  <!--消息列表-->
+  <!--通知公告列表 注 以前是消息列表，通知公告需求还没有定下来，数据获取的还是消息的列表数据-->
   <notice
     bind:navigateToInfoList="navigateToInfoList" 
     infoList="{{infoList}}" 
@@ -37,7 +43,7 @@
     bind:navigateToHeart="navigateToHeart"
     bind:navigateToEducation="navigateToEducation"
     bind:navigateToSafe="navigateToSafe"
-    bind:navigateToPolicy="navigateToPolicy"
+    bind:navigateToIntegral="navigateToIntegral"
     bind:navigateToSynthetical="navigateToSynthetical">
   </sudoku>
 
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss
index 15c5b83..bdd8a47 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxss
+++ b/epdc-resident-mp-yushan/pages/index/index.wxss
@@ -38,6 +38,9 @@ page {
   width: 100%;
   height: 100rpx;
   position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 .belong-grid .belong-grid-bg {
   width: 100%;
@@ -48,13 +51,22 @@ page {
   z-index: 10;
 }
 .belong-grid .grid {
-  width: 100%;
+  width: calc(100% - 50rpx);
   height: 100%;
   position: relative;
   z-index: 100;
   display: flex;
   align-items: center;
 }
+.belong-grid .notice {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10px;
+}
+.belong-grid .notice image{
+  width: 40rpx;
+  height: 40rpx;
+}
 .belong-grid .grid .party-logo {
   width: 32rpx;
   height: 32rpx;