From ce3c4a81ca202857799b29d6b3b07079ca5ee167 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Fri, 28 Oct 2022 18:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/videoList.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/videoList.vue b/src/pages/videoList.vue
index 2484c18..25266ef 100644
--- a/src/pages/videoList.vue
+++ b/src/pages/videoList.vue
@@ -182,16 +182,18 @@ export default {
         dataId: dataId,
         success: data => {
           console.log('分片上传视频成功', data)
-          this.uploadLoading = false
+
           // 合并
           this.$API.fileMerge({
             dataId: dataId,
             videoName: data.videoName,
             id: randomNum
+          }).then(res => {
+            this.uploadLoading = false
+            this.pageNum = 1
+            this.videoList = []
+            this.getVideoList()
           })
-          this.pageNum = 1
-          this.videoList = []
-          this.getVideoList()
         },
         error: e => {
           console.log('分片上传视频失败', e)
-- 
2.22.0