Authored by ccbikai

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

framework @ 75bbc3b0
1 -Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
@@ -197,6 +197,8 @@ if ($('.brand-search-page').length) { @@ -197,6 +197,8 @@ if ($('.brand-search-page').length) {
197 $('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList'); 197 $('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList');
198 }); 198 });
199 } 199 }
  200 + } else {
  201 + $('.history').css('display', 'none');
200 } 202 }
201 203
202 removeHistory = new Hammer($('.removeHistory')[0]); 204 removeHistory = new Hammer($('.removeHistory')[0]);
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 padding: 14rem / $pxConvertRem 3.125%; 6 padding: 14rem / $pxConvertRem 3.125%;
7 background-color: #f8f8f8; 7 background-color: #f8f8f8;
8 left: 0; 8 left: 0;
9 - top: 88rem / $pxConvertRem; 9 + top: 90rem / $pxConvertRem;
10 position: fixed; 10 position: fixed;
11 z-index: 2; 11 z-index: 2;
12 12