diff --git a/app.json b/app.json index 2973b07..2f8c197 100644 --- a/app.json +++ b/app.json @@ -1,16 +1,16 @@ { "pages": [ - "pages/index/index", - "pages/coupons/details/index", - "pages/coupons/index/index", - "pages/user/index", + "pages/order/details/index", "pages/market/index", + "pages/order/index/index", + "pages/user/index", + "pages/coupons/index/index", + "pages/coupons/details/index", + "pages/success/index", "pages/login/index", - "pages/order/index/index", - "pages/order/details/index", + "pages/index/index", "pages/shop/index/index", - "pages/shop/details/index", - "pages/success/index" + "pages/shop/details/index" ], "tabBar": { "color":"#9F9F9F", diff --git a/pages/order/details/index.wxml b/pages/order/details/index.wxml index 55f9155..bf9429c 100644 --- a/pages/order/details/index.wxml +++ b/pages/order/details/index.wxml @@ -1 +1,61 @@ -pages/t/index.wxml + + + + 付款成功,请尽快到门店使用 + + + + + + + 黑椒牛排 + + + 购买数量:1件 + + 下单时间:2018-07-10 11:30 + + + + + + ¥1.00 + ¥59.00 + + + + + + 有效期: + 2018-07-10 至 2018-07-10 + + + 适用门店 + + + + + 兑换码: + 1234567890 + + + + + + + + 下单时间 + 2018-07-10 11:30 + + + 订单编号 + 1234567890 + + + 订单金额 + ¥1.00 + + + \ No newline at end of file diff --git a/pages/order/details/index.wxss b/pages/order/details/index.wxss index e69de29..20218f1 100644 --- a/pages/order/details/index.wxss +++ b/pages/order/details/index.wxss @@ -0,0 +1,145 @@ +@import '../../../app.wxss'; +.order { + width: 100%; +} +.tips { + width: 92%; + height: 88rpx; + background: #00C0FF; + color: #fff; + padding: 0 4%; + line-height: 88rpx; +} +.tips text:nth-child(2) { + font-size: 24rpx; + padding-left: 16rpx; +} +.tips text:nth-child(1) { + width: 32rpx; + height: 32rpx; + background: #fff; + border-radius: 50%; + color: #00C0FF; + line-height: 32rpx; + text-align: center; + display: inline-block; + font-size: 28rpx; +} +.section { + margin-top: 2%; +} +.detail_msg { + width: 92%; + height: 220rpx !important; + background: #fff; + display: flex; + margin: 0 4%; + margin-top: 2%; + border-bottom: 1px solid #ededed; +} + +.logo { + width: 248rpx; + height: 184rpx; + border-radius: 30rpx; +} + +.logo image { + width: 100%; + height: 100%; +} + +.info view:nth-child(1) { + display: flex; + justify-content: space-between; + padding: 0 4%; +} + +.info { + width: 100%; +} + +.info view:nth-child(1) { + margin-bottom: 72rpx; +} + +.info view:nth-child(1) text { + font-size: 30rpx; +} + +.info view:nth-child(1) text:nth-child(2) { + color: #ffae00; + font-size: 24rpx; +} + +.info view:nth-child(2), .info view:nth-child(3) { + color: #ff3434; + font-size: 24rpx; + padding-left: 4%; +} + +.info view:nth-child(2) text, .info view:nth-child(3) text { + font-size: 22rpx; + color: #b8b8b8; +} + +.info view:nth-child(3) { + margin-top: 5rpx; +} + +.payment { + width: 92%; + height: 120rpx; + line-height: 120rpx; + padding: 0 4%; + display: flex; + justify-content: space-between; + border-bottom: 20rpx solid #EDEDED; +} + +.payment view:nth-child(2) text:nth-child(1) { + font-size: 36rpx; + color: #ff3434; + font-weight: bold; +} + +.payment view:nth-child(2) text:nth-child(2) { + font-size: 24rpx; + color: #b4b4b4; + padding-left: 18rpx; + text-decoration: line-through; +} +.classif { + width: 100%; +} +.classif>view{ + height: 88rpx; + line-height: 88rpx; + display: flex; + justify-content: space-between; + padding-left: 4%; + padding-right: 4%; +} +.classif>view text{ + font-size: 30rpx; +} +.classif>view text:nth-child(2){ + color: #B8B8B8; + font-size: 30rpx; +} +.classif>view:nth-child(1) { + display: block; +} +.classif>view:nth-child(1) text:nth-child(2) { + padding-left: 15rpx; +} +.classif>view:nth-child(3),.classif>view:nth-child(4) { + border-top: 20rpx solid #EDEDED; +} +.classif>view:nth-child(3) view text:nth-child(2) { + padding-left: 15rpx; +} +.classif>view:nth-child(6) text:nth-child(2){ + color: #FF3434; + font-weight: bold; +} \ No newline at end of file diff --git a/pages/success/index.wxml b/pages/success/index.wxml index 55f9155..5c06055 100644 --- a/pages/success/index.wxml +++ b/pages/success/index.wxml @@ -1 +1,9 @@ -pages/t/index.wxml + + + + + + diff --git a/pages/success/index.wxss b/pages/success/index.wxss index e69de29..109cf55 100644 --- a/pages/success/index.wxss +++ b/pages/success/index.wxss @@ -0,0 +1,47 @@ +.success { + width: 100%; + height: 100%; + background: #f6f6f6; + position: absolute; +} + +.success_logo { + width: 201rpx; + height: 281rpx; + margin: 10% auto; + display: flex; + flex-direction: column; + margin-bottom: 20%; +} + +.success_logo icon { + width: 201rpx; + height: 201rpx; + background: #00c0ff; + border-radius: 50%; + color: #fff; + font-size: 40px; + text-align: center; + line-height: 201rpx; +} + +.success_logo text { + font-size: 36rpx; + text-align: center; + padding-top: 3%; +} + +.success button { + width: 504rpx; + height: 88rpx; + background: #00c0ff; + color: #fff; + margin: 3% auto; + font-size: 36rpx; +} + +.check { + background: #fff!important; + color: #00c0ff!important; + border:1px solid #00c0ff; +}