diff --git a/dist/tab/index.wxss b/dist/tab/index.wxss index 50ee10a..29b9b67 100644 --- a/dist/tab/index.wxss +++ b/dist/tab/index.wxss @@ -16,12 +16,12 @@ .i-tabs-tab-bar { display: block; width: 72%; - height: 6rpx; + height: 8rpx; background: 0 0; position: absolute; bottom: 0; left: 15%; - background: #af6e34; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); border-radius: 100px; } @@ -30,17 +30,17 @@ line-height: 30rpx; text-align: center; box-sizing: border-box; - color: #666666; + color: #3C3C3C; } .i-tabs-tab-title-current { - color: #af6e34; - font-size: 36rpx; + color: #FD782D; + font-size: 30rpx; } .i-tabs-tab-scroll { display: inline-block; width: auto; - min-width:75rpx; + min-width:96rpx; margin-right:33rpx; } \ No newline at end of file diff --git a/dist/tabs/index.wxss b/dist/tabs/index.wxss index 7885846..6e228c2 100644 --- a/dist/tabs/index.wxss +++ b/dist/tabs/index.wxss @@ -1,8 +1,8 @@ .i-tabs { display: flex; width: 100%; - height: 42px; - line-height: 42px; + height: 48px; + line-height: 48px; box-sizing: border-box; position: relative; justify-content: space-around; diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 7660ea0..feb606e 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -1,8 +1,16 @@ - 领取成功,请尽快到门店使用 - 付款成功,请尽快到门店使用 + + + 领取成功 + 请尽快到门店使用,有效期至{{}} + + + 付款成功 + 请尽快到门店使用,有效期至{{}} + diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index d2aad69..8ebd7fc 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -13,27 +13,32 @@ page { vertical-align: middle; width: 40rpx; margin-right: 10rpx; + float: left; } .tips { width: 92%; - height: 88rpx; - background: #00c0ff; + height: 120rpx; + background: #2C8DFF; color: #fff; padding: 0 4%; - line-height: 88rpx; + /* line-height: 88rpx; */ } .merchantName { color: #666!important; } -.tips text:nth-child(2) { +.tips view{ + +} +.tips view:nth-child(2) { font-size: 32rpx; padding-left: 16rpx; + float: left; } -.tips text:nth-child(1) { +.tips view:nth-child(1) { width: 32rpx; height: 32rpx; background: #fff; @@ -41,9 +46,12 @@ page { color: #00c0ff; line-height: 32rpx; text-align: center; - display: inline-block; + /* display: inline-block; */ font-size: 28rpx; } +.msg text{ + width: 32rpx; +} .section { margin-top: 2%; diff --git a/pages/order/index/index.json b/pages/order/index/index.json index 25a47f0..3c08631 100644 --- a/pages/order/index/index.json +++ b/pages/order/index/index.json @@ -3,5 +3,6 @@ "i-tab": "../../../dist/tab/index", "i-tabs": "../../../dist/tabs/index" }, - "navigationBarTitleText": "我的订单" + "navigationBarTitleText": "我的订单", + "navigationBarBackgroundColor": "#F4F5F9" } \ No newline at end of file diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index d1cf37f..d698bcd 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -5,37 +5,39 @@ + + + + + {{item.title}} + 等待付款 + 拼团中 + 待退款 + 交易关闭 + 砍价中 + 砍价成功 + 砍价失败 + 砍价取消 + 拼团已过期 + 拼团失败 + 砍价失败 + 已退款 + 退款失败 + 拼团成功 + 免费领取 + 积分兑换 + 付款成功 + + - - - - {{item.title}} - 等待付款 - 拼团中 - 待退款 - 交易关闭 - 砍价中 - 砍价成功 - 砍价失败 - 砍价取消 - 拼团已过期 - 拼团失败 - 砍价失败 - 已退款 - 退款失败 - 拼团成功 - 免费领取 - 积分兑换 - 付款成功 - {{item.subTitle}} 面额:{{item.price/100}}元{{item.price/100}}小时 原价:{{item.price/100}}元{{item.price/100}}小时 - + 下单时间:{{item.createDate}} @@ -51,8 +53,8 @@ 1完成 2取消 --> - - 查看详情 + + 去查看 砍价详情 @@ -66,6 +68,9 @@ 退款失败 + + 再次购买 + diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index e3462e7..4a84199 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -1,32 +1,36 @@ .market { width: 100%; height: 100%; + background: #F4F5F9; + margin-top: 20rpx; } - .tabs { position: fixed; width: 100% !important; - height: 88rpx; + height: 96rpx; top: 0; left: 0; right: 0; text-align: center; z-index: 10000000; + font-size: 26rpx; } .i-tab { width: 30% !important; display: inline-block; } - +.section{ + background: #FFFFFF; +} .detail_msg { position: relative; width: 92%; background: #fff; display: flex; margin: 0 30rpx; - padding-bottom: 30rpx; - padding-top: 30rpx; + padding-bottom: 20rpx; + padding-top: 20rpx; border-bottom: 1rpx solid #eee; } .sendImg{ @@ -38,23 +42,29 @@ .logo { display: block; - width: 180rpx; - height: 180rpx; + width: 120rpx; + height: 120rpx; border: 1px solid #f8f8f8; - border-radius: 16rpx; + border-radius: 20rpx; } .logo image { display: block; - width: 180rpx; - height: 180rpx; - border-radius: 16rpx; + width: 120rpx; + height: 120rpx; + border-radius: 20rpx; } - -.info view:nth-child(1) { +.detail_top{ + width: 100%; + height: 40rpx; + line-height: 40rpx; + font-size: 30rpx; + padding-top: 30rpx; +} +.detail_top view:nth-child(1) { display: flex; justify-content: space-between; - padding: 0 0 0 4%; + padding: 0 4% 0 4%; } .info { @@ -67,10 +77,10 @@ letter-spacing: 0; line-height: 33rpx; padding-left: 4%; - height: 66rpx; + height: 33rpx; overflow: hidden; white-space: wrap; -text-overflow: ellipsis; + text-overflow: ellipsis; } .info view:nth-child(1) text { @@ -90,12 +100,14 @@ text-overflow: ellipsis; top:86rpx; right:2rpx; } -.info .sucess { +.detail_top .sucess { display: inline-block; width: 123rpx !important; /* overflow: hidden; */ - font-size: 26rpx; - color: #02c0ff; + font-family:PingFangSC-Regular; + font-size: 28rpx; + font-weight:400; + color: #2C8DFF; letter-spacing: 0; text-align: right; line-height: 26px; @@ -106,7 +118,7 @@ text-overflow: ellipsis; width: 123rpx !important; overflow: visible!important; font-size: 28rpx; - color: #ff4949; + color: #FD832D; letter-spacing: 0; text-align: right; line-height: 28rpx!important; @@ -148,13 +160,15 @@ text-overflow: ellipsis; } .info view:nth-child(3) { - margin-top: 20rpx; + margin-top: 16rpx; +} +.info view:nth-child(2) { + margin-top: 16rpx; } - .payment { position: relative; width: 92%; - height: 88rpx; + height: 80rpx; line-height: 88rpx; padding: 0 4%; display: flex; @@ -188,7 +202,39 @@ text-overflow: ellipsis; bottom: 0; margin: auto; right: 20rpx; - width: 180rpx; + width: 118rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + color: #fff; + float: right; + font-size: 26rpx; + border-radius: 20rpx; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); +} +.btnZf{ + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 118rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + color: #fff; + float: right; + font-size: 26rpx; + border-radius: 20rpx; + background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); +} +.btnGm{ + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 140rpx; height: 52rpx; line-height: 52rpx; text-align: center; @@ -201,9 +247,12 @@ text-overflow: ellipsis; .payment view:nth-child(2) text { font-size: 30rpx; - color: #02c0ff; + color: #FFFFFF; +} +.txGm{ + font-size: 24rpx; + color: #2C8DFF!important; } - .dingdan { margin-top: 33rpx; } diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml index d181ab2..4c9c88e 100644 --- a/pages/specialcourtesy/specialcourtesy.wxml +++ b/pages/specialcourtesy/specialcourtesy.wxml @@ -4,7 +4,7 @@ - 会员码:{{memberId}} + 会员码:{{memberId}} 会员等级为[{{level}}]对应门店的优惠折扣 @@ -31,6 +31,6 @@ - 此等级暂未开放折扣 + 此等级暂未开放折扣,敬请期待! diff --git a/pages/specialcourtesy/specialcourtesy.wxss b/pages/specialcourtesy/specialcourtesy.wxss index 0b32a8c..6230124 100644 --- a/pages/specialcourtesy/specialcourtesy.wxss +++ b/pages/specialcourtesy/specialcourtesy.wxss @@ -5,10 +5,10 @@ Page { } .none { - font-size: 28rpx; + font-size: 24rpx; text-align: center; - margin-top: 30rpx; - color: #fff; + margin-top: 38rpx; + color: #FFFFFF; float: none !important; } @@ -123,7 +123,7 @@ Page { } .level { - color: yellow; + color: #FD832D; } #mycanvas2 { @@ -169,12 +169,16 @@ Page { height: 150rpx; margin: 0 auto 10rpx; } +.canWrap{ + width: 358rpx; + height: 358rpx; +} .code image { - display: block; width: 358rpx; height: 358rpx; - margin: 142rpx 178rpx 72rpx; + display: block; + margin:142rpx auto 72rpx; } .memCode{ width: 562rpx; @@ -182,10 +186,17 @@ Page { line-height: 88rpx; border-radius:16rpx; border:1px solid rgba(225,225,225,1); - margin: 0 auto; + margin: 36rpx auto 0; color: #666; display: block; - font-size: 28rpx; + font-size: 24rpx; + text-align: center; +} +.memNum{ + font-weight:600; + font-size: 32rpx; + color: #3C3C3C; + font-family:PingFangSC-Medium; text-align: center; } .building{