diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 97294ff..3aad712 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -10,6 +10,7 @@ Page({ data: { succUrl: imgurl.succ.url, spcodeUrl: imgurl.spcode.url, + rDetailUrl: imgurl.rDetail.url, teljpgUrl: imgurl.teljpg.url, newUrl: imgurl.new1.url, weixinTitle: imgurl.weixinTitle.url, @@ -79,6 +80,8 @@ Page({ console.log(res, 444444444444444444) } }, + + powerDrawer: function (e) { let that = this; console.log(e) diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index feb606e..631d6de 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -1,8 +1,6 @@ - 领取成功 请尽快到门店使用,有效期至{{}} @@ -13,14 +11,34 @@ + + {{order.title}} + + {{item.title}} + 等待付款 + 拼团中 + 待退款 + 交易关闭 + 砍价中 + 砍价成功 + 砍价失败 + 砍价取消 + 拼团已过期 + 拼团失败 + 砍价失败 + 已退款 + 退款失败 + 拼团成功 + 免费领取 + 积分兑换 + 付款成功 + + - - {{order.title}} - {{order.subTitle}} @@ -43,36 +61,39 @@ 只有支付完成的时 才显示兑换码 --> - - - 兑换码 + + + 兑换码: {{order.couponOrderId}} + - + - 订单编号 + 订单编号: {{order.orderNumber}} - + - 订单金额 - {{order.payment/100}}元 + 实付金额: + ¥ + {{order.payment/100}} + + - 适用门店: + 适用门店 diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 8ebd7fc..cf38e3c 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -2,6 +2,7 @@ button::after{ border: none; } page { height: auto !important; + background: #F4F5F9; } .order { @@ -18,68 +19,78 @@ page { .tips { width: 92%; - height: 120rpx; + height: 100rpx; background: #2C8DFF; color: #fff; - padding: 0 4%; - /* line-height: 88rpx; */ + padding: 20rpx 4% 0; } .merchantName { - color: #666!important; + color: #3C3C3C!important; + margin-left: 160rpx; + font-size: 28rpx; } -.tips view{ - -} .tips view:nth-child(2) { font-size: 32rpx; padding-left: 16rpx; - float: left; + width: 100%; } .tips view:nth-child(1) { - width: 32rpx; + width: 100%; height: 32rpx; background: #fff; border-radius: 50%; color: #00c0ff; - line-height: 32rpx; text-align: center; - /* display: inline-block; */ font-size: 28rpx; } -.msg text{ - width: 32rpx; +.msg text:nth-child(1){ + width: 90%; + font-size: 28rpx; + float: left; +} + +.msg text:nth-child(2){ + font-size: 24rpx; + float: left; + margin-left: 35rpx; } .section { - margin-top: 2%; + /* margin-top: 2%; */ + background: #FFFFFF; } .detail_msg { width: 92%; - background: #fff; display: flex; margin: 0 4%; - margin-top: 30rpx; - padding-bottom: 30rpx; + margin-top: 10rpx; + padding-bottom: 42rpx; border-bottom: 1rpx solid #eee; } .logo { display: block; - width: 180rpx; - height: 180rpx; + width: 120rpx; + height: 120rpx; border-radius: 16rpx; } .logo image { - width: 180rpx; - height: 180rpx; + width: 120rpx; + height: 120rpx; border-radius: 16rpx; } - +.sectionTit{ + padding-top: 30rpx; + width:92%; + margin:0 4%; + font-size: 30rpx; + color: #3C3C3C; +} .info view:nth-child(1) { display: flex; justify-content: space-between; @@ -135,40 +146,63 @@ page { padding-left: 18rpx; text-decoration: line-through; } - +.dhCode{ + position: relative; + height: 96rpx; + line-height: 96rpx; + border-bottom: 1rpx solid #F4F5F9; + padding-left: 5%; + padding-right: 5%; +} .classif { - width: 92%; - padding-left: 4%; - padding-right: 4%; + background: #FFFFFF; + width: 100%; + margin-top: 20rpx; +} +.classifShop{ + background: #FFFFFF; + width: 100%; + margin-top: 20rpx; +} +.classifShop >view{ + font-size: 28rpx; + color: #A6A6A6; + position: relative; + height: 150rpx; + line-height: 150rpx; + display: flex; + justify-content: space-between; + padding-left: 5%; + padding-right: 5%; +} +.classifShop >view:nth-child(1){ + height: 88rpx!important; + line-height:94rpx; } -.classif > view { +.classif > view:nth-child(2),.classif > view:nth-child(3){ position: relative; height: 94rpx; line-height: 94rpx; display: flex; justify-content: space-between; + padding-left: 5%; + padding-right: 5%; /* border-bottom: 1rpx solid #eee; */ } -.classif > view text { - font-size: 30rpx; -} - .classif > view text:nth-child(2) { - color: #b8b8b8; - font-size: 30rpx; - margin-left:80rpx; + font-size: 28rpx; + color: #3C3C3C; +} +.classif > view text:nth-child(1) { + font-size: 28rpx; + color: #A6A6A6; } .classif > view:nth-child(1) { display: block; } - -.classif > view:nth-child(1) text:nth-child(2) { - padding-left: 15rpx; -} - .classif > view:nth-child(3) view text:nth-child(2) { padding-left: 15rpx; } @@ -179,11 +213,19 @@ page { .spcode { position: absolute; - right: 0; + right: 70rpx; bottom: 0; top: 0; margin: auto; width: 50rpx; + z-index: 1; +} +.rArrow{ + position: absolute; + right: 0; + height:88rpx; + width: 380rpx; + margin: auto; } /*mask*/ @@ -296,10 +338,11 @@ radio { .fl { float: left; + color: #3C3C3C!important; } .fr { - float: right; + float: left; } .clearfix:after { @@ -369,9 +412,14 @@ radio { width: 350rpx; height: 350rpx; } - +.RMB{ + color: #FD782D !important; + font-size: 24rpx !important; + position: absolute; + right: 65rpx +} .jine { - color: #f96563 !important; + color: #FD782D !important; font-size: 36rpx !important; font-weight: 400 !important; } @@ -427,7 +475,7 @@ radio { } .merchantVoList .tel { - width: 40rpx; + width: 76rpx; position: absolute; top: 0; bottom: 0; @@ -447,7 +495,7 @@ radio { border-radius: 61rpx; } .merchantImgUrl{ - width: 60rpx; + width: 120rpx; position: absolute; top: 0; bottom: 0; diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 3613425..238e622 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -5,7 +5,7 @@ let app = getApp(); const imgurl = require("../../../utils/imgurl"); Page({ data: { - dingdanUrl: imgurl.dingdan.url, + noOrdersUrl: imgurl.noOrders.url, loadingUrl: imgurl.loading.url, wmhome: imgurl.wmhome.url, wmdiscount: imgurl.wmdiscount.url, diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index d698bcd..cc2c8d7 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -7,8 +7,8 @@ - - + + {{item.title}} 等待付款 拼团中 @@ -74,7 +74,7 @@ - + 您还没有相关订单 再忙,也要记得买点什么犒赏自己~ diff --git a/pages/orderquanma/index.json b/pages/orderquanma/index.json index fc979cc..80b65b3 100644 --- a/pages/orderquanma/index.json +++ b/pages/orderquanma/index.json @@ -1,3 +1,4 @@ { - "navigationBarTitleText": "优惠券" + "navigationBarTitleText": "兑换码", + "navigationBarBackgroundColor": "#FD832D" } \ No newline at end of file diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss index 755424f..3560d82 100644 --- a/pages/orderquanma/index.wxss +++ b/pages/orderquanma/index.wxss @@ -1,6 +1,6 @@ @import "../../app.wxss"; page { - background: #02c0ff; + background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); } .couponbg { diff --git a/utils/imgurl.js b/utils/imgurl.js index 4b06bad..57713f9 100644 --- a/utils/imgurl.js +++ b/utils/imgurl.js @@ -84,6 +84,10 @@ module.exports = { 'url': baseUrl + 'dingdan.png', 'name': '' }, + 'noOrders': { + 'url': baseUrl + 'noOrders.png', + 'name': '' + }, 'down-white': { 'url': baseUrl + 'down-white.png', 'name': '' @@ -292,6 +296,10 @@ module.exports = { 'url': baseUrl + 'spcode.png', 'name': '' }, + 'rDetail': { + 'url': baseUrl + 'rDetail.png', + 'name': '' + }, 'spphone': { 'url': baseUrl + 'spphone.png', 'name': ''