Merge branch 'feature/reds' into release/5.6

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-03-23 17:12:53
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-18 14:51:52
+ * @Last Modified time: 2017-04-18 15:07:13
  */
 // 红人店铺首页
 
@@ -334,7 +334,8 @@
 
     .margin-bottom {
         width: 100%;
-        height: 40px;
+        height: 20px;
+        background-color: #f0f0f0;
     }
 
     .all-goods {

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-03-23 11:02:31
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-14 15:05:27
+ * @Last Modified time: 2017-04-18 15:04:20
  */
 /* 红人店铺数据处理 */
 
@@ -114,7 +114,7 @@ const _tools = {
             module_type: 'CarouselImage',
             num: countCarouselImage,
             pics: _picsHandle(moduleData),
-            isModuleMargin: Boolean(_.get(moduleData, 'properties.isModuleMargin', 0)),
+            isModuleMargin: _.get(moduleData, 'properties.isModuleMargin', 0),
         };
     },