Authored by jinhu.tung

shopping cart total money

... ... @@ -188,11 +188,13 @@ const filterCartData = (result, uid) => {
// 预售商品
let advancedGoods = [],
selectedAdvanceNum = 0,
totalAdvanceMoney,
advancedCartData;
// 普通商品
let ordinaryGoods = [],
selectedOrdinaryNum = 0,
totalOrdinaryMoney,
ordinaryCartData;
// skn=0或者已下架的商品,定义为失效商品
... ... @@ -214,6 +216,7 @@ const filterCartData = (result, uid) => {
// 预售商品
advancedCartData = result.data.advance_cart_data;
console.log('---------------advance------:', advancedCartData.goods_list.length);
totalAdvanceMoney = advancedCartData.shopping_cart_data.last_order_amount;
advancedGoods = _.concat(advancedGoods, advancedCartData.goods_list);
invalidGoods = _.concat(invalidGoods, advancedCartData.off_shelves_goods_list);
soldOutGoods = _.concat(soldOutGoods, advancedCartData.sold_out_goods_list);
... ... @@ -231,6 +234,7 @@ const filterCartData = (result, uid) => {
// 普通商品
ordinaryCartData = result.data.ordinary_cart_data;
console.log('---------------ordinary------:', ordinaryCartData.goods_list.length);
totalOrdinaryMoney = ordinaryCartData.shopping_cart_data.last_order_amount;
ordinaryGoods = _.concat(ordinaryGoods, ordinaryCartData.goods_list);
invalidGoods = _.concat(invalidGoods, ordinaryCartData.off_shelves_goods_list);
soldOutGoods = _.concat(soldOutGoods, ordinaryCartData.sold_out_goods_list);
... ... @@ -253,7 +257,9 @@ const filterCartData = (result, uid) => {
commonPros: ordinaryGoods.length ? _.groupBy(ordinaryGoods, 'brand_id') : [],
invalidPros: invalidGoods,
selectedNum: selectedAdvanceNum + selectedOrdinaryNum,
checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum)
checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum),
totalMoney: totalAdvanceMoney + totalOrdinaryMoney
});
};
... ...
... ... @@ -204,13 +204,13 @@
<div class="selected-num">已选<span>\{{selectedNum}}</span>件</div>
<div class="checkout-total">
<div class="total-title">商品金额:</div>
<div class="total-money">¥<span>58999.00</span></div>
<div class="total-money">¥<span>\{{totalMoney}}</span></div>
</div>
</div>
<div class="calculate">
<div class="checkout-total pay-total">
<div class="pay-title">应付金额(不含运费):</div>
<div class="total-money">¥<span>58999.00</span></div>
<div class="total-money">¥<span>\{{totalMoney}}</span></div>
</div>
</div>
<div class="checkout">
... ...
... ... @@ -13,13 +13,13 @@
<div class="selected-num">已选<span>{{selectedNum}}</span></div>
<div class="checkout-total">
<div class="total-title">商品金额:</div>
<div class="total-money">¥<span></span></div>
<div class="total-money">¥<span>{{totalMoney}}</span></div>
</div>
</div>
<div class="calculate">
<div class="checkout-total pay-total">
<div class="pay-title">应付金额(不含运费):</div>
<div class="total-money">¥<span>58999.00</span></div>
<div class="total-money">¥<span>{{totalMoney}}</span></div>
</div>
</div>
<div class="checkout">
... ...