Merge branch 'feature/search' of git.yoho.cn:fe/YOHOBUYWAP into feature/search

@@ -331,10 +331,10 @@ if ($('.brand-search-page').length > 0) {
     brandsData = $.parseJSON($('#brands-data').html());
     $keyword = $('#keyword');
 
-    $keyword.on('input', function() {
-        searchInput();
-
-    }).focus();
+    //$keyword.on('input', function() {
+    //    searchInput();
+    //
+    //}).focus();
 
     // 2016.1.13 产品（高扬）要求进入页面默认显示取消按钮
     $icon.css('color', '#444');

@@ -2,7 +2,7 @@
 <div class="brand-page brand-search-page yoho-page">
     <div class="newbrand-search">
         <form class="search-box clearfix">
-            <input type="text" class="search-input" id="keyword" placeholder="查找品牌" autofocus>
+            <input type="text" class="search-input" id="keyword" placeholder="查找品牌">
             <i class="search-icon iconfont">&#xe60f;</i>
             <div class="search-action">
                 <span class="iconfont clear-text">&#xe623;</span>