首页公告加详情

pages/index/index.js

@@ -44,7 +44,8 @@ Page({
     //记录首页点击-登录后继续跳转
     dofun: null,
     xunjianImgCount: '000,000',
-    NoticeTitle: "登录查看公告"
+    NoticeTitle: "登录查看公告",
+    noticeItem:''
   },
 
   onLoad() {
@@ -327,13 +328,16 @@ Page({
 
   initIndexPageSuccess(res) {
 
+    console.log("@@",res)
     if (res.code == 200) {
       this.setData({
         xunjianImgCount: res.data.xunjianImgCount,
       })
       if (res.data.noticeList.length > 0) {
+        
         this.setData({
-          NoticeTitle: res.data.noticeList[0].noticeTitle
+          NoticeTitle: res.data.noticeList[0].noticeTitle,
+          noticeItem: res.data.noticeList[0]
         })
       } else {
         this.setData({
@@ -343,7 +347,27 @@ Page({
     }
 
   },
-
+goNoticeDetails(e){
+  
+  let details = e.currentTarget.dataset.item
+  if (app.globalToken == null) {
+    wx.showToast({
+      title: '尚未登录，登录后即可使用',
+      icon: 'none'
+    })
+    return
+  }
+  if(details==null||details==''){
+    wx.showToast({
+      title: '暂无公告',
+      icon: 'none'
+    })
+    return
+  }
+  wx.navigateTo({
+    url: '../notice/notice_details?details='+JSON.stringify(details)
+  })
+},
   // getSysUserInfo(info) {
   //   let that = this
   //   wx.login({

pages/index/index.wxml

@@ -60,7 +60,7 @@
   <view class="tzgg">
   <view class="img"><image src="{{host}}/images/xcx_lb.png" /></view>
     <!-- <b>[待办]</b> -->
-    <text>{{NoticeTitle}}</text>
+    <text catchtap="goNoticeDetails"data-item='{{noticeItem}}'>{{NoticeTitle}} </text>
     <view class="more" data-fun="bindViewGengDuo" bindtap="init_userInfo">更多></view>
   </view>
   <!-- 中间图片banner -->

pages/xunchajilu/xunchajilu.wxml

@@ -6,7 +6,7 @@
     <view class="qy_bz">
       <image src="{{host}}/images/qy_bz.png" />
       <h2>{{todayXunchaCount}}</h2>
-      <p>本日查询</p>
+      <p>本日巡查</p>
 
     </view>
     <view class="qy_by">