diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 951bbcc..b46cb43 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -471,23 +471,27 @@ Page({ var ie = { pickup_id: pcid, pname: pikname, goods: narr, wind: m_wind, distr_t: dis_t,card_cut_price:0,exp_type:e_t, goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0, user_note:0}; - - //-- 如果是回退回来的情况 -- - if(th.data.cartlist && th.data.cartlist.length>0) { - for(var kj in th.data.cartlist){ - if(ie.pickup_id==th.data.cartlist[kj].pickup_id){ - ie.exp_type=th.data.cartlist[kj].exp_type; - break; - } - } - } - + //-- 把等级卡会优惠多少钱装进去 -- if(item.cut_price1) ie.card_cut_price+=item.cut_price1; arr.push(ie); } } + + //-- 如果是回退回来的情况 -- + if(th.data.cartlist && th.data.cartlist.length>0) { + for(var kj in th.data.cartlist){ + for(var ih in arr){ + var ie=arr[ih]; + if(ie.pickup_id==th.data.cartlist[kj].pickup_id){ + ie.exp_type=parseInt(th.data.cartlist[kj].exp_type); + break; + } + } + } + } + //深拷贝 th.data.old_cartlist= JSON.parse(JSON.stringify(arr)); th.setData({