fix: 计算金额退额卡
This commit is contained in:
parent
99cd939fae
commit
24703cae4c
|
|
@ -586,61 +586,57 @@
|
||||||
// 循环购物车
|
// 循环购物车
|
||||||
let list = Object.keys(this['GetCartList']);
|
let list = Object.keys(this['GetCartList']);
|
||||||
for (let i = 0; i < list['length']; i++) {
|
for (let i = 0; i < list['length']; i++) {
|
||||||
// 将item转为数字
|
let id = +Object.keys(this['GetCartList'])[i];
|
||||||
let id = +Object.keys(this['GetCartList'])[i];
|
console.log(this['GetCartList'][id], "当前商品")
|
||||||
console.log(this['GetCartList'][id], "当前商品")
|
let index = commodityids.indexOf(id);
|
||||||
// // 在commodityids中查找item
|
let item = {};
|
||||||
let index = commodityids.indexOf(id);
|
if (index != -1) {
|
||||||
let item = {};
|
item = {
|
||||||
if (index != -1) {
|
...shoparr[index],
|
||||||
|
num: this['GetCartList'][id]['num'],
|
||||||
|
sku: this['GetCartList'][id]['sku'],
|
||||||
|
sku_code: this['GetCartList'][id]['sku_code'],
|
||||||
|
restaurant_id: this['GetShopInfor']['restaurant_id'],
|
||||||
|
adj_pay: 0,
|
||||||
|
add_price: this['GetCartList'][id]?.add_price ? (+this['GetCartList'][id]['add_price']) : 0
|
||||||
|
};
|
||||||
|
console.log(item['sku'], '当前sku');
|
||||||
|
item['adj_pay'] = (+item['product_price']) + (+item['add_price']);
|
||||||
|
Price += item['bt_price'] * item['num'];
|
||||||
|
lastPrice += item['adj_pay'] * item['num'];
|
||||||
|
|
||||||
item = {
|
// 修正:父级商品使用自己的补贴价格
|
||||||
...shoparr[index],
|
cardbtPrice += item['subsidy_card_price'] * item['num'];
|
||||||
num: this['GetCartList'][id]['num'],
|
newArr.push(item);
|
||||||
sku: this['GetCartList'][id]['sku'],
|
console.log(this['GetCartList'][id], '是否规格商品');
|
||||||
sku_code: this['GetCartList'][id]['sku_code'],
|
|
||||||
restaurant_id: this['GetShopInfor']['restaurant_id'],
|
|
||||||
// 原价 + 加价
|
|
||||||
adj_pay: 0,
|
|
||||||
// 商品加料价格
|
|
||||||
add_price:this['GetCartList'][id]?.add_price?(+this['GetCartList'][id]['add_price']):0
|
|
||||||
};
|
|
||||||
console.log(item['sku'],'当前sku');
|
|
||||||
// 原价 + 加料价格
|
|
||||||
item['adj_pay'] = (+item['product_price']) + (+item['add_price']);
|
|
||||||
Price += item['bt_price'] * item['num'];
|
|
||||||
lastPrice += item['adj_pay'] * item['num'];
|
|
||||||
cardbtPrice += item['subsidy_card_price'] * item['num'];
|
|
||||||
newArr.push(item);
|
|
||||||
console.log(this['GetCartList'][id],'是否规格商品');
|
|
||||||
// 此处逻辑是将同商品下的不同规格数据取出来
|
|
||||||
if (this['GetCartList'][id]['Differentskulist'] && this['GetCartList'][id]['Differentskulist']['length'] > 0) {
|
|
||||||
console.log('多规格');
|
|
||||||
for (let i = 0; i < this['GetCartList'][id]['Differentskulist']['length']; i++) {
|
|
||||||
let _item = this['GetCartList'][id]['Differentskulist'][i];
|
|
||||||
console.log(_item,'当前规格商品');
|
|
||||||
_item = {
|
|
||||||
...shoparr[index],
|
|
||||||
num: _item['num'],
|
|
||||||
sku: _item['sku'],
|
|
||||||
sku_code: _item['sku_code'],
|
|
||||||
// 商品原价
|
|
||||||
adj_pay: 0,
|
|
||||||
// 商品加料价格
|
|
||||||
add_price: _item?.add_price?_item['add_price']:0
|
|
||||||
};
|
|
||||||
_item['adj_pay'] = (+_item['product_price']) + (+_item['add_price']);
|
|
||||||
Price += _item['bt_price'] * _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']);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
if (this['GetCartList'][id]['Differentskulist'] && this['GetCartList'][id]['Differentskulist']['length'] > 0) {
|
||||||
// 后期处理存在购物车但是店铺已下架商品
|
console.log('多规格');
|
||||||
}
|
for (let j = 0; j < this['GetCartList'][id]['Differentskulist']['length']; j++) {
|
||||||
|
let _item = this['GetCartList'][id]['Differentskulist'][j];
|
||||||
|
console.log(_item, '当前规格商品');
|
||||||
|
_item = {
|
||||||
|
...shoparr[index],
|
||||||
|
num: _item['num'],
|
||||||
|
sku: _item['sku'],
|
||||||
|
sku_code: _item['sku_code'],
|
||||||
|
adj_pay: 0,
|
||||||
|
add_price: _item?.add_price ? _item['add_price'] : 0
|
||||||
|
};
|
||||||
|
_item['adj_pay'] = (+_item['product_price']) + (+_item['add_price']);
|
||||||
|
Price += _item['bt_price'] * _item['num'];
|
||||||
|
lastPrice += _item['adj_pay'] * _item['num'];
|
||||||
|
|
||||||
|
// 修正:使用规格自己的补贴价格,而不是父级商品的
|
||||||
|
cardbtPrice += _item['subsidy_card_price'] * _item['num'];
|
||||||
|
|
||||||
|
this['GetCartList'][id]['Differentskulist'][j] = _item;
|
||||||
|
};
|
||||||
|
newArr.push(...this['GetCartList'][id]['Differentskulist']);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 后期处理存在购物车但是店铺已下架商品
|
||||||
|
}
|
||||||
};
|
};
|
||||||
console.log(Price,'Price');
|
console.log(Price,'Price');
|
||||||
console.log(newArr, 'newArrnewArrnewArrnewArr');
|
console.log(newArr, 'newArrnewArrnewArrnewArr');
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>在线点餐</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
|
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>在线点餐</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
|
||||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.39454503.js></script></body></html>
|
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.bf3fc399.js></script></body></html>
|
||||||
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.a284cb87.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.a284cb87.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue