Merge branch 'dev' into 'test'

Dev See merge request !911

Merge branch 'dev' into 'test'
Dev See merge request !911
后端研发-苏明海
2 parents 811ef375 46fe703f
Showing 2 changed files with 12 additions and 0 deletions
pages/cart/cart2/cart2.js
pages/giftpack/giftpacklist/giftpacklist.js
@@ -3624,6 +3624,16 @@ Page({
                 }
             }
  
+            var  prom_pt_json= ep.prom_pt_json;
+            if(prom_pt_json){
+                for(let oj in prom_pt_json){
+                    let item_j=prom_pt_json[oj];
+                    if(item_j.ladder_prom_id){
+                        cut_price += parseFloat(item_j.dis);
+                    }
+                }
+            }
+            
             arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price;
             arr[ind].check_quan_ware_list = check_quan_ware_list;
             arr[ind].check_quan_price_list = check_quan_price_list;
@@ -39,6 +39,8 @@ Page({
       orderSn: options.orderSn,
       getUserID: d.user_id,
     })
+
+    if(options.lbId) th.data.lbId=options.lbId;
     //-- 获取分享人的ID --
     var first_leader = options.first_leader || getApp().globalData.first_leader;
     if (first_leader) {