Authored by biao

Merge branch 'hotfix/outlet'

... ... @@ -124,6 +124,7 @@ const _convertActicityData = (data) => {
data = data || [];
_.forEach(data, (item) => {
if (item.promotionName) {
discountArr = item.promotionName.split('~');
if (discountArr.length === 1) {
discountNum = _transDiscountToArr(discountArr[0])[0];
... ... @@ -145,6 +146,7 @@ const _convertActicityData = (data) => {
leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
hide: false
});
}
});
return formatData;
... ...