wxd / MShopWeApp

Merged
Merge Request #502 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 3 changed files
pages/cart/cart2/cart2.js
  View file @cc37eff
... ... @@ -738,6 +738,7 @@ Page({
738 738  
739 739 //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
740 740 for(var j=0;j<item.length;j++){
  741 + if(item[j].is_gift) continue;
741 742 if(item[j].prom_type==3 && item[j].prom_id==item_map.prom_id){
742 743 item[j].is_xz_yh= item_map.is_xz_yh;
743 744 item[j].is_past= item_map.is_past;
... ...
pages/user/order_detail/order_detail.js
  Edit  View file @cc37eff
... ... @@ -148,6 +148,7 @@ Page({
148 148 r['has_rt'] = 1; //有部分退
149 149 goodslist[iii]['return_btn'] = 2; break;
150 150 case 2://退款完成
  151 + r['has_rt'] = 1; //有部分退
151 152 goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
152 153 case 3://已拒绝，重新退款
153 154 goodslist[iii]['return_btn'] = 3; break;
... ...
pages/user/order_list/order_list.js
  Edit  View file @cc37eff
... ... @@ -188,6 +188,7 @@ Page({
188 188 data[ind]['has_rt'] = 1; //有部分退
189 189 goodslist[iii]['return_btn'] = 2; break;
190 190 case 2://退款完成
  191 + data[ind]['has_rt'] = 1; //有部分退
191 192 goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
192 193 case 3://已拒绝，重新退款
193 194 goodslist[iii]['return_btn'] = 3; break;
... ...