fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit ded80518e5ef53ed068b9b05bde202e1f9d47593 1 parent cdd109fd

m

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
... ... @@ -385,13 +385,13 @@ const formatSubPromotionPools = (pools, selectedGiftsList, isAdvance) => {
let goodsList = pool.goodsList;
if (goodsList && goodsList.length) {
return _.map(goodsList, g => {
pool.goodsList = _.map(goodsList, g => {
g.promotionInfos = pool.promotionInfos;
return g;
});
}
return [];
return pool;
});
// [ [goods, goods], [goods, ..], [] ] => [goods, goods ]
... ... @@ -410,6 +410,7 @@ const formatPromotionPools = (pools, selectedGiftsList, isAdvance) => {
let pool = {
poolTitle: p.pool_title,
poolType: p.pool_type,
isBrandGroup: Number(p.pool_type) === 1,
goodsList: formatCartGoods(p.goods_list, isAdvance),
promotionInfos: formatPoolPromotionInfos(p.promotion_list, selectedGiftsList)
};
... ...
... ... @@ -146,8 +146,8 @@
{{#if subs}}
<div class="cart-table">
{{#each subs}}
<ul class="table table-group">
{{#each .}}
<ul class="table {{#isBrandGroup}}table-group{{/isBrandGroup}}">
{{#each goodsList}}
{{> cart-item}}
{{/each}}
</ul>
... ... @@ -156,7 +156,7 @@
{{/if}}
{{#if goodsList}}
<div class="cart-table">
<ul class="table">
<ul class="table {{#isBrandGroup}}table-group{{/isBrandGroup}}">
{{#goodsList}}
{{> cart-item}}
{{/goodsList}}
... ...