|
|
@@ -94,13 +94,8 @@ |
|
|
|
|
|
|
|
<form bindsubmit="gotopay" report-submit='true'> |
|
|
|
<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};"> |
|
|
|
<<<<<<< HEAD |
|
|
|
<button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> |
|
|
|
<button bindtap='gotopay' disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> |
|
|
|
======= |
|
|
|
<button class='goback' bindtap='goback'><image src='./../../../assets/images/home.png' mode="widthFix"></image></button> |
|
|
|
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> |
|
|
|
>>>>>>> Formed |
|
|
|
<text class='txt'>{{data.salePriceStr}}元</text>马上购买</button> |
|
|
|
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.salePriceStr==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> |
|
|
|
<button class='buy' disabled='true' wx:if="{{data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8}}">已售罄</button> |
|
|
|