Commit 05be2e3b599969d92db349a2724ac4567ebc2987
Merge branch 'test' into 'qa'
Test See merge request !59
Showing
1 changed file
with
9 additions
and
4 deletions
pages/user/order_list/order_list.js
| ... | ... | @@ -240,9 +240,7 @@ Page({ |
| 240 | 240 | confirmOrder: function(t) { |
| 241 | 241 | var e = this, a = t.currentTarget.dataset.id; |
| 242 | 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 | 245 | wx.showModal({ |
| 248 | 246 | title: "是否确认收货?", |
| ... | ... | @@ -252,7 +250,14 @@ Page({ |
| 252 | 250 | order_id: a,order_status:2 |
| 253 | 251 | }, |
| 254 | 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 | 262 | if(is_zsorder==3){ |
| 258 | 263 | getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{ | ... | ... |