fe / yohobuywap-node · Commits

Go to a project

Authored by biao
Commit 82e6a3ff7418ab691580ae570844971c49d21a49 2 parents 572ab8fb c45ff1fe

Merge branch 'hotfix/outlet'

Inline Side-by-side
Showing 1 changed file with 2 additions and 0 deletions
@@ -124,6 +124,7 @@ const _convertActicityData = (data) => { @@ -124,6 +124,7 @@ const _convertActicityData = (data) => {
124 124
125 data = data || []; 125 data = data || [];
126 _.forEach(data, (item) => { 126 _.forEach(data, (item) => {
  127 + if (item.promotionName) {
127 discountArr = item.promotionName.split('~'); 128 discountArr = item.promotionName.split('~');
128 if (discountArr.length === 1) { 129 if (discountArr.length === 1) {
129 discountNum = _transDiscountToArr(discountArr[0])[0]; 130 discountNum = _transDiscountToArr(discountArr[0])[0];
@@ -145,6 +146,7 @@ const _convertActicityData = (data) => { @@ -145,6 +146,7 @@ const _convertActicityData = (data) => {
145 leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime, 146 leftTime: item.startLeftTime > 0 ? dateFormate(item.startTime) : item.endLeftTime,
146 hide: false 147 hide: false
147 }); 148 });
  149 + }
148 }); 150 });
149 151
150 return formatData; 152 return formatData;