...
|
...
|
@@ -389,16 +389,16 @@ const formatPromotion = (it, selectedGiftsList) => { |
|
|
// 判断赠品/加价购商品,是否被选中
|
|
|
info.giftGoodsList = checkGoodsIsSel(info.giftGoodsList, info.promotionId, selectedGiftsList);
|
|
|
|
|
|
function toDecimal(x){
|
|
|
var f = Math.round(x*100)/100;
|
|
|
var s= f.toString();
|
|
|
var rs =s.indexOf('.');
|
|
|
if(rs<0){
|
|
|
function toDecimal(x) {
|
|
|
var f = Math.round(x * 100) / 100;
|
|
|
var s = f.toString();
|
|
|
var rs = s.indexOf('.');
|
|
|
if (rs < 0) {
|
|
|
rs = s.length;
|
|
|
s+=".";
|
|
|
s += '.';
|
|
|
}
|
|
|
while(s.length<=rs+2){
|
|
|
s+='0';
|
|
|
while (s.length <= rs + 2) {
|
|
|
s += '0';
|
|
|
}
|
|
|
return s;
|
|
|
}
|
...
|
...
|
@@ -414,9 +414,9 @@ const formatPromotion = (it, selectedGiftsList) => { |
|
|
tipTxt += '元满足';
|
|
|
}
|
|
|
|
|
|
info.promotionTitle = tipTxt + "("+ info.promotionTitle + ")";
|
|
|
info.promotionTitle = tipTxt + '(' + info.promotionTitle + ')';
|
|
|
} else if (status === 10) {
|
|
|
info.promotionTitle = '已满足' + "("+ info.promotionTitle + ")";
|
|
|
info.promotionTitle = '已满足' + '(' + info.promotionTitle + ')';
|
|
|
}
|
|
|
|
|
|
if (info.giftGoodsList) {
|
...
|
...
|
|