Commit a39d9d37fd76a01b98f23f50385d848c025ba8d1
Merge branch 'dev' into 'test'
Dev See merge request !58
Showing
1 changed file
with
9 additions
and
4 deletions
pages/user/order_list/order_list.js
| @@ -240,9 +240,7 @@ Page({ | @@ -240,9 +240,7 @@ Page({ | ||
| 240 | confirmOrder: function(t) { | 240 | confirmOrder: function(t) { |
| 241 | var e = this, a = t.currentTarget.dataset.id; | 241 | var e = this, a = t.currentTarget.dataset.id; |
| 242 | var is_zsorder=t.currentTarget.dataset.zsorder; | 242 | var is_zsorder=t.currentTarget.dataset.zsorder; |
| 243 | - | ||
| 244 | - console.log("confirmOrder"); | ||
| 245 | - console.log(is_zsorder); | 243 | + var th=this; |
| 246 | 244 | ||
| 247 | wx.showModal({ | 245 | wx.showModal({ |
| 248 | title: "是否确认收货?", | 246 | title: "是否确认收货?", |
| @@ -252,7 +250,14 @@ Page({ | @@ -252,7 +250,14 @@ Page({ | ||
| 252 | order_id: a,order_status:2 | 250 | order_id: a,order_status:2 |
| 253 | }, | 251 | }, |
| 254 | success: function(t) { | 252 | success: function(t) { |
| 255 | - e.deleteOrderData(a); | 253 | + //e.deleteOrderData(a); |
| 254 | + for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id ==a ) { | ||
| 255 | + th.data.orderList.splice(e, 1), th.setData({ | ||
| 256 | + orderList: th.data.orderList | ||
| 257 | + }); | ||
| 258 | + break; | ||
| 259 | + } | ||
| 260 | + | ||
| 256 | //如果是会员团订单 | 261 | //如果是会员团订单 |
| 257 | if(is_zsorder==3){ | 262 | if(is_zsorder==3){ |
| 258 | getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{ | 263 | getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{ |