From c90136e79be2cdbc124cefa249392d056dde065c Mon Sep 17 00:00:00 2001 From: "@QQNZX" Date: Fri, 15 Dec 2023 14:00:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gasStation-uni/pagesHome/MyCard/MyCard.vue | 36 +- .../pagesHome/oilRecharge/oilRecharge.vue | 3 + gasStation-uni/pagesMy/VIP/vip.vue | 595 ++++++++++-------- 3 files changed, 340 insertions(+), 294 deletions(-) diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index b2ef69781..b88c90218 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -25,7 +25,7 @@ {{cardBalance}} - + 立即充值 @@ -34,10 +34,6 @@ 囤油卡 - - - - 上一张 @@ -48,11 +44,6 @@ - - - - - @@ -73,9 +64,12 @@ style="margin-right: 15px;"> - - 立即充值 + + + 立即充值 + + @@ -104,8 +98,10 @@ style="margin-right: 15px;"> - - 立即兑换 + + + 立即兑换 + @@ -134,9 +130,9 @@ this.getUserBalance() }, methods: { - gocard() { + gocard(id) { uni.navigateTo({ - url: '/pagesHome/oilRecharge/oilRecharge' + url: '/pagesHome/oilRecharge/oilRecharge?id=' + id }) }, s_() { @@ -342,4 +338,12 @@ font-weight: bold; color: #000; } + + .z_yw { + width: 100%; + margin: 5px auto; + display: flex; + align-items: center; + justify-content: flex-end; + } \ No newline at end of file diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index da17b5efb..fb3296519 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -193,6 +193,9 @@ }, components: { + }, + onLoad(option) { + this.actinput = option.id }, onShow() { this.getValueCars(); diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index a5cca2c22..8207de070 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -1,325 +1,364 @@ + .an-title { + font-size: 16px; + font-weight: bold; + color: #333333; + margin-left: 5px; + } + \ No newline at end of file From 802285657250b406c130845c1f9e519f8ae4bad6 Mon Sep 17 00:00:00 2001 From: "@QQNZX" Date: Fri, 15 Dec 2023 14:34:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pagesHome/PointsMall/PointsMall.vue | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index 07c51c13b..e3889e655 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -62,7 +62,11 @@ + + + @@ -126,7 +130,6 @@ page: 1, pageSize: 10000 } - } }, @@ -251,12 +254,18 @@ \ No newline at end of file