From 5fbb0130cf6843487fc77a417e1e93b3439b378e Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Tue, 2 Nov 2021 15:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue  | 10 +++-------
 src/components/ImagesUpload/index.vue |  6 ++----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index ed6c93f5..44f8ff34 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -31,7 +31,7 @@
                     </div>
                 </div>
             </div>
-            <div v-show="uploadData.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
+            <div v-show="url === '' && uploadData.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
                 <el-image :src="uploadData.progress.preview" :style="`width:${width}px;height:${height}px;`" fit="fill" />
                 <el-progress type="circle" :width="Math.min(width, height) * 0.8" :percentage="uploadData.progress.percent" />
             </div>
@@ -135,14 +135,10 @@ function beforeUpload(file) {
 }
 function onProgress(file) {
     uploadData.value.progress.percent = ~~file.percent
-    if (uploadData.value.progress.percent == 100) {
-        setTimeout(() => {
-            uploadData.value.progress.preview = ''
-            uploadData.value.progress.percent = 0
-        }, 1000)
-    }
 }
 function onSuccess(res) {
+    uploadData.value.progress.preview = ''
+    uploadData.value.progress.percent = 0
     emit('on-success', res)
 }
 </script>
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index 14be548b..230993cb 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -158,12 +158,10 @@ function beforeUpload(file) {
 }
 function onProgress(file) {
     uploadData.value.progress.percent = ~~file.percent
-    if (uploadData.value.progress.percent == 100) {
-        uploadData.value.progress.preview = ''
-        uploadData.value.progress.percent = 0
-    }
 }
 function onSuccess(res) {
+    uploadData.value.progress.preview = ''
+    uploadData.value.progress.percent = 0
     emit('on-success', res)
 }
 </script>