From 6fb507076b241eba8ffe8b559a0e4660d2d9c8f5 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Wed, 15 Mar 2023 16:29:41 +0800 Subject: [PATCH] upload --- index/passCar.wxml | 2 +- pages/ConsumeDetail/ConsumeDetail.js | 9 ++- pages/ConsumeDetail/ConsumeDetail.wxml | 8 ++- pages/ConsumeDetail/ConsumeDetail.wxss | 99 ++++++++++++++++---------- pages/exchangeCard/exchangeCard.js | 2 +- 5 files changed, 76 insertions(+), 44 deletions(-) diff --git a/index/passCar.wxml b/index/passCar.wxml index 5b289ae..6652deb 100644 --- a/index/passCar.wxml +++ b/index/passCar.wxml @@ -27,7 +27,7 @@ - + 您有停车券可使用哦 {{quantitle}} diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 0db109d..6135f18 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -58,7 +58,8 @@ Page({ more: "点击查看更多", showMore: true, supportTransfer: 1, - showIndexReuturn: false + showIndexReuturn: false, + pageNum: 1 }, phone: function (e) { let that = this; @@ -157,7 +158,7 @@ Page({ data: { cardId: cardId, pageNum: 1, - pageSize: 100 + pageSize: 500 } }; Http.get(parmer) @@ -245,4 +246,8 @@ Page({ showbutton: false }) }, + + onReachBottom() { + + }, }); \ No newline at end of file diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml index 4dc5322..eba8953 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxml +++ b/pages/ConsumeDetail/ConsumeDetail.wxml @@ -28,12 +28,16 @@ {{item.merchantName}} - -{{item.deductionAmount/100}}元 + + 退款:+ {{item.deductionAmount/100}}元 + - {{item.deductionAmount/100}}元 + - {{item.updateDate}} + 更新时间:{{item.updateDate}} 余 {{item.cardRemainAmount/100}}元 + 订单号:{{item.orderId}} diff --git a/pages/ConsumeDetail/ConsumeDetail.wxss b/pages/ConsumeDetail/ConsumeDetail.wxss index 08b2be6..979ba3c 100644 --- a/pages/ConsumeDetail/ConsumeDetail.wxss +++ b/pages/ConsumeDetail/ConsumeDetail.wxss @@ -1,7 +1,11 @@ -button::after{ border: none; } -.notes{ +button::after { + border: none; +} + +.notes { padding-bottom: 60rpx; } + .record text:nth-of-type(2n+1) { float: left; } @@ -20,14 +24,20 @@ button::after{ border: none; } } .record1 text:nth-of-type(1) { - font-size:30rpx; - font-family:PingFang-SC-Bold; - color:rgba(51,51,51,1); + font-size: 30rpx; + font-family: PingFang-SC-Bold; + color: rgba(51, 51, 51, 1); } .list { padding: 18rpx 0; } + +.orderId { + margin-top: 15rpx; + color: #999999; +} + .title { display: block; padding: 0 32rpx; @@ -39,9 +49,10 @@ button::after{ border: none; } .record2 { margin-top: 16rpx; - color:rgba(153,153,153,1)!important; + color: rgba(153, 153, 153, 1) !important; } -.record2 text{ + +.record2 text { font-size: 30rpx; } @@ -126,7 +137,8 @@ button::after{ border: none; } .titles .fr { color: red; } -.titles .fr text{ + +.titles .fr text { font-size: 42rpx; } @@ -150,6 +162,7 @@ button::after{ border: none; } letter-spacing: 0; line-height: 42rpx; } + .tel { right: 0; top: 0; @@ -158,13 +171,16 @@ button::after{ border: none; } width: 50rpx; height: 50rpx; } -.list{ + +.list { padding: 20rpx 32rpx; - border-bottom:1px solid #EAEAEA; + border-bottom: 1px solid #EAEAEA; } -.notess{ + +.notess { padding: 0 32rpx; } + .dingdan { margin-top: 33rpx; } @@ -192,52 +208,59 @@ button::after{ border: none; } height: 300rpx; margin: 0 auto 16rpx; } -.head{ - padding:32rpx 32rpx 0; + +.head { + padding: 32rpx 32rpx 0; } -.bottom{ + +.bottom { text-align: center; height: 70rpx; line-height: 70rpx; color: #999; font-size: 32rpx; } -.support-tansfer{ + +.support-tansfer { display: block; width: 540rpx; margin: 4rpx auto; border-radius: 50rpx; /* background: #02C0FF!important; */ - background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); } -.share{ + +.share { width: 40rpx; height: 40rpx; margin-right: 20rpx; } -.share-bottom{ + +.share-bottom { width: 100%; /* overflow:hidden; */ - margin-top:66rpx; + margin-top: 66rpx; } + .goback { - float:left; - width:122rpx!important; - height:95rpx; - background:rgba(255,255,255,1); - line-height:95rpx; - border:1rpx solid rgba(227,227,227,1); - box-shadow:0px 8px 8px 1px rgba(189,189,189,0.32); - border-radius:48rpx; - margin-left:25rpx; -} -.goback image{ - position:absolute; - width:60rpx; - left:0; - right:0; - top:0; - bottom:0; - margin:auto; - height: 80rpx; + float: left; + width: 122rpx !important; + height: 95rpx; + background: rgba(255, 255, 255, 1); + line-height: 95rpx; + border: 1rpx solid rgba(227, 227, 227, 1); + box-shadow: 0px 8px 8px 1px rgba(189, 189, 189, 0.32); + border-radius: 48rpx; + margin-left: 25rpx; } + +.goback image { + position: absolute; + width: 60rpx; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + height: 80rpx; +} \ No newline at end of file diff --git a/pages/exchangeCard/exchangeCard.js b/pages/exchangeCard/exchangeCard.js index 27389d3..95c6295 100644 --- a/pages/exchangeCard/exchangeCard.js +++ b/pages/exchangeCard/exchangeCard.js @@ -261,6 +261,6 @@ Page({ onLoad() { setTimeout(() => { this.checkPhoneStatus() - }, 2000); + }, 500); } })