menc 2 år sedan
förälder
incheckning
5480abd326

+ 2 - 1
app.json

@@ -34,7 +34,8 @@
     "pages/material/serch/material_serch",
     "pages/warehouselist/serch/warehouse_serch",
     "pages/teamlist/serch/team_serch",
-    "pages/maillist/maillist"
+    "pages/maillist/maillist",
+    "pages/maillist/serch/maillist_serch"
   ],
   "requiredPrivateInfos": [
     "getLocation"

+ 3 - 25
base/httputil.js

@@ -1,31 +1,9 @@
 // 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 app = getApp()
-
-
-
-// function send_post_login(url, data, successfun) {
-
-//   wx.request({
-//     url: BASE_Server_Login + url, //仅为示例,并非真实的接口地址 
-//     method: "POST",
-//     header: {
-//       'content-type': 'application/json'
-//     },
-//     data: data,
-//     success(res) {
-//       successfun(res)
-//       // var d = decodeURIComponent(decodeURIComponent(res.data.data))
-//       // console.log("*****", d) 
-//       // var json = JSON.parse(d)
-//       // successfun(json)
-//     }
-//   })
-// }
+  let BASE_Server = "https://192.168.1.100:18080"
+// let BASE_Server = "https://sookajs.top:18080"
 
 
+let app = getApp()
 
 //-----------------------------登录,获取token-----------------------------------
 function init_userInfo() {

+ 164 - 19
pages/maillist/maillist.js

@@ -1,20 +1,180 @@
 // pages/maillist.js
+import http from '../../base/httputil'
+const app = getApp()
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+ /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中,避免数据多次加载
+     */
+    loadingData: false,
+    bookList: [],
+    isRefresh: true,
+    total: 0,
+    pageNum: 1 // 页码
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad(options) {
+  onLoad: function (){
+    this.loadData()
+   
+  },
+
+  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)
+  },
+  getBookListSuccess(res) {
+
+    console.log("@@@@", res)
+    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({
+          bookList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          bookList: this.data.bookList.concat(res.data.rows)
+        })
+        // 隐藏加载框
+
+        setTimeout(function () {
+          that.setData({
+            hidden: true,
+            loadingData: false
+          });
+
+          wx.hideLoading();
+        }, 1000)
+
+      }
+    } else {
+      console.log("@@!", "请求失败")
+    }
+  },
+  onPullDownRefresh: function () {
+    
+    // 显示顶部刷新图标
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+    this.loadData()
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  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
+      });
+      console.info(that.data.hidden);
+    }
+
+    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();
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+
+  },
 
+  // 搜索结果跳页
+  bindViewSearchEnd() {
+    wx.navigateTo({
+      url: '../maillist/serch/maillist_serch'
+    })
   },
+  Call(e){
+    let phone = e.currentTarget.dataset.index
+    if(phone.phonenumber!=""){
+      wx.makePhoneCall({
+        phoneNumber: phone.phonenumber
+      })
+    }else{
+      wx.showToast({
+        title: '该联系人暂无电话',
+        icon:'error'
+      })
+    }
 
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -43,24 +203,9 @@ Page({
 
   },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
+ 
 
-  },
+ 
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
 
-  }
 })

+ 9 - 1
pages/maillist/maillist.json

@@ -1,6 +1,14 @@
 {
-  "usingComponents": {},
+  "component": true, 
+  "usingComponents": {
+  },
+
+
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true,
   "navigationBarTitleText": "通讯录"
+
 }

+ 9 - 19
pages/maillist/maillist.wxml

@@ -1,9 +1,10 @@
 <!--pages/maillist.wxml-->
 <view class="container">
   <!-- 搜索 -->
+
   <view class="search-container">
     <view class="search-left">
-      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
     </view>
     <button bindtap="bindViewSearchEnd" class="search-right">
       <text class="iconfont icon-sousuo"></text>
@@ -12,31 +13,20 @@
 
   <!-- 列表 -->
   <view class="list_vi2">
-    <view class="list_li4" >
-      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
-      <view class="txl_txt">
-        <text>艾庆志</text>
-        <i>15956566666</i>
-      </view>
-    </view>
-    <view class="list_li4" >
+    <view class="list_li4" catchtap="Call" wx:for="{{bookList}}" wx:key="index" data-index="{{item}}">
       <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
       <view class="txl_txt">
-        <text>卜志楼</text>
-        <i>15956566666</i>
-      </view>
-    </view>
-    <view class="list_li4" >
-      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
-      <view class="txl_txt">
-        <text>陈玲玲</text>
-        <i>15956566666</i>
+        <text>{{item.nickName}}</text>
+        <i>{{item.phonenumber}}</i>
       </view>
     </view>
+  
 
   </view>
 
 
 
-
+  <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
 </view>

+ 8 - 1
pages/maillist/maillist.wxss

@@ -1 +1,8 @@
-/* pages/maillist.wxss */
+/* pages/maillist.wxss */
+.data-loading {
+  height: 100rpx;
+  line-height: 100rpx;
+  background-color: #fff;
+  text-align: center;
+  font-size: 14px;
+}

+ 235 - 0
pages/maillist/serch/maillist_serch.js

@@ -0,0 +1,235 @@
+// pages/maillist.js
+import http from '../../../base/httputil'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+ /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中,避免数据多次加载
+     */
+    loadingData: false,
+    bookList: [],
+    isRefresh: true,
+    total: 0,
+    pageNum: 1 ,// 页码
+    serchValue:""
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (){
+   // this.loadData()
+   
+  },
+  searchEnterprise(e) {
+    var obj = new Object()
+    //每次搜索初始化数据
+    this.setData({
+      serchValue: e.detail.value,
+      bookList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
+    })
+    obj.nickName = e.detail.value
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    this.loadData(obj)
+
+  },
+
+
+  loadData(data){
+    http.send_get("/system/AppPBookController/getPBookList", data, this.getBookListSuccess)
+  },
+  getBookListSuccess(res) {
+
+    console.log("@@@@", res)
+    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({
+          bookList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          bookList: this.data.bookList.concat(res.data.rows)
+        })
+        // 隐藏加载框
+
+        setTimeout(function () {
+          that.setData({
+            hidden: true,
+            loadingData: false
+          });
+
+          wx.hideLoading();
+        }, 1000)
+
+      }
+    } else {
+      console.log("@@!", "请求失败")
+    }
+  },
+  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.pageNum = this.data.pageNum
+    obj.nickName = this.data.serchValue
+    obj.pageSize = 10
+    obj.reasonable = false
+    this.loadData(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
+      });
+      console.info(that.data.hidden);
+    }
+
+    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){
+      let obj = new Object()
+      obj.pageNum = that.data.pageNum
+      obj.nickName = that.data.serchValue
+      obj.pageSize = 10
+      obj.reasonable = false
+    that.loadData(obj);
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+
+  },
+
+  
+  Call(e){
+    let phone = e.currentTarget.dataset.index
+    if(phone.phonenumber!=""){
+    wx.makePhoneCall({
+      phoneNumber: phone.phonenumber
+    })
+  }else{
+    wx.showToast({
+      title: '该联系人暂无电话',
+      icon:'error'
+    })
+  }
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+ 
+
+ 
+
+
+})

+ 14 - 0
pages/maillist/serch/maillist_serch.json

@@ -0,0 +1,14 @@
+{
+  "component": true, 
+  "usingComponents": {
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true,
+  "navigationBarTitleText": "通讯录"
+
+}

+ 31 - 0
pages/maillist/serch/maillist_serch.wxml

@@ -0,0 +1,31 @@
+<!--pages/maillist.wxml-->
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="searchEnterprise" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi2">
+    <view class="list_li4" catchtap="Call" wx:for="{{bookList}}" wx:key="index" data-index="{{item}}">
+      <view class="txl_img"><i class="iconfont icon-yonghutouxiang"></i></view>
+      <view class="txl_txt">
+        <text>{{item.nickName}}</text>
+        <i>{{item.phonenumber}}</i>
+      </view>
+    </view>
+  
+
+  </view>
+
+
+
+  <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
+</view>

+ 8 - 0
pages/maillist/serch/maillist_serch.wxss

@@ -0,0 +1,8 @@
+/* pages/maillist.wxss */
+.data-loading {
+  height: 100rpx;
+  line-height: 100rpx;
+  background-color: #fff;
+  text-align: center;
+  font-size: 14px;
+}

+ 2 - 2
pages/material/details/material_details.wxml

@@ -15,9 +15,9 @@
   <i>{{connector}}</i>
   </view>
   <view class="tit"><i class="iconfont icon-dian"></i>联系电话</view>
-    <view class="bor">
+    <view class="bor"bindtap="Call">
     <i class="iconfont icon-weibiaoti--"></i>
-  <i class="phone" bindtap="Call">{{connectorPhone}}</i>
+  <i class="phone" >{{connectorPhone}}</i>
 
   </view>
   <view class="tit"><i class="iconfont icon-dian"></i>创建人</view>

+ 3 - 0
pages/material/serch/material_serch.js

@@ -59,6 +59,7 @@ Page({
   },
 
   list(data) {
+    console.log("$$$$$-=-=-=-"+data.materialName);
     http.send_get("/system/AppMaterialController/geMaterialList", data, this.getMaterListSuccess)
   },
 
@@ -139,6 +140,7 @@ Page({
 
     let obj = new Object()
     obj.pageNum = this.data.pageNum
+    obj.materialName = this.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     this.list(obj)
@@ -176,6 +178,7 @@ Page({
     // that.loadData();
     let obj = new Object()
     obj.pageNum = that.data.pageNum
+    obj.materialName = that.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     that.list(obj)

+ 2 - 1
pages/teamlist/serch/team_serch.js

@@ -45,7 +45,6 @@ Page({
       pageNum: 1, // 页
     })
     obj.teamName = e.detail.value
-    obj.materialName = e.detail.value
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
     obj.reasonable = false
@@ -134,6 +133,7 @@ Page({
 
     let obj = new Object()
     obj.pageNum = this.data.pageNum
+    obj.teamName = this.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     this.list(obj)
@@ -171,6 +171,7 @@ Page({
     // that.loadData();
     let obj = new Object()
     obj.pageNum = that.data.pageNum
+    obj.teamName =that.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     that.list(obj)

+ 2 - 0
pages/warehouselist/serch/warehouse_serch.js

@@ -132,6 +132,7 @@ Page({
 
     let obj = new Object()
     obj.pageNum = this.data.pageNum
+    obj.warehouseName = this.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     this.list(obj)
@@ -169,6 +170,7 @@ Page({
     // that.loadData();
     let obj = new Object()
     obj.pageNum = that.data.pageNum
+    obj.warehouseName = that.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     that.list(obj)

+ 8 - 2
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
        })
     }
    

+ 1 - 0
pages/xuncha/xuncha.json

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

+ 194 - 29
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,53 +41,207 @@ 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)
   },
 
-  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
-    })
+  
+    // 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

+ 4 - 1
pages/xunchawu/xunchawu.json

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

+ 3 - 1
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>

+ 7 - 0
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;
+    }
 
   

+ 1 - 1
project.private.config.json

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