Authored by hf

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

@@ -17,6 +17,7 @@ var $icon = $('.search-icon'); @@ -17,6 +17,7 @@ var $icon = $('.search-icon');
17 var $form = $('#search-form'); 17 var $form = $('#search-form');
18 18
19 var $history = $('.history'); 19 var $history = $('.history');
  20 +var $historySearch = $('.history-search');
20 21
21 var $clearHistory = $('#clear-history'); 22 var $clearHistory = $('#clear-history');
22 23
@@ -31,6 +32,8 @@ chHammer.on('tap', function() { @@ -31,6 +32,8 @@ chHammer.on('tap', function() {
31 localStorage.removeItem('historys'); 32 localStorage.removeItem('historys');
32 33
33 $history.html(''); 34 $history.html('');
  35 + $historySearch.hide();
  36 + $clearHistory.hide();
34 37
35 window.rePosFooter(); 38 window.rePosFooter();
36 }); 39 });
@@ -80,7 +83,7 @@ $('#search').on('touchend', function() { @@ -80,7 +83,7 @@ $('#search').on('touchend', function() {
80 83
81 $history.html(html); 84 $history.html(html);
82 $clearHistory.removeClass('hide'); 85 $clearHistory.removeClass('hide');
83 - 86 + $historySearch.removeClass('hide');
84 window.rePosFooter(); 87 window.rePosFooter();
85 } 88 }
86 } 89 }
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/ hot}} 21 {{/ hot}}
22 </ul> 22 </ul>
23 </div> 23 </div>
24 - <div class="history-search"> 24 + <div class="history-search hide">
25 <h3>历史搜索</h3> 25 <h3>历史搜索</h3>
26 <ul class="history clearfix"></ul> 26 <ul class="history clearfix"></ul>
27 </div> 27 </div>
@@ -29,4 +29,4 @@ @@ -29,4 +29,4 @@
29 </div> 29 </div>
30 {{/ search}} 30 {{/ search}}
31 </div> 31 </div>
32 -{{> layout/footer}}  
  32 +{{> layout/footer}}