From d107ebf40c50891d3c682e1f9bd7673cfff21e26 Mon Sep 17 00:00:00 2001
From: iizmg <Cqsvw1234567890>
Date: Mon, 25 May 2020 12:59:40 +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/src/App.vue | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 1e52924..4029c92 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -4,6 +4,16 @@
        @touchmove="touchMove"
        @touchend="touchEnd"
   >
+    <div v-if="this.moveDistance > 0" :style="mainDivLoadingStyle">
+      <div v-if="moveState === 0" class="text-center">
+        <i class="el-icon-arrow-down" style="font-weight: bold;font-size: 25px;color: #FF6A00;"></i>
+      </div>
+      <div v-if="moveState === 1" class="text-center">
+        <div class="spinner-grow text-success" role="status">
+          <span class="sr-only">Loading...</span>
+        </div>
+      </div>
+    </div>
     <el-container :style="mainElContainerStyle">
       <el-header :style="mainElHeaderStyle" :height="mainElHeaderStyle.height">
         <el-button class="mainMenuBtn" :style="mainMenuBtnStyle" type="text"
@@ -92,9 +102,6 @@
               <i class="el-icon-caret-top"></i>
             </el-backtop>
             <div class="mainDiv">
-              <div v-if="moveState > 0">
-                <div v-if="moveState === 1" class="text-center">释放即可刷新...</div>
-              </div>
               <el-main>
                 <transition name="el-zoom-in-center">
                   <keep-alive>
@@ -223,7 +230,12 @@
         rightUserCenterDrawerShow: false,
         startY: '',
         moveDistance: 0,
-        moveState: 0
+        moveState: 0,
+        mainDivLoadingStyle: {
+          "position": "absolute",
+          "width": "100%",
+          "z-index": "2000"
+        }
       }
     },
     mounted() {
@@ -256,6 +268,7 @@
           if (move > 0) {
             e.preventDefault();
             this.moveDistance = Math.pow(move, 0.8);
+            this.mainDivLoadingStyle.top = (this.moveDistance > 70 ? 70 : this.moveDistance) + 'px';
             // console.log(window.innerHeight, scrollTop, e.targetTouches[0].clientY, y, this.startY, move, this.moveDistance);
             if (this.moveDistance > 70) {
               if (this.moveState === 1) return;
@@ -272,8 +285,8 @@
         //下拉刷新逻辑
         {
           if (this.moveDistance > 70) {
-            this.moveDistance = 70;
             this.$EventBus.$emit(glob.eventNames.globRefreshEventName);
+            this.moveDistance = 0;
             this.moveState = 0;
           } else {
             this.moveDistance = 0;