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