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

yvan.ni
2 parents 47b4b753 faed903e
Showing 1 changed file with 9 additions and 6 deletions
packageE/pages/cart/cart2/cart2.js
@@ -588,7 +588,7 @@ Page({
     var collocation_list = [];
     var pick = null;
     var distr_t = 0;
-
+    
     //如果是购物车的时候，
     if (arr) {
       var idx = th.data.allsto.findIndex(function (e) {
@@ -625,7 +625,7 @@ Page({
         }
       }
     })
-
+    
     if (!collocation_list) return null;
     var new_arr = [];
@@ -1158,6 +1158,7 @@ Page({
   get_buy_goods: function (e) {
     var th = this;
     var gg = to.get_b_now();
+    
     //--------如果goods_id一样，就是要立即购买-----
     if (e == gg.goods_id) {
       a.get("/api/weshop/goods/get/" + oo.stoid + "/" + e, {
@@ -1260,16 +1261,18 @@ Page({
               th.setData({ card_cut_price: cut_p });
             }
           }
+          
-          //-- 判断是不是可以收藏 --
-          if (gd.prom_type == 5 && !th.data.all_collocation_list.length) {
-            await th.set_collection(gd);
-          }
           //-- 当是搭配购的时候 --
           gd.prom_type = gg.prom_type ? gg.prom_type : 0;
           gd.prom_id = gg.prom_id ? gg.prom_id : 0;
+          //-- 判断是不是可以收藏 --
+          if (gd.prom_type == 5  && !th.data.all_collocation_list.length) {
+            
+            await th.set_collection(gd);
+          }
           if (gd.whsle_id > 0) {
             gd.prom_type = gg.prom_type = 0;