Merge branch 'dev' into 'test'

Dev See merge request !58

Merge branch 'dev' into 'test'
Dev See merge request !58
后端研发-苏明海
2 parents ded290a7 240c74c1
Showing 1 changed file with 9 additions and 4 deletions
pages/user/order_list/order_list.js
@@ -240,9 +240,7 @@ Page({
     confirmOrder: function(t) {
         var e = this, a = t.currentTarget.dataset.id;
         var is_zsorder=t.currentTarget.dataset.zsorder;
-
-        console.log("confirmOrder");
-        console.log(is_zsorder);
+        var th=this;
  
         wx.showModal({
             title: "是否确认收货?",
@@ -252,7 +250,14 @@ Page({
                         order_id: a,order_status:2
                     },
                     success: function(t) {
-                        e.deleteOrderData(a);
+                        //e.deleteOrderData(a);
+                        for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id ==a ) {
+                            th.data.orderList.splice(e, 1), th.setData({
+                                orderList: th.data.orderList
+                            });
+                            break;
+                        }
+                        
                         //如果是会员团订单
                         if(is_zsorder==3){
                           getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{