Authored by 陈峰

修改bug

@@ -343,7 +343,7 @@ @@ -343,7 +343,7 @@
343 background-color: #fff; 343 background-color: #fff;
344 border: none; 344 border: none;
345 line-height: 74px; 345 line-height: 74px;
346 - height: 100%; 346 + height: 74px;
347 347
348 &:disabled { 348 &:disabled {
349 color: initial; 349 color: initial;
@@ -167,6 +167,7 @@ @@ -167,6 +167,7 @@
167 167
168 &.down { 168 &.down {
169 height: auto; 169 height: auto;
  170 + min-height: 108px;
170 171
171 .promo-item { 172 .promo-item {
172 display: flex; 173 display: flex;
1 .good-list-page { 1 .good-list-page {
2 .intro-text { 2 .intro-text {
3 width: 100%; 3 width: 100%;
4 - line-height: 24px; 4 + line-height: 28px;
5 padding: 22px 24px; 5 padding: 22px 24px;
6 font-size: 24px; 6 font-size: 24px;
7 background: #f8f8f8; 7 background: #f8f8f8;
@@ -63,7 +63,7 @@ const formatAdvanceGoods = (advanceGood, isGift) => { @@ -63,7 +63,7 @@ const formatAdvanceGoods = (advanceGood, isGift) => {
63 promotionId: advanceGood.promotion_id, 63 promotionId: advanceGood.promotion_id,
64 promotionTitle: advanceGood.promotion_title, 64 promotionTitle: advanceGood.promotion_title,
65 status: advanceGood.status, 65 status: advanceGood.status,
66 - goods: _.get(advanceGood, 'gift_goods_List', []).map(good => { 66 + goods: (_.get(advanceGood, 'gift_goods_List') || _.get(advanceGood, 'goods_list') || []).map(good => {
67 return { 67 return {
68 id: good.product_skn, 68 id: good.product_skn,
69 name: good.product_name, 69 name: good.product_name,