Commit 5927a93970d263a625a6f192f9a2c19684b1174b
Merge branch 'dev' into 'test'
订单列表，和订单详情关于退款完成后。以及退款进行中的bug优化 See merge request !68
Showing
2 changed files
with
15 additions
and
11 deletions
pages/user/order_detail/order_detail.js
| @@ -124,7 +124,8 @@ Page({ | @@ -124,7 +124,8 @@ Page({ | ||
| 124 | 124 | ||
| 125 | //if(r['order_status'] == 1 && r['pay_status'] == 1) { | 125 | //if(r['order_status'] == 1 && r['pay_status'] == 1) { |
| 126 | goodslist.forEach(function (eeb, iii) { | 126 | goodslist.forEach(function (eeb, iii) { |
| 127 | - //goodslist[iii]['return_btn'] = 1; | 127 | + if(r['order_status'] == 1 && r['pay_status'] == 1) |
| 128 | + goodslist[iii]['return_btn'] = 1; //申请退款 | ||
| 128 | ttd.data.data.pageData.forEach(function (eea, ii) { | 129 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 129 | var st = eea.status; | 130 | var st = eea.status; |
| 130 | if (eea.goods_id == eeb.goods_id){ | 131 | if (eea.goods_id == eeb.goods_id){ |
pages/user/order_list/order_list.js
| @@ -139,7 +139,8 @@ Page({ | @@ -139,7 +139,8 @@ Page({ | ||
| 139 | 139 | ||
| 140 | //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) { | 140 | //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) { |
| 141 | goodslist.forEach(function (eeb, iii) { | 141 | goodslist.forEach(function (eeb, iii) { |
| 142 | - //goodslist[iii]['return_btn'] = 1; | 142 | + if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) |
| 143 | + goodslist[iii]['return_btn'] = 1; //申请退款 | ||
| 143 | ttd.data.data.pageData.forEach(function (eea, ii) { | 144 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 144 | var st = eea.status; | 145 | var st = eea.status; |
| 145 | if (eea.goods_id == eeb.goods_id){ | 146 | if (eea.goods_id == eeb.goods_id){ |
| @@ -224,7 +225,7 @@ Page({ | @@ -224,7 +225,7 @@ Page({ | ||
| 224 | if(t.data.code==0) | 225 | if(t.data.code==0) |
| 225 | { | 226 | { |
| 226 | 0 == e.data.activeCategoryId ? | 227 | 0 == e.data.activeCategoryId ? |
| 227 | - (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData(a); | 228 | + (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a); |
| 228 | } | 229 | } |
| 229 | else | 230 | else |
| 230 | { | 231 | { |
| @@ -251,14 +252,7 @@ Page({ | @@ -251,14 +252,7 @@ Page({ | ||
| 251 | order_id: a,order_status:2 | 252 | order_id: a,order_status:2 |
| 252 | }, | 253 | }, |
| 253 | success: function(t) { | 254 | success: function(t) { |
| 254 | - //e.deleteOrderData(a); | ||
| 255 | - for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id ==a ) { | ||
| 256 | - th.data.orderList.splice(e, 1), th.setData({ | ||
| 257 | - orderList: th.data.orderList | ||
| 258 | - }); | ||
| 259 | - break; | ||
| 260 | - } | ||
| 261 | - | 255 | + e.deleteOrderData2(a); |
| 262 | //如果是会员团订单 | 256 | //如果是会员团订单 |
| 263 | if(is_zsorder==3){ | 257 | if(is_zsorder==3){ |
| 264 | getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{ | 258 | getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{ |
| @@ -294,6 +288,15 @@ Page({ | @@ -294,6 +288,15 @@ Page({ | ||
| 294 | }); | 288 | }); |
| 295 | }, | 289 | }, |
| 296 | 290 | ||
| 291 | + deleteOrderData2:function(order_id){ | ||
| 292 | + for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id == order_id) { | ||
| 293 | + th.data.orderList.splice(e, 1), th.setData({ | ||
| 294 | + orderList: this.data.orderList | ||
| 295 | + }); | ||
| 296 | + break; | ||
| 297 | + } | ||
| 298 | + }, | ||
| 299 | + | ||
| 297 | //---判断是不是有退款----- | 300 | //---判断是不是有退款----- |
| 298 | checkReturnGoodsStatus: function(t) { | 301 | checkReturnGoodsStatus: function(t) { |
| 299 | var e = t.currentTarget.dataset.recid; | 302 | var e = t.currentTarget.dataset.recid; |