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

season
2 parents d7e6aac0 6f0fe2db
Showing 1 changed file with 19 additions and 2 deletions
packageE/pages/cart/cart2/cart2.js
@@ -2526,7 +2526,7 @@ Page({
   },
   //寻找活动在列表中的最后一个
-  is_has_gift(ord_goods, prom_id,get_data) {
+  is_has_gift(ord_goods, prom_id,get_data,index) {
     if (!ord_goods || ord_goods.length == 0) return false;
     var len = ord_goods.length;
     var is_ck=false;
@@ -2535,6 +2535,23 @@ Page({
       if (e.prom_type == 3 && e.prom_id == prom_id && e.is_gift == 1) {
         if(get_data.zp_by>0){
           ord_goods[i].is_past=1;
+
+          //cartlist和old_cartlist的值要同步
+          let fidx=this.data.cartlist[index].goods.findIndex((ee)=>{
+              return ee.prom_type == 3 && ee.prom_id == prom_id && ee.is_gift == 1 && ee.goods_id==e.goods_id
+          })
+          if(fidx>-1){
+            this.data.cartlist[index].goods[fidx].is_past=1;
+          }
+
+          fidx=this.data.old_cartlist[index].goods.findIndex((ee)=>{
+            return ee.prom_type == 3 && ee.prom_id == prom_id && ee.is_gift == 1 && ee.goods_id==e.goods_id
+          })
+          if(fidx>-1){
+            this.data.old_cartlist[index].goods[fidx].is_past=1;
+          }
+
+
         }
         is_ck=true;
       }
@@ -2554,7 +2571,7 @@ Page({
   cart_add_gift(item_map, pickid, i, ord_goods, get_data) {
     var th = this;
-    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id,get_data)
+    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id,get_data,i)
     //-- 没有赠品的时候才添加，避免购物车重复出现 --
     if (!is_has_gift) {