commit

app.json

@@ -35,7 +35,9 @@
     "pages/warehouselist/serch/warehouse_serch",
     "pages/teamlist/serch/team_serch",
     "pages/maillist/maillist",
-    "pages/maillist/serch/maillist_serch"
+    "pages/maillist/serch/maillist_serch",
+    "pages/xqzgdetail/xqzgdetail",
+    "pages/fcdetail/fcdetail"
   ],
   "requiredPrivateInfos": [
     "getLocation"

base/httputil.js

@@ -64,7 +64,12 @@ function loginSuccess(res) {
 
 
 
-
+/**
+ * 携带token json数据 POST请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
 function send_post(url, data, successfun) {
 
   console.log("令牌:", app.globalToken)
@@ -98,7 +103,12 @@ function send_post(url, data, successfun) {
 
   })
 }
-
+/**
+ * 携带token表单数据POST请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
 function post(url, data, successfun) {
   console.log("令牌:", app.globalToken)
   if (app.globalToken == null) {
@@ -127,7 +137,12 @@ function post(url, data, successfun) {
   })
 }
 
-
+/**
+ * 无token json数据使用的POST请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
 function post_token(url, data, successfun) {
   console.log("令牌:", app.globalToken)
   wx.request({
@@ -152,7 +167,21 @@ function post_token(url, data, successfun) {
 
   })
 }
+/**
+ * 备用的GET请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
 function get(url, data, successfun) {
+  console.log("令牌:", app.globalToken)
+  if (app.globalToken == null) {
+    wx.showToast({
+      title: '尚未登录，登录后即可使用',
+      icon: 'none'
+    })
+    return
+  }
   wx.request({
     url: BASE_Server + url, //仅为示例，并非真实的接口地址
     method: "GET",
@@ -172,9 +201,21 @@ function get(url, data, successfun) {
   })
 }
 
-
+/**
+ * 携带token使用的GET请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
 function send_get(url, data, successfun) {
   console.log("令牌:", app.globalToken)
+  if (app.globalToken == null) {
+    wx.showToast({
+      title: '尚未登录，登录后即可使用',
+      icon: 'none'
+    })
+    return
+  }
   wx.request({
     url: BASE_Server + url, //仅为示例，并非真实的接口地址 
     method: "GET",
@@ -193,6 +234,39 @@ function send_get(url, data, successfun) {
     fail(res){
       wx.showToast({
         title: "网络请求失败",
+        icon:'none',
+      })
+    }
+
+  })
+}
+/**
+ * 无token 可使用的 GET 请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
+function get_token(url, data, successfun) {
+  console.log("令牌:", app.globalToken)
+  wx.request({
+    url: BASE_Server + url, //仅为示例，并非真实的接口地址 
+    method: "GET",
+    header: {
+      'content-type': 'application/json',
+      'Authorization': 'Bearer ' + app.globalToken
+    },
+    data: data,
+    success(res) {
+      // var d = decodeURIComponent(decodeURIComponent(res.data.data))
+      // var json = JSON.parse(d)
+      console.log("TAG","返回数据："+res.data)
+      authToken(res.data)
+      successfun(res.data)
+    },
+    fail(res){
+      wx.showToast({
+        title: "网络请求失败",
+        icon:'none',
       })
     }
 
@@ -250,14 +324,15 @@ function send(data, successfun) {
 }
 module.exports = {
   BASE_Server: BASE_Server,
-  send_post: send_post,
   send_photo: send_photo,
   send: send,
   post: post,
+  send_post: send_post,
   post_token: post_token,
   // wxpost: wxpost,
   get: get,
   send_get:send_get,
+  get_token:get_token,
   send_postdecode: send_postdecode,
 
 

pages/fcdetail/fcdetail.js

@@ -0,0 +1,115 @@
+import util from '../../base/utils'
+import http from '../../base/httputil'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    logId:null,
+    askCompany:null,
+    opinion:null,
+    nickname:null,
+    qianming:null,
+    qianming1:null,
+    number:null,
+    number1:null,
+    lasttime:null,
+    gzsTime:null,
+    deptName:null,
+    fcCode:null,
+    checkTime:null,
+    checker1Code:null,
+    checker2Code:null,
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.data.logId=options.logId
+    var time= util.formatDate(new Date(),'yyyy年MM月dd日')
+    this.setData({
+      time:time
+    })
+    var obj={};
+    obj["logId"]=this.data.logId,
+    http.send_post("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
+  },
+  detailsSuccess(e){
+    console.log(JSON.stringify(e))
+    if(e.code == 200){
+      this.data.lasttime=util.formatDate(new Date(e.data.fcyjgzs.lasttime),'yyyy年MM月dd日') ;
+      // this.data.deptName=e.fcyjgzs.deptName;
+      this.data.askCompany=e.data.fcyjgzs.askCom;
+      this.data.opinion=e.data.fcyjgzs.myoption;
+      this.data.nickname=e.data.fcyjgzs.checker1Sign;
+      this.data.qianming=e.data.fcyjgzs.checker2Sign;
+      this.data.checker1Code=e.data.fcyjgzs.checker1Code;
+      this.data.checker2Code=e.data.fcyjgzs.checker2Code;
+      this.data.qianming1=e.data.fcyjgzs.becheckerSign;
+      this.data.checkTime=util.formatDate(new Date(e.data.fcyjgzs.checkTime),'yyyy年MM月dd日') ;
+      this.data.fcCode=e.data.fcyjgzs.code;
+      this.setData({
+        lasttime:this.data.lasttime,
+        checkTime:this.data.checkTime,
+        nickname:this.data.nickname,
+        opinion:this.data.opinion,
+        askCompany:this.data.askCompany,
+        fcCode:this.data.fcCode,
+        checker1Code:this.data.checker1Code,
+        checker2Code:this.data.checker2Code,
+        qianming:this.data.qianming,
+        qianming1:this.data.qianming1,
+        deptName:this.data.deptName,
+      })
+    }
+  },
+  onShow() {
+     
+  
+  },
+  
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/fcdetail/fcdetail.json

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

pages/fcdetail/fcdetail.wxml

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

pages/fcdetail/fcdetail.wxss

@@ -0,0 +1,64 @@
+.container{
+  margin: 30rpx;
+}
+.zg_bh{
+  display: flex;
+  flex-direction: row;
+  color: #666;
+}
+input{
+  border-bottom: 1px solid rgb(238, 238, 238);
+  height: 50rpx;
+  line-height: 50rpx;
+}
+.con_tit{
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 44rpx;
+  display: block;
+}
+.flex_row{
+  margin-bottom: 20rpx;
+  line-height: 70rpx;
+  font-size: 34rpx;
+  color: #333;
+}
+.flex_row input{
+display: inline-table;
+padding: 0px 10rpx;
+text-align: center;
+}
+.text_ind{
+  text-indent:60rpx;
+}
+textarea{
+  border: 1px solid rgb(238, 238, 238);
+  outline: 0px;
+  padding: 1%;
+  width: 98%;
+  margin-bottom: 20rpx;
+}
+.mar_top{
+  margin-top: 10rpx;
+}
+.mar_top2{
+  margin-top: 30rpx;
+}
+button{
+  width: 70%!important;
+  margin: 50rpx auto;
+}
+.qm_img{
+  width: 200rpx;
+  height: 160rpx;
+}
+.txt_vi{
+  display: flex;
+}
+.width_400{
+width:400rpx ;
+}
+.color_red{
+  color: #f00;
+}

pages/me/me.js

@@ -141,7 +141,23 @@ clear(){
    */
   onShareAppMessage() {
 
+  },
+  bindViewTest(){
+     wx.navigateTo({
+      // url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
+            url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
+    })
   }
+  // bindViewXqzgDetail(){
+  //   wx.navigateTo({
+  //     url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
+  //   })
+  // },
+  // bindViewFcDetail(){
+  //   wx.navigateTo({
+  //     url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
+  //   })
+  // },
 
   // init_userInfo() {
 

pages/me/me.wxml

@@ -32,7 +32,7 @@
         <i class="iconfont icon-xiangyou"></i>
       </view>
   </view>
-  <view class="tit_one">
+  <view class="tit_one" bindtap="bindViewTest">
     <image src="../images/metit1.png" class="metit" />
     <view class="meline">
     <i class="iconfont icon-guanyuwomen"></i>

pages/xqzgdetail/xqzgdetail.js

@@ -0,0 +1,118 @@
+import http from '../../base/httputil'
+import util from '../../base/utils'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    logId:null,
+    askCompany:null,
+    nickname:null,
+    qianming:null,
+    qianming1:null,
+    number:null,
+    number1:null,
+    lasttime:null,
+    deptName:null,
+    xqCode:null,
+    checkTime:null,
+    checker1Code:null,
+    checker2Code:null,
+    listData:null,
+  }, 
+  getDetailsSuccess(e) {
+    console.log(JSON.stringify(e))
+    if(e.code == 200){
+      this.data.lasttime=util.formatDate(new Date(e.data.zgtzs.lastTime),'yyyy年MM月dd日') ;
+      // this.data.deptName=e.fcyjgzs.deptName;
+      this.data.askCompany=e.data.zgtzs.askCom;
+      this.data.nickname=e.data.zgtzs.checker1Sign;
+      this.data.qianming=e.data.zgtzs.checker2Sign;
+      this.data.checker1Code=e.data.zgtzs.checker1Code;
+      this.data.checker2Code=e.data.zgtzs.checker2Code;
+      this.data.qianming1=e.data.zgtzs.becheckerSign;
+      this.data.checkTime=util.formatDate(new Date(e.data.zgtzs.checkTime),'yyyy年MM月dd日') ;
+      this.data.xqCode=e.data.zgtzs.code;
+      this.data.listData=e.data.zgtzs_items;
+      this.setData({
+        listData:this.data.listData,
+        lasttime:this.data.lasttime,
+        checkTime:this.data.checkTime,
+        nickname:this.data.nickname,
+        askCompany:this.data.askCompany,
+        xqCode:this.data.xqCode,
+        checker1Code:this.data.checker1Code,
+        checker2Code:this.data.checker2Code,
+        qianming:this.data.qianming,
+        qianming1:this.data.qianming1,
+        deptName:this.data.deptName,
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options)
+    this.data.logId = options.logId
+    this.data.busEnterpriseId = options.busEnterpriseId
+    var obj ={}
+    obj["logId"]=this.data.logId,
+    http.post('/system/AppXunchaController/getXHXqzgtzsDetail', obj, this.getDetailsSuccess);
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+
+  onShareAppMessage() {
+
+  },
+ 
+})

pages/xqzgdetail/xqzgdetail.json

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

pages/xqzgdetail/xqzgdetail.wxml

@@ -0,0 +1,25 @@
+<view class="container">
+  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" disabled="disabled" value="{{xqCode}}"/></view>
+  <text class="con_tit mar_top">隐患限期整改告知书</text>
+  <view class="flex_row text_ind mar_top2">经查，你单位存在下列问题： </view>
+  <view wx:for="{{listData}}" wx:key="index" class="jcwt">
+    {{index+1}}、{{item.itemContent}}
+  </view>
+  <!-- <b> {{pageData.latTime}}</b> -->
+  <view class="flex_row text_ind">现告知你单位对上述问题于<input type="text" style="width: 400rpx;" disabled="disabled" value="{{lasttime}}"/>,前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成事故的，依法追究有关人员的责任。整改期间，你单位应当采取措施，确保安全生产。</view>
+  <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
+  <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 400rpx;" disabled="disabled" value="{{askCompany}}"/>咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
+  <view class="flex_row mar_top">检查人员：<text style="margin-right: 30rpx;">{{nickname}}</text></view>
+  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker1Code}}"/></view>
+  <view class="flex_row mar_top2 txt_vi"><text>监督人员（签名）：</text>
+    <image wx:if="{{qianming != undefined && qianming != null}}" src="{{qianming}}" class="qm_img"></image>
+  </view>
+  <view class="flex_row mar_top">监督人员编号<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker2Code}}"/></view>
+  <view class="flex_row mar_top2 txt_vi"><text>被复查单位负责人（签名）：</text>
+    <image wx:if="{{qianming1 != undefined && qianming1 != null}}" src="{{qianming1}}" class="qm_img"></image>
+  </view>
+  <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 340rpx;"  disabled="disabled" value="{{deptName}}"/> 部门</view>
+  <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 340rpx;"  disabled="disabled" value="{{checkTime}}"/></view>
+  <view style="height: 10rpx;"></view>
+
+</view>

pages/xqzgdetail/xqzgdetail.wxss

@@ -0,0 +1,71 @@
+/* pages/xqzggzs2/xqzggzs2.wxss */
+.container{
+  margin: 30rpx;
+}
+.zg_bh{
+  display: flex;
+  flex-direction: row;
+  color: #666;
+}
+input{
+  border-bottom: 1px solid rgb(238, 238, 238);
+  height: 50rpx;
+  line-height: 50rpx;
+}
+.con_tit{
+  text-align: center;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 44rpx;
+  display: block;
+}
+.flex_row{
+  margin-bottom: 20rpx;
+  line-height: 70rpx;
+  font-size: 34rpx;
+  color: #181818;
+}
+.flex_row input{
+display: inline-table;
+padding: 0px 10rpx;
+text-align: center;
+}
+.text_ind{
+  text-indent:60rpx;
+}
+textarea{
+  border: 1px solid rgb(238, 238, 238);
+  outline: 0px;
+  padding: 1%;
+  width: 98%;
+  margin-bottom: 20rpx;
+}
+.mar_top{
+  margin-top: 60rpx;
+}
+.mar_top2{
+  margin-top: 30rpx;
+}
+button{
+  width: 70%!important;
+  margin: 50rpx auto;
+}
+.jcwt{
+  font-weight: 500;
+  font-size: 34rpx;
+  color: #181818;
+  margin-bottom: 18rpx;
+}
+.flex_row b{
+  color: #f00;
+}
+.qm_img{
+  width: 200rpx;
+  height: 160rpx;
+}
+.txt_vi{
+  display: flex;
+}
+.txt_vi text{
+  line-height: 160rpx;
+}

pages/xqzggzs/xqzggzs.js

@@ -11,7 +11,6 @@ Page({
     host: app.globalData.host,
     index:null,
     isFirst:true,
-    qianming:null,
     currentTime:null,
     logId:null,
     askCompany:null,
@@ -157,7 +156,7 @@ Page({
     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["myoption"]=this.data.opinion, 
     bean["lasttime"]=this.data.needLastTime, 
     bean["checker1Sign"]=this.data.nickname,
     bean["checker1Code"]=this.data.number,
@@ -170,6 +169,11 @@ Page({
   },
   submitSuccess(e){
     if(e.code == 200){
+      // let page = getCurrentPages();
+      // let prevPage = page[page.length - 2];
+      // prevPage.setData({
+      //   isRefresh:true,
+      // });
       wx.showToast({
         title: e.msg,
       })
@@ -185,26 +189,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    if(!this.data.isFirst){
-      let pages = getCurrentPages();
-      let currPage = pages[pages.length-1];
-      this.data.index=currPage.data.index;
-      if(this.data.index==2){
-        this.data.qianming=currPage.data.qianming;
-        if (this.data.qianming != undefined && this.data.qianming != null) {
-          this.setData({
-            qianming: this.data.qianming
-          })
-        }
-      }
-    }
-    this.data.isFirst=false
-  },
-
-  /**
    * 生命周期函数--监听页面隐藏
    */
   onHide() {

pages/xqzggzs/xqzggzs.wxml

@@ -1,6 +1,6 @@
 <!--pages/xqzggzs/xqzggzs.wxml-->
 <view class="container">
-  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;"  disabled="disabled"/></view>
+  <!-- <view class="zg_bh" wx:if="false"><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 ">本机关于 <text type="text" style="width: 250rpx;color: red;" >{{gzsTime}}</text> ，对你单位做出了隐患限期整改告知书（编号：<text type="text" style="width: 250rpx;" >{{yhzggzsCode}}</text>），经对你单位整改情况进行复查，提出如下意见：</view>
   <textarea bindinput="bindInputOpinionArea"></textarea>

pages/xqzggzs2/xqzggzs2.json

@@ -1,8 +1,5 @@
 {
   "usingComponents": {},
-
-
-
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "限期整改告知书"

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;" disabled="disabled"/></view>
+  <!-- <view class="zg_bh" wx:if="false"><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/xunjianmore/xunjianmore.js

@@ -18,22 +18,23 @@ Page({
     isHave_fcyjtzs:false,
   },
   onLoad(e) {
-    this.initData(e)
-  },
-  onShow(){
+    this.data.buslogid = e.buslogid
     
   },
-  initData(e){
-     let buslogid = e.buslogid
-     this.data.buslogid = buslogid
-    console.log("####",this.data.buslogid)
+  onShow(){
+    // let pages = getCurrentPages();
+    // let currPage = pages[pages.length-1];
+    // if(currPage.data.isRefresh != undefined &&currPage.data.isRefresh){
 
+    // }
     let obj = new Object()
     obj.busLogId = this.data.buslogid 
     http.post("/system/AppXunjianimgController/getXunjianimgList",obj,this.getXunjianMoreListSuccess)
   },
+ 
   getXunjianMoreListSuccess(res){
-    console.log("@@@@@",res)
+    console.log("isHave_xqzgtzs",res.data.isHave_xqzgtzs)
+    console.log("isHave_fcyjtzs",res.data.isHave_fcyjtzs)
     this.setData({
       pictureBasePath : res.data.pictureBasePath+"/",
       mapdata : res.data.xunjianimgMap,
@@ -54,6 +55,16 @@ Page({
           hiddenName:!this.data.hiddenName
       })
   },
+  bindViewXqzgDetail(){
+    wx.navigateTo({
+      url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
+    })
+  },
+  bindViewFcDetail(){
+    wx.navigateTo({
+      url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
+    })
+  },
   // 跳转整改进度
   bindViewXqZgGzS(){
     wx.navigateTo({

pages/xunjianmore/xunjianmore.wxml

@@ -12,7 +12,7 @@
         <view class="txt_wz">
           <text class="">{{index+1}}、{{item.busItemName}}</text>
           <view class="span_vi">
-            <span class="yellow">{{item.itemsTypeValue}}</span>
+            <span class="yellow" wx:if="{{item.itemsTypeValue}}">{{item.itemsTypeValue}}</span>
             <span class="yellow">{{item.riskStatusValue}}</span>
           </view>
           <!-- <view class="qy_txt">{{item.busEnterpriseName}}</view> -->
@@ -21,18 +21,16 @@
       </view>
     </view>
     <!-- 巡检悬浮按钮 -->
-    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn" hidden="{{!isHave_xqzgtzs}}">
+    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn" wx:if="{{isHave_xqzgtzs}}">
       <view class="tab_nav" hidden="{{hiddenName}}">
         <view class="tab_nav_t" >
-        <text mode="heightFix" >隐患限期整改告知书</text>
+        <text mode="heightFix" bindtap="bindViewXqzgDetail">隐患限期整改告知书</text>
       </view>
-        <view class="tab_nav_t" hidden="{{!isHave_fcyjtzs}}">
-        <text mode="heightFix">复查意见告知书</text>
+        <view class="tab_nav_t" wx:if="{{isHave_fcyjtzs}}">
+        <text mode="heightFix" bindtap="bindViewFcDetail">复查意见告知书</text>
         </view>
-        <view class="tab_nav_t" hidden="{{isHave_fcyjtzs}}">
-          <i class="iconfont icon-zengjiashuzi" bindtap="bindViewXqZgGzS"></i>
+          <i class="iconfont icon-zengjiashuzi" wx:if="{{!isHave_fcyjtzs}}" bindtap="bindViewXqZgGzS"></i>
         </view>
     </view>
   </view>
-</view>
 </view>

project.private.config.json

@@ -1,7 +1,7 @@
 {
   "projectname": "sooka_edyj_minapp",
   "setting": {
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",