diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 468429e..8c7c7b4 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1153,7 +1153,8 @@ Page({ var c_item = arr[k]; if(!is_change){ //-- 要进行归类一下活动 -- - await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,1,(show_can_cx)=>{ + await m_cx.cart_cx_group(th,arr[k].goods,c_item,0,0,(show_can_cx)=>{ + arr[k].show_can_cx=show_can_cx; }) }else{ @@ -1189,12 +1190,13 @@ Page({ } } //-- 如果组合购的总数量不足的处理 -- - if(no_zh_num[item1.prom_id] && item1.prom_type == 7){ - item1.prom_type = 0; - item1.prom_type1 = 0; - item1.prom_id = 0; - item1.prom_id1 = 0 - } + // if(no_zh_num[item1.prom_id] && item1.prom_type == 7){ + // item1.prom_type = 0; + // item1.prom_type1 = 0; + // item1.prom_id = 0; + // item1.prom_id1 = 0 + // } + //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在 if (item1.prom_type == 7) { if (!th.data.zuhe_map_good[item1.prom_id]) { @@ -1219,10 +1221,10 @@ Page({ store_count_ok = 0; no_zh_num[item1.prom_id]=1; //-- 清理一下活动的状态 -- - item1.prom_type = 0; - item1.prom_type1 = 0; - item1.prom_id = 0; - item1.prom_id1 = 0 + // item1.prom_type = 0; + // item1.prom_type1 = 0; + // item1.prom_id = 0; + // item1.prom_id1 = 0 }else{ th.data.zhhe_act_map[item1.prom_id] = res.data.data; @@ -7703,6 +7705,12 @@ Page({ var cx_prom_group=this.data.cartlist[idx].show_can_cx[gd_key].act_arr; var pk=this.data.cartlist[idx].pickup_id; + th.setData({ + send_lb:{}, + month_lb:{} + }) + + var fir_sele=0; for(var dx=0;dx - 可参促销 - 优惠促销 - 搭配促销 - 组合购 - 阶梯促销 + 优惠促销 + 搭配促销 + 组合购 + 阶梯促销 diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss index 20979b5..fee02dc 100644 --- a/pages/cart/cart/cart.wxss +++ b/pages/cart/cart/cart.wxss @@ -435,9 +435,13 @@ page { /* margin:0 auto; */ color: #fff; padding: 6rpx 20rpx; +} +.xc-coupon-fram .xc-coupon.gray{ + background-color: #bbb; } + .xc-coupon-fram .xc-circular { width: 16rpx; height: 16rpx;