Merge branch 'master' into develop

@@ -8,8 +8,17 @@
         {{! 资源位}}
         {{> channel/content}}
 
+        {{! 商品列表}}
+        {{#if twoColumnGoods}}
+            {{> channel/two-column-goods}}
+        {{/if}}
+
         {{! 你可能喜欢}}
+        {{#if lifestyleHomePage}}
+            {{> channel/maybe-like-lifestyle}}
+        {{else}}           
             {{> channel/maybe-like}}
+        {{/if}}
 
         {{! 底部banner}}
         {{#bannerBottom}}

 {{# content}}
     {{! 头部banner}}
-    {{# bannerTop}}
-        {{> home/banner_top}}
-    {{/ bannerTop}}
+    {{#if focus}}
+        {{> channel/banner-top}}
+    {{/if}}
     {{! 图标入口}}
-    {{# iconsEnter}}
-        {{> home/icons_enter}}
-    {{/ iconsEnter}}
+    {{#if appIconList}}
+        {{> channel/icons-enter}}
+    {{/if}}
     {{! 中间banner}}
-    {{# banner}}
-        {{> home/banner}}
-    {{/ banner}}
+    {{#if singleImage}}
+        {{> channel/banner}}
+    {{/if}}
     {{! 两个小图}}
-    {{# smallPic}}
-        {{> home/thumb_row}}
-    {{/ smallPic}}
+    {{#if smallPic}}
+        {{> channel/thumb-row}}
+    {{/if}}
     {{! 热门品类}}
-    {{# hotCategory}}
-        {{> home/hot_category}}
-    {{/ hotCategory}}
+    {{#if recommendContentFive}}
+        {{> channel/hot-category}}
+    {{/if}}
     {{! 热门品牌}}
-    {{# hotBrands}}
-        {{> home/hot_brands_list}}
-    {{/ hotBrands}}
+    {{#if appHotBrands}}
+        {{> channel/hot-brands-list}}
+    {{/if}}
     {{! 热门品牌可滑动}}
-    {{# hotBrandsScroll}}
-        {{> home/hot_brands_swipe}}
-    {{/ hotBrandsScroll}}
+    {{#if customBrands}}
+        {{> channel/hot-brands-swipe}}
+    {{/if}}
     {{! 潮人搭配}}
-    {{# trendColloaction}}
-        {{> home/trendsetter_collocation}}
-    {{/trendColloaction}}
+    {{#if trendsetterCollocation}}
+        {{> channel/trendsetter-collocation}}
+    {{/if}}
     {{! 潮流话题}}
-    {{# trendTopics}}
-        {{> home/trend_topics}}
-    {{/ trendTopics}}
+    {{#if trendgoodsTopic}}
+        {{> channel/trend-topics}}
+    {{/if}}
     {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
-    {{# goodsCategory}}
-        {{> home/goods_category}}
-    {{/ goodsCategory}}
+    {{#if recommendContentOne}}
+        {{> channel/goods-category}}
+    {{/if}}
     {{! 新入住品牌/品味生活/创意生活}}
-    {{# creativeLife}}
-       {{> home/creative_life}}
-    {{/ creativeLife}}
+    {{#if recommendContentTwo}}
+       {{> channel/creative-life}}
+    {{/if}}
     {{! PLUS}}
-    {{# plusStar}}
-        {{> home/plus_star}}
-    {{/ plusStar}}
+    {{#if singleNameImage}}
+        {{> channel/plus-star}}
+    {{/if}}
     {{! 新人专享}}
-    {{# freshOnly}}
-        {{> home/fresh_only}}
-    {{/ freshOnly}}
+    {{#if newUserFloor}}
+        {{> channel/fresh-only}}
+    {{/if}}
 {{/ content}}
\ No newline at end of file
-
-{{! 可能喜欢}}                   
-{{> home/maybe_like_lifestyle}}
\ No newline at end of file

@@ -55,8 +55,4 @@
     {{#if newUserFloor}}
         {{> channel/fresh-only}}
     {{/if}}
-    {{! 商品列表}}
-    {{#if twoColumnGoods}}
-        {{> channel/two-column-goods}}
-    {{/if}}
 {{/content}}

@@ -20,7 +20,7 @@
     .classify-list > li {
         float: left;
         width: 213.3px;
-        height: 192px;
+        height: 194px;
         border-top: 1px solid #e0e0e0;
         border-right: 1px solid #e0e0e0;
     }