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

@@ -165,7 +165,7 @@ if ($('.brand-search-page').length) {
         if ($keyword.val().length) {
         if ($keyword.val().length) {
             $icon.css('color', '#000');
             $icon.css('color', '#000');
             $(this).closest('.search-box').css('width', '11.25rem');
             $(this).closest('.search-box').css('width', '11.25rem');
-            $searchAction.show();
+            $searchAction.show().find('.clear-text').show();
         } else {
         } else {
             $icon.css('color', '#b2b2b2');
             $icon.css('color', '#b2b2b2');
             $(this).closest('.search-box').css('width', '12.5rem');
             $(this).closest('.search-box').css('width', '12.5rem');
@@ -177,7 +177,7 @@ if ($('.brand-search-page').length) {
     // 2016.1.13 产品（高扬）要求进入页面默认显示取消按钮
     // 2016.1.13 产品（高扬）要求进入页面默认显示取消按钮
     $icon.css('color', '#000');
     $icon.css('color', '#000');
     $keyword.closest('.search-box').css('width', '11.25rem');
     $keyword.closest('.search-box').css('width', '11.25rem');
-    $searchAction.show();
+    $searchAction.show().find('.clear-text').hide();
 
 
     clearTextHammer = new Hammer($('.clear-text')[0]);
     clearTextHammer = new Hammer($('.clear-text')[0]);
     clearTextHammer.on('tap', function(e) {
     clearTextHammer.on('tap', function(e) {