Commit 0b69b217d7ae18ee509107ba4e180ff9d2710162

Authored by yvan.ni
1 parent 472d0df9

已兑光的文字显示

pages/goods/goodsInfo/goodsInfo.wxml
@@ -1325,17 +1325,19 @@ @@ -1325,17 +1325,19 @@
1325 </view> 1325 </view>
1326 1326
1327 </block> --> 1327 </block> -->
1328 - <view class="buy-btn-all cart-btn" style="width: 30%;border-radius:0rpx 55rpx 55rpx 0rpx;" wx:if="{{can_integral}}"> 1328 + <view class="buy-btn-all cart-btn" style="width: 30%;border-radius:0rpx 55rpx 55rpx 0rpx;overflow: hidden; " wx:if="{{can_integral}}">
1329 <!-- 立即兑换 --> 1329 <!-- 立即兑换 -->
1330 <!-- <view wx:if="{{ prom_act.show_time_off}}" >即将开始</view> --> 1330 <!-- <view wx:if="{{ prom_act.show_time_off}}" >即将开始</view> -->
1331 <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;">即将开始</view> 1331 <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;">即将开始</view>
  1332 + <view wx:elif="{{ prom_act.limitqty<= prom_act.buy_num}}" style="background-color: #aaa;">已兑光</view>
1332 <view bindtap="go_pay_integral" wx:else>立即兑换</view> 1333 <view bindtap="go_pay_integral" wx:else>立即兑换</view>
1333 </view> 1334 </view>
1334 <view class="buy-btn cart-btn" style="background-color: #aaa;border-radius:0rpx 55rpx 55rpx 0rpx;" wx:else>积分不足</view> 1335 <view class="buy-btn cart-btn" style="background-color: #aaa;border-radius:0rpx 55rpx 55rpx 0rpx;" wx:else>积分不足</view>
1335 </block> 1336 </block>
1336 <block wx:else> 1337 <block wx:else>
1337 - <view class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}"> 1338 + <view class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;overflow: hidden;" wx:if="{{can_integral}}">
1338 <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;" >即将开始</view> 1339 <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;" >即将开始</view>
  1340 + <view wx:elif="{{ prom_act.limitqty<= prom_act.buy_num}}" style="background-color: #aaa;" >已兑光</view>
1339 <view bindtap="go_pay_integral" wx:else>立即兑换</view> 1341 <view bindtap="go_pay_integral" wx:else>立即兑换</view>
1340 </view> 1342 </view>
1341 <!-- <block wx:if="{{can_integral}}"> 1343 <!-- <block wx:if="{{can_integral}}">