fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 5db2394fc96d83486b262195fff8927d2e3236f6 2 parents 21376192 e2bfb22f

Merge branch 'feature/reds' into release/5.6

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-23 17:12:53 3 * @Date: 2017-03-23 17:12:53
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-04-18 14:51:52 5 + * @Last Modified time: 2017-04-18 15:07:13
6 */ 6 */
7 // 红人店铺首页 7 // 红人店铺首页
8 8
@@ -334,7 +334,8 @@ @@ -334,7 +334,8 @@
334 334
335 .margin-bottom { 335 .margin-bottom {
336 width: 100%; 336 width: 100%;
337 - height: 40px; 337 + height: 20px;
  338 + background-color: #f0f0f0;
338 } 339 }
339 340
340 .all-goods { 341 .all-goods {
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-23 11:02:31 3 * @Date: 2017-03-23 11:02:31
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-04-14 15:05:27 5 + * @Last Modified time: 2017-04-18 15:04:20
6 */ 6 */
7 /* 红人店铺数据处理 */ 7 /* 红人店铺数据处理 */
8 8
@@ -114,7 +114,7 @@ const _tools = { @@ -114,7 +114,7 @@ const _tools = {
114 module_type: 'CarouselImage', 114 module_type: 'CarouselImage',
115 num: countCarouselImage, 115 num: countCarouselImage,
116 pics: _picsHandle(moduleData), 116 pics: _picsHandle(moduleData),
117 - isModuleMargin: Boolean(_.get(moduleData, 'properties.isModuleMargin', 0)), 117 + isModuleMargin: _.get(moduleData, 'properties.isModuleMargin', 0),
118 }; 118 };
119 }, 119 },
120 120