diff --git a/pages/cardorder/cardUse/cardUse.wxml b/pages/cardorder/cardUse/cardUse.wxml index d571463..e6aa7f2 100644 --- a/pages/cardorder/cardUse/cardUse.wxml +++ b/pages/cardorder/cardUse/cardUse.wxml @@ -26,9 +26,9 @@ 有效期: - {{data.type==10?pickStartDate:validStartDate}} + {{data.type==10 ? validStartDate : soldStartTime}} - {{data.type==10?pickEndDate:validEndDate}} + {{data.type==10 ? validEndDate: soldEndTime}} 满{{data.usePrice/100}}元可用 diff --git a/pages/coupon/childDetail/childDetail.js b/pages/coupon/childDetail/childDetail.js index 1324efc..e0fae15 100644 --- a/pages/coupon/childDetail/childDetail.js +++ b/pages/coupon/childDetail/childDetail.js @@ -692,8 +692,8 @@ Page({ if (res.data.type == 10) { that.setData({ salePriceStr: res.data.salePriceStr, - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), + validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), + validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), priceStr: res.data.priceStr, tailPriceStr: res.data.tailPriceStr, origPriceStr: res.data.origPriceStr @@ -701,10 +701,10 @@ Page({ } if (res.data.validType == 1) { that.setData({ + soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"), + soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"), validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), }); } else { if (res.data.validDays) { diff --git a/pages/coupon/childDetail/childDetail.wxml b/pages/coupon/childDetail/childDetail.wxml index 7fc6f9f..e72b564 100644 --- a/pages/coupon/childDetail/childDetail.wxml +++ b/pages/coupon/childDetail/childDetail.wxml @@ -58,9 +58,9 @@ ¥ {{tailPriceStr}} {{origPriceStr}} - 预购时间:{{validStartDate}}至{{validEndDate}} + 预购时间:{{soldStartTime}}至{{soldEndTime}} - 提货时间:{{pickStartDate}}至{{pickEndDate}} + 提货时间:{{validStartDate}}至{{validEndDate}} diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index bfed2fc..8658cc4 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -765,8 +765,8 @@ Page({ if (res.data.type == 10) { that.setData({ salePriceStr: res.data.salePriceStr, - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), + validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), + validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), priceStr: res.data.priceStr, tailPriceStr: res.data.tailPriceStr, origPriceStr: res.data.origPriceStr @@ -774,10 +774,10 @@ Page({ } if (res.data.validType == 1) { that.setData({ + soldStartTime: util.formatTime(res.data.soldStartTime, "yyyy-MM-dd"), + soldEndTime: util.formatTime(res.data.soldEndTime, "yyyy-MM-dd"), validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"), validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd"), - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd"), }); } else { if (res.data.validDays) { diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 567328c..92e3490 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -58,9 +58,9 @@ ¥ {{tailPriceStr}} {{origPriceStr}} - 预购时间:{{validStartDate}}至{{validEndDate}} + 预购时间:{{soldStartTime}}至{{soldEndTime}} - 提货时间:{{pickStartDate}}至{{pickEndDate}} + 提货时间:{{validStartDate}}至{{validEndDate}} diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 96012dc..537bc0a 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -245,12 +245,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) { + if (that.data.data.soldStartTime && that.data.data.soldEndTime) { 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"), - pickStartDate: util.formatTime(res.data.pickStartDate, "yyyy-MM-dd hh:mm:ss"), - pickEndDate: util.formatTime(res.data.pickEndDate, "yyyy-MM-dd hh:mm:ss"), + soldStartTime: util.formatTime(that.data.data.soldStartTime, "yyyy-MM-dd hh:mm:ss"), + soldEndTime: util.formatTime(that.data.data.soldEndTime, "yyyy-MM-dd hh:mm:ss"), + validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd hh:mm:ss"), + validEndDate: util.formatTime(res.data.validEndDate, "yyyy-MM-dd hh:mm:ss"), }) } diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 3cc2c66..4e1ca7b 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -26,9 +26,9 @@ 有效期: - {{data.type==10?pickStartDate:validStartDate}} + {{data.type==10?validStartDate:soldStartTime}} - {{data.type==10?pickEndDate:validEndDate}} + {{data.type==10?validEndDate:soldEndTime}} 满{{data.usePrice/100}}元可用 @@ -59,7 +59,8 @@ {{showIdFalg?code:codeS}} - + + diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 1401522..bd4bed8 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -1,8 +1,8 @@ - -.box{ +.box { height: 100%; - background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); + background: linear-gradient(180deg, rgba(253, 131, 45, 1) 0%, rgba(254, 74, 22, 1) 100%); } + .container { background: #fff; width: 92%; @@ -10,20 +10,25 @@ border-radius: 16rpx; } -.coedTiem{ + +.coedTiem { text-align: center; - color: rgba(253,131,45,1); + color: rgba(253, 131, 45, 1); margin-bottom: 10rpx; } + page { - background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); + background: linear-gradient(180deg, rgba(253, 131, 45, 1) 0%, rgba(254, 74, 22, 1) 100%); height: auto !important; } -.zhuangtai{ + +.zhuangtai { margin-bottom: 20rpx; - + } -.panel, .zhuangtai image { + +.panel, +.zhuangtai image { position: relative; width: 600rpx; display: block; @@ -32,9 +37,11 @@ page { padding: 0; z-index: 10000; } -.panel{ + +.panel { position: relative; } + .pane2 { background: #fff; opacity: 0.6; @@ -62,37 +69,42 @@ page { margin: 0 auto; } -.barnum{ - background: #fff; - height: 88rpx; - width: 600rpx; - margin: 0 auto; - line-height: 88rpx; - border: 2rpx solid #ccc; - border-radius: 10px; - font-size: 36rpx; - color: #333; - letter-spacing: 0; - text-align: center; - overflow: hidden; -} -.barnumtext{ - float: left; - margin-left: 20rpx; - font-size: 30rpx; -} -.barnumImg{ - float: left; - height: 40rpx; - width: 40rpx !important; - margin: 24rpx 20rpx !important; -} -.barnumtext::before{ - content: "优惠券码:"; - font-size: 24rpx; - color: #999; -} -.barcode > canvas { +.barnum { + background: #fff; + height: 88rpx; + width: 600rpx; + margin: 0 auto; + line-height: 88rpx; + border: 2rpx solid #ccc; + border-radius: 10px; + font-size: 36rpx; + color: #333; + letter-spacing: 0; + text-align: center; + overflow: hidden; +} + +.barnumtext { + float: left; + margin-left: 20rpx; + font-size: 30rpx; +} + +.barnumImg { + float: left; + height: 40rpx; + width: 40rpx !important; + margin: 24rpx 20rpx !important; + z-index: 999; +} + +.barnumtext::before { + content: "优惠券码:"; + font-size: 24rpx; + color: #999; +} + +.barcode>canvas { width: 510rpx; height: 100rpx; } @@ -108,7 +120,7 @@ page { margin: 0 auto; } -.qrcode > canvas { +.qrcode>canvas { width: 350rpx; height: 350rpx; } @@ -207,6 +219,7 @@ page { letter-spacing: 0; text-align: left; } + .timevalidity text:nth-of-type(3) { font-size: 22rpx; color: #999; @@ -244,7 +257,7 @@ page { flex-direction: column; } -.notes view:nth-child(2) > text { +.notes view:nth-child(2)>text { font-size: 24rpx; color: #333; letter-spacing: 0; @@ -284,7 +297,7 @@ page { .manjian { margin-left: 26rpx; - color: #999!important; + color: #999 !important; font-size: 26rpx !important; text-align: center; } @@ -297,56 +310,63 @@ page { } -.game-entry{ +.game-entry { width: 690rpx; height: 140rpx; margin: 10rpx auto 0; } -.gameimg{ + +.gameimg { display: block; width: 100%; height: 140rpx; } -.refund{ + +.refund { display: inline-block; - font-size: 26rpx!important; - color: red!important; + font-size: 26rpx !important; + color: red !important; border: 1px solid red; padding: 3rpx; } -.closeRq{ +.closeRq { position: absolute; - width: 420rpx; + width: 420rpx; height: 420rpx; line-height: 420rpx; text-align: center; background-color: rgba(0, 0, 0, 0.8); - left: 50%; top: 42%; - transform: translate(-50%, -50%); /* 50%为自身尺寸的一半 */ + left: 50%; + top: 42%; + transform: translate(-50%, -50%); + /* 50%为自身尺寸的一半 */ z-index: 10000000; color: #fff; font-size: 38rpx; } -.updataRqCode{ + +.updataRqCode { width: 80rpx !important; height: 80rpx; margin-top: calc(50%-80rpx) !important; margin-left: calc(50%-80rpx) !important; display: inline-block !important; } -.upDataRq{ + +.upDataRq { position: absolute; width: 100%; text-align: center; height: 80rpx; - color: #fff ; + color: #fff; top: 20%; left: 0; } + /* .upDataRqImg{ width: 40rpx !important; height: 40rpx; float: left; margin: 20rpx 0 0 20rpx !important; -} */ +} */ \ No newline at end of file diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml index 1080293..e0b4008 100644 --- a/pages/orderquanma/index.wxml +++ b/pages/orderquanma/index.wxml @@ -1,11 +1,11 @@ - + {{title}} - + - + - - - - - - - 点一点刷新二维码 - - 二维码在 - {{expiredSeconds}}s - 后失效 - - - {{showIdFalg?code:codeS}} - + + + + + + + 点一点刷新二维码 + + 二维码在 + {{expiredSeconds}}s + 后失效 + + + {{showIdFalg?code:codeS}} + + @@ -56,10 +57,10 @@ - + 用户专享神秘礼物 独家福利,抢完即止 - + \ No newline at end of file