wxd / MShopWeApp

Commit 24b92218c2a16129e17c5af425f137a7ca517b18

Authored by 后端研发-苏明海
2 parents aabb1e6e 5927a939

Merge branch 'test' into 'qa' 

Test

See merge request !69
Inline Side-by-side
Showing 2 changed files with 15 additions and 11 deletions
pages/user/order_detail/order_detail.js
  View file @24b9221
... ... @@ -124,7 +124,8 @@ Page({
124 124  
125 125 //if(r['order_status'] == 1 && r['pay_status'] == 1) {
126 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 129 ttd.data.data.pageData.forEach(function (eea, ii) {
129 130 var st = eea.status;
130 131 if (eea.goods_id == eeb.goods_id){
... ...
pages/user/order_list/order_list.js
  View file @24b9221
... ... @@ -139,7 +139,8 @@ Page({
139 139  
140 140 //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
141 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 144 ttd.data.data.pageData.forEach(function (eea, ii) {
144 145 var st = eea.status;
145 146 if (eea.goods_id == eeb.goods_id){
... ... @@ -224,7 +225,7 @@ Page({
224 225 if(t.data.code==0)
225 226 {
226 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 230 else
230 231 {
... ... @@ -251,14 +252,7 @@ Page({
251 252 order_id: a,order_status:2
252 253 },
253 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 257 if(is_zsorder==3){
264 258 getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{
... ... @@ -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 301 checkReturnGoodsStatus: function(t) {
299 302 var e = t.currentTarget.dataset.recid;
... ...