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

@@ -18,6 +18,7 @@ var swiper,
 var searchH = $('.newbrand-search').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
     brandSwipe = parseInt(searchH) + parseInt(headerH) - 1,
+    minBrandListTop,
     searchArray = [];
 
 var brandsData,
@@ -42,13 +43,15 @@ $('.yoho-header').css({
 });
 
 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>');
-$fixTitleBar.hide();
+$fixTitleBar.css({
+    position: 'fixed',
+    top: brandSwipe
+}).hide();
+minBrandListTop = brandSwipe + $('.hot-brand').outerHeight() + $('.banner-top').outerHeight();
 $('.brand-list').last().append($fixTitleBar);
 
 $(window).scroll(function() {
-    var scrTop = $(window).scrollTop(),
-        minBrandListTop = brandSwipe + $('.hot-brand').outerHeight() +
-        $('.banner-top').outerHeight();
+    var scrTop = $(window).scrollTop();
 
     if ($brandList.eq(0).offset().top < minBrandListTop) {
         $fixTitleBar.hide();
@@ -59,9 +62,7 @@ $(window).scroll(function() {
 
         if (scrTop >= offTop) {
             $fixTitleBar.css({
-                display: 'block',
-                position: 'fixed',
-                top: brandSwipe
+                display: 'block'
             }).find('h2').html($(this).find('.title-bar').text());
         }
 

@@ -53,4 +53,5 @@ $('.no-search').on('touchend', function() {
     hideBigSearch();
 });
 
-window.rePosFooter && window.rePosFooter();
+// 底部计算有误
+// window.rePosFooter && window.rePosFooter();

@@ -55,11 +55,14 @@
                 right: -74rem / $pxConvertRem;
                 font-size: 32rem / $pxConvertRem;
                 line-height: 60rem / $pxConvertRem;
-                color: #666;
+                color: #bdbdbd;
             }
 
             .cancel-btn {
                 display: inline;
+                color: #bdbdbd;
+                font-size: 32rem / $pxConvertRem;
+                vertical-align: middle;
             }
 
             .clear-text {
@@ -86,9 +89,15 @@
                 .img-box {
                     display: table-cell;
                     vertical-align: middle;
-                    width: 100%;
+                    text-align: center;
+                    width: 158rem / $pxConvertRem;
                     height: 158rem / $pxConvertRem;
                 }
+
+                img {
+                    max-width: 140rem / $pxConvertRem;
+                    max-height: 140rem / $pxConvertRem;
+                }
             }
         }
     }

@@ -36,8 +36,9 @@
                 height: 44px;
                 text-align: center;
                 color: #fff;
-                background-image: linear-gradient(#323232, #0f0f0f);
                 border-radius: 10px;
+                @include background(linear-gradient(#323232, #0f0f0f));
+                // background-image: linear-gradient(#323232, #0f0f0f);
             }
         }
 

@@ -27,7 +27,7 @@
         .clear-input {
             position: absolute;
             top: 24rem / $pxConvertRem;
-            right: 110rem / $pxConvertRem;
+            right: 100rem / $pxConvertRem;
             font-size: 32rem / $pxConvertRem;
             color: #b2b2b2;
         }
@@ -35,9 +35,10 @@
         .search {
             position: absolute;
             top: 20rem / $pxConvertRem;
-            right: 0;
+            right: 12rem / $pxConvertRem;
             border: none;
             background: transparent;
+            color: #b2b2b2;
             font-size: 32rem / $pxConvertRem;
         }
     }

@@ -6,7 +6,7 @@
                 <i class="search-icon iconfont">&#xe60f;</i>
                 <input type="text" placeholder="搜索商品" name="query">
                 <i class="clear-input iconfont hide">&#xe626;</i>
-                <button id="search" class="search" type="submit">搜索</button>
+                <span id="search" class="search" type="submit">搜索</span>
             </form>
         </div>
         <div class="search-items">

@@ -9,7 +9,6 @@
             <a href="javascript:;">
             {{/ url}}
                 {{# img}}
-                <!-- <img class="nav-img" src="{{.}}" alt=""> -->
                 <span class="nav-img" style="background-image: url({{.}})"></span>
                 {{/ img}}
                 {{^ img}}