Browse Source

[修改我的券包有效期的显示]

tags/富茂链客4.1.0
meo 6 years ago
parent
commit
ed1614b489
8 changed files with 58 additions and 13 deletions
  1. +2
    -2
      pages/coupon/detail/index.wxml
  2. +3
    -1
      pages/coupon/detail/index.wxss
  3. +15
    -0
      pages/couponorder/detail/index.js
  4. +7
    -2
      pages/couponorder/detail/index.wxml
  5. +10
    -2
      pages/couponorder/detail/index.wxss
  6. +9
    -3
      pages/couponorder/index/index.wxml
  7. +8
    -3
      pages/couponorder/index/index.wxss
  8. +4
    -0
      utils/imgurl.js

+ 2
- 2
pages/coupon/detail/index.wxml View File

@@ -45,9 +45,9 @@
</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}}">有效期:自领取之日起
<text class='time'>{{validDays}}</text>天内有效</view>
<text class='time'>{{validDays}}</text>天内有效<text class="use">(请在有效期内使用)</text></view>
<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 class='rest' wx:if="{{data.type==5}}">
<text class='time'>当次有效</text>


+ 3
- 1
pages/coupon/detail/index.wxss View File

@@ -131,7 +131,9 @@ button::after{ border: none; }
color: #ff4949;
letter-spacing: 0;
}

.use{
color: #ff4949;
}
.salePriceStr .yuan {
font-size: 24rpx;
color: #ff4949;


+ 15
- 0
pages/couponorder/detail/index.js View File

@@ -11,6 +11,7 @@ Page({
wm01Url: imgurl.wm01.url,
wm02Url: imgurl.wm02.url,
wm03Url: imgurl.wm03.url,
wm04Url: imgurl.wm04.url,
teljpgUrl: imgurl.teljpg.url,
newUrl: imgurl.new.url,
data: {
@@ -20,6 +21,8 @@ Page({
},
createDate: "",
expiredTime: "",
validStartDate:"",
validEndDate:"",
updateDate: "",
//存储计时器
setInter: "",
@@ -115,6 +118,12 @@ Page({
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")
});
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 => {
wx.showToast({
@@ -145,6 +154,12 @@ Page({
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")
});
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({
END:"C",
TYPE:"couponorder",


+ 7
- 2
pages/couponorder/detail/index.wxml View File

@@ -16,16 +16,21 @@
</view>
</view>
</view>
<view class="timevalidity">
<view class="timevalidity" wx:if="{{data.validStatus != 0}}">
<text>有效期至:</text>
<text>{{expiredTime}}</text>
</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>
<view class="zhuangtai">
<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==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">
<canvas canvas-id="qrcode" />
</view>


+ 10
- 2
pages/couponorder/detail/index.wxss View File

@@ -187,7 +187,12 @@ page {
letter-spacing: 0;
text-align: left;
}

.timevalidity text:nth-of-type(3) {
font-size: 22rpx;
color: #999;
letter-spacing: 0;
text-align: left;
}
.posi {
width: 100%;
display: flex;
@@ -238,7 +243,10 @@ page {
text-overflow: ellipsis;
overflow: hidden;
}

.timevalidity i{
font-style: normal;
font-size: 28rpx;
}
.posi_logo view:nth-child(2) text:nth-child(2) {
font-size: 24rpx;
color: #b8b8b8;


+ 9
- 3
pages/couponorder/index/index.wxml View File

@@ -31,9 +31,15 @@
</view>
</view>
<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>
<image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='./../../../assets/images/give.png' mode='widthFix'></image>


+ 8
- 3
pages/couponorder/index/index.wxss View File

@@ -42,8 +42,6 @@
}

.expiretime {
display: block;
width: 100%;
text-align: left;
text-indent: 1em;
height:60rpx;
@@ -53,7 +51,14 @@
letter-spacing: 0;
margin-top: 10rpx;
}

.found{
color: red;
font-size: 26rpx;
margin-right: 20rpx;
height:60rpx;
line-height:60rpx;
margin-top: 10rpx;
}
.liness {
display: block;
width: 100%;


+ 4
- 0
utils/imgurl.js View File

@@ -324,6 +324,10 @@ module.exports = {
'url': baseUrl + 'wm03.jpg',
'name': ''
},
'wm04': {
'url': baseUrl + 'wm04.jpg',
'name': ''
},
'icon001': {
'url': baseUrl + 'icon001.png',
'name': ''


Loading…
Cancel
Save