Merge remote-tracking branch 'remotes/origin/develop/wap' into beta/wap

@@ -31,9 +31,12 @@ $('.nav-btn').on('touchstart', function(event) {
     event.preventDefault();
     event.preventDefault();
     event.stopPropagation();
     event.stopPropagation();
     openSideNav = true;
     openSideNav = true;
+    event.preventDefault();
+    event.stopPropagation();
 
 
     //设置boy高宽，页面不能上下滑动
     //设置boy高宽，页面不能上下滑动
     $('body').css({
     $('body').css({
+        height: $(window).height(),
         overflow: 'hidden'
         overflow: 'hidden'
     });
     });
     return false;
     return false;
@@ -47,6 +50,7 @@ function hideSideBar() {
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
         $sideNav.removeClass('on');
         $sideNav.removeClass('on');
         $('body').css({
         $('body').css({
+            height: 'auto',
             overflow: 'auto'
             overflow: 'auto'
         });
         });
     }
     }