Showing
4 changed files
with
10 additions
and
2 deletions
@@ -112,11 +112,15 @@ function getShoppingKey() { | @@ -112,11 +112,15 @@ function getShoppingKey() { | ||
112 | 112 | ||
113 | //根据页面内容重新设置通用底部的显示 | 113 | //根据页面内容重新设置通用底部的显示 |
114 | function rePosFooter() { | 114 | function rePosFooter() { |
115 | + var winH; | ||
116 | + | ||
115 | if ($footer.length === 0) { | 117 | if ($footer.length === 0) { |
116 | return; | 118 | return; |
117 | } | 119 | } |
118 | 120 | ||
119 | - if ($('body').height() <= $(window).height() - parseInt($footer.css('height'), 0)) { | 121 | + winH = Math.min($(window).height(), window.screen.availHeight); |
122 | + | ||
123 | + if ($('body').height() <= winH - parseInt($footer.css('height'), 0)) { | ||
120 | $footer.addClass('bottom'); | 124 | $footer.addClass('bottom'); |
121 | } else { | 125 | } else { |
122 | $footer.removeClass('bottom'); | 126 | $footer.removeClass('bottom'); |
@@ -1980,6 +1984,8 @@ chHammer.on('tap', function() { | @@ -1980,6 +1984,8 @@ chHammer.on('tap', function() { | ||
1980 | localStorage.removeItem('historys'); | 1984 | localStorage.removeItem('historys'); |
1981 | 1985 | ||
1982 | $history.html(''); | 1986 | $history.html(''); |
1987 | + | ||
1988 | + window.rePosFooter(); | ||
1983 | }); | 1989 | }); |
1984 | 1990 | ||
1985 | $input.on('input', function() { | 1991 | $input.on('input', function() { |
@@ -2027,6 +2033,8 @@ $('#search').on('touchend', function() { | @@ -2027,6 +2033,8 @@ $('#search').on('touchend', function() { | ||
2027 | 2033 | ||
2028 | $history.html(html); | 2034 | $history.html(html); |
2029 | $clearHistory.removeClass('hide'); | 2035 | $clearHistory.removeClass('hide'); |
2036 | + | ||
2037 | + window.rePosFooter(); | ||
2030 | } | 2038 | } |
2031 | } | 2039 | } |
2032 | }()); | 2040 | }()); |
@@ -7703,7 +7711,7 @@ function hideWeChatPay() { | @@ -7703,7 +7711,7 @@ function hideWeChatPay() { | ||
7703 | var $payApps = $('.app'); | 7711 | var $payApps = $('.app'); |
7704 | 7712 | ||
7705 | $payApps.each(function(idx, app) { | 7713 | $payApps.each(function(idx, app) { |
7706 | - if ($(app).attr('id') === 'weixin') { | 7714 | + if ($(app).parent().attr('id') === 'weixin') { |
7707 | $(app).parent().css('display', 'none'); | 7715 | $(app).parent().css('display', 'none'); |
7708 | return false; | 7716 | return false; |
7709 | } | 7717 | } |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
-
Please register or login to post a comment