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 9482a7f..0e463c9 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,9 +12,14 @@
- ¥
-
- {{__amount(totalPrice)}}
+
+ ¥
+
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
@@ -179,9 +184,14 @@
- ¥
-
- {{__amount(totalPrice)}}
+
+ ¥
+
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
@@ -259,9 +269,14 @@
- ¥
-
- {{__amount(totalPrice)}}
+
+ ¥
+
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
@@ -348,8 +363,13 @@
- ¥
- {{__amount(totalPrice)}}
+
+ ¥
+ {{__amount(totalPrice)}}
+
+
+ ¥{{__amount(lastPrice)}}
+
@@ -465,7 +485,8 @@
// 购物车
MealList: [],
// 购物车合计
- totalPrice: 0,
+ totalPrice: 0,
+ lastPrice: 0,
// 购物车弹框显示变量
shoppingshow: false,
// 购物车弹框距离购物车定位距离
@@ -529,6 +550,7 @@
let shoparr = [];
let newArr = [];
let Price = 0;
+ let lastPrice = 0;
this['tabbar'].map(item => {
shoparr.push(...item['foods'])
});
@@ -560,6 +582,7 @@
// 原价 + 加料价格
item['adj_pay'] = (+item['product_price']) + (+item['add_price']);
Price += item['bt_price'] * item['num'];
+ lastPrice += item['adj_pay'] * item['num'];
newArr.push(item);
console.log(this['GetCartList'][id],'是否规格商品');
// 此处逻辑是将同商品下的不同规格数据取出来
@@ -580,6 +603,7 @@
};
_item['adj_pay'] = (+_item['product_price']) + (+_item['add_price']);
Price += _item['bt_price'] * _item['num'];
+ lastPrice += _item['adj_pay'] * _item['num'];
this['GetCartList'][id]['Differentskulist'][i] = _item;
};
newArr.push(...this['GetCartList'][id]['Differentskulist']);
@@ -592,7 +616,8 @@
console.log(Price,'Price');
console.log(newArr, 'newArrnewArrnewArrnewArr');
this['MealList'] = newArr;
- this['totalPrice'] = Price;
+ this['totalPrice'] = Price;
+ this['lastPrice'] = lastPrice;
// 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){
@@ -798,5 +823,9 @@
font-weight: 500;
}
}
-
+ .yuanjia {
+ color: gray;
+ padding-left: 20rpx;
+ text-decoration: line-through;
+ }
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 880e526..75764bd 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
@@ -381,6 +381,7 @@
text-decoration: line-through;
.price {
font-size: 24rpx !important;
+ font-weight: 300 !important;
}
}
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index acc0ca9..120d1ec 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -125,7 +125,7 @@
实际付款:
¥{{realPayment}}
-
+
积分:
{{computedTotal.integral}}
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index f1e934c..77aa043 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -144,7 +144,7 @@
实际付款:
¥{{realPayment}}
-
+
积分:
¥{{computedTotal.integral}}
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 11ab4e5..62a6f66 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('')