Merge branch 'master' of http://121.37.83.100:3000/sooka_edyj/sooka_edyj_minapp

pages/material/serch/material_serch.js

@@ -7,14 +7,26 @@ Page({
   data: {
     host: app.globalData.host,
     materialList: [],
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    isRefresh: true,
+    total: 0,
+    pageNum: 1, // 页码
+    serchValue: ""
   },
   onLoad() {
-   // this.list(null)
+    // this.list(null)
   },
   // 搜索结果跳页
   bindViewSearchEnd() {
     // wx.navigateTo({
-      // url: '../search/search'
+    // url: '../search/search'
     // })
   },
   // 物资详情页
@@ -27,9 +39,22 @@ Page({
   },
 
   searchEnterprise(e) {
+   
     var obj = new Object()
+    //每次搜索初始化数据
+    this.setData({
+      serchValue: e.detail.value,
+      materialList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
+    })
     obj.materialName = e.detail.value
-    
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
     this.list(obj)
   },
 
@@ -38,12 +63,134 @@ Page({
   },
 
   getMaterListSuccess(res) {
-    console.log("!!!!",res.data.rows.length)
-    this.setData({
-      materialList: res.data.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({
+          materialList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          materialList: this.data.materialList.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.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
+      });
+      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();
+    let obj = new Object()
+    obj.pageNum = that.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    that.list(obj)
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+
+  },
 
 })

pages/material/serch/material_serch.json

@@ -1,6 +1,9 @@
 {
   "usingComponents": {},
   "navigationBarBackgroundColor": "#f94b0e",
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "搜索结果"
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "搜索结果",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true
 }

pages/material/serch/material_serch.wxml

@@ -29,5 +29,7 @@
 
 
 
-
+<view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
 </view>

pages/material/serch/material_serch.wxss

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

pages/teamlist/serch/team_serch.js

@@ -7,29 +7,48 @@ Page({
   data: {
     host: app.globalData.host,
     teamList: [],
+     /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    isRefresh: true,
+    total: 0,
+    pageNum: 1, // 页码
+    serchValue: ""
   },
   onLoad() {
    // this.list(null)
   },
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    // wx.navigateTo({
-      // url: '../search/search'
-    // })
-  },
-  // 企业详细页
+ 
+  // 队伍详细页
   bindViewDetails(e) {
-    let warehouse_details = e.currentTarget.dataset.index
+    let team_details = e.currentTarget.dataset.index
 
     wx.navigateTo({
-      url: '../details/team_details?details=' + JSON.stringify(warehouse_details)
+      url: '../details/team_details?details=' + JSON.stringify(team_details)
     })
   },
 
   searchEnterprise(e) {
     var obj = new Object()
+    this.setData({
+      serchValue: e.detail.value,
+      teamList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
+    })
     obj.teamName = e.detail.value
-    
+    obj.materialName = e.detail.value
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
     this.list(obj)
   },
 
@@ -38,13 +57,135 @@ Page({
   },
 
   getTeamListSuccess(res) {
-  
-    console.log("$$$",res)
-    this.setData({
-      teamList: res.data.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({
+          teamList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          teamList: this.data.teamList.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.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
+      });
+      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();
+    let obj = new Object()
+    obj.pageNum = that.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    that.list(obj)
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+
+  },
 
 })

pages/teamlist/serch/team_serch.json

@@ -1,6 +1,9 @@
 {
   "usingComponents": {},
   "navigationBarBackgroundColor": "#f94b0e",
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "搜索结果"
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "搜索结果",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true
 }

pages/teamlist/serch/team_serch.wxml

@@ -29,5 +29,7 @@
 
 
 
-
+<view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
 </view>

pages/teamlist/serch/team_serch.wxss

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

pages/warehouselist/serch/warehouse_serch.js

@@ -7,17 +7,24 @@ Page({
   data: {
     host: app.globalData.host,
     warehouseList: [],
+     /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    isRefresh: true,
+    total: 0,
+    pageNum: 1, // 页码
+    serchValue: ""
   },
   onLoad() {
    // this.list(null)
   },
-  // 搜索结果跳页
-  bindViewSearchEnd() {
-    // wx.navigateTo({
-      // url: '../search/search'
-    // })
-  },
-  // 企业详细页
+  
+  // 仓库详细页
   bindViewDetails(e) {
     let warehouse_details = e.currentTarget.dataset.index
 
@@ -28,7 +35,19 @@ Page({
 
   searchEnterprise(e) {
     var obj = new Object()
+    this.setData({
+      serchValue: e.detail.value,
+      warehouseList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
+    })
     obj.warehouseName = e.detail.value
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
     
     this.list(obj)
   },
@@ -38,12 +57,134 @@ Page({
   },
 
   getWareHouseListSuccess(res) {
-  
-    this.setData({
-      warehouseList: res.data.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({
+          warehouseList: res.data.rows,
+          total: res.data.total
+        })
+
+
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          warehouseList: this.data.warehouseList.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.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
+      });
+      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();
+    let obj = new Object()
+    obj.pageNum = that.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    that.list(obj)
+
+    // }else{
+
+    //   setTimeout(function () {
+    //     that.setData({
+    //       hidden: true,
+    //     });
+
+    //   }, 2000)
+    // }
+
+
+  },
 
-  }
 
 })

pages/warehouselist/serch/warehouse_serch.json

@@ -1,6 +1,9 @@
 {
   "usingComponents": {},
   "navigationBarBackgroundColor": "#f94b0e",
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "搜索结果"
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "搜索结果",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true
 }

pages/warehouselist/serch/warehouse_serch.wxml

@@ -27,6 +27,8 @@
 </view>
 
 
-
+<view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
 
 </view>

pages/warehouselist/serch/warehouse_serch.wxss

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

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",