diff --git a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
index ce21ef5..50891ab 100644
--- a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
+++ b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
@@ -76,6 +76,11 @@
{{item['bt_price']}}
+
+
+ 消费补贴卡:¥
+ {{item['subsidy_card_price']}}
+
预估积分:
@@ -363,7 +368,7 @@
padding-left: 22rpx;
&-bottom {
- margin-bottom: 15rpx;
+ // margin-bottom: 12rpx;
}
&-title {
diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue
index 487d63d..78e004f 100644
--- a/pages/restaurant/home/shop_home/shop_home.vue
+++ b/pages/restaurant/home/shop_home/shop_home.vue
@@ -107,7 +107,7 @@
return {
// 肯德基
// 顶部通知
- topNotice: '当前3人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~',
+ topNotice: '当前6人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~',
show: false,
suspend: config['suspend'],
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 61e82b6..216806a 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -94,6 +94,15 @@
+
+
+
+ 消费补贴卡:
+ (¥{{ UserCard.amount }} )
+
+
+
+
温馨提示
1、出餐后不支持退款,如需退款,请在出餐前联系客服;
@@ -209,6 +218,7 @@
import wx from 'weixin-js-sdk';
import state from '@/store/index';
import { HTTP_REQUEST_URL } from '@/config/app.js';
+ import { getCardPrice } from '@/request/index/index.js';
// 混入
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
@@ -261,7 +271,8 @@
// 产品集合
products: [],
use_coin: 0,
- use_broker: 0,
+ use_broker: 0,
+ use_card: 0,
// products>product_id
// products>amount
// products>is_deduction
@@ -285,11 +296,13 @@
computedTotal: {},
use_coin: false,
use_broker: false,
+ use_card: false,
hasAssigned: false, // 标志变量
YingPrice: 0 ,// 应付
realPayment: 0, // 实际付款
ZeroData: {},
+ UserCard: {}
};
},
onLoad() {
@@ -366,6 +379,7 @@
// 计算点餐金额
this['FormInfor']['use_coin'] = this.use_coin? 1 : 0;
this['FormInfor']['use_broker'] = this.use_broker? 1 : 0;
+ this['FormInfor']['use_card'] = this.use_card? 1 : 0;
this['FormInfor']['brand_id'] = this['BrandInfor']['brand_id'];
this['FormInfor']['restaurant_id'] = this['GetShopInfor']['restaurant_id'];
@@ -377,6 +391,14 @@
// 佣金计算
this.computedOrder(this.FormInfor);
+ this.getUserCard();
+ },
+
+
+ getUserCard() {
+ getCardPrice().then(res => {
+ this.UserCard = res.data;
+ })
},
// 是否使用券
@@ -386,6 +408,12 @@
this.getCart();
},
+ // 是否使用消费补贴卡
+ isCard() {
+ this.use_card = !this.use_card;
+ this.getCart();
+ },
+
isBroker() {
this.use_broker = !this.use_broker;
this.getCart();
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index e01c601..8cc27b8 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -117,6 +117,15 @@
+
+
+
+ 消费补贴卡:
+ (¥{{ UserCard.amount }} )
+
+
+
+
温馨提示
@@ -233,7 +242,8 @@