From 6b835f51625a72a1da790c4c43e9d210c4c11d6f Mon Sep 17 00:00:00 2001 From: whitechiina <1293616053@qq.com> Date: Wed, 16 Apr 2025 17:34:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=82=B9=E9=A4=90?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop_home/shop-combo/mdl-shop-combo.vue | 15 ++- .../orders-settlement/orders-settlement.vue | 1 + .../order/orders-settlement/settlement.vue | 120 +++++++++++++++--- unpackage/dist/build/.DS_Store | Bin 6148 -> 6148 bytes unpackage/dist/build/web.zip | Bin 1511124 -> 1513730 bytes unpackage/dist/build/web/index.html | 4 +- ....2a9d3084.js => chunk-vendors.48d1c479.js} | 2 +- .../build/web/static/js/index.45c60011.js | 1 + .../build/web/static/js/index.58ad7669.js | 1 - .../build/web/static/js/mixin/PayMixin.js | 33 ++++- .../web/static/js/mixin/restaurantmixins.js | 18 ++- ...es-diy-addposition-addposition.61ea0b87.js | 1 - ...es-diy-addposition-addposition.df358381.js | 1 + ...uan~pages-restaurant~9ec24df5.15719053.js} | 2 +- ...9f2.js => pages-film-filmSeat.9dc14ea7.js} | 2 +- .../js/pages-restaurant-home-home.12ae4a9f.js | 1 + .../js/pages-restaurant-home-home.e592480a.js | 1 - ...home-shop-combo-mdl-shop-combo.a1aa618e.js | 1 - ...home-shop-combo-mdl-shop-combo.bd804299.js | 1 + ...urant-home-shop_home-shop_home.7ad1771b.js | 1 - ...urant-home-shop_home-shop_home.aef209d8.js | 1 + ...es-restaurant-index-index_dyp.baa6ceba.js} | 2 +- ...es-restaurant-index-index_kdj.6414fde9.js} | 2 +- ...es-restaurant-index-index_mdl.1d7d8ea4.js} | 2 +- ...ges-restaurant-index-index_nx.b180d7ea.js} | 2 +- ...ges-restaurant-index-index_rx.ff4a73e0.js} | 2 +- ...es-restaurant-index-index_xbk.00ba3507.js} | 2 +- ...ls-rx-orders-details~~5d2f8755.2975e215.js | 1 - ...ls-rx-orders-details~~5d2f8755.7f8209b3.js | 1 + ...r-order-details-order-details.d8d52e46.js} | 2 +- ...der-order-status-order-status.2194cded.js} | 2 +- ...s-settlement-orders-settlement.591bb932.js | 1 + ...s-settlement-orders-settlement.869be9f5.js | 1 - ...r-orders-settlement-settlement.6c836d43.js | 1 - ...r-orders-settlement-settlement.73a66552.js | 1 + ...nt-restaurant_home_list-index.eafad68d.js} | 2 +- 36 files changed, 175 insertions(+), 56 deletions(-) rename unpackage/dist/build/web/static/js/{chunk-vendors.2a9d3084.js => chunk-vendors.48d1c479.js} (98%) create mode 100644 unpackage/dist/build/web/static/js/index.45c60011.js delete mode 100644 unpackage/dist/build/web/static/js/index.58ad7669.js delete mode 100644 unpackage/dist/build/web/static/js/pages-diy-addposition-addposition.61ea0b87.js create mode 100644 unpackage/dist/build/web/static/js/pages-diy-addposition-addposition.df358381.js rename unpackage/dist/build/web/static/js/{pages-film-filmIndex~pages-film-filmPlay~pages-film-filmYSearch~pages-film-filmYuan~pages-restaurant~9ec24df5.923eccca.js => pages-film-filmIndex~pages-film-filmPlay~pages-film-filmYSearch~pages-film-filmYuan~pages-restaurant~9ec24df5.15719053.js} (70%) rename unpackage/dist/build/web/static/js/{pages-film-filmSeat.5be289f2.js => pages-film-filmSeat.9dc14ea7.js} (78%) create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-home.12ae4a9f.js delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-home.e592480a.js delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop-combo-mdl-shop-combo.a1aa618e.js create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop-combo-mdl-shop-combo.bd804299.js delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.7ad1771b.js create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.aef209d8.js rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_dyp.267307a1.js => pages-restaurant-index-index_dyp.baa6ceba.js} (72%) rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_kdj.f546c88b.js => pages-restaurant-index-index_kdj.6414fde9.js} (82%) rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_mdl.e4630e49.js => pages-restaurant-index-index_mdl.1d7d8ea4.js} (91%) rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_nx.ba66648f.js => pages-restaurant-index-index_nx.b180d7ea.js} (91%) rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_rx.c4b2d9fc.js => pages-restaurant-index-index_rx.ff4a73e0.js} (91%) rename unpackage/dist/build/web/static/js/{pages-restaurant-index-index_xbk.51d82d25.js => pages-restaurant-index-index_xbk.00ba3507.js} (61%) delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-order-details-details~pages-restaurant-order-order-details-rx-orders-details~~5d2f8755.2975e215.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.7f8209b3.js rename unpackage/dist/build/web/static/js/{pages-restaurant-order-order-details-order-details.f2134529.js => pages-restaurant-order-order-details-order-details.d8d52e46.js} (77%) rename unpackage/dist/build/web/static/js/{pages-restaurant-order-order-status-order-status.07fcff37.js => pages-restaurant-order-order-status-order-status.2194cded.js} (83%) create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.591bb932.js delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.869be9f5.js delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.6c836d43.js create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.73a66552.js rename unpackage/dist/build/web/static/js/{pages-restaurant-restaurant_home_list-index.60adb98d.js => pages-restaurant-restaurant_home_list-index.eafad68d.js} (86%) diff --git a/pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.vue b/pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.vue index 6d5ec87..879ebf5 100644 --- a/pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.vue +++ b/pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.vue @@ -58,14 +58,15 @@ *{{item['amount']}} - + + - {{_amount(Selectedpay)}} + {{_amount(Selectedpay * 100)}} @@ -151,9 +152,13 @@ return e['price'] * e['amount'] }; return 0 - }).reduce((a, b) => a + b); - let price = (+this['InforData']['pay_price']) + _addpay; - console.log(price,'price'); + }).reduce((a, b) => a + b); + + // let price = (+this['InforData']['pay_price']) + _addpay; + + let price = (+this['InforData']['product_price']) + _addpay; + console.log(price,'price'); + // 该字段为前端计算使用 // this['InforData']['adj_pay'] = (+this['InforData']['pay_price']); this['InforData']['add_price'] = _addpay; diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index 0d2cf67..e345495 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -287,6 +287,7 @@ hasAssigned: false, // 标志变量 YingPrice: 0 ,// 应付 realPayment: 0, // 实际付款 + ZeroData: {} }; }, onLoad() { diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue index f894f6b..7d71278 100644 --- a/pages/restaurant/order/orders-settlement/settlement.vue +++ b/pages/restaurant/order/orders-settlement/settlement.vue @@ -91,7 +91,7 @@ - + 应付: ¥{{ YingPrice }} @@ -126,7 +126,7 @@ 实际付款: - ¥{{computedTotal.real_pay_price}} + ¥{{realPayment}} 积分: @@ -139,6 +139,39 @@ + + + + + +