From ed1614b489632dca123fbdb7956edbd1d4977ea3 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 11 Mar 2019 15:15:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E5=88=B8?= =?UTF-8?q?=E5=8C=85=E6=9C=89=E6=95=88=E6=9C=9F=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.wxml | 4 ++-- pages/coupon/detail/index.wxss | 4 +++- pages/couponorder/detail/index.js | 15 +++++++++++++++ pages/couponorder/detail/index.wxml | 9 +++++++-- pages/couponorder/detail/index.wxss | 12 ++++++++++-- pages/couponorder/index/index.wxml | 12 +++++++++--- pages/couponorder/index/index.wxss | 11 ++++++++--- utils/imgurl.js | 4 ++++ 8 files changed, 58 insertions(+), 13 deletions(-) diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0a69bc5..e34a02d 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -45,9 +45,9 @@ 砍价活动将于{{day02+'天'+hour02+':'+min02+':'+sec02}}后准时开始 有效期:自领取之日起 - {{validDays}}天内有效 + {{validDays}}天内有效(请在有效期内使用) 有效期: - {{validStartDate}}至{{validEndDate}} + {{validStartDate}}至{{validEndDate}}(请在有效期内使用) 当次有效 diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index e59e2b1..f4fa8fe 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -131,7 +131,9 @@ button::after{ border: none; } color: #ff4949; letter-spacing: 0; } - +.use{ + color: #ff4949; +} .salePriceStr .yuan { font-size: 24rpx; color: #ff4949; diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 0b0c4c1..ad2eb7f 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -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", diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index c7cc327..9cb5b09 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -16,16 +16,21 @@ - + 有效期至: {{expiredTime}} + + 有效期: + {{validStartDate}}{{validEndDate}} + - + + diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 71bc511..9ba5702 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -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; diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index 590179a..f0fa80d 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -31,9 +31,15 @@ - - 有效期至: - {{item.expiredTime}} + + + 有效期至: + {{item.expiredTime}} + + + 过期自动退款 + 过期不退款 + diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index 0154b84..dbae735 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -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%; diff --git a/utils/imgurl.js b/utils/imgurl.js index e68f618..71ec442 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -324,6 +324,10 @@ module.exports = { 'url': baseUrl + 'wm03.jpg', 'name': '' }, + 'wm04': { + 'url': baseUrl + 'wm04.jpg', + 'name': '' + }, 'icon001': { 'url': baseUrl + 'icon001.png', 'name': ''