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

taiyuan
2 parents cec26bef 5b987e7e
Showing 4 changed files with 16 additions and 4 deletions
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/goodsInfo/goodsInfo.wxss
@@ -415,6 +415,10 @@ Page({
                 }
             }
         }else{
+            if(!gg.pick_id){
+                getApp().showWarning("未找到门店");
+                return false;
+            }
             var gg = getApp().globalData.service_now;
             var goods={
@@ -513,6 +513,12 @@ Page({
 	th.setData({
       open_ind_store: ind
     });
+
+	if(!th.data.sto_sele_name){
+        getApp().my_warnning('请选择门店', 1, th, 450);
+        return false;
+    }
+
 	if(action=="buy"){
 		//--------------此时操作的数据------------
@@ -208,7 +208,7 @@
        </view>
 	   <!-- 选择门店模块 -->
-	   <view  class="flex-space-between address ai_end xc-width" style="margin-top: 30rpx;">   
+	   <view  class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">
 	                <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 	                  <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 	                    <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
@@ -298,9 +298,9 @@
 	  								 </block>
 	  								 <block wx:else>
 	  									 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-	  										 class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+	  										 class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" data-action="add">加入购物车</view>
 	  									 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
-	  										 class="spec-cart-btn spec-buy" data-action="buy">
+	  										 class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" data-action="buy">
 	  										 {{sele_g.offline_price?"券后购买":"立即购买"}}
 	  									</view> 
 	  								 </block>
@@ -2842,4 +2842,6 @@ button.custom-service::after{
 .stock {
 	flex: 1;
-}
 \ No newline at end of file
+}
+
+.gray{ background-color: #dcdcdc !important;}
 \ No newline at end of file