Authored by 王水玲

Merge branch 'master' into develop

@@ -8,8 +8,17 @@ @@ -8,8 +8,17 @@
8 {{! 资源位}} 8 {{! 资源位}}
9 {{> channel/content}} 9 {{> channel/content}}
10 10
  11 + {{! 商品列表}}
  12 + {{#if twoColumnGoods}}
  13 + {{> channel/two-column-goods}}
  14 + {{/if}}
  15 +
11 {{! 你可能喜欢}} 16 {{! 你可能喜欢}}
12 - {{> channel/maybe-like}} 17 + {{#if lifestyleHomePage}}
  18 + {{> channel/maybe-like-lifestyle}}
  19 + {{else}}
  20 + {{> channel/maybe-like}}
  21 + {{/if}}
13 22
14 {{! 底部banner}} 23 {{! 底部banner}}
15 {{#bannerBottom}} 24 {{#bannerBottom}}
1 {{# content}} 1 {{# content}}
2 {{! 头部banner}} 2 {{! 头部banner}}
3 - {{# bannerTop}}  
4 - {{> home/banner_top}}  
5 - {{/ bannerTop}} 3 + {{#if focus}}
  4 + {{> channel/banner-top}}
  5 + {{/if}}
6 {{! 图标入口}} 6 {{! 图标入口}}
7 - {{# iconsEnter}}  
8 - {{> home/icons_enter}}  
9 - {{/ iconsEnter}} 7 + {{#if appIconList}}
  8 + {{> channel/icons-enter}}
  9 + {{/if}}
10 {{! 中间banner}} 10 {{! 中间banner}}
11 - {{# banner}}  
12 - {{> home/banner}}  
13 - {{/ banner}} 11 + {{#if singleImage}}
  12 + {{> channel/banner}}
  13 + {{/if}}
14 {{! 两个小图}} 14 {{! 两个小图}}
15 - {{# smallPic}}  
16 - {{> home/thumb_row}}  
17 - {{/ smallPic}} 15 + {{#if smallPic}}
  16 + {{> channel/thumb-row}}
  17 + {{/if}}
18 {{! 热门品类}} 18 {{! 热门品类}}
19 - {{# hotCategory}}  
20 - {{> home/hot_category}}  
21 - {{/ hotCategory}} 19 + {{#if recommendContentFive}}
  20 + {{> channel/hot-category}}
  21 + {{/if}}
22 {{! 热门品牌}} 22 {{! 热门品牌}}
23 - {{# hotBrands}}  
24 - {{> home/hot_brands_list}}  
25 - {{/ hotBrands}} 23 + {{#if appHotBrands}}
  24 + {{> channel/hot-brands-list}}
  25 + {{/if}}
26 {{! 热门品牌可滑动}} 26 {{! 热门品牌可滑动}}
27 - {{# hotBrandsScroll}}  
28 - {{> home/hot_brands_swipe}}  
29 - {{/ hotBrandsScroll}} 27 + {{#if customBrands}}
  28 + {{> channel/hot-brands-swipe}}
  29 + {{/if}}
30 {{! 潮人搭配}} 30 {{! 潮人搭配}}
31 - {{# trendColloaction}}  
32 - {{> home/trendsetter_collocation}}  
33 - {{/trendColloaction}} 31 + {{#if trendsetterCollocation}}
  32 + {{> channel/trendsetter-collocation}}
  33 + {{/if}}
34 {{! 潮流话题}} 34 {{! 潮流话题}}
35 - {{# trendTopics}}  
36 - {{> home/trend_topics}}  
37 - {{/ trendTopics}} 35 + {{#if trendgoodsTopic}}
  36 + {{> channel/trend-topics}}
  37 + {{/if}}
38 {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} 38 {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
39 - {{# goodsCategory}}  
40 - {{> home/goods_category}}  
41 - {{/ goodsCategory}} 39 + {{#if recommendContentOne}}
  40 + {{> channel/goods-category}}
  41 + {{/if}}
42 {{! 新入住品牌/品味生活/创意生活}} 42 {{! 新入住品牌/品味生活/创意生活}}
43 - {{# creativeLife}}  
44 - {{> home/creative_life}}  
45 - {{/ creativeLife}} 43 + {{#if recommendContentTwo}}
  44 + {{> channel/creative-life}}
  45 + {{/if}}
46 {{! PLUS}} 46 {{! PLUS}}
47 - {{# plusStar}}  
48 - {{> home/plus_star}}  
49 - {{/ plusStar}} 47 + {{#if singleNameImage}}
  48 + {{> channel/plus-star}}
  49 + {{/if}}
50 {{! 新人专享}} 50 {{! 新人专享}}
51 - {{# freshOnly}}  
52 - {{> home/fresh_only}}  
53 - {{/ freshOnly}}  
54 -{{/ content}}  
55 -  
56 -{{! 可能喜欢}}  
57 -{{> home/maybe_like_lifestyle}}  
  51 + {{#if newUserFloor}}
  52 + {{> channel/fresh-only}}
  53 + {{/if}}
  54 +{{/ content}}
@@ -55,8 +55,4 @@ @@ -55,8 +55,4 @@
55 {{#if newUserFloor}} 55 {{#if newUserFloor}}
56 {{> channel/fresh-only}} 56 {{> channel/fresh-only}}
57 {{/if}} 57 {{/if}}
58 - {{! 商品列表}}  
59 - {{#if twoColumnGoods}}  
60 - {{> channel/two-column-goods}}  
61 - {{/if}}  
62 {{/content}} 58 {{/content}}
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 .classify-list > li { 20 .classify-list > li {
21 float: left; 21 float: left;
22 width: 213.3px; 22 width: 213.3px;
23 - height: 192px; 23 + height: 194px;
24 border-top: 1px solid #e0e0e0; 24 border-top: 1px solid #e0e0e0;
25 border-right: 1px solid #e0e0e0; 25 border-right: 1px solid #e0e0e0;
26 } 26 }