diff --git a/pages/mallInfo/mallInfo.wxml b/pages/mallInfo/mallInfo.wxml index 643c9a9..7c8ba15 100644 --- a/pages/mallInfo/mallInfo.wxml +++ b/pages/mallInfo/mallInfo.wxml @@ -2,9 +2,9 @@ - - - + + + {{name}} @@ -12,7 +12,7 @@ 营业时间 : - + {{item.time}}({{item.weekName}}) @@ -23,9 +23,8 @@ 热线电话 : - - {{servicePhone}} + + {{servicePhone}} - - + \ No newline at end of file diff --git a/pages/mallInfo/mallInfo.wxss b/pages/mallInfo/mallInfo.wxss index 9192e7a..43bc888 100644 --- a/pages/mallInfo/mallInfo.wxss +++ b/pages/mallInfo/mallInfo.wxss @@ -1,13 +1,16 @@ /* pages/mallInfo.wxss */ @import "../../app.wxss"; -page{ - background:linear-gradient(180deg,#FD832D 0%,#FE4A16 100%); + +page { + background: linear-gradient(180deg, #FD832D 0%, #FE4A16 100%); } -.codeBox{ - background:linear-gradient(180deg,#FD832D 0%,#FE4A16 100%); + +.codeBox { + background: linear-gradient(180deg, #FD832D 0%, #FE4A16 100%); height: 100%; overflow: auto; } + .none { font-size: 24rpx; text-align: center; @@ -52,53 +55,68 @@ page{ background: #fff; margin: 20rpx auto; border-radius: 10rpx; - padding-top: 20rpx; - padding-bottom: 20rpx; -} -.code image{ - display:block; - margin: auto ; -} -.info{ + padding-top: 18rpx; + padding-bottom: 18rpx; +} + +.code image { + display: block; + width: 650rpx; + margin: auto; +} + +.info { width: 650rpx; background: #fff; margin: 20rpx auto; border-radius: 10rpx; padding: 20rpx; } -.title{ + +.title { margin: 20rpx 0; text-align: center; font-size: 50rpx; } -.phone,.park,.introduction{ + +.phone, +.park, +.introduction { font-size: 30rpx; - line-height:40rpx; + line-height: 40rpx; margin: 20rpx 0; } -.time{ + +.time { margin: 20rpx 0; font-size: 30rpx; display: flex; } -.timesBox{ + +.timesBox { display: flex; flex-direction: column; } -.times{ + +.times { margin-left: 10rpx; } -.times text{ + +.times text { line-height: 40rpx; } -.park > text:nth-child(2) ,.phone > text:nth-child(2){ + +.park>text:nth-child(2), +.phone>text:nth-child(2) { margin-left: 10rpx; } + .tel { margin: 0 10rpx; width: 30rpx; height: 30rpx; } -.phoneNum{ - color:#FD832D; + +.phoneNum { + color: #FD832D; } \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index dfc9e13..0095ed9 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -112,8 +112,8 @@ Page({ } }).then(res => { wx.hideLoading(); - // console.log(res.data.orders[0].title,"ccc"); - if (res.data.orders[0].title == "停车券") { + console.log(res.data.orders[0], "data"); + if (res.data.orders[0].type == 5 || res.data.orders[0].type == 51) { wx.showModal({ title: '领取成功', cancelText: '我知道了',