巡查分页

base/httputil.js

@@ -1,6 +1,8 @@
 // let BASE_Server = "http://127.0.0.1:8329"
-   let BASE_Server = "https://192.168.1.100:18080"
-//let BASE_Server = "https://sookajs.top:18080"
+
+  let BASE_Server = "https://192.168.1.100:18080"
+// let BASE_Server = "https://sookajs.top:18080"
+
 
 let app = getApp()
 

base/utils.js

@@ -10,12 +10,31 @@
   //返回年月日，时分秒
   //  return [year, month, day].map(formatNumber)//.join(\'/\') + \' \' + [hour, minute].map(formatNumber).join(\':\')   
  }
- 
-//  const formatNumber = n => {
-//    n = n.toString()
-//    return n[1] ? n : \'0\' + n
-//  }
- 
+ function formatDate(date, fmt) {
+  if (typeof date == 'string') {
+    return date;
+  }
+
+  if (!fmt) fmt = "yyyy-MM-dd hh:mm:ss";
+
+  if (!date || date == null) return null;
+  var o = {
+    'M+': date.getMonth() + 1, // 月份
+    'd+': date.getDate(), // 日
+    'h+': date.getHours(), // 小时
+    'm+': date.getMinutes(), // 分
+    's+': date.getSeconds(), // 秒
+    'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+    'S': date.getMilliseconds() // 毫秒
+  }
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+  }
+  return fmt
+}
+
  module.exports = {
-   formatTime: formatTime
+   formatTime: formatTime,
+   formatDate: formatDate
  }

pages/maillist/maillist.js

@@ -31,10 +31,13 @@ Page({
 
   loadData(){
     let obj = new Object()
+    obj.nickName = ""
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
     obj.reasonable = false
-    http.send_get("/system/AppPBookController/getPBookList", obj, this.getBookListSuccess)
+
+   
+    http.send_post("/system/AppPBookController/getPBookList", obj, this.getBookListSuccess)
   },
   getBookListSuccess(res) {
 
@@ -160,9 +163,16 @@ Page({
   },
   Call(e){
     let phone = e.currentTarget.dataset.index
-    wx.makePhoneCall({
-      phoneNumber: phone.phonenumber
-    })
+    if(phone.phonenumber!=""){
+      wx.makePhoneCall({
+        phoneNumber: phone.phonenumber
+      })
+    }else{
+      wx.showToast({
+        title: '该联系人暂无电话',
+        icon:'error'
+      })
+    }
 
   },
   /**

pages/maillist/serch/maillist_serch.js

@@ -51,7 +51,7 @@ Page({
 
 
   loadData(data){
-    http.send_get("/system/AppPBookController/getPBookList", data, this.getBookListSuccess)
+    http.send_post("/system/AppPBookController/getPBookList", data, this.getBookListSuccess)
   },
   getBookListSuccess(res) {
 
@@ -188,10 +188,16 @@ Page({
   
   Call(e){
     let phone = e.currentTarget.dataset.index
+    if(phone.phonenumber!=""){
     wx.makePhoneCall({
       phoneNumber: phone.phonenumber
     })
-
+  }else{
+    wx.showToast({
+      title: '该联系人暂无电话',
+      icon:'error'
+    })
+  }
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/xqzggzs/xqzggzs.js

@@ -1,5 +1,6 @@
 // pages/xqzggzs/xqzggzs.js
 import util from '../../base/utils'
+import http from '../../base/httputil'
 const app = getApp()
 Page({
 
@@ -11,21 +12,163 @@ Page({
     index:null,
     isFirst:true,
     qianming:null,
-    time:null,
+    currentTime:null,
+    logId:null,
+    askCompany:null,
+    opinion:null,
+    nickname:null,
+    qianming:null,
+    qianming1:null,
+    number:null,
+    number1:null,
+    needLastTime:null,
+    lasttime:null,
+    gzsTime:null,
+    deptName:null,
+    yhzggzsCode:null,
+    isFirst:true,
+  },
+  bindQianming() {
+    wx.navigateTo({
+      url: '../qianming/qianming?index=0',
+    })
   },
-  bindViewQianMing(){
+
+  bindQianming1() {
     wx.navigateTo({
-      url: '../qianming/qianming?index=2',
+      url: '../qianming/qianming?index=1',
     })
   },
+  bindInputOpinionArea(e){
+    this.data.opinion = e.detail.value;
+  },
+  bindInputJianChaNumber(e){
+    this.data.number = e.detail.value;
+  },
+  bindInputJianDuNumber(e){
+    this.data.number1 = e.detail.value;
+  },
+  bindInputCompany(e){
+    this.data.askCompany = e.detail.value;
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    var time= util.formatTime(new Date())
+    this.data.logId=options.logId
+    var time= util.formatDate(new Date(),'yyyy年MM月dd日')
     this.setData({
       time:time
     })
+    var data=new Object();
+    data["logId"]=this.data.logId,
+    http.send_post("/system/AppXunjianController/getFCTZSdetail",data,this.detailsSuccess)
+  },
+  detailsSuccess(e){
+    if(e.code == 200){
+      this.data.needLastTime=new Date(e.data.last_time);
+      this.data.lasttime=util.formatDate(new Date(e.data.last_time),'yyyy年MM月dd日') ;
+      this.data.gzsTime=util.formatDate(new Date(e.data.gzs_time),'yyyy年MM月dd日') ;
+      this.data.deptName=e.data.deptName;
+      this.data.nickname=e.data.nickName;
+      this.data.yhzggzsCode=e.data.gzs_code;
+      this.setData({
+        lasttime:this.data.lasttime,
+        gzsTime:this.data.gzsTime,
+        deptName:this.data.deptName,
+        nickname:this.data.nickname,
+        yhzggzsCode:this.data.yhzggzsCode,
+      })
+    }
+  },
+  onShow() {
+    if(!this.data.isFirst){
+      let pages = getCurrentPages();
+      let currPage = pages[pages.length-1];
+      this.data.index=currPage.data.index;
+      if(this.data.index==0){
+        this.data.qianming=currPage.data.qianming;
+        if (this.data.qianming != undefined && this.data.qianming != null) {
+          this.setData({
+            qianming: this.data.qianming
+          })
+        }
+      }else if(this.data.index==1){
+        this.data.qianming1=currPage.data.qianming1;
+        if (this.data.qianming1 != undefined && this.data.qianming1 != null) {
+          this.setData({
+            qianming1: this.data.qianming1
+          })
+        }
+      }
+    }
+    this.data.isFirst=false
+  
+  },
+
+  bindViewSubmit(){
+    if(this.data.opinion==null){
+      wx.showToast({
+        title: '请输入意见',
+        icon:'none'
+      })
+      return
+    }
+
+    if(this.data.number==null){
+      wx.showToast({
+        title: '请输入检查人员编号',
+        icon:'none'
+      })
+      return
+    }
+    if(this.data.qianming==null){
+      wx.showToast({
+        title: '请监督人员签名',
+        icon:'none'
+      })
+      return
+    }
+    if(this.data.number1==null){
+      wx.showToast({
+        title: '请输入监督人员编号',
+        icon:'none'
+      })
+      return
+    }
+    if(this.data.qianming1==null){
+      wx.showToast({
+        title: '请被复查单位负责人签名',
+        icon:'none'
+      })
+      return
+    }
+
+    var data={};
+    var bean={};
+    // var tzs_items=[];   
+    
+    bean["logId"]=this.data.logId,
+    // xqzgtzs["lasttime"]=new Date(this.data.pageData.latTime.replace("年","-").replace("月","-").replace("日","")),
+    bean["askCom"]=this.data.askCompany,
+    bean["option"]=this.data.opinion, 
+    bean["lasttime"]=this.data.needLastTime, 
+    bean["checker1Sign"]=this.data.nickname,
+    bean["checker1Code"]=this.data.number,
+    bean["checker2Sign"]=this.data.qianming,
+    bean["checker2Code"]=this.data.number1,
+    bean["becheckerSign"]=this.data.qianming1,
+    bean["checkTime"]=new Date()
+    data['tzsFcyjgzs']=bean
+    http.send_post("/system/AppXunjianController/saveFCTZS",data,this.submitSuccess)
+  },
+  submitSuccess(e){
+    if(e.code == 200){
+      wx.showToast({
+        title: e.msg,
+      })
+      wx.navigateBack()
+    }
   },
 
   /**

pages/xqzggzs/xqzggzs.json

@@ -1,9 +1,6 @@
 {
   "usingComponents": {},
-
-
-
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "限期整改告知书"
+  "navigationBarTitleText": "复查意见告知书"
 }

pages/xqzggzs/xqzggzs.wxml

@@ -1,23 +1,32 @@
 <!--pages/xqzggzs/xqzggzs.wxml-->
 <view class="container">
-  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" /></view>
+  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;"  disabled="disabled"/></view>
   <text class="con_tit mar_top">复查意见告知书</text>
-  <view class="flex_row text_ind mar_top2">本机关于 <input type="text" style="width: 250rpx;" />，对你单位做出了隐患限期整改告知书（编号：<input type="number" style="width: 250rpx;" />），经对你单位整改情况进行复查，提出如下意见：</view>
-  <textarea></textarea>
-  <view class="flex_row text_ind">现告知你单位对上述问题于 <input type="text" style="width: 100rpx;" />前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成应当采取措施，确保安全生产。</view>
+  <view class="flex_row text_ind mar_top2 ">本机关于 <text type="text" style="width: 250rpx;color: red;" >{{gzsTime}}</text> ，对你单位做出了隐患限期整改告知书（编号：<text type="text" style="width: 250rpx;" >{{yhzggzsCode}}</text>），经对你单位整改情况进行复查，提出如下意见：</view>
+  <textarea bindinput="bindInputOpinionArea"></textarea>
+  <view class="flex_row text_ind">现告知你单位对上述问题于 <text type="text" style="width: 100rpx;color: red;" >{{lasttime}}</text> 前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成应当采取措施，确保安全生产。</view>
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
-  <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 150rpx;" />咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
+  <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 150rpx;" bindinput="bindInputCompany" />咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
 
+  <view class="flex_row mar_top">检查人员：{{nickname}}</view>
+  <view class="flex_row mar_top">
+    <text>检查人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianChaNumber"/>
+  </view>
   <view class="flex_row mar_top txt_vi">
-    <text bindtap="bindViewQianMing">被复查单位负责人（签名）：</text>
+    <text bindtap="bindQianming">监督人员（签名）：</text>
     <image wx:if="{{qianming != undefined && qianming != null}}" src="{{qianming}}" class="qm_img"></image>
   </view>
-  <view class="flex_row mar_top2">检查人员：<input type="text" style="width: 190rpx;" /><text>编号：</text><input type="text" style="width: 190rpx;" /></view>
-  <view class="flex_row mar_top2"><text style="opacity: 0;">检查人员：</text><input type="text" style="width: 190rpx;" />编号：<input type="text" style="width: 190rpx;" /></view>
-  <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 370rpx;" />部门</view>
+  <view class="flex_row mar_top">
+    <text>监督人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianDuNumber"/>
+  </view>
+  <view class="flex_row mar_top txt_vi">
+    <text bindtap="bindQianming1">被复查单位负责人（签名）：</text>
+    <image wx:if="{{qianming1 != undefined && qianming1 != null}}" src="{{qianming1}}" class="qm_img"></image>
+  </view>
+  <view class="flex_row mar_top" style="text-align: right;"><text type="text" style="width: 370rpx;" >{{deptName}}</text>部门</view>
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><input type="number" style="width: 100rpx;" />年<input type="number" style="width: 100rpx;" />月<input type="number" style="width: 100rpx;" />日</view> -->
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{time}}</view>
+  <view class="flex_row mar_top" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{time}}</view>
 
-  <button type="primary">提交</button>
+  <button type="primary" bindtap="bindViewSubmit">提交</button>
   <view style="height: 10rpx;"></view>
 </view>

pages/xqzggzs/xqzggzs.wxss

@@ -41,7 +41,7 @@ textarea{
   margin-bottom: 20rpx;
 }
 .mar_top{
-  margin-top: 60rpx;
+  margin-top: 10rpx;
 }
 .mar_top2{
   margin-top: 30rpx;
@@ -56,4 +56,10 @@ button{
 }
 .txt_vi{
   display: flex;
+}
+.width_400{
+width:400rpx ;
+}
+.color_red{
+  color: #f00;
 }

pages/xqzggzs2/xqzggzs2.js

@@ -54,7 +54,7 @@ Page({
     this.data.logId = options.logId
     this.data.busEnterpriseId = options.busEnterpriseId
     this.getXqzggzs2()
-    var time= util.formatTime(new Date())
+    var time= util.formatDate(new Date(),'yyyy年MM月dd日')
     this.setData({
       time:time
     })
@@ -198,7 +198,7 @@ Page({
     var data={};
     var xqzgtzs={};
     // var tzs_items=[];   
-    data["xqzgtzs"]=xqzgtzs
+    
     data["tzs_items"]=this.data.submitdata
     xqzgtzs["logId"]=this.data.logId,
     xqzgtzs["enterpriseId"]=this.data.busEnterpriseId,
@@ -210,6 +210,7 @@ Page({
     xqzgtzs["checker2Code"]=this.data.number1,
     xqzgtzs["becheckerSign"]=this.data.qianming1,
     xqzgtzs["checkTime"]=new Date()
+    data["xqzgtzs"]=xqzgtzs
     http.send_post("/system/AppXunjianController/saveZGTZS",data,this.submitXqzggzs2Success)
   },
   submitXqzggzs2Success(e){

pages/xqzggzs2/xqzggzs2.wxml

@@ -1,6 +1,6 @@
 <!--pages/xqzggzs2/xqzggzs2.wxml-->
 <view class="container">
-  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" /></view>
+  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" disabled="disabled"/></view>
   <text class="con_tit mar_top">隐患限期整改告知书</text>
   <view class="flex_row text_ind mar_top2">经查，你单位存在下列问题： </view>
   <view wx:for="{{pageData.riskInspections}}" wx:key="index" class="jcwt">

pages/xuncha/xuncha.js

@@ -49,12 +49,18 @@ Page({
   
   },
   getXunchaList() {
-    http.post("/system/AppXunchaController/getXunchaList", null, this.getXunchaListSuccess)
+    let obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.busEnterpriseName = ""
+    obj.pageSize = 10
+    obj.reasonable = true
+    http.send_get("/system/AppXunchaController/getXunchaList", obj, this.getXunchaListSuccess)
   },
   getXunchaListSuccess(res) {
+    console.log("@@@@",res)
     if(res.code==200){
        this.setData({
-        xunchaList: res.rows
+        xunchaList: res.data.rows
        })
     }
    

pages/xuncha/xuncha.json

@@ -9,4 +9,5 @@
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "巡查"
+ 
 }

pages/xunchawu/xunchawu.js

@@ -2,8 +2,8 @@ import http from '../../base/httputil'
 const app = getApp()
 Page({
 
-  onLoad(){
-    this.getXunchaList()
+  onLoad() {
+    //this.getXunchaList()
   },
   /**
    * 页面的初始数据
@@ -11,7 +11,18 @@ Page({
   data: {
     host: app.globalData.host,
     xunchaList: null,
-
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    isRefresh: true,
+    total: 0,
+    pageNum: 1, // 页码
+    serchValue: "",
     menulist: [{
         "id": "1",
         "url": "icon-anquanxuncha",
@@ -30,54 +41,208 @@ Page({
     }
   },
 
-  toBindXunjinaMore(e){
+  toBindXunjinaMore(e) {
     let isrisk = e.currentTarget.dataset.isrisk
     let buslogid = e.currentTarget.dataset.buslogid
-    if(isrisk == 0){
+    if (isrisk == 0) {
       wx.showToast({
         title: '没有发现安全隐患,请放心!!',
-        icon: "none" 
+        icon: "none"
+      })
+    } else {
+      wx.navigateTo({
+        url: '../xunjianmore/xunjianmore?buslogid=' + buslogid
       })
     }
-    console.log(isrisk,"####",buslogid)
+    // console.log(isrisk,"####",buslogid)
   },
 
-  getXunchaList() {
-    http.post("/system/AppXunchaController/getXunchaList", null, this.getXunchaListSuccess)
-  },
+  // getXunchaList() {
+  //   http.post("/system/AppXunchaController/getXunchaList", null, this.getXunchaListSuccess)
+  // },
   getXunchaListSuccess(res) {
-    this.setData({
-      xunchaList: res.rows
-    })
+    console.log("!!!!!!",res)
+    // this.setData({
+    //   xunchaList: res.rows
+    // })
+
+
+    if (res.code == 200) {
+      // 显示加载图标
+      wx.showLoading({
+        title: '玩命加载中',
+      })
+      var that = this
+
+      if (res.data.rows.length == 0) {
+        wx.showToast({
+          title: '暂无更多数据',
+          icon: "none"
+        })
+      }
+      if (this.data.isRefresh) {
+        this.setData({
+          xunchaList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          xunchaList: this.data.xunchaList.concat(res.data.rows)
+        })
+        // 隐藏加载框
+
+        setTimeout(function () {
+          that.setData({
+            hidden: true,
+            loadingData: false
+          });
+
+          wx.hideLoading();
+        }, 1000)
+
+      }
+    } else {
+      console.log("@@!", "请求失败")
+    }
   },
-  getXunchaListByEnterpriseName(e) {
+  onPullDownRefresh: function () {
+    // 显示顶部刷新图标
+    if (this.data.serchValue == "") {
+      wx.showToast({
+        title: '请输入搜索内容',
+        icon: 'error'
+      })
+      return
+    }
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+
     let obj = new Object()
-    obj.busEnterpriseName = e.detail.value
-    http.post("/system/AppXunchaController/getXunchaList", obj, this.getXunchaListSuccess)
+    obj.pageNum = this.data.pageNum
+    obj.busEnterpriseName = this.data.serchValue
+    obj.pageSize = 10
+    obj.reasonable = false
+    this.list(obj)
   },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    let that = this
+    var loadingData = that.data.loadingData
 
+    var hidden = that.data.hidden
+    // 页数+1
+    that.setData({
+      pageNum: that.data.pageNum + 1,
+      isRefresh: false
+    })
+    if (hidden) {
+      that.setData({
+        hidden: false
+      });
+     
+    }
 
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      loadingData: true
+    });
+
+
+    //console.log("@@@@"+Math.ceil(this.data.total/10))
+    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
+    // that.loadData();
+    let obj = new Object()
+    obj.pageNum = that.data.pageNum
+    obj.busEnterpriseName = that.data.serchValue
+    obj.pageSize = 10
+    obj.reasonable = false
+    that.list(obj)
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
 
 
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    wx.navigateTo({
-      url: '../search/search'
-    })
   },
-  // 企业详细页
-  bindViewDetails() {
-    wx.navigateTo({
-      url: '../details/details'
+  getXunchaListByEnterpriseName(e) {
+    var obj = new Object()
+    this.setData({
+      serchValue: e.detail.value,
+      teamList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
     })
+    obj.busEnterpriseName = e.detail.value
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    //obj.busEnterpriseName = e.detail.value
+    this.list(obj)
   },
-  // 企业查询页
-  bindViewQiYeChaXun() {
-    wx.navigateTo({
-      url: '../qiyechaxun/qiyechaxun'
-    })
+  list(data) {
+
+    
+    http.send_get("/system/AppXunchaController/getXunchaList", data, this.getXunchaListSuccess)
   },
 
+
+
+
+  // // 搜索结果跳页
+  // bindViewSearchEnd() {
+  //   wx.navigateTo({
+  //     url: '../search/search'
+  //   })
+  // },
+  // 企业详细页
+  // bindViewDetails() {
+  //   wx.navigateTo({
+  //     url: '../details/details'
+  //   })
+  // },
+  // 企业查询页
+  // bindViewQiYeChaXun() {
+  //   wx.navigateTo({
+  //     url: '../qiyechaxun/qiyechaxun'
+  //   })
+  // },
+
   menuItemClick: function (res) {
     //获取点击事件的信息
     let clickInfo = res.detail.iteminfo

pages/xunchawu/xunchawu.json

@@ -5,5 +5,8 @@
 
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "巡查"
+  "navigationBarTitleText": "巡查",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true
 }

pages/xunchawu/xunchawu.wxml

@@ -33,5 +33,7 @@
   </view>
   <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮，menulist为折叠的菜单的数组数据-->
   <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu>
-
+  <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
 </view>

pages/xunchawu/xunchawu.wxss

@@ -30,5 +30,12 @@ position: relative;
   .qy_con view p{
     font-size: 35rpx;
     }
+    .data-loading {
+      height: 100rpx;
+      line-height: 100rpx;
+      background-color: #fff;
+      text-align: center;
+      font-size: 14px;
+    }
 
   

pages/xunjianmore/xunjianmore.js

@@ -14,15 +14,14 @@ Page({
     mapdata : null,
     pictureBasePath : null,
     hiddenName:true,
-    isShowFuChaGaoZhiShu:true,
+    isHave_xqzgtzs:false,
+    isHave_fcyjtzs:false,
   },
   onLoad(e) {
     this.initData(e)
   },
   onShow(){
-    this.setData({
-      isShowFuChaGaoZhiShu:true
-    })
+    
   },
   initData(e){
      let buslogid = e.buslogid
@@ -37,7 +36,9 @@ Page({
     console.log("@@@@@",res)
     this.setData({
       pictureBasePath : res.data.pictureBasePath+"/",
-      mapdata : res.data.xunjianimgMap
+      mapdata : res.data.xunjianimgMap,
+      isHave_xqzgtzs:res.data.isHave_xqzgtzs,
+      isHave_fcyjtzs:res.data.isHave_fcyjtzs,
     })
   },
   bindViewZhengGaiJinDu(e){
@@ -56,7 +57,7 @@ Page({
   // 跳转整改进度
   bindViewXqZgGzS(){
     wx.navigateTo({
-      url: '../xqzggzs/xqzggzs',
+      url: '../xqzggzs/xqzggzs?logId='+this.data.buslogid,
     })
   },
 })

pages/xunjianmore/xunjianmore.wxml

@@ -21,13 +21,13 @@
       </view>
     </view>
     <!-- 巡检悬浮按钮 -->
-    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn">
+    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn" hidden="{{!isHave_xqzgtzs}}">
       <view class="tab_nav" hidden="{{hiddenName}}">
         <text mode="heightFix" >隐患限期整改告知书</text>
-        <view class="tab_nav" hidden="{{!isShowFuChaGaoZhiShu}}">
+        <view class="tab_nav" hidden="{{!isHave_fcyjtzs}}">
         <text mode="heightFix">复查意见告知书</text>
         </view>
-        <view class="tab_nav" hidden="{{isShowFuChaGaoZhiShu}}">
+        <view class="tab_nav" hidden="{{isHave_fcyjtzs}}">
           <i class="iconfont icon-zengjiashuzi" bindtap="bindViewXqZgGzS"></i>
         </view>
     </view>