HolyKnightIX 2 anni fa
parent
commit
30fba0f974
2 ha cambiato i file con 13 aggiunte e 12 eliminazioni
  1. +2
    -1
      pages/coupon/detail/index.js
  2. +11
    -11
      pages/coupon/detail/index.wxml

+ 2
- 1
pages/coupon/detail/index.js Vedi File

@@ -710,7 +710,8 @@ Page({
// title: res.data.title // title: res.data.title
// }) // })
that.setData({ that.setData({
barTitle: res.data.title
barTitle: res.data.title,
activityStatus: res.data.activityStatus ? res.data.activityStatus : ''
}) })
var EndTime = res.data.validStartDate; var EndTime = res.data.validStartDate;
var NowTime = new Date().getTime(); var NowTime = new Date().getTime();


+ 11
- 11
pages/coupon/detail/index.wxml Vedi File

@@ -29,8 +29,8 @@
<view style='text-align:center;display:inline-block;'> <view style='text-align:center;display:inline-block;'>
<image class='clock' src='{{clockUrl}}' mode='widthFix' wx:if="{{data.type!=10}}"></image> <image class='clock' src='{{clockUrl}}' mode='widthFix' wx:if="{{data.type!=10}}"></image>
<image class='clock' src='{{yushouUrl}}' mode='widthFix' wx:if="{{data.type==10}}"></image> <image class='clock' src='{{yushouUrl}}' mode='widthFix' wx:if="{{data.type==10}}"></image>
<text class="qiang" wx:if="{{data.activityStatus!=0}}">距结束 :</text>
<text class="qiang" wx:if="{{data.activityStatus==0}}">距开始 :</text>
<text class="qiang" wx:if="{{activityStatus!=0}}">距结束 :</text>
<text class="qiang" wx:if="{{activityStatus==0}}">距开始 :</text>
</view> </view>
<view wx:if="{{clock=='00'||data.status==1}}" class='times'> <view wx:if="{{clock=='00'||data.status==1}}" class='times'>
已经结束 已经结束
@@ -166,26 +166,26 @@
<image src='{{homeSelectedO}}' mode="widthFix"></image> <image src='{{homeSelectedO}}' mode="widthFix"></image>
<text class='btnTxt'>首页</text> <text class='btnTxt'>首页</text>
</button> </button>
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11 && data.type!=8 && data.type!=50 && data.type!=51 && priceAndStockObj.salePrice/100!=0 && priceAndStockObj.remainInventory!=0 && endtime!='活动已结束' && data.activityStatus!=0}}">
<button form-type="submit" disabled='{{showbutton}}' hover-class='active' class='buy' wx:if="{{data.type!=11 && data.type!=8 && data.type!=50 && data.type!=51 && priceAndStockObj.salePrice/100!=0 && priceAndStockObj.remainInventory!=0 && endtime!='活动已结束' && activityStatus!=0}}">
<text class='txt'>{{priceAndStockObj.salePrice/100}}元</text>马上购买 <text class='txt'>{{priceAndStockObj.salePrice/100}}元</text>马上购买
</button> </button>
<button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" class="home">配送到家 <button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" class="home">配送到家
</button> </button>
<button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" class="arrive">到店自提 <button wx:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" class="arrive">到店自提
</button> </button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type !=8 && data.type !=50 && data.type != 51 && priceAndStockObj.salePrice / 100 == 0 && priceAndStockObj.remainInventory !=0 && endtime != '活动已结束' && data.activityStatus != 0}}">免费领取</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type !=8 && data.type !=50 && data.type != 51 && priceAndStockObj.salePrice / 100 == 0 && priceAndStockObj.remainInventory !=0 && endtime != '活动已结束' && activityStatus != 0}}">免费领取</button>


<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type == 51 && priceAndStockObj.remainInventory !=0 || data.type == 50 && priceAndStockObj.remainInventory != 0}}">马上兑换</button>
<button form-type="submit" disabled='{{showbutton}}' class='buy' wx:if="{{data.type == 51 && priceAndStockObj.remainInventory !=0 || data.type == 50 && priceAndStockObj.remainInventory != 0 && activityStatus != 0}}">马上兑换</button>


<button class='buy buyHr' disabled='true' wx:if="{{data.sendType !=3 && (priceAndStockObj.remainInventory ==0 && endtime != '活动已结束' || priceAndStockObj.remainInventory ==0 && data.type == 8)}}">已售罄</button>
<button class='buy buyHr' disabled='true' wx:if="{{data.sendType !=3 && activityStatus != 0 && (priceAndStockObj.remainInventory ==0 && endtime != '活动已结束' || priceAndStockObj.remainInventory ==0 && data.type == 8)}}">已售罄</button>


<button class='buy' disabled='true' wx:if="{{priceAndStockObj.remainInventory ==0 && data.type == 50 || priceAndStockObj.remainInventory ==0 && data.type == 51}}">已兑完</button>
<button class='buy' disabled='true' wx:if="{{priceAndStockObj.remainInventory ==0 && data.type == 50 || priceAndStockObj.remainInventory ==0 && data.type == 51 && activityStatus != 0}}">已兑完</button>


<button class='buy' disabled='true' wx:if="{{endtime == '活动已结束' && data.activityStatus != 0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{endtime == '活动已结束' && activityStatus != 0}}">活动已结束</button>


<button class='buy' disabled='true' wx:if="{{total_micro_second <=0 && data.activityStatus != 0}}">活动已结束</button>
<button class='buy' disabled='true' wx:if="{{total_micro_second <=0 && activityStatus != 0}}">活动已结束</button>


<button id='noBuy' disabled='true' wx:if="{{data.activityStatus == 0}}">活动未开始</button>
<button id='noBuy' disabled='true' wx:if="{{activityStatus == 0}}">活动未开始</button>
</view> </view>
</form> </form>
</view> </view>
@@ -196,7 +196,7 @@
<text class='btnTxt'>首页</text> <text class='btnTxt'>首页</text>
</button> </button>


<block wx:if="{{data.activityStatus != 0}}">
<block wx:if="{{activityStatus != 0}}">
<form bindsubmit="gotopay" report-submit='true' class="fl"> <form bindsubmit="gotopay" report-submit='true' class="fl">
<button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'> <button form-type="submit" style='background:transparent;color:#fff;' data-discount='discount1' disabled='{{showbutton}}'>
<text>¥{{priceAndStockObj.price/100}}</text> <text>¥{{priceAndStockObj.price/100}}</text>


Caricamento…
Annulla
Salva