Commit b9e630d2ffc1010396fb8719997a7d6c96782088

Authored by 后端研发-苏明海
2 parents 745871a6 00eb5258

Merge branch 'dev' into 'test'

Dev

See merge request !892
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -279,7 +279,7 @@ Page({ @@ -279,7 +279,7 @@ Page({
279 isTimeUp: false, 279 isTimeUp: false,
280 280
281 surplus: 0, 281 surplus: 0,
282 - canBuy: true, 282 + canBuy: false,
283 283
284 }, 284 },
285 285
pages/index/index/index.wxml
@@ -46,6 +46,8 @@ @@ -46,6 +46,8 @@
46 </view> 46 </view>
47 <!-- 如果有关注,要 --> 47 <!-- 如果有关注,要 -->
48 <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> 48 <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
  49 + <!-- 如果有顶部门店 -->
  50 + <view wx:if="{{is_topstore}}" style="height: 60rpx"></view>
49 51
50 <!--滚动广告--> 52 <!--滚动广告-->
51 <view class="rel title-img" wx:if="{{banner}}"> 53 <view class="rel title-img" wx:if="{{banner}}">