From 177abbc91fd8e1ae917543ac0e3d1fd2c3192643 Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Mon, 25 May 2020 20:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/index.html  | 12 +-----------
 admin/src/App.vue |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/admin/index.html b/admin/index.html
index 017cad8..5bb2732 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -133,7 +133,7 @@
     }
   </style>
 </head>
-<body class="scroll">
+<body>
 <noscript>
   <strong>您的浏览器禁用了JavaScript脚本，系统无法正常为您提供服务</strong>
 </noscript>
@@ -146,14 +146,4 @@
   </div>
 </div>
 </body>
-<script type="text/javascript">
-  document.addEventListener('touchmove', {
-    function(e) {
-      e.preventDefault()
-    }
-  }, false);
-  // document.body.addEventListener('touchmove', function (e) {
-  //   e.preventDefault();
-  // }, {passive: false});
-</script>
 </html>
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 34d5e94..9f31c81 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -249,7 +249,7 @@
       touchMove(e) {
         //下拉刷新逻辑
         {
-          let scrollTop = document.getElementsByClassName('el-scrollbar__wrap')[1].scrollTop;
+          let scrollTop = document.documentElement.scrollTop || document.body.scrollTop || document.getElementsByClassName('el-scrollbar__wrap')[1].scrollTop;
           if (scrollTop > 0) {
             return;
           } else {