修改合并内容

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)