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 0e463c9..d1dc4c8 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
@@ -12,13 +12,19 @@
-
- ¥
-
- {{__amount(totalPrice)}}
-
-
- ¥{{__amount(lastPrice)}}
+
+
+
+ ¥
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
+
+
+ 消费补贴:¥{{cardbtPrice}}
+
@@ -184,13 +190,19 @@
-
- ¥
-
- {{__amount(totalPrice)}}
-
-
- ¥{{__amount(lastPrice)}}
+
+
+
+ ¥
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
+
+
+ 消费补贴:¥{{cardbtPrice}}
+
@@ -269,15 +281,21 @@
-
- ¥
-
- {{__amount(totalPrice)}}
+
+
+
+ ¥
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
+
+
+ 消费补贴:¥{{cardbtPrice}}
+
-
- ¥{{__amount(lastPrice)}}
-
-
+
{{Shoplength > 0?'结算':'未选择商品'}}
@@ -363,12 +381,19 @@
-
- ¥
- {{__amount(totalPrice)}}
-
-
- ¥{{__amount(lastPrice)}}
+
+
+
+ ¥
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
+
+
+ 消费补贴:¥{{cardbtPrice}}
+
@@ -486,7 +511,8 @@
MealList: [],
// 购物车合计
totalPrice: 0,
- lastPrice: 0,
+ lastPrice: 0,
+ cardbtPrice: 0,
// 购物车弹框显示变量
shoppingshow: false,
// 购物车弹框距离购物车定位距离
@@ -550,7 +576,8 @@
let shoparr = [];
let newArr = [];
let Price = 0;
- let lastPrice = 0;
+ let lastPrice = 0;
+ let cardbtPrice = 0;
this['tabbar'].map(item => {
shoparr.push(...item['foods'])
});
@@ -582,9 +609,10 @@
// 原价 + 加料价格
item['adj_pay'] = (+item['product_price']) + (+item['add_price']);
Price += item['bt_price'] * item['num'];
- lastPrice += item['adj_pay'] * item['num'];
+ lastPrice += item['adj_pay'] * item['num'];
+ cardbtPrice += item['subsidy_card_price'] * item['num'];
newArr.push(item);
- console.log(this['GetCartList'][id],'是否规格商品');
+ console.log(this['GetCartList'][id],'是否规格商品');
// 此处逻辑是将同商品下的不同规格数据取出来
if (this['GetCartList'][id]['Differentskulist'] && this['GetCartList'][id]['Differentskulist']['length'] > 0) {
console.log('多规格');
@@ -603,7 +631,8 @@
};
_item['adj_pay'] = (+_item['product_price']) + (+_item['add_price']);
Price += _item['bt_price'] * _item['num'];
- lastPrice += _item['adj_pay'] * _item['num'];
+ lastPrice += _item['adj_pay'] * _item['num'];
+ cardbtPrice += item['subsidy_card_price'] * item['num'];
this['GetCartList'][id]['Differentskulist'][i] = _item;
};
newArr.push(...this['GetCartList'][id]['Differentskulist']);
@@ -618,6 +647,7 @@
this['MealList'] = newArr;
this['totalPrice'] = Price;
this['lastPrice'] = lastPrice;
+ this['cardbtPrice'] = cardbtPrice;
// console.timeEnd()
console.log('结束initCategoryNum');
// if(this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 2 || this['BrandInfor']['brand_id'] == 5 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 13){
@@ -827,5 +857,12 @@
color: gray;
padding-left: 20rpx;
text-decoration: line-through;
+ }
+ .xfbt {
+ padding-left: 26rpx;
+ color: gray;
+ font-size: 24rpx;
+ color: #000;
+ font-weight: 400;
}
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 62a6f66..fa13b5e 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('')