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 7d82043..589b533 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 @@ -585,62 +585,58 @@ let commodityids = shoparr.map(item => item['product_id']); // 循环购物车 let list = Object.keys(this['GetCartList']); - for (let i = 0; i < list['length']; i++) { - // 将item转为数字 - let id = +Object.keys(this['GetCartList'])[i]; - console.log(this['GetCartList'][id], "当前商品") - // // 在commodityids中查找item - let index = commodityids.indexOf(id); - let item = {}; - if (index != -1) { - - item = { - ...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']; - 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 { - // 后期处理存在购物车但是店铺已下架商品 - } + for (let i = 0; i < list['length']; i++) { + let id = +Object.keys(this['GetCartList'])[i]; + console.log(this['GetCartList'][id], "当前商品") + let index = commodityids.indexOf(id); + let item = {}; + if (index != -1) { + item = { + ...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']; + + // 修正:父级商品使用自己的补贴价格 + 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 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(newArr, 'newArrnewArrnewArrnewArr'); diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html index 4bbc8f1..72b6298 100644 --- a/unpackage/dist/build/web/index.html +++ b/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@