From c8c285118d544c742b9e0ae142fa64569b8f2b47 Mon Sep 17 00:00:00 2001 From: xvv Date: Mon, 23 Sep 2024 17:41:41 +0800 Subject: [PATCH] 9.23 --- gasStation-uni/pages.json | 13 +- gasStation-uni/pages/my/my.vue | 9 +- .../pagesHome/PointsMall/PointsMall.vue | 158 ++++------- .../pagesHome/goodsDetails/goodsDetails.vue | 73 +++-- .../pagesHome/myPointsOrder/details.vue | 264 ++++++++++++++++++ .../pagesHome/myPointsOrder/myPointsOrder.vue | 63 ++++- gasStation-uni/pagesHome/order/order.vue | 33 +-- gasStation-uni/static/imgs/telicon.png | Bin 0 -> 1760 bytes gasStation-uni/static/new/queshengye.png | Bin 0 -> 18700 bytes 9 files changed, 454 insertions(+), 159 deletions(-) create mode 100644 gasStation-uni/pagesHome/myPointsOrder/details.vue create mode 100644 gasStation-uni/static/imgs/telicon.png create mode 100644 gasStation-uni/static/new/queshengye.png diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index f9a64a047..1e3553279 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -136,7 +136,12 @@ "path": "myPointsOrder/myPointsOrder", "style": { "navigationBarTitleText": "我的订单" - + } + }, + { + "path": "myPointsOrder/details", + "style": { + "navigationBarTitleText": "订单详情" } }, { @@ -163,8 +168,8 @@ { "path": "PointsMall/PointsMall", "style": { - "navigationBarTitleText": "积分商城", - "navigationStyle": "custom" + "navigationBarTitleText": "积分商城" + } }, { @@ -393,4 +398,4 @@ "backgroundColor": "#F8F8F8" }, "uniIdRouter": {} -} \ No newline at end of file +} diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index d2108296b..2a7dc5ab7 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -79,7 +79,7 @@ 消费记录 - + @@ -248,6 +248,11 @@ url: '/pagesMy/myorder/myorder' }) } + if (num == 3) { + uni.navigateTo({ + url: '/pagesHome/myPointsOrder/myPointsOrder' + }) + } }, // 查询全部充值订单 getAllOrderList() { @@ -606,4 +611,4 @@ height: 100%; } } - \ No newline at end of file + diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index 175ebca75..53b029ef0 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -1,67 +1,23 @@