From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

---
 src/components/subComponents/FileUpload/file.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/subComponents/FileUpload/file.vue b/src/components/subComponents/FileUpload/file.vue
index 333a547..1d8c5c7 100644
--- a/src/components/subComponents/FileUpload/file.vue
+++ b/src/components/subComponents/FileUpload/file.vue
@@ -35,7 +35,7 @@
         <div class="uploader-file-status">
           <span v-show="status !== 'uploading'">{{statusText}}</span>
           <span v-show="status === 'uploading'">
-            <!-- <span>{{progressStyle.progress}}</span> -->
+            <span>{{progressStyle.progress}}</span>
             <em>{{formatedAverageSpeed}}</em>
 
             <i>&nbsp;&nbsp;{{formatedTimeRemaining}}</i>

--
Gitblit v1.8.0