Authored by 陈峰

修改bug

... ... @@ -343,7 +343,7 @@
background-color: #fff;
border: none;
line-height: 74px;
height: 100%;
height: 74px;
&:disabled {
color: initial;
... ...
... ... @@ -167,6 +167,7 @@
&.down {
height: auto;
min-height: 108px;
.promo-item {
display: flex;
... ...
.good-list-page {
.intro-text {
width: 100%;
line-height: 24px;
line-height: 28px;
padding: 22px 24px;
font-size: 24px;
background: #f8f8f8;
... ...
... ... @@ -63,7 +63,7 @@ const formatAdvanceGoods = (advanceGood, isGift) => {
promotionId: advanceGood.promotion_id,
promotionTitle: advanceGood.promotion_title,
status: advanceGood.status,
goods: _.get(advanceGood, 'gift_goods_List', []).map(good => {
goods: (_.get(advanceGood, 'gift_goods_List') || _.get(advanceGood, 'goods_list') || []).map(good => {
return {
id: good.product_skn,
name: good.product_name,
... ...