From fdb7bff5469303f9e180ae7405e6c1eb53de2ffe Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Tue, 1 Apr 2025 18:01:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200=E5=85=83=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../b-rx-commodity-item.vue | 14 ++-
.../order/order-details/details.vue | 10 +-
.../orders-settlement/orders-settlement.vue | 108 ++++++++++++++++--
request/restaurant/index.js | 1 +
static/js/mixin/calculationamountmixin.js | 2 +-
unpackage/dist/build/web/index.html | 2 +-
.../{index.965941ca.js => index.213dbfac.js} | 2 +-
.../static/js/mixin/calculationamountmixin.js | 2 +-
.../js/pages-restaurant-home-home.54da4d57.js | 1 -
.../js/pages-restaurant-home-home.fb976450.js | 1 +
...nt-order-order-details-details.5f10cd19.js | 1 -
...nt-order-order-details-details.688bc8b2.js | 1 +
...ls-rx-orders-details~~5d2f8755.8c9df1a7.js | 1 -
...ls-rx-orders-details~~5d2f8755.c84d92d9.js | 1 +
...s-settlement-orders-settlement.ac65874b.js | 1 +
...s-settlement-orders-settlement.e1a21912.js | 1 -
...r-orders-settlement-settlement.abf36df8.js | 1 -
...r-orders-settlement-settlement.e896b25b.js | 1 +
18 files changed, 123 insertions(+), 28 deletions(-)
rename unpackage/dist/build/web/static/js/{index.965941ca.js => index.213dbfac.js} (99%)
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-home.54da4d57.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-home.fb976450.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details.5f10cd19.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details.688bc8b2.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details~pages-restaurant-order-order-details-rx-orders-details~~5d2f8755.8c9df1a7.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details~pages-restaurant-order-order-details-rx-orders-details~~5d2f8755.c84d92d9.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.ac65874b.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.e1a21912.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.abf36df8.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.e896b25b.js
diff --git a/components/b-rx-commodity-item/b-rx-commodity-item.vue b/components/b-rx-commodity-item/b-rx-commodity-item.vue
index e65818a..ef134c3 100644
--- a/components/b-rx-commodity-item/b-rx-commodity-item.vue
+++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue
@@ -37,7 +37,8 @@
¥{{item['pay_price']}}
- ¥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}
+ ¥{{item['user_price'] * (item['num']?item['num']:item['amount'])}}
+ ¥{{item['pay_price'] * (item['num']?item['num']:item['amount'])}}
¥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}}
@@ -145,6 +146,17 @@
width: 42rpx;
height: 42rpx;
}
+ }
+
+ .now {
+ font-size: 34rpx;
+ font-weight: bold;
+ }
+
+ .last {
+ color: gray;
+ text-decoration: line-through;
+ padding-left: 10rpx;
}
}
diff --git a/pages/restaurant/order/order-details/details.vue b/pages/restaurant/order/order-details/details.vue
index 57a29be..7762f21 100644
--- a/pages/restaurant/order/order-details/details.vue
+++ b/pages/restaurant/order/order-details/details.vue
@@ -337,12 +337,11 @@