From 10c7941a02be01e06f45aef8c8c336826da9e884 Mon Sep 17 00:00:00 2001
From: iizmg <Cqsvw1234567890>
Date: Mon, 25 May 2020 14:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/admin/index.html b/admin/index.html
index e7f02ff..5bb2732 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -132,46 +132,12 @@
       }
     }
   </style>
-  <script type="text/javascript">
-    //禁止下拉
-    var overscroll = function (el) {
-      el.addEventListener('touchstart', function () {
-        var top = el.scrollTop
-          , totalScroll = el.scrollHeight
-          , currentScroll = top + el.offsetHeight
-        //If we're at the top or the bottom of the containers
-        //scroll, push up or down one pixel.
-        //
-        //this prevents the scroll from "passing through" to
-        //the body.
-        if (top === 0) {
-          el.scrollTop = 1
-        } else if (currentScroll === totalScroll) {
-          el.scrollTop = top - 1
-        }
-      })
-      el.addEventListener('touchmove', function (evt) {
-        //if the content is actually scrollable, i.e. the content is long enough
-        //that scrolling can occur
-        if (el.offsetHeight < el.scrollHeight)
-          evt._isScroller = true
-      })
-    }
-    overscroll(document.querySelector('.scroll'));
-    document.body.addEventListener('touchmove', function (evt) {
-      //In this case, the default behavior is scrolling the body, which
-      //would result in an overflow.  Since we don't want that, we preventDefault.
-      if (!evt._isScroller) {
-        evt.preventDefault()
-      }
-    })
-  </script>
 </head>
 <body>
 <noscript>
   <strong>您的浏览器禁用了JavaScript脚本，系统无法正常为您提供服务</strong>
 </noscript>
-<div id="app" class="scroll">
+<div id="app">
   <div class="start-loading-center">
     <svg width="100" height="100">
       <circle class="start-loading-mouth" cx="50" cy="50" r="14"></circle>
diff --git a/admin/src/App.vue b/admin/src/App.vue
index 67402e9..40c199a 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,9 +1,5 @@
 <template>
-  <div id="app" class="app" :style="appStyle"
-       @touchstart="touchStart"
-       @touchmove="touchMove"
-       @touchend="touchEnd"
-  >
+  <div id="app" class="app" :style="appStyle">
     <div class="loadDiv" v-if="this.moveDistance > 0">
       <div v-if="moveState === 0" class="text-center">
         <i class="el-icon-arrow-down" style="font-weight: bold;font-size: 25px;color: #FF6A00;"></i>
@@ -101,7 +97,11 @@
             <el-backtop :style="backtopStyle" target=".main-el-scrollbar .el-scrollbar__wrap">
               <i class="el-icon-caret-top"></i>
             </el-backtop>
-            <div class="mainDiv">
+            <div class="mainDiv"
+                 @touchstart="touchStart"
+                 @touchmove="touchMove"
+                 @touchend="touchEnd"
+            >
               <el-main>
                 <transition name="el-zoom-in-center">
                   <keep-alive>