Authored by OF1706

结算

@@ -392,7 +392,7 @@ const formatPromotion = (it, selectedGiftsList) => { @@ -392,7 +392,7 @@ const formatPromotion = (it, selectedGiftsList) => {
392 info.giftGoodsList = checkGoodsIsSel(info.giftGoodsList, info.promotionId, selectedGiftsList); 392 info.giftGoodsList = checkGoodsIsSel(info.giftGoodsList, info.promotionId, selectedGiftsList);
393 393
394 if (status === 0) { 394 if (status === 0) {
395 - let tipTxt = `差${ - Math.round(info.conditionValue * 100)/100}`; 395 + let tipTxt = `差${ -Math.round(info.conditionValue * 100) / 100}`;
396 396
397 if (info.conditionUnit === 1) { 397 if (info.conditionUnit === 1) {
398 tipTxt += '件 '; 398 tipTxt += '件 ';
@@ -585,9 +585,9 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => { @@ -585,9 +585,9 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
585 result.ordinaryCart.hasGlobalBlock = hasGifts || hasPrices || hasPromo; 585 result.ordinaryCart.hasGlobalBlock = hasGifts || hasPrices || hasPromo;
586 } 586 }
587 result.stat = { 587 result.stat = {
588 - orderAmount: orderAmount , 588 + orderAmount: orderAmount,
589 lastOrderAmount: lastOrderAmount, 589 lastOrderAmount: lastOrderAmount,
590 - discountAmount: Math.round((orderAmount - lastOrderAmount)*100)/100, 590 + discountAmount: (orderAmount - lastOrderAmount).toFixed(2),
591 gainYohoCoin: parseFloat(_.get(advStat, 'gainYohoCoin', 0)) + parseFloat(_.get(ordStat, 'gainYohoCoin', 0)), 591 gainYohoCoin: parseFloat(_.get(advStat, 'gainYohoCoin', 0)) + parseFloat(_.get(ordStat, 'gainYohoCoin', 0)),
592 goodsCount: _.get(advStat, 'goodsCount', 0) + _.get(ordStat, 'goodsCount', 0), 592 goodsCount: _.get(advStat, 'goodsCount', 0) + _.get(ordStat, 'goodsCount', 0),
593 selectedGoodsCount: _.get(advStat, 'selectedGoodsCount', 0) + _.get(ordStat, 'selectedGoodsCount', 0) 593 selectedGoodsCount: _.get(advStat, 'selectedGoodsCount', 0) + _.get(ordStat, 'selectedGoodsCount', 0)