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

@@ -99,7 +99,11 @@ function thumbTouchEvt(e) {
 }
 }
 
 
 if (isIphone) {
 if (isIphone) {
+    if ($('.yoho-header').length > 0) {
+        $('#wrapper').addClass('ios has-head');
+    } else {
         $('#wrapper').addClass('ios');
         $('#wrapper').addClass('ios');
+    }
 }
 }
 
 
 ellipsis.init();
 ellipsis.init();

@@ -211,3 +211,10 @@ setTimeout(tsAnimate, 3000);
 $('#yoho-footer').css({
 $('#yoho-footer').css({
     'margin-bottom': '2.5rem'
     'margin-bottom': '2.5rem'
 });
 });
+
+//set cookie
+exports.set = function(c) {
+    window.setCookie('_Channel', c, {
+        expires: 365
+    });
+};

@@ -9,49 +9,27 @@ var $searchBox = $('.search-box'),
     $indexSearch = $('.index-search'),
     $indexSearch = $('.index-search'),
     $indexLogo = $('.index-logo');
     $indexLogo = $('.index-logo');
 
 
+var $search = $searchBox.children('input'),
+    $cancelSearch = $indexSearch.children('.no-search');
+
 require('../common');
 require('../common');
 
 
-function showBigSearch() {
-    $indexLogo.css({
-        opacity: 0
-    });
-    $searchBox.css({
-        width: '12.8rem'
-    });
-    $indexSearch.css({
-        width: '15.5rem'
-    });
-    $('.clear-text, .no-search').show();
-}
-
-function hideBigSearch() {
-    $indexLogo.css({
-        opacity: 1
-    });
-    $searchBox.css({
-        width: '8.8rem'
-    });
-    $indexSearch.css({
-        width: '9.6rem'
-    });
-    $('.clear-text, .no-search').hide();
-}
-
-$searchBox.find('input').on('focus', function() {
-    showBigSearch();
+$search.on('focus', function() {
+    $indexSearch.addClass('action');
+    $indexLogo.addClass('action');
 });
 });
 
 
-$searchBox.find('.clear-text').on('touchend', function() {
-    $searchBox.find('input').val('');
-});
-$searchBox.find('.search-icon').on('touchend', function() {
-    $indexSearch.submit();
+$cancelSearch.on('touchstart', function() {
+    $indexSearch.removeClass('action');
+    $indexLogo.removeClass('action');
+
+    $search.blur();
 });
 });
 
 
-$('.no-search').on('touchend', function() {
-    $searchBox.find('input').val('');
-    hideBigSearch();
+$searchBox.children('.clear-text').on('touchstart', function() {
+    $search.val('').focus();
 });
 });
 
 
-// 底部计算有误
-// window.rePosFooter && window.rePosFooter();
+$searchBox.children('.search-icon').on('touchstart', function() {
+    $indexSearch.submit();
+});

@@ -35,6 +35,10 @@ $clothes: sprite-map("guang/clothes/*.png");
         left: 0;
         left: 0;
         right: 0;
         right: 0;
         overflow: hidden;
         overflow: hidden;
+
+        &.has-head {
+            top: 90rem / $pxConvertRem;
+        }
     }
     }
 
 
     .author {
     .author {

@@ -15,6 +15,11 @@
             color: #343434;
             color: #343434;
             opacity: 1;
             opacity: 1;
             transition: all 400ms;
             transition: all 400ms;
+
+            &.action {
+                opacity: 0;
+                width: 0;
+            }
         }
         }
 
 
         .index-search {
         .index-search {
@@ -27,6 +32,18 @@
             overflow: hidden;
             overflow: hidden;
             z-index: 3;
             z-index: 3;
             @include transition(width .4s);
             @include transition(width .4s);
+
+            &.action {
+                width: 620rem / $pxConvertRem;
+                .no-search, .clear-text {
+                    display: block;
+                }
+
+                .search-box {
+                    width: 512rem / $pxConvertRem;
+                }
+            }
+
             .search-box {
             .search-box {
                 float: left;
                 float: left;
                 position: relative;
                 position: relative;

@@ -14,7 +14,7 @@
             </form>
             </form>
         </div>
         </div>
         <div class="index-channel">
         <div class="index-channel">
-            <img class="img" src="{{background}}" alt="">  
+            <img class="img" src="{{background}}">
             <div class="index-channel-list">
             <div class="index-channel-list">
                 <a href="/boys" class="list-item">男生 <span class="lighter">BOYS</span> <span class="iconfont right-icon">&#xe614;</span></a>
                 <a href="/boys" class="list-item">男生 <span class="lighter">BOYS</span> <span class="iconfont right-icon">&#xe614;</span></a>
                 <a href="/girls" class="list-item">女生 <span class="lighter">GIRLS</span> <span class="iconfont right-icon">&#xe614;</span></a>
                 <a href="/girls" class="list-item">女生 <span class="lighter">GIRLS</span> <span class="iconfont right-icon">&#xe614;</span></a>

@@ -96,25 +96,33 @@
 {{!-- 首页 --}}
 {{!-- 首页 --}}
 {{#if grilsHomePage}}
 {{#if grilsHomePage}}
 <script>
 <script>
-    seajs.use('js/home/home');
+    seajs.use('js/home/home', function(h) {
+        h.set('girls');
+    });
     seajs.use('js/index/footer');
     seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if boysHomePage}}
 {{#if boysHomePage}}
 <script>
 <script>
-    seajs.use('js/home/home');
+    seajs.use('js/home/home', function(h) {
+        h.set('boys');
+    });
     seajs.use('js/index/footer');
     seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if kidsHomePage}}
 {{#if kidsHomePage}}
 <script>
 <script>
-    seajs.use('js/home/home');
+    seajs.use('js/home/home', function(h) {
+        h.set('kids');
+    });
     seajs.use('js/index/footer');
     seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 {{#if lifestyleHomePage}}
 {{#if lifestyleHomePage}}
 <script>
 <script>
-    seajs.use('js/home/home');
+    seajs.use('js/home/home', function(h) {
+        h.set('lifestyle');
+    });
     seajs.use('js/index/footer');
     seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}