Commit 8491594d3db72c2296c57ddf6e76276580407022
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
4 changed files
with
16 additions
and
4 deletions
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/goodsInfo/goodsInfo.js
| ... | ... | @@ -513,6 +513,12 @@ Page({ |
| 513 | 513 | th.setData({ |
| 514 | 514 | open_ind_store: ind |
| 515 | 515 | }); |
| 516 | + | |
| 517 | + if(!th.data.sto_sele_name){ | |
| 518 | + getApp().my_warnning('请选择门店', 1, th, 450); | |
| 519 | + return false; | |
| 520 | + } | |
| 521 | + | |
| 516 | 522 | |
| 517 | 523 | if(action=="buy"){ |
| 518 | 524 | //--------------此时操作的数据------------ | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -208,7 +208,7 @@ |
| 208 | 208 | </view> |
| 209 | 209 | |
| 210 | 210 | <!-- 选择门店模块 --> |
| 211 | - <view class="flex-space-between address ai_end xc-width" style="margin-top: 30rpx;"> | |
| 211 | + <view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;"> | |
| 212 | 212 | <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}"> |
| 213 | 213 | <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text> |
| 214 | 214 | <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}"> |
| ... | ... | @@ -298,9 +298,9 @@ |
| 298 | 298 | </block> |
| 299 | 299 | <block wx:else> |
| 300 | 300 | <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" |
| 301 | - class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view> | |
| 301 | + class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" data-action="add">加入购物车</view> | |
| 302 | 302 | <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" |
| 303 | - class="spec-cart-btn spec-buy" data-action="buy"> | |
| 303 | + class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" data-action="buy"> | |
| 304 | 304 | {{sele_g.offline_price?"券后购买":"立即购买"}} |
| 305 | 305 | </view> |
| 306 | 306 | </block> | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxss