fixes bug to merge develop code

@@ -112,11 +112,15 @@ function getShoppingKey() {
 
 
 //根据页面内容重新设置通用底部的显示
 //根据页面内容重新设置通用底部的显示
 function rePosFooter() {
 function rePosFooter() {
+    var winH;
+
     if ($footer.length === 0) {
     if ($footer.length === 0) {
         return;
         return;
     }
     }
 
 
-    if ($('body').height() <= $(window).height() - parseInt($footer.css('height'), 0)) {
+    winH = Math.min($(window).height(), window.screen.availHeight);
+
+    if ($('body').height() <= winH - parseInt($footer.css('height'), 0)) {
         $footer.addClass('bottom');
         $footer.addClass('bottom');
     } else {
     } else {
         $footer.removeClass('bottom');
         $footer.removeClass('bottom');
@@ -1980,6 +1984,8 @@ chHammer.on('tap', function() {
     localStorage.removeItem('historys');
     localStorage.removeItem('historys');
 
 
     $history.html('');
     $history.html('');
+
+    window.rePosFooter();
 });
 });
 
 
 $input.on('input', function() {
 $input.on('input', function() {
@@ -2027,6 +2033,8 @@ $('#search').on('touchend', function() {
 
 
             $history.html(html);
             $history.html(html);
             $clearHistory.removeClass('hide');
             $clearHistory.removeClass('hide');
+
+            window.rePosFooter();
         }
         }
     }
     }
 }());
 }());
@@ -7703,7 +7711,7 @@ function hideWeChatPay() {
     var $payApps = $('.app');
     var $payApps = $('.app');
 
 
     $payApps.each(function(idx, app) {
     $payApps.each(function(idx, app) {
-        if ($(app).attr('id') === 'weixin') {
+        if ($(app).parent().attr('id') === 'weixin') {
             $(app).parent().css('display', 'none');
             $(app).parent().css('display', 'none');
             return false;
             return false;
         }
         }