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


Test


From test into qa

Merged by 后端研发-苏明海

1 participants


pages/cart/cart2/cart2.js
@@ -441,11 +441,11 @@ Page({ @@ -441,11 +441,11 @@ Page({
441 } 441 }
442 442
443 var ie = { 443 var ie = {
444 - pickup_id: pcid, pname: pikname, goods: narr, exp_type: e_t, wind: m_wind, distr_t: dis_t,card_cut_price:0, 444 + pickup_id: pcid, pname: pikname, goods: narr, wind: m_wind, distr_t: dis_t,card_cut_price:0,
445 goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0}; 445 goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0};
446 446
447 if(!th.data.add_back){ 447 if(!th.data.add_back){
448 - ie.exp_type= et; 448 + ie.exp_type= e_t
449 } 449 }
450 //-- 把等级卡会优惠多少钱装进去 -- 450 //-- 把等级卡会优惠多少钱装进去 --
451 if(item.cut_price) ie.card_cut_price+=item.cut_price; 451 if(item.cut_price) ie.card_cut_price+=item.cut_price;