Merge branch 'dev-livemanage-20200702' into 'release'

取消上传大文件MP4格式优化，Code Review:bo.dang



See merge request !185

src/views/yqrange/live-manage.vue

@@ -667,6 +667,11 @@ export default {
 
     },
 
+    // // 上传视频
+    // uploadVideo(file, fileList){
+    //  console.log("uploadVideo: file path is :" + file.name);
+    // },
+
     //上传直播简介
     beforeUploadVideo(file) {
       let fileLimit = {
@@ -689,13 +694,18 @@ export default {
       vm.videoSize = file.size / 1024 / 1024;
       const isSize =  vm.videoSize < fileLimit.size;
       if (!isMp4) {
+        this.$refs.upload.clearFiles();
         vm.$message.error('上传回放视频只能是mp4格式!')
         // vm.isDisabledIns = false;
+        file = null;
         return;
       }
       if (!isSize) {
-        vm.$message.error('视频大小不符合规范，请根据规范上传视频')
+        // this.$refs.upload.abort();
+        this.$refs.upload.clearFiles();
+        vm.$message.error('视频大小不符合规范，请根据规范上传视频');
         // vm.isDisabledIns = false;
+        file = null;
         return;
       }
 
@@ -749,9 +759,9 @@ export default {
     delVideo(){
       if(vm.uploadProgress1 > 0 && vm.uploadProgress1 < 100){
         openLoading(this);
-        this.$refs.upload.abort();
+        this.$refs.upload.abort();// 取消上传请求(element)
         this.$refs.upload.clearFiles();
-        unsubscribe();
+        unsubscribe();// 取消七牛上传请求
         // if(vm.videoSize > 500){
         //   setTimeout(() => {
         //     closeLoading(this);