From a3dc9ee56392d55d1115191dea365833d9da5849 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 17 Sep 2018 20:06:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=88=91=E7=9A=84=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/couponorder/detail/index.js | 35 ++------ pages/couponorder/detail/index.wxml | 38 +++++++-- pages/couponorder/detail/index.wxss | 125 +++++++++++++++++----------- 3 files changed, 114 insertions(+), 84 deletions(-) diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 40161a2..a7cba2b 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -56,9 +56,9 @@ Page({ }); } that.setData({ - expiredTime: util.fmtDate(that.data.data.expiredTime), - updateDate: util.fmtDate(that.data.data.updateDate), - createDate: util.fmtDate(that.data.data.createDate) + expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dddd hh:mm:ss"), + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") }); }); } @@ -79,32 +79,13 @@ Page({ data: res.data }); that.setData({ - expiredTime: util.fmtDate(that.data.data.expiredTime), - updateDate: util.fmtDate(that.data.data.updateDate), - createDate: util.fmtDate(that.data.data.createDate) + expiredTime: util.formatTime(that.data.data.expiredTime, "yyyy-MM-dddd hh:mm:ss"), + updateDate: util.formatTime(that.data.data.updateDate, "yyyy-MM-dddd hh:mm:ss"), + createDate: util.formatTime(that.data.data.createDate, "yyyy-MM-dddd hh:mm:ss") }); util.barcode("barcode", options.quancode, 510, 100); util.qrcode("qrcode", options.quancode, 350, 350); - }); - - // Http.get({ - // url: config.api.couponOrderDetail, - // data: { - // couponOrderId: options.quancode - // } - // }).then(res => { - // console.log(res); - // that.setData({ - // data: res.data - // }); - // that.setData({ - // expiredTime: util.fmtDate(that.data.data.expiredTime), - // updateDate: util.fmtDate(that.data.data.updateDate), - // createDate: util.fmtDate(that.data.data.createDate) - // }); - // util.barcode("barcode", options.quancode, 510, 100); - // util.qrcode("qrcode", options.quancode, 350, 350); - // }); + }) }, phone: function() { let that = this; @@ -115,4 +96,4 @@ Page({ }); } } -}); +}); \ No newline at end of file diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index c562ed5..b60e863 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -18,10 +18,12 @@ 有效期至: {{expiredTime}} + + @@ -29,7 +31,8 @@ - 兑换码:{{code}} + + 优惠券码:{{code}} @@ -48,16 +51,35 @@ + + + 实付金额: + {{data.couponPrice/100}} + + + + 下单时间: + {{createDate}} + + + 核销时间: + {{updateDate}} + + + 过期时间: + {{updateDate}} + + + 退款时间: + {{updateDate}} + - 下单时间{{createDate}} - 核销时间{{updateDate}} - 过期时间{{updateDate}} - 退款时间{{updateDate}} - - 订单编号{{data.orderId}} + + 订单编号: + {{data.orderId}} + - 实付金额{{data.couponPrice/100}}元 diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 5b48ea4..c63c3c0 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -2,11 +2,12 @@ background: #fff; width: 92%; margin: 8% auto 6%; - border-radius:16rpx; + border-radius: 16rpx; overflow: hidden; } -page{ - background: #02C0FF; + +page { + background: #02c0ff; } .panel, .zhuangtai image { @@ -14,7 +15,6 @@ page{ width: 600rpx; display: block; border-radius: 10rpx; - background-color: #fff; margin: 22rpx auto 0; padding: 30rpx 0 0; z-index: 10000000000; @@ -58,7 +58,7 @@ page{ font-size: 36rpx; color: #333; letter-spacing: 0; - text-align:center; + text-align: center; } .barnum text { @@ -91,8 +91,6 @@ page{ height: 350rpx; } - - /* .fl { float: left; } @@ -101,9 +99,10 @@ page{ float: right; } */ -..coupon_detail{ - position:relative; +..coupon_detail { + position: relative; } + .coupon_detail .wmfl { position: absolute; width: 120rpx; @@ -129,20 +128,25 @@ page{ .coupon_detail .title { font-size: 32rpx; -color: #1F2D3D; -letter-spacing: 0; -text-align: center; -display: block; -padding-top: 73rpx; -line-height: 45rpx; + color: #1f2d3d; + letter-spacing: 0; + text-align: center; + display: block; + padding-top: 92rpx; + line-height: 45rpx; +} +.line{ + height: 10rpx; + display: block; + width: 100%; } .time { font-size: 26rpx; -color: #999999; -letter-spacing: 0; -text-align: center; -line-height: 37rpx; + color: #999; + letter-spacing: 0; + text-align: center; + line-height: 37rpx; } .time text { @@ -172,17 +176,20 @@ line-height: 37rpx; .timevalidity { text-align: center; - margin-top: 20rpx; } .timevalidity text:nth-of-type(1) { - color: #333; - font-size: 30rpx; + font-size: 22rpx; + color: #999; + letter-spacing: 0; + text-align: left; } .timevalidity text:nth-of-type(2) { - font-size: 30rpx; - color: red; + font-size: 22rpx; + color: #999; + letter-spacing: 0; + text-align: left; } .posi { @@ -201,12 +208,19 @@ line-height: 37rpx; z-index: 100; } +.shiji { + font-size: 24rpx !important; + color: #919191 !important; + letter-spacing: 0; +} + .posi_logo view:nth-child(1) { width: 126rpx; height: 126rpx; - border-radius: 50%; overflow: hidden; flex: 2; + border: 2rpx solid #e7e7e7; + border-radius: 6rpx; } .posi_logo view:nth-child(1) image { @@ -225,6 +239,10 @@ line-height: 37rpx; .posi_logo view:nth-child(2) text:nth-child(1) { font-size: 30rpx; + width: 320rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } .posi_logo view:nth-child(2) text:nth-child(2) { @@ -234,17 +252,17 @@ line-height: 37rpx; } .tit { - font-size: 30rpx; - color: #000; - font-weight: bold; padding: 24rpx 0 33rpx; border-bottom: 1rpx solid #eee; text-indent: 20rpx; + font-size: 24rpx; + color: #919191; + letter-spacing: 0; } .tel { position: absolute; - right: 50rpx; + right: 30rpx; top: 0; bottom: 0; margin: auto; @@ -259,13 +277,12 @@ line-height: 37rpx; padding: 0 4%; line-height: 87rpx; background: #fff; - border-bottom: 1rpx solid #f5f5f5; } .notes view:nth-child(1) text { - font-size: 24rpx; -color: #919191; -letter-spacing: 0; + font-size: 24rpx; + color: #919191; + letter-spacing: 0; } .notes view:nth-child(2) { @@ -278,19 +295,21 @@ letter-spacing: 0; } .notes view:nth-child(2) > text { -font-size: 24rpx; -color: #333333; -letter-spacing: 0; -line-height: 42rpx; + font-size: 24rpx; + color: #333; + letter-spacing: 0; + line-height: 42rpx; } -.notes{ - border-bottom-left-radius:16rpx; + +.notes { + border-bottom-left-radius: 16rpx; border-bottom-right-radius: 16rpx; + padding-bottom: 30rpx; } + .note view { - height: 94rpx; - line-height: 94rpx; - border-bottom: 2rpx solid #f9f9f9; + height: 48rpx; + line-height: 48rpx; } .note view text { @@ -298,19 +317,20 @@ line-height: 42rpx; } .note text:nth-of-type(1) { - width: 30%; + width: 22%; text-indent: 30rpx; text-align: left; - font-size: 30rpx; - color: #000; + font-size: 24rpx; + color: #333; + letter-spacing: 1.16rpx; } .note text:nth-of-type(2) { width: 67%; - padding-right: 3%; - text-align: right; - color: #bdbdbd; - font-size: 30rpx; + padding-right: 1%; + font-size: 24rpx; + color: #333; + letter-spacing: 1.16rpx; } .manjian { @@ -318,3 +338,10 @@ line-height: 42rpx; color: #666 !important; font-size: 26rpx !important; } + +.moneys { + font-size: 40rpx !important; + color: #ff4949 !important; + letter-spacing: 0; + text-align: right; +}