修改bug

pages/details/details.js

@@ -40,7 +40,7 @@ Page({
     http.post("/system/AppEnterpriseController/getEnterpriseDetails", obj, this.getEnterpriseDetailsSuccess)
   },
   getEnterpriseDetailsSuccess(res) {
-    console.log(res)
+    console.log("%%%%",res)
     this.setData({
       enterpriseDetails: res.enterpriseDetails,
       latitude: res.enterpriseDetails.latitude,

pages/qiye/qiye.js

@@ -60,14 +60,14 @@ Page({
     http.send_post("/system/AppEnterpriseController/getInitEnterpriseList", null, this.getQiyeEnterpriseListSuccess)
   },
   getQiyePageSuccess(res) {
-    if(res.code==200){
+   // if(res.code==200){
       let enterpriseCount = res.enterpriseCount;
       this.setData({
         weekCount: enterpriseCount.weekCount,
         monthCount: enterpriseCount.monthCount,
         totalCount: enterpriseCount.totalCount,
       })
-    }
+   // }
   
   },
   getQiyeEnterpriseListSuccess(res) {

pages/warehouselist/serch/warehouse_serch.js

@@ -18,10 +18,23 @@ Page({
     isRefresh: true,
     total: 0,
     pageNum: 1, // 页码
-    serchValue: ""
+    serchValue: "",
+    longitude: '',
+    latitude: ''
   },
   onLoad() {
    // this.list(null)
+   let that=this
+   wx.getLocation({
+    type: 'wgs84',
+    success: function (res) {
+      that.setData({
+        longitude: res.longitude,
+        latitude: res.latitude
+      })
+      //that.loadData()
+    }
+  })
   },
   
   // 仓库详细页
@@ -48,6 +61,8 @@ Page({
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
     obj.reasonable = false
+    obj.longitude=this.data.longitude
+    obj.latitude=this.data.latitude
     
     this.list(obj)
   },
@@ -135,6 +150,8 @@ Page({
     obj.warehouseName = this.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
+    obj.longitude=this.data.longitude
+    obj.latitude=this.data.latitude
     this.list(obj)
   },
   /**
@@ -173,6 +190,8 @@ Page({
     obj.warehouseName = that.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
+    obj.longitude=that.data.longitude
+    obj.latitude=that.data.latitude
     that.list(obj)
 
     // }else{

pages/warehouselist/serch/warehouse_serch.wxml

@@ -20,6 +20,7 @@
       <view class="li_tit">{{item.warehouseName}}</view>
       <view class="li_time">
       <text>部门名称:{{item.deptName}}</text>
+      <text class="fl_ri">距离：{{item.dis}} km</text>
       </view>
       </view>
       <i class="iconfont icon-xiangyou list_right"></i>

pages/warehouselist/serch/warehouse_serch.wxss

@@ -5,4 +5,7 @@
   background-color: #fff;
   text-align: center;
   font-size: 14px;
+}
+.fl_ri{
+  margin-left: auto;
 }

pages/warehouselist/warehouselist.wxml

@@ -21,7 +21,7 @@
       <view class="li_tit">{{item.warehouseName}}</view>
       <view class="li_time">
       <text>部门名称:{{item.deptName}}</text>
-      <text class="fl_ri">距离：5566km</text>
+      <text class="fl_ri">距离：{{item.dis}} km</text>
       </view>
       </view>
       <i class="iconfont icon-xiangyou list_right"></i>

pages/xuncha/xuncha.js

@@ -39,13 +39,15 @@ Page({
   },
   getXunchaCountSuccess(res) {
   
-    if(res.code==200){
+    console.log("@@@@",res)
+    //if(res.code==200){
       this.setData({
           todayXunchaCount: res.xunchaCount.todayXunchaCount,
           todayRiskCount: res.xunchaCount.todayRiskCount,
           todayEnterpriseCount: res.xunchaCount.todayEnterpriseCount
         })
-    }
+     
+   // }
   
   },
   getXunchaList() {

pages/xunchajilu/xunchajilu.js

@@ -26,7 +26,7 @@ Page({
   getXunchaList(){
     let obj = new Object();
     obj.busEnterpriseId = this.data.busEnterpriseId 
-    http.send_post("/system/AppXunchaController/getXunchaList",obj,this.getXunchaListSuccess)
+    http.send_get("/system/AppXunchaController/getXunchaList",obj,this.getXunchaListSuccess)
   },
   getXunchaListSuccess(res){
     console.log("!!!",res.data.rows)
@@ -47,9 +47,20 @@ Page({
     xunchaList : null
   },
  // 巡检详细
- bindViewXunJianMore(){
-  wx.navigateTo({
-    url: '../xunjianmore/xunjianmore',
-  })
-}
+ toBindXunjinaMore(e){
+  let isrisk = e.currentTarget.dataset.isrisk
+  let buslogid = e.currentTarget.dataset.buslogid
+  if(isrisk == 0){
+    wx.showToast({
+      title: '没有发现安全隐患,请放心!!',
+      icon: "none" 
+    })
+  }else{
+    console.log(isrisk,"####",buslogid)
+    wx.navigateTo({
+      url: '../xunjianmore/xunjianmore?buslogid='+buslogid
+    })
+  }
+ 
+},
 })

pages/xunchajilu/xunchajilu.wxml

@@ -17,7 +17,8 @@
   </view>
   <!-- 列表 -->
   <view class="list_vi">
-    <view class="list_li" wx:for="{{xunchaList}}" wx:key="index" >
+    <view class="list_li" wx:for="{{xunchaList}}" wx:key="index"    bindtap="toBindXunjinaMore"
+     data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}">
       <i class="list_icon iconfont icon-queding" wx:if="{{item.isRisk != 1}}"></i>
       <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.isRisk == 1}}"></i>
       <text>[{{item.busLogTypeLabel}}]{{item.busEnterpriseName}}</text>