Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents dd532011 eb2cde97
Showing 3 changed files with 29 additions and 14 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
utils/more_cx.js
@@ -8195,6 +8195,12 @@ Page({
             goods[fg].prom_type=ck_prom_type.prom_type;
             goods[fg].prom_id=ck_prom_type.prom_id;
  
+            //如果是不参与的话，商品的活动状态要清理
+            if(th.data.cartlist[idx].show_can_cx[gd_key].no_cj_prom && ck_prom_type.prom_type==3){
+              goods[fg].prom_type=0;
+              goods[fg].prom_id=0;
+            }
+
             for(var ik=0;ik< th.data.cartlist[idx].goods.length;ik++){
                 if(th.data.cartlist[idx].goods[ik].id==goods[fg].id){
                   th.data.cartlist[idx].goods[ik].prom_type= goods[fg].prom_type;
@@ -8392,7 +8398,7 @@ Page({
         goods[fg].prom_id = ck_prom_type.prom_id;
  
         //如果是不参与的话，商品的活动状态要清理
-        if(item.no_cj_prom){
+        if(item.no_cj_prom && ck_prom_type.prom_type==3){
             goods[fg].prom_type=0;
             goods[fg].prom_id=0;
         }
@@ -2381,9 +2381,11 @@ Page({
           rd_arr.push({});
           continue;
         }
+
+        //不需要修改价格
         await m_cx.cart_cx_group(th, ite1, car[a], 0, n_ok, (show_can_cx) => {
           rd_arr.push(show_can_cx)
-        })
+        },1)
       }
  
       if(car.length>1 && c_ind>-1){
@@ -2391,7 +2393,7 @@ Page({
           //检验和设置商品的最终是以 取用什么活动，因为多促销
           await m_cx.cart_cx_group(th, ite2, car[c_ind], 0, n_ok, (show_can_cx) => {
             rd_arr[c_ind]=show_can_cx;
-          })
+          },1)
       }
  
       for (var a = 0; a < car.length; a++) {
@@ -5132,7 +5134,7 @@ Page({
     m_cx.cart_cx_group(this, item, car[c_idx], 0, 0, (show_can_cx) => {
       car[c_idx].show_can_cx = show_can_cx;
       th.cx_check_ok2(func, car);
-    });
+    },1);
  
   },
  
@@ -314,7 +314,7 @@ module.exports = {
     //-- 判读一下促销分组的问题 --
     //-- is_need_ck_num 是多门店计算的时候，数量是不是要累家计算,主要是拿来计算限购 --
     //-- need_ok是判断要不要满足条件，这是在cart2的时候，才会赋值成1 --
-    async cart_cx_group(th,goods,car_item,is_need_ck_num,need_ok,func){
+    async cart_cx_group(th,goods,car_item,is_need_ck_num,need_ok,func,is_no_change){
  
         var os= getApp().globalData.setting;
         //更改活动的时候，就不能再重新计算活动，只有再加减数量和选择商品的时候，就要重新计算活动
@@ -525,17 +525,24 @@ module.exports = {
                     for(var f=0;f<t_goods.length;f++){
                         all_num+=t_goods[f].goods_num;
  
-                        //-- 优惠促销取价的优化 --
-                        let f_price=t_goods[f].goods_price;
-                        if(fd.discount_field!=undefined){
-                            switch (fd.discount_field){
-                                case 0: f_price=t_goods[f].goods_price;break;
-                                case 1: f_price=t_goods[f].shop_price;break;
-                                case 2: f_price=t_goods[f].goods_market_price;break;
+                        if(!is_no_change) {
+                            //-- 优惠促销取价的优化 --
+                            let f_price = t_goods[f].goods_price;
+                            if (fd.discount_field != undefined) {
+                                switch (fd.discount_field) {
+                                    case 0:
+                                        f_price = t_goods[f].goods_price;
+                                        break;
+                                    case 1:
+                                        f_price = t_goods[f].shop_price;
+                                        break;
+                                    case 2:
+                                        f_price = t_goods[f].goods_market_price;
+                                        break;
+                                }
                             }
+                            t_goods[f].goods_price = f_price;
                         }
-                        t_goods[f].goods_price=f_price;
-
  
                         all_pri+=t_goods[f].goods_num*t_goods[f].goods_price;
                     }