购物车不满足条件的活动要全部删除，

yvan.ni
1 parent d851efe3
Showing 2 changed files with 9 additions and 3 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
@@ -425,6 +425,11 @@ Page({
                                 item.buyqty=t_item.buyqty;
                                 item.zh_b_num=promgoodsbuynum;
                                 item.act=th.data.zuhe_map[item.prom_id];
+                            }else{
+                                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                                getApp().request.delete(url, {});
+                                th.data.zuhe_map[item.prom_id]=-1;
+                                continue;
                             }
                         }
                         else if(item.prom_type == 0) {
@@ -1246,7 +1246,7 @@ Page({
                     var cart_item = c_arr[i];      //就是每一单的意思
                     var pickid = cart_item.pickup_id;
                     var o_price = 0;
-                    var o_price_no_zh=0;  //不包含限制优惠叠加组合购的金额汇总
+                    var o_price_no_zh=0;  //参与订单优惠叠加--组合购的金额汇总
                     var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
                     var item = c_arr[i].goods;   //就是每一单的从表的意思
@@ -1307,8 +1307,9 @@ Page({
                             //找到那些可以订单优惠叠加的
                             for(let ij in zh_prom_goods){
                             	let kitem=zh_prom_goods[ij];
-                                if(kitem.act.is_orderyh) continue;
-                                o_price_no_zh-=kitem.cut_price;
+                            	var is_has_zh=kitem.is_has_zh;
+                                if(kitem.act.is_orderyh)
+                                     o_price_no_zh-=kitem.cut_price;
                             }
                         }
                     }