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

@@ -112,7 +112,9 @@ function disableNumEdit() {
 
 
 
 
 function show(html, cb) {
 function show(html, cb) {
-    var scrollPosition = [
+    var $html = $('html, body');
+
+    /*var scrollPosition = [
             document.documentElement.scrollLeft || document.body.scrollLeft,
             document.documentElement.scrollLeft || document.body.scrollLeft,
             document.documentElement.scrollTop || document.body.scrollTop
             document.documentElement.scrollTop || document.body.scrollTop
         ],
         ],
@@ -122,7 +124,7 @@ function show(html, cb) {
     $html.data('previous-overflow', $html.css('overflow'));
     $html.data('previous-overflow', $html.css('overflow'));
     $html.css('overflow', 'hidden');
     $html.css('overflow', 'hidden');
     $html.css('height', '100%');
     $html.css('height', '100%');
-    window.scrollTo(scrollPosition[0], scrollPosition[1]);
+    window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
 
 
     if (html) {
     if (html) {
         $chosePanel.html(html);
         $chosePanel.html(html);
@@ -138,13 +140,15 @@ function show(html, cb) {
 
 
 //隐藏当前Panel
 //隐藏当前Panel
 function hide() {
 function hide() {
-    var $html = $('html, body'),
+    $html = $('html, body');
+
+    /*var $html = $('html, body'),
         scrollPosition = $html.data('scroll-position');
         scrollPosition = $html.data('scroll-position');
 
 
     // un-lock scroll position
     // un-lock scroll position
     $html.css('overflow', $html.data('previous-overflow'));
     $html.css('overflow', $html.data('previous-overflow'));
     $html.css('height', 'auto');
     $html.css('height', 'auto');
-    window.scrollTo(scrollPosition[0], scrollPosition[1]);
+    window.scrollTo(scrollPosition[0], scrollPosition[1]);*/
     $('.chose-panel').hide();
     $('.chose-panel').hide();
 }
 }