From e70e41434ff1026d168db16fe65e7c74d6cc914d Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 6 Dec 2023 10:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gasStation-uni/pagesMy/myorder/myorder.vue | 2 +- .../pagesRefuel/orderDetail/index.vue | 4 +- .../mp-weixin/pagesMy/Recharge/Recharge.json | 3 +- .../mp-weixin/pagesMy/Recharge/Recharge.wxml | 2 +- .../mp-weixin/pagesMy/Recharge/Recharge.wxss | 51 +++++++++++++++++++ .../mp-weixin/pagesMy/feedback/feedback.js | 4 +- 6 files changed, 58 insertions(+), 8 deletions(-) diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue index f36d4f0df..682eb5503 100644 --- a/gasStation-uni/pagesMy/myorder/myorder.vue +++ b/gasStation-uni/pagesMy/myorder/myorder.vue @@ -255,7 +255,7 @@ page: 1, pageSize: 5, storeId: "", - orderStatus: "", + orderStatus: "paid", remark: "待评价", } this.getMyOrder() diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue index 80a88c305..2cf435e54 100644 --- a/gasStation-uni/pagesRefuel/orderDetail/index.vue +++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue @@ -231,8 +231,8 @@ } }, onLoad(e) { - // this.orderNo = e.orderNo - this.orderNo = "20231201114800ebe24b" + this.orderNo = e.orderNo + // this.orderNo = "20231201114800ebe24b" }, onShow() { this.getOilOrder(); diff --git a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.json b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.json index fd74df989..372bd2356 100644 --- a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.json +++ b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.json @@ -2,7 +2,6 @@ "navigationBarTitleText": "充值记录", "navigationStyle": "custom", "usingComponents": { - "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons", - "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty" + "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons" } } \ No newline at end of file diff --git a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxml b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxml index fe13eee11..bd7325385 100644 --- a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxml +++ b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxml @@ -1 +1 @@ -充值记录{{item.text}} \ No newline at end of file +充值记录{{item.text}}储值卡充值成功充值金额￥123优惠合计￥999订单时间20230304 \ No newline at end of file diff --git a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxss b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxss index 4fb29f376..a4107ef95 100644 --- a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxss +++ b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/Recharge/Recharge.wxss @@ -76,4 +76,55 @@ .lan.data-v-4ea1f3b2 { background: #0000ff; } +.box-order.data-v-4ea1f3b2 { + width: 95%; + border-radius: 8px; + background: #ffffff; + box-sizing: border-box; + padding: 10px; + margin: 10px auto; +} +.or-box-top.data-v-4ea1f3b2 { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding: 5px 0px; + border-bottom: 1px solid #e5e5e5; +} +.chengg.data-v-4ea1f3b2 { + color: #1678ff; +} +.but-box.data-v-4ea1f3b2 { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 14px; + margin: 5px 0px; +} +.reds.data-v-4ea1f3b2 { + color: red; +} +.huis.data-v-4ea1f3b2 { + color: #666666; +} +.end-box.data-v-4ea1f3b2 { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; +} +.anniu.data-v-4ea1f3b2 { + width: 70px; + height: 25px; + background-color: #1678ff; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + font-size: 14px; + border-radius: 15px; +} diff --git a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/feedback/feedback.js b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/feedback/feedback.js index d78e394ed..95fa11dac 100644 --- a/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/feedback/feedback.js +++ b/gasStation-uni/unpackage/dist/dev/mp-weixin/pagesMy/feedback/feedback.js @@ -104,10 +104,10 @@ try { return Promise.all(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-icons/uni-icons.vue */ 453)) }, "u-Textarea": function () { - return Promise.all(/*! import() | uni_modules/uview-ui/components/u--textarea/u--textarea */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--textarea/u--textarea")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--textarea/u--textarea.vue */ 632)) + return Promise.all(/*! import() | uni_modules/uview-ui/components/u--textarea/u--textarea */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--textarea/u--textarea")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--textarea/u--textarea.vue */ 640)) }, uUpload: function () { - return Promise.all(/*! import() | uni_modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-upload/u-upload.vue */ 638)) + return Promise.all(/*! import() | uni_modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-upload/u-upload.vue */ 646)) }, } } catch (e) {