From a23140774e8bc5ad8637be349cc5acb254a87c65 Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Wed, 29 Aug 2018 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8C=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9]:=20orderStatus=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=8C=89=E9=92=AE=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/couponorder/detail/index.wxml | 2 +- pages/couponorder/detail/index.wxss | 3 +-- pages/order/detail/index.wxml | 10 +++++----- pages/order/detail/index.wxss | 2 ++ pages/order/index/index.wxml | 23 +++++++++++++++++------ 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index bc5828f..0a1c65f 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -32,7 +32,7 @@ - 兑换码:{{code}} + 兑换码:{{code}} diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 8693001..4edb81d 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -36,9 +36,8 @@ width: 670rpx; height: 46rpx; line-height: 46rpx; - font-size: 32rpx; + font-size: 30rpx; text-align: center; - letter-spacing: 2rpx; white-space: nowrap; color: #999; } diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 1633130..968198b 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -30,9 +30,9 @@ {{order.merchantName}} - - 兑换码: - {{order.id}} + + 兑换码 + {{order.id}} @@ -59,7 +59,7 @@ - + \ No newline at end of file diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 26a98cd..b38a0b1 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -126,6 +126,7 @@ } .classif > view text { font-size: 30rpx; + margin-right:6rpx; } .classif > view text:nth-child(2) { color: #b8b8b8; @@ -287,6 +288,7 @@ radio { } .barnum { + width: 88%; height: 46rpx; line-height: 46rpx; font-size: 32rpx; diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 5bec2bf..f7107f0 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -11,9 +11,9 @@ {{item.title}} - 等待付款 + 待付款 已付款 - 订单取消 + 已过期 {{item.subTitle}} @@ -26,11 +26,22 @@ ¥{{item.salePrice/100}} ¥{{item.price/100}} - - 查看详情 - 支付 - 支付 + + + 查看详情 + + 支付 + + + 已过期 + +