Commit 6076844adfbc7cca80cde0e83b7ac157e8c22baa
1 parent
08981e0b
拼团的优化
Showing
4 changed files
with
6 additions
and
4 deletions
packageA/pages/goodsInfo/goodsInfo.js
| @@ -1631,6 +1631,7 @@ Page({ | @@ -1631,6 +1631,7 @@ Page({ | ||
| 1631 | 1631 | ||
| 1632 | //---------拿出门店分类和门店------------ | 1632 | //---------拿出门店分类和门店------------ |
| 1633 | get_sto(e) { | 1633 | get_sto(e) { |
| 1634 | + var is_normal=e; | ||
| 1634 | var th = this,that=this; | 1635 | var th = this,that=this; |
| 1635 | var timer_get = setInterval(function() { | 1636 | var timer_get = setInterval(function() { |
| 1636 | if (th.data.is_get_local_ok == 0) return false; | 1637 | if (th.data.is_get_local_ok == 0) return false; |
| @@ -1688,7 +1689,7 @@ Page({ | @@ -1688,7 +1689,7 @@ Page({ | ||
| 1688 | } | 1689 | } |
| 1689 | 1690 | ||
| 1690 | //如果有秒杀的指定门店 | 1691 | //如果有秒杀的指定门店 |
| 1691 | - if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length){ | 1692 | + if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){ |
| 1692 | var pick_up_lists=th.data.prom_act.pick_up_lists; | 1693 | var pick_up_lists=th.data.prom_act.pick_up_lists; |
| 1693 | for (var kq = 0; kq < e.data.data.pageData.length; kq++) { | 1694 | for (var kq = 0; kq < e.data.data.pageData.length; kq++) { |
| 1694 | var it0=e.data.data.pageData[kq]; | 1695 | var it0=e.data.data.pageData[kq]; |
packageA/pages/serviceCard_pd/goodsInfo/buy_pt.wxml
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> | 55 | <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view> |
| 56 | </view> | 56 | </view> |
| 57 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view> | 57 | <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该店不可售)</view> |
| 58 | - <view class="no_store" wx:elif="{{def_pick_store.is_no_act}}">(该店不可售)</view> | 58 | + <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act}}">(该店不可售)</view> |
| 59 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view> | 59 | <view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view> |
| 60 | <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> | 60 | <view class="fs24 xc-ash-9f xc-distance-top" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view> |
| 61 | </view> | 61 | </view> |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
| @@ -358,7 +358,6 @@ Page({ | @@ -358,7 +358,6 @@ Page({ | ||
| 358 | var appd = getApp().globalData; | 358 | var appd = getApp().globalData; |
| 359 | var w_time = setInterval(function () { | 359 | var w_time = setInterval(function () { |
| 360 | if (that.data.is_get_local_ok == 0) return false; | 360 | if (that.data.is_get_local_ok == 0) return false; |
| 361 | - | ||
| 362 | if (!th.data.data) return false; | 361 | if (!th.data.data) return false; |
| 363 | var ser_card = th.data.data; | 362 | var ser_card = th.data.data; |
| 364 | //--如果默认门店不在等级卡的默认们店以内 | 363 | //--如果默认门店不在等级卡的默认们店以内 |
| @@ -1217,6 +1216,7 @@ Page({ | @@ -1217,6 +1216,7 @@ Page({ | ||
| 1217 | 1216 | ||
| 1218 | //---------拿出门店分类和门店------------ | 1217 | //---------拿出门店分类和门店------------ |
| 1219 | get_sto(e) { | 1218 | get_sto(e) { |
| 1219 | + var is_normal=e; | ||
| 1220 | var th = this, that = this; | 1220 | var th = this, that = this; |
| 1221 | var timer_get = setInterval(function () { | 1221 | var timer_get = setInterval(function () { |
| 1222 | if (th.data.is_get_local_ok == 0) return false; | 1222 | if (th.data.is_get_local_ok == 0) return false; |
| @@ -1276,7 +1276,7 @@ Page({ | @@ -1276,7 +1276,7 @@ Page({ | ||
| 1276 | } | 1276 | } |
| 1277 | 1277 | ||
| 1278 | //如果有秒杀的指定门店 | 1278 | //如果有秒杀的指定门店 |
| 1279 | - if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length){ | 1279 | + if(th.data.prom_type==6 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){ |
| 1280 | var pick_up_lists=th.data.prom_act.pick_up_lists; | 1280 | var pick_up_lists=th.data.prom_act.pick_up_lists; |
| 1281 | for (var kq = 0; kq < e.data.data.pageData.length; kq++) { | 1281 | for (var kq = 0; kq < e.data.data.pageData.length; kq++) { |
| 1282 | var it0=e.data.data.pageData[kq]; | 1282 | var it0=e.data.data.pageData[kq]; |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss