Merge branch 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program

pages/order_tabs/orderTabs.js

@@ -7,26 +7,51 @@ Page({
    */
   data: {
       hasmore:false,
-      orders:[]
+      orders:[],
+      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;
-        self.setData({
-          orders
-        });
-        console.log(self.data.orders);
-      })
+      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();
+    })
   },
 
   /**
@@ -68,7 +93,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-  
+    this.req_datas();
   },
 
   /**
@@ -76,5 +101,13 @@ Page({
    */
   onShareAppMessage: function () {
   
+  },
+
+  timeFormat(time){
+    let date = new Date(time*1000);
+    let year = date.getFullYear();
+    let month = date.getMonth()+1;
+    let day = date.getDate();
+    return `${year}-${month}-${day}`;
   }
 })

pages/order_tabs/orderTabs.wxml

@@ -2,7 +2,7 @@
   <block wx:key="{{index}}" wx:for="{{orders}}">
     <view class='order_item'>
       <view class='order_time'>
-          <text class='add_time'>2018-03-14</text>
+          <text class='add_time'>{{addTimes[index]}}</text>
           <text class='state_desc'>{{item.order_info.state_desc}}</text>
       </view>
       <block wx:key="{{index}}" wx:for-item="goods_list"  wx:for="{{item.order_goods}}">
@@ -19,13 +19,13 @@
           </view>
         </view>
         <view class='order_price'>
-          <view>￥430</view>
+          <view>￥{{goods_list.goods_pay_price}}</view>
           <view>x{{goods_list.goods_num}}</view>
         </view>
       </view>
       </block>
       <view class='order_total'>
-        <text>共1件 合计￥430(含运费￥0)</text>
+        <text>共{{item.order_goods.length}}件 合计：<text class='order_amount'>￥{{item.order_info.order_amount}}</text> (含运费￥{{item.order_info.shipping_fee}})</text>
       </view>
       <view class='order_handle'>
         <text>删除订单</text>

pages/order_tabs/orderTabs.wxss

@@ -7,7 +7,7 @@
 .order_time {
   position: relative;
   display: flex;
-  padding: 0 15rpx 5rpx 15rpx;
+  padding: 10rpx 15rpx;
 }
 
 .order_time::after {
@@ -59,6 +59,7 @@
 
 .order_total {
   padding-right: 15rpx;
+  padding-top: 15rpx;
 }
 
 .order_handle text {
@@ -76,3 +77,6 @@
   margin-top:20rpx;
   display:inline-block;
 }
+.order_amount {
+  color: #eb4e4f;
+}