From 65c2e4fd1814347eaa8680c45b25b566faa47a13 Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Mon, 20 Jul 2026 18:30:09 +0800
Subject: [PATCH] updata
---
.../shop_home/components/shop-cart/shop-cart.vue | 6 ++++--
.../order/orders-settlement/orders-settlement.vue | 13 +++++++------
.../order/orders-settlement/settlement.vue | 13 +++++++------
unpackage/dist/build/web/index.html | 2 +-
.../js/{index.ef52e3ce.js => index.f3af94ee.js} | 2 +-
...-restaurant-home-shop_home-shop_home.8f41cfb8.js | 1 +
...-restaurant-home-shop_home-shop_home.967c4a3a.js | 1 -
...-orders-settlement-orders-settlement.1825c6ea.js | 1 -
...-orders-settlement-orders-settlement.80516801.js | 1 +
...t-order-orders-settlement-settlement.a6d869ef.js | 1 -
...t-order-orders-settlement-settlement.f52d72d6.js | 1 +
11 files changed, 23 insertions(+), 19 deletions(-)
rename unpackage/dist/build/web/static/js/{index.ef52e3ce.js => index.f3af94ee.js} (99%)
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.8f41cfb8.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.967c4a3a.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.1825c6ea.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.80516801.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.a6d869ef.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.f52d72d6.js
diff --git a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
index 1ddf705..fc953f2 100644
--- a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
+++ b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue
@@ -740,13 +740,15 @@
// console.log(self['MealList']['sku'],'MealList').;
// return.
self.SETREPLACE(self['MealList']);
+ const cardFlag = this.MealList[0]?.subsidy_card_price == 0? false : true;
+
if( this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 5){
uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/settlement`
+ url: `/pages/restaurant/order/orders-settlement/settlement?cardFlag=${cardFlag}`
});
}else if(this['BrandInfor']['brand_id'] == 13 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 2){
uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/orders-settlement`
+ url: `/pages/restaurant/order/orders-settlement/orders-settlement?cardFlag=${cardFlag}`
});
}
return;
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 4cd7e1b..f67abf8 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -94,7 +94,7 @@
-
+
消费补贴卡:
@@ -176,14 +176,14 @@
-
+
抵用券抵扣
-
{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}
-
+
消费补贴卡抵扣
-
@@ -309,11 +309,12 @@
YingPrice: 0 ,// 应付
realPayment: 0, // 实际付款
ZeroData: {},
- UserCard: {}
+ UserCard: {},
+ cardFlag: false // 消费补贴是否开启 数值不为0为开启
};
},
- onLoad() {
- self = this;
+ onLoad(e) {
+ this.cardFlag = e.cardFlag === "true"? true : false;
console.log(this['getPhone'],'手机号');
// 就餐类型
this['FormInfor']['eat_type'] = this['GetMODE'];
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 77aa043..6ad8a24 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -117,10 +117,10 @@
-
+
- 消费补贴卡:
+ 消费补贴卡:{{computedTotal}}
(¥{{ UserCard.amount }} )
@@ -200,7 +200,7 @@
{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}
-
+
消费补贴卡抵扣
-
@@ -324,11 +324,12 @@
YingPrice: 0, // 应付
realPayment: 0, // 实际付款
ZeroData: {},
- UserCard: {}
+ UserCard: {},
+ cardFlag: false // 消费补贴是否开启 数值不为0为开启
};
},
- onLoad() {
- self = this;
+ onLoad(e) {
+ this.cardFlag = e.cardFlag === "true"? true : false;
this['FormInfor']['eat_type'] = this['GetMODE'];
// 上次下单手机号
this['FormInfor']['phone_number'] = this['getPhone'];
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 9ced2a2..13c6061 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
在线点餐
\ No newline at end of file
+ document.write('')