Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/EducationvideoList.vue

@@ -141,6 +141,7 @@
                 <i class="el-icon-plus avatar-uploader-icon"></i>
                 <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
             </el-upload>
+            <p style="font-size:12px" v-show="scLoad">上传中，请稍后...</p>
         </el-form-item>
        
 
@@ -169,6 +170,7 @@ export default {
   },
   data () {
     return {
+        scLoad:false,
         videoDivState:false,
         thisVideoAddress:'',
         defaultImg: 'this.src="' + require("../assets/img/bg_z1@2x.png") + '"',
@@ -299,11 +301,15 @@ export default {
             let newArr = [];
             newArr.push(file.file);
             let path = "/Sale/Uploadvideo/";
+            this.scLoad=true;
             this.uploadFile(path, newArr, x => {
+                this.scLoad=false;
                 this.addMsg.VideoAddress=this.baseurl+x.name;
                 let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
                 this.addMsg.Cover=this.addMsg.VideoAddress+lastUrl;
+                
             });
+            
         },
         handleCurrentChange() {
             this.msg.pageIndex = this.msg.pageIndex +1;
@@ -385,6 +391,10 @@ export default {
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
             if (valid) {
+                if(this.scLoad){
+                    this.Error("上传中，请稍候...")
+                    return;
+                }
                 let Label=this.addMsg.Label;
                 if (['酒店','景点','餐食','交通','专辑','其他'].indexOf(Label) == -1) {
                     this.Error("请选择正确的标签！");