| @@ -45,9 +45,9 @@ | |||||
| </view> | </view> | ||||
| <view wx:if="{{showbutton1}}" style='font-size:24rpx;font-family:PingFang-SC-Medium;font-weight:500;color:rgba(0,0,0,1);'>砍价活动将于<view style='display:inline;margin:0 8rpx;color:#F74812;font-size:28rpx;font-family:PingFang-SC-Medium;font-weight:500;'>{{day02+'天'+hour02+':'+min02+':'+sec02}}</view>后准时开始</view> | <view wx:if="{{showbutton1}}" style='font-size:24rpx;font-family:PingFang-SC-Medium;font-weight:500;color:rgba(0,0,0,1);'>砍价活动将于<view style='display:inline;margin:0 8rpx;color:#F74812;font-size:28rpx;font-family:PingFang-SC-Medium;font-weight:500;'>{{day02+'天'+hour02+':'+min02+':'+sec02}}</view>后准时开始</view> | ||||
| <view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起 | <view class='rest' wx:if="{{data.validType==2}}">有效期:自领取之日起 | ||||
| <text class='time'>{{validDays}}</text>天内有效</view> | |||||
| <text class='time'>{{validDays}}</text>天内有效<text class="use">(请在有效期内使用)</text></view> | |||||
| <view class='rest' wx:if="{{data.validType==1}}">有效期: | <view class='rest' wx:if="{{data.validType==1}}">有效期: | ||||
| <text class='time'>{{validStartDate}}至{{validEndDate}}</text> | |||||
| <text class='time'>{{validStartDate}}至{{validEndDate}}<text class="use">(请在有效期内使用)</text></text> | |||||
| </view> | </view> | ||||
| <view class='rest' wx:if="{{data.type==5}}"> | <view class='rest' wx:if="{{data.type==5}}"> | ||||
| <text class='time'>当次有效</text> | <text class='time'>当次有效</text> | ||||
| @@ -131,7 +131,9 @@ button::after{ border: none; } | |||||
| color: #ff4949; | color: #ff4949; | ||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| } | } | ||||
| .use{ | |||||
| color: #ff4949; | |||||
| } | |||||
| .salePriceStr .yuan { | .salePriceStr .yuan { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #ff4949; | color: #ff4949; | ||||
| @@ -11,6 +11,7 @@ Page({ | |||||
| wm01Url: imgurl.wm01.url, | wm01Url: imgurl.wm01.url, | ||||
| wm02Url: imgurl.wm02.url, | wm02Url: imgurl.wm02.url, | ||||
| wm03Url: imgurl.wm03.url, | wm03Url: imgurl.wm03.url, | ||||
| wm04Url: imgurl.wm04.url, | |||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| newUrl: imgurl.new.url, | newUrl: imgurl.new.url, | ||||
| data: { | data: { | ||||
| @@ -20,6 +21,8 @@ Page({ | |||||
| }, | }, | ||||
| createDate: "", | createDate: "", | ||||
| expiredTime: "", | expiredTime: "", | ||||
| validStartDate:"", | |||||
| validEndDate:"", | |||||
| updateDate: "", | updateDate: "", | ||||
| //存储计时器 | //存储计时器 | ||||
| setInter: "", | setInter: "", | ||||
| @@ -115,6 +118,12 @@ Page({ | |||||
| updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), | updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), | ||||
| createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") | createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") | ||||
| }); | }); | ||||
| if (that.data.data.validStartDate && that.data.data.validEndDate) { | |||||
| that.setData({ | |||||
| validStartDate: util.formatTime(that.data.data.validStartDate, "yyyy-MM-dd hh:mm:ss"), | |||||
| validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | |||||
| }) | |||||
| } | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| @@ -145,6 +154,12 @@ Page({ | |||||
| updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), | updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dd hh:mm:ss"), | ||||
| createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") | createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dd hh:mm:ss") | ||||
| }); | }); | ||||
| if (that.data.data.validStartDate && that.data.data.validEndDate){ | |||||
| that.setData({ | |||||
| validStartDate: util.formatTime(that.data.data.validStartDate, "yyyy-MM-dd hh:mm:ss"), | |||||
| validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | |||||
| }) | |||||
| } | |||||
| let url = JSON.stringify({ | let url = JSON.stringify({ | ||||
| END:"C", | END:"C", | ||||
| TYPE:"couponorder", | TYPE:"couponorder", | ||||
| @@ -16,16 +16,21 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="timevalidity"> | |||||
| <view class="timevalidity" wx:if="{{data.validStatus != 0}}"> | |||||
| <text>有效期至:</text> | <text>有效期至:</text> | ||||
| <text>{{expiredTime}}</text> | <text>{{expiredTime}}</text> | ||||
| </view> | </view> | ||||
| <view class="timevalidity" wx:if="{{data.validStatus == 0}}"> | |||||
| <text>有效期:</text> | |||||
| <text>{{validStartDate}}</text><i>至</i><text>{{validEndDate}}</text> | |||||
| </view> | |||||
| <image class='line' mode="widthFix" src="{{lineUrl}}"></image> | <image class='line' mode="widthFix" src="{{lineUrl}}"></image> | ||||
| <view class="zhuangtai"> | <view class="zhuangtai"> | ||||
| <image wx:if="{{data.couponOrderStatus==1}}" src="{{wm01Url}}" mode='widthFix'></image> | <image wx:if="{{data.couponOrderStatus==1}}" src="{{wm01Url}}" mode='widthFix'></image> | ||||
| <image wx:if="{{data.couponOrderStatus==2}}" src="{{wm02Url}}" mode='widthFix'></image> | <image wx:if="{{data.couponOrderStatus==2}}" src="{{wm02Url}}" mode='widthFix'></image> | ||||
| <image wx:if="{{data.couponOrderStatus==3}}" src="{{wm03Url}}" mode='widthFix'></image> | <image wx:if="{{data.couponOrderStatus==3}}" src="{{wm03Url}}" mode='widthFix'></image> | ||||
| <view class="panel" wx:if="{{data.couponOrderStatus==0}}"> | |||||
| <image wx:if="{{data.couponOrderStatus==0&&data.validStatus==0}}" src="{{wm04Url}}" mode='widthFix'></image> | |||||
| <view class="panel" wx:if="{{data.couponOrderStatus==0&&data.validStatus!=0}}"> | |||||
| <view class="qrcode"> | <view class="qrcode"> | ||||
| <canvas canvas-id="qrcode" /> | <canvas canvas-id="qrcode" /> | ||||
| </view> | </view> | ||||
| @@ -187,7 +187,12 @@ page { | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| text-align: left; | text-align: left; | ||||
| } | } | ||||
| .timevalidity text:nth-of-type(3) { | |||||
| font-size: 22rpx; | |||||
| color: #999; | |||||
| letter-spacing: 0; | |||||
| text-align: left; | |||||
| } | |||||
| .posi { | .posi { | ||||
| width: 100%; | width: 100%; | ||||
| display: flex; | display: flex; | ||||
| @@ -238,7 +243,10 @@ page { | |||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| } | } | ||||
| .timevalidity i{ | |||||
| font-style: normal; | |||||
| font-size: 28rpx; | |||||
| } | |||||
| .posi_logo view:nth-child(2) text:nth-child(2) { | .posi_logo view:nth-child(2) text:nth-child(2) { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #b8b8b8; | color: #b8b8b8; | ||||
| @@ -31,9 +31,15 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> | <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> | ||||
| <view class='expiretime'> | |||||
| <text class="txt1">有效期至:</text> | |||||
| <text class="txt2">{{item.expiredTime}}</text> | |||||
| <view class='clearfix'> | |||||
| <view class='expiretime fl'> | |||||
| <text class="txt1">有效期至:</text> | |||||
| <text class="txt2">{{item.expiredTime}}</text> | |||||
| </view> | |||||
| <view class='fr found'> | |||||
| <text class="txt2" wx:if="{{item.autoRefund == 0}}">过期自动退款</text> | |||||
| <text class="txt2" wx:if="{{item.autoRefund == 1}}">过期不退款</text> | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='./../../../assets/images/give.png' mode='widthFix'></image> | <image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='./../../../assets/images/give.png' mode='widthFix'></image> | ||||
| @@ -42,8 +42,6 @@ | |||||
| } | } | ||||
| .expiretime { | .expiretime { | ||||
| display: block; | |||||
| width: 100%; | |||||
| text-align: left; | text-align: left; | ||||
| text-indent: 1em; | text-indent: 1em; | ||||
| height:60rpx; | height:60rpx; | ||||
| @@ -53,7 +51,14 @@ | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| margin-top: 10rpx; | margin-top: 10rpx; | ||||
| } | } | ||||
| .found{ | |||||
| color: red; | |||||
| font-size: 26rpx; | |||||
| margin-right: 20rpx; | |||||
| height:60rpx; | |||||
| line-height:60rpx; | |||||
| margin-top: 10rpx; | |||||
| } | |||||
| .liness { | .liness { | ||||
| display: block; | display: block; | ||||
| width: 100%; | width: 100%; | ||||
| @@ -324,6 +324,10 @@ module.exports = { | |||||
| 'url': baseUrl + 'wm03.jpg', | 'url': baseUrl + 'wm03.jpg', | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'wm04': { | |||||
| 'url': baseUrl + 'wm04.jpg', | |||||
| 'name': '' | |||||
| }, | |||||
| 'icon001': { | 'icon001': { | ||||
| 'url': baseUrl + 'icon001.png', | 'url': baseUrl + 'icon001.png', | ||||
| 'name': '' | 'name': '' | ||||