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


Dev


From dev into test

Merged by 后端研发-苏明海

1 participants

pages/cart/cart2/cart2.js
... ... @@ -3624,6 +3624,16 @@ Page({
3624 3624 }
3625 3625 }
3626 3626  
  3627 + var prom_pt_json= ep.prom_pt_json;
  3628 + if(prom_pt_json){
  3629 + for(let oj in prom_pt_json){
  3630 + let item_j=prom_pt_json[oj];
  3631 + if(item_j.ladder_prom_id){
  3632 + cut_price += parseFloat(item_j.dis);
  3633 + }
  3634 + }
  3635 + }
  3636 +
3627 3637 arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price;
3628 3638 arr[ind].check_quan_ware_list = check_quan_ware_list;
3629 3639 arr[ind].check_quan_price_list = check_quan_price_list;
... ...
pages/giftpack/giftpacklist/giftpacklist.js
... ... @@ -39,6 +39,8 @@ Page({
39 39 orderSn: options.orderSn,
40 40 getUserID: d.user_id,
41 41 })
  42 +
  43 + if(options.lbId) th.data.lbId=options.lbId;
42 44 //-- 获取分享人的ID --
43 45 var first_leader = options.first_leader || getApp().globalData.first_leader;
44 46 if (first_leader) {
... ...