diff --git a/assets/img/che.png b/assets/img/che.png new file mode 100644 index 0000000..713203c Binary files /dev/null and b/assets/img/che.png differ diff --git a/assets/img/ding.png b/assets/img/ding.png new file mode 100644 index 0000000..d41daf7 Binary files /dev/null and b/assets/img/ding.png differ diff --git a/assets/img/quans.png b/assets/img/quans.png new file mode 100644 index 0000000..3ee3af6 Binary files /dev/null and b/assets/img/quans.png differ diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index 02eb240..b54d8a9 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -11,13 +11,13 @@ {{item.title}} - 待付款 + 等待付款 待退款 - 已取消 + 交易关闭 已退款 退款失败 - 免费领取 - 已付款 + 免费领取 + 付款成功 {{item.subTitle}} @@ -42,10 +42,10 @@ 去支付 - + + 待退款 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index e3ad6d2..46cfb9c 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -29,16 +29,18 @@ } .logo { - width: 350rpx; - height: 184rpx; + display: block; + width: 180rpx; + height: 180rpx; border: 1px solid #f8f8f8; border-radius: 16rpx; overflow: hidden; } .logo image { - width: 100%; - height: 100%; + display: block; + width: 180rpx; + height: 180rpx; } .info view:nth-child(1) { @@ -64,13 +66,28 @@ text-overflow: ellipsis; */ } -.info view:nth-child(1) text:nth-child(2) { - color: #f96563; - font-size: 24rpx; - /* width: 340rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; */ +.info .sucess { + font-size: 28rpx; + color: #02c0ff; + letter-spacing: 0; + text-align: right; + line-height: 28px; +} + +.wait { + font-size: 28rpx; + color: #ff4949; + letter-spacing: 0; + text-align: right; + line-height: 28rpx; +} + +.close { + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: right; + line-height: 28rpx; } .info view:nth-child(2), .info view:nth-child(3) { @@ -121,16 +138,16 @@ height: 60rpx; line-height: 60rpx; text-align: center; - background: #00c0ff; color: #fff; float: right; - border-radius: 15rpx; font-size: 28rpx; + border: 2rpx solid #02c0ff; + border-radius: 30rpx; } .payment view:nth-child(2) text { - font-size: 28rpx; - color: #fff; + font-size: 30rpx; + color: #02C0FF; } .dingdan { @@ -144,13 +161,15 @@ letter-spacing: 0; text-align: center; } + .dingdan text:nth-of-type(2) { display: block; -font-size: 28rpx; -color: #999999; -letter-spacing: 0; -text-align: center; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: center; } + .dingdan image { display: block; width: 300rpx; diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 366643b..c9bb8a3 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -16,13 +16,13 @@ - 我的订单 + 我的订单 查看全部 - 待付款 + 待付款 @@ -30,7 +30,7 @@ - 已完成 + 已完成 @@ -38,7 +38,7 @@ - 券包 + 券包 @@ -47,7 +47,7 @@ - 智能停车 + 智能停车 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 9fe7c55..9797686 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,12 +1,16 @@ -.margin { - /* background: #f8f8f8; *//* height: 20rpx; */ +.icons{ + width: 40rpx; + margin-right: 20rpx; + vertical-align: middle; } - .user { background: #fff; min-height: 100vh; } - +.navigator-hover{ + opacity: 1!important; + background: #fff; +} .user-title { position: relative; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); @@ -36,7 +40,7 @@ position: absolute; top: 39rpx; bottom: 0; - right: 26px; + right: 20px; width: 16rpx; height: 16rpx; border-radius: 50%;