diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 2140fb3..a1243bf 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -22,7 +22,7 @@ Page({ name: "已退款" } ], - list: [{wm:'000'}], + list: [], current: "0", current_scroll: "0", page: 1, diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index f77430e..04ce5bf 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -11,6 +11,7 @@ + - + 兑换码: {{data.id}} @@ -55,4 +55,19 @@ ¥{{data.salePrice/100}} - \ No newline at end of file + + + + + + + + + + + + + + 兑换码:{{data.id}} + + diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index f4e205b..d9bb3de 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,11 +1,11 @@ -@import '../../../app.wxss'; +@import "../../../app.wxss"; .order { width: 100%; } .tips { width: 92%; height: 88rpx; - background: #00C0FF; + background: #00c0ff; color: #fff; padding: 0 4%; line-height: 88rpx; @@ -19,7 +19,7 @@ height: 32rpx; background: #fff; border-radius: 50%; - color: #00C0FF; + color: #00c0ff; line-height: 32rpx; text-align: center; display: inline-block; @@ -72,13 +72,15 @@ font-size: 24rpx; } -.info view:nth-child(2), .info view:nth-child(3) { +.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 { +.info view:nth-child(2) text, +.info view:nth-child(3) text { font-size: 22rpx; color: #b8b8b8; } @@ -94,7 +96,7 @@ padding: 0 4%; display: flex; justify-content: space-between; - border-bottom: 20rpx solid #EDEDED; + border-bottom: 20rpx solid #ededed; } .payment view:nth-child(2) text:nth-child(1) { @@ -112,40 +114,197 @@ .classif { width: 100%; } -.classif>view{ +.classif > view { height: 88rpx; line-height: 88rpx; display: flex; justify-content: space-between; padding-left: 4%; padding-right: 4%; - border-bottom:1rpx solid #eee; + border-bottom: 1rpx solid #eee; } -.classif>view text{ +.classif > view text { font-size: 30rpx; } -.classif>view text:nth-child(2){ - color: #B8B8B8; - font-size: 30rpx; +.classif > view text:nth-child(2) { + color: #b8b8b8; + font-size: 30rpx; } -.classif>view:nth-child(1) { +.classif > view:nth-child(1) { display: block; } -.classif>view:nth-child(1) text:nth-child(2) { +.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), +.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; +.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; } -.spcode{ +.spcode { width: 60rpx; display: inline-block; margin-top: 15rpx; +} + +/*mask*/ +.drawer_screen { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + z-index: 1000; + background: #000; + opacity: 0.5; + overflow: hidden; +} + +.drawer_box { + width: 650rpx; + position: fixed; + overflow: hidden; + top: 50%; + left: 0; + z-index: 1001; + margin: -150px 50rpx 0 50rpx; + border-radius: 3px; +} +.drawer_title { + padding: 15px; + font: 20px "microsoft yahei"; + text-align: center; +} +.drawer_content { + height: 210px; + overflow-y: scroll; /*超出父盒子高度可滚动*/ +} +.btn_ok { + padding: 10px; + font: 20px "microsoft yahei"; + text-align: center; + border-top: 1px solid #e8e8ea; + color: #3cc51f; +} +.top { + padding-top: 8px; +} +.bottom { + padding-bottom: 8px; +} +.title { + height: 30px; + line-height: 30px; + width: 160rpx; + text-align: center; + display: inline-block; + font: 300 28rpx/30px "microsoft yahei"; +} +.input_base { + border: 2rpx solid #ccc; + padding-left: 10rpx; + margin-right: 50rpx; +} +.input_h30 { + height: 30px; + line-height: 30px; +} +.input_h60 { + height: 60px; +} +.input_view { + font: 12px "microsoft yahei"; + background: #fff; + color: #000; + line-height: 30px; +} +input { + font: 12px "microsoft yahei"; + background: #fff; + color: #000; +} +radio { + margin-right: 20px; +} +.grid { + display: -webkit-box; + display: box; +} +.col-0 { + -webkit-box-flex: 0; + box-flex: 0; +} +.col-1 { + -webkit-box-flex: 1; + box-flex: 1; +} +.fl { + float: left; +} +.fr { + float: right; +} + + +.panel { + width: 600rpx; + border-radius: 10rpx; + background-color: #fff; + margin: 30rpx auto 0; + padding: 30rpx 0; + position: relative; + z-index: 10000000000; +} +.pane2{ + background: #fff; + opacity: .6; +} +.pane2 image{ + width: 500rpx; + display: block; + margin: 40rpx auto 0; +} + +.barcode { + height: 100rpx; + width: 500rpx; + margin: 0 auto; +} + +.barnum { + height: 46rpx; + line-height: 46rpx; + font-size: 32rpx; + text-align: center; + letter-spacing: 2rpx; + white-space: nowrap; + color: #999; +} + +.barnum text { + color: #333; +} + +.barcode > canvas { + width: 500rpx; + height: 100rpx; +} + +.qrcode { + height: 370rpx; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: center; +} + +.qrcode > canvas { + width: 350rpx; + height: 400rpx; } \ No newline at end of file