From 91fc2cb85e2522fc7435ba5898677b8ae0bf3a69 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Wed, 29 Apr 2020 10:12:29 +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

---
 pages/indexNew/indexNew.js   | 26 ++++++++++++++++-----
 pages/indexNew/indexNew.wxml | 26 ++++++++++++++++++---
 pages/indexNew/indexNew.wxss | 45 ++++++++++++++++++++++++++++++++----
 3 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 26d74a1..02d8f02 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -325,10 +325,11 @@ Page({
     })
   },
   swiperChange: function(e) {
-    this.setData({
-      'options.currentSwiper': e.detail.current,
-      currentIndex: e.detail.current
-    })
+    if (e.detail.source === 'touch') {
+      this.setData({
+        currentIndex: e.detail.current
+      })
+    }
   },
   swiperChange2: function(e) {
     this.setData({
@@ -345,7 +346,6 @@ Page({
   },
   // 跳转我的消息
   toInfoList() {
-    console.log('ssssss')
     wx.navigateTo({
       url: '/subpages/home/pages/info/info'
     })
@@ -380,5 +380,19 @@ Page({
     wx.navigateTo({
       url: `../association/association`
     })
-  }
+  },
+  // 跳转我的
+  toMine() {
+    wx.navigateTo({
+      url: '../mine/mine'
+    })
+  },
+  // 暂未开通模块显示敬请期待
+  noMore() {
+    wx.showToast({
+      title: '暂无更多消息~',
+      icon: 'none',
+      duration: 1000
+    })
+  },
 })
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 35480f5..31a3467 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -14,7 +14,11 @@
       <view class="grid-name">{{departmentName}}</view>
       <image class="more-grid" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk3uAAMMcAAADckZSIh0279.png" />
     </view>
-    <image bindtap="toInfoList" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" />
+    <view class="my-and-news">
+      <image wx:if="{{infoObj.title == ''}}" bindtap="noMore" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" />
+      <image wx:else bindtap="toInfoList" class="news" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nk4yASWCrAAAKA-kIkt0142.png" />
+      <image bindtap="toMine" class="my" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB716n_HiAZ9BOAAAIkMWBOnA191.png" />
+    </view>
   </view>
   <!-- banner swiperBannerList -->
   <view class="banner">
@@ -69,10 +73,26 @@
 
   <!-- 我有话说 -->
   <view class="grid-all">
-    <image bindtap="wyss" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nki6AIOnKAAEFtEe51uE843.png"></image>
+    <button bindtap="wyss" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nki6AIOnKAAEFtEe51uE843.png'></image>
+    </button>
+
+    <button bindtap="dqhd" class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkqeAFhyBAAEedWqz2eE440.png'></image>
+    </button>
+
+    <button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkrqAB9DJAAEx8Bq_7R8226.png'></image>
+    </button>
+
+    <button class="weui-btn" form-type='submit' plain='true' hover-class="hover-btn">
+      <image src='https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nks6ALQtRAAExnBUFGQs281.png'></image>
+    </button>
+
+    <!-- <image bindtap="wyss" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nki6AIOnKAAEFtEe51uE843.png"></image>
     <image bindtap="dqhd" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkqeAFhyBAAEedWqz2eE440.png"></image>
     <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nkrqAB9DJAAEx8Bq_7R8226.png"></image>
-    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nks6ALQtRAAExnBUFGQs281.png"></image>
+    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/05/rBAB716nks6ALQtRAAExnBUFGQs281.png"></image> -->
   </view>
 
   <!-- 列表 -->
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index f9cad88..f0b9ed8 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -58,7 +58,8 @@ page {
 }
 
 .belong-grid .grid {
-  width: 90%;
+  /* width: 90%; */
+  width: calc(100% - 129rpx);
   height: 100%;
   position: relative;
   z-index: 100;
@@ -84,13 +85,33 @@ page {
   margin-top: 5rpx;
 }
 
-.belong-grid .news {
+.belong-grid .my-and-news {
+  width: 129rpx;
+  height: 100%;
+  position: relative;
+  z-index: 100;
+  display: flex;
+  align-items: center;
+}
+
+.belong-grid .my-and-news .news {
+  width: 34rpx;
+  height: 34rpx;
+}
+
+.belong-grid .my-and-news .my {
+  width: 34rpx;
+  height: 34rpx;
+  margin-left: 30rpx;
+}
+
+/* .belong-grid .news {
   width: 34rpx;
   height: 34rpx;
   margin-right: 22rpx;
   position: relative;
   z-index: 100;
-}
+} */
 
 /* bannner *********** start */
 
@@ -344,12 +365,28 @@ page {
   margin-left: 27rpx;
 }
 
-.grid-all image {
+.grid-all .weui-btn {
   height: 50%;
   width: 50%;
+  padding: 0;
+  border: none;
   float: left;
 }
 
+.hover-btn {
+  box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
+  border: 1px solid #666;
+}
+
+.weui-btn+.weui-btn {
+  margin-top: 0 !important;
+}
+
+.grid-all .weui-btn image {
+  height: 100%;
+  width: 100%;
+}
+
 /* 我有事说 end*/
 
 /* 列表样式 */