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

WXD-SEASON\season
2 parents 35fc3332 fc776fb9
Showing 2 changed files with 10 additions and 3 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
packageE/pages/cart/cart2/cart2.js
@@ -712,6 +712,9 @@ Page({
       this.data.show_prew_img = 0; return false;
     }
+    th.data.fir_def_store =null;
+    that.setData({ def_pick_store: null,});
+
     /*--
     //优惠券要实时更新
     getApp().getConfig2(function (e) {
@@ -2396,7 +2396,8 @@ Page({
                       giftsinfo: get_data.giftsinfo,
                       zp_num: get_data.zp_num * get_data.bs,
                       gf_pr_name: item_map.name,
-                      prom_id: item_map.prom_id
+                      prom_id: item_map.prom_id,
+                      bs: parseInt(get_data.bs),
                     });
                     duo_zp_num_arr[item_map.prom_id] = t_zp_num;
@@ -7250,7 +7251,8 @@ Page({
       zp_num: this.data.send_gf[pk][index].zp_num,
       gift_pkid: pk,
       gf_prom_id: this.data.send_gf[pk][index].prom_id,
-      send_gf_index: index
+      send_gf_index: index,
+      gf_bs:this.data.send_gf[pk][index].bs
     })
   },
@@ -7310,6 +7312,8 @@ Page({
     th.data.isget_by_quan[gf_pickup_id]=null;
     var zp_num = this.data.zp_num;
+    var gf_bs = this.data.gf_bs?this.data.gf_bs:1;
+
     var giftsinfo = this.data.giftsinfo;
     var all_num = 0;
     for (let i in giftsinfo) {
@@ -7319,7 +7323,7 @@ Page({
           ut.m_toast("必送的赠品没有选中");
           return false;
         }
-        if(item.goods_num<item.must_num){
+        if(item.goods_num<item.must_num*gf_bs){
           ut.m_toast("活动赠品的超量数量不足");
           return false;
         }