updata

pages/order_tabs/orderTabs.js

@@ -8,30 +8,50 @@ Page({
   data: {
       hasmore:false,
       orders:[],
-      addTimes:[]
+      addTimes:[],
+      curpage:1
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.req_datas();
+  },
+
+  req_datas(){
+    wx.showLoading({
+      title: '加载中',
+    });
     let self = this;
     getReq({
       act: 'member_order',
       op: 'list',
       page: 15,
-      curpage : 1
-      },function(res){
-        let orders = res.datas.orders;
-        let addTimes = [];
-        for (let item of orders) {
-          addTimes.push(self.timeFormat(item.order_info.add_time));
-        }
-        self.setData({
-          orders,
-          addTimes
-        });
-      })
+      curpage: this.data.curpage
+    }, function (res) {
+      let orders = res.datas.orders;
+      let addTimes = [];
+      let hasmore = false;
+      let curpage = self.data.curpage
+      for (let item of orders) {
+        addTimes.push(self.timeFormat(item.order_info.add_time));
+      }
+      if (res.datas.mobile_page.hasmore) {
+        hasmore = true;
+        curpage = self.data.curpage + 1;
+      }
+      else {
+        hasmore = false;
+      }
+      self.setData({
+        hasmore,
+        curpage,
+        orders: self.data.orders.concat(orders),
+        addTimes: self.data.addTimes.concat(addTimes)
+      });
+      wx.hideLoading();
+    })
   },
 
   /**
@@ -73,7 +93,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-  
+    this.req_datas();
   },
 
   /**