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

season
2 parents 4bfa39fe c5589e3c
Showing 2 changed files with 31 additions and 6 deletions
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
@@ -8223,6 +8223,28 @@ Page({
         }
       }
  
+      //promise_get.  看一下有没有指定门店的限制
+      let gd=null
+      let gd_rs= await getApp().promiseGet('/api/weshop/goods/get/' + os.stoid + "/" + item.goods_id,{})
+      if(gd_rs && gd_rs.data.code==0 && gd_rs.data.data){
+        gd=gd_rs.data.data;
+      }
+
+      if(gd.pick_group_ids){
+        var idx0=gd.pick_up_lists.findIndex(function (e){
+          return e.pickup_id==pickup_id;
+        })
+        if(idx0<0){
+          wx.showToast({
+            title: item.goods_name+"的门店不可售",
+            icon: 'none',
+            duration: 2000
+          })
+          return false;
+        }
+      }
+
+
       var bn_coll = th.selectComponent("#col"+cart_index); //组件的id
       bn_coll.set_sele(index);
  
@@ -171,12 +171,14 @@
                    </block>
                </block>
  
-               <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom) }}">
-                 <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
-                   <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
-                   <view class="yu_er">参与优惠活动</view>
+               <block wx:if="{{!items.is_gift}}">
+                 <view class="set-mes" wx:if="{{items.prom_type==3 || (items.prom_type==0 && item.show_can_cx[items.goods_id].no_cj_prom && item.show_can_cx[items.goods_id].sele_prom_type==3) }}">
+                   <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{items.goods_id}}"  bindtap='no_cj_prom'>
+                     <icon color="{{!item.show_can_cx[items.goods_id].no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
+                     <view class="yu_er">参与优惠活动</view>
+                   </view>
                  </view>
-               </view>
+               </block>
  
              </block>
  
@@ -231,7 +233,8 @@
                           </view>
                         </block>
  
-                        <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) }}">
+
+                        <view class="set-mes" wx:if="{{pitem.is_duo_gd && pitem.sele_prom_type==3 && util.check_is_last(index,items.goods_id) && !items.is_gift }}">
                           <view class="use-item" data-pidx="{{pidx}}" data-can_cx_idx="{{index}}"  bindtap='no_cj_prom'>
                             <icon color="{{!pitem.no_cj_prom?'red':'gray'}}" size="16" type="success"></icon>
                             <view class="yu_er">参与优惠活动</view>