diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 8c7c7b4..eadf59c 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -4777,6 +4777,21 @@ Page({ goods.quan_num = g_item.quan_num; goods.quan_no = g_item.quan_no; } + + //如果活动一样,那么商品的活动就要清理成0 + var sh_can_cx=t_item.show_can_cx; + if(sh_can_cx){ + for (let kh in sh_can_cx) { + var cur=sh_can_cx[kh]?sh_can_cx[kh].cur_act:null; + if(cur && cur.is_no_ok){ + //如果活动一样,那么商品的活动就要清理成0 + if(g_item.prom_type==cur.prom_type && g_item.prom_id==cur.prom_id){ + g_item.prom_type=0; + } + } + } + } + //--判断活动的类型-- switch (g_item.prom_type) { case 1: @@ -4927,7 +4942,6 @@ Page({ zhlist.push(ite); } - item.zhlist=zhlist; } @@ -5030,7 +5044,7 @@ Page({ // debugger var str = JSON.stringify(pdata); console.log(str,'aaaaaaaaaaaaaaa'); - // return false; + //return false; wx.showLoading({ title: "加载中" }); th.setData({ submit: 1, })