Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -15,12 +15,15 @@ var winH = $(window).height(),
     page = 0,
     gender = $('.mobile-wrap').hasClass('boys-wrap') ? '1,3' : '2,3',
     kidsType = $('.mobile-wrap').hasClass('kids-wrap') ? true : false,
+    lifestyleType = $('.mobile-wrap').hasClass('lifestyle-wrap') ? true : false,
     num,
     url;
 
 ///recom/maylikekids
 if (kidsType) {
     url = '/product/recom/maylikekids';
+} else if (lifestyleType) {
+    url = '/product/recom/maylikelife';
 } else {
     url = '/product/recom/maylike?gender=' + gender;
 }

@@ -17,4 +17,26 @@
         background: image-url("up-icon.png") no-repeat;
         background-size: 100% 100%;
     }
+
+    .maybe-like-nav {
+        width: 100%;
+        height: 60rem / $pxConvertRem;
+        padding: 10rem / $pxConvertRem 0;
+        background-color: #fff;
+    }
+
+    .maybe-like-nav-item {
+        box-sizing: border-box;
+        float: left;
+        width: 50%;
+        height: 60rem / $pxConvertRem;
+        line-height: 60rem / $pxConvertRem;
+        text-align: center;
+        color: #ccc;
+        border-right: 1px solid #ccc;
+
+        &.focus {
+            color: #000;
+        }
+    }
 }
\ No newline at end of file

@@ -10,7 +10,7 @@
             {{> home/home_header}}
         {{/ homeHeader}}
 
-        {{> home/content}}
+        {{> home/content_lifestyle}}
  
         {{! 商品列表}}
         {{# twoColumnGoods}}

+{{# content}}
+    {{! 头部banner}}
+    {{# bannerTop}}
+        {{> home/banner_top}}
+    {{/ bannerTop}}
+
+    {{! 图标入口}}
+    {{# iconsEnter}}
+        {{> home/icons_enter}}
+    {{/ iconsEnter}}
+
+    {{! 中间banner}}
+    {{# banner}}
+        {{> home/banner}}
+    {{/ banner}}
+
+    {{! 热门品类}}
+    {{# hotCategory}}
+        {{> home/hot_category}}
+    {{/ hotCategory}}
+
+    {{! 热门品牌}}
+    {{# hotBrands}}
+        {{> home/hot_brands_list}}
+    {{/ hotBrands}}
+
+    {{! 热门品牌可滑动}}
+    {{# hotBrandsScroll}}
+        {{> home/hot_brands_swipe}}
+    {{/ hotBrandsScroll}}
+
+    {{! 潮人搭配}}
+    {{# trendColloaction}}
+        {{> home/trendsetter_collocation}}
+    {{/trendColloaction}}
+
+    {{! 潮流话题}}
+    {{# trendTopics}}
+        {{> home/trend_topics}}
+    {{/ trendTopics}}
+    
+    {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
+    {{# goodsCategory}}
+        {{> home/goods_category}}
+    {{/ goodsCategory}}
+
+    {{! 新入住品牌/品味生活/创意生活}}
+    {{# creativeLife}}
+       {{> home/creative_life}}
+    {{/ creativeLife}}
+
+    {{! PLUS}}
+    {{# plusStar}}
+        {{> home/plus_star}}
+    {{/ plusStar}}
+{{/ content}}
+
+{{! 可能喜欢}}                   
+{{> home/maybe_like_lifestyle}}
\ No newline at end of file

+<div class="maybe-like">
+    <p class="title">
+        <i class="icon"></i>
+        <span>你可能喜欢</span>
+    </p>
+
+        <ul id="maybe-like-nav" class="maybe-like-nav clearfix">
+            <li class="maybe-like-nav-item focus">新品到着</li>
+            <li class="maybe-like-nav-item">人气单品</li>
+        </ul>
+   
+        <div id="goods-list">
+            {{> product/goods_container}}
+        </div>
+
+    <div id="load-more-info" class="load-more-info">
+        <div class="loading status hide">
+            正在加载...
+        </div>
+        <span class="no-more status hide">没有更多啦</span>
+    </div>
+</div>
+
+       
\ No newline at end of file