Merge branch 'develop' into test

@@ -95,11 +95,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');

@@ -31,6 +31,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() {
@@ -78,6 +80,8 @@ $('#search').on('touchend', function() {
 
 
             $history.html(html);
             $history.html(html);
             $clearHistory.removeClass('hide');
             $clearHistory.removeClass('hide');
+
+            window.rePosFooter();
         }
         }
     }
     }
 }());
 }());

@@ -103,7 +103,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;
         }
         }

@@ -84,7 +84,7 @@
             display: block;
             display: block;
             color: #b0b0b0;
             color: #b0b0b0;
             font-size: 24rem / $pxConvertRem;
             font-size: 24rem / $pxConvertRem;
-            margin: 30rem / $pxConvertRem 0 110rem / $pxConvertRem;
+            margin: 30rem / $pxConvertRem 0 80rem / $pxConvertRem;
         }
         }
 
 
         .walk-way {
         .walk-way {
@@ -185,6 +185,12 @@
     .name {
     .name {
         font-size: 28rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
         max-width: 70%;
         max-width: 70%;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
     }
     }
 
 
     .row:nth-child(2) {
     .row:nth-child(2) {

@@ -36,7 +36,7 @@
       > div {
       > div {
         width: 60rem / $pxConvertRem;
         width: 60rem / $pxConvertRem;
         height: 60rem / $pxConvertRem;
         height: 60rem / $pxConvertRem;
-        background-image: url(http://localhost:8000/img/layout/pay-icon.png);
+        background-image: image-url("/img/layout/pay-icon.png");
         background-size: 90%;
         background-size: 90%;
         background-position-y: 8rem / $pxConvertRem;
         background-position-y: 8rem / $pxConvertRem;
         background-position-x: center;
         background-position-x: center;

@@ -20,10 +20,10 @@
             display: block;
             display: block;
         }
         }
         span{
         span{
-            float: left;
             overflow: hidden;
             overflow: hidden;
         }
         }
         .user-name {
         .user-name {
+            float: left;
             max-width: 240rem / $pxConvertRem;
             max-width: 240rem / $pxConvertRem;
             text-overflow:ellipsis; 
             text-overflow:ellipsis; 
             white-space:nowrap; 
             white-space:nowrap; 
@@ -32,6 +32,7 @@
         }
         }
 
 
         .vip-icon {
         .vip-icon {
+            float: left;
             width: pxToRem(72px);
             width: pxToRem(72px);
             height: pxToRem(32px);
             height: pxToRem(32px);
             line-height: 36rem / $pxConvertRem;
             line-height: 36rem / $pxConvertRem;