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

src/components/WebSet/WebSiteEdit.vue

@@ -475,7 +475,7 @@
               }
               for(let g=0;g<y.SubMenuList.length;g++){
                 let z = y.SubMenuList[g]
-                if(!z.MenuName||!z.MenuSubName||!z.LinkUrl) {
+                if(!z.MenuName||!z.LinkUrl) {
                   return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-'+(j+1)+'-'+(g+1))
                 }
               }

src/components/WebSet/home/indexNav.vue

@@ -224,7 +224,7 @@
                   <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)+`-`+(subIndex+1)" style="margin-bottom: 0;">
                     <div class="webSliderDiv" @click="menuIndex=index,subMenuIndex=subIndex">
                       <el-upload
-                      :before-upload="(file)=>beforeUploadVideo(file,sub.FileType)"
+                      :before-upload="(file)=>beforeUploadVideo(file,sub.FileType,1)"
                       :http-request="(file)=>UploadAttachment2(file,sub.FileType)" :multiple="true" :accept="getAccept(sub.FileType)"
                         :show-file-list="false" action="">
                         <img v-if="sub.FileType==1&&sub.FileUrl" :src="sub.FileUrl" class="web_imgUrl" alt="" />
@@ -425,7 +425,18 @@
           }
         });
       },
-      beforeUploadVideo: function (file,FileType) { // 视频验证
+      beforeUploadVideo (file,FileType,index) { // 视频验证
+        if(file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        if(index){
+          this.plugData.MenuList[this.menuIndex].SubMenuList[this.subMenuIndex].FileType = FileType
+        }else{
+          this.plugData.MenuList[this.menuIndex].FileType = FileType
+        }
         if(FileType==1) return true
         const isLt10M = file.size / 1024 / 1024 < 10;
         if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -
@@ -450,6 +461,13 @@
         //   this.plugData.MenuList[this.menuIndex].FileUrl = imgUrl;
         //   this.$message.success(this.$t('tips.scchenggong'));
         // },2);
+        if(file.file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.MenuList[this.menuIndex].FileType = FileType
         if(FileType==1){
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;
@@ -472,6 +490,13 @@
         newArr.push(file.file);
         var path = "/Upload/WebSite/";
         this.$message.info(this.$t('tips.shangchuanzhong'))
+        if(file.file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.MenuList[this.menuIndex].SubMenuList[this.subMenuIndex].FileType = FileType
         if(FileType==1){
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;

src/components/WebSet/home/indexRoll1.vue

@@ -270,7 +270,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo: function (file,FileType) { // 视频验证
+      beforeUploadVideo(file,FileType) { // 视频验证
+        if(file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1) return true
         const isLt10M = file.size / 1024 / 1024 < 10;
         if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -
@@ -289,6 +296,13 @@
         newArr.push(file.file);
         var path = "/Upload/WebSite/";
         this.$message.info(this.$t('tips.shangchuanzhong'))
+        if(file.file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1){
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;

src/components/WebSet/home/indexRoll2.vue

@@ -273,7 +273,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo: function (file,FileType) { // 视频验证
+      beforeUploadVideo (file,FileType) { // 视频验证
+        if(file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1) return true
         const isLt10M = file.size / 1024 / 1024 < 10;
         if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -
@@ -292,6 +299,13 @@
         newArr.push(file.file);
         var path = "/Upload/WebSite/";
         this.$message.info(this.$t('tips.shangchuanzhong'))
+        if(file.file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1){
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;

src/components/WebSet/home/indexSlider1.vue

@@ -271,7 +271,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo: function (file,FileType) { // 视频验证
+      beforeUploadVideo (file,FileType) { // 视频验证
+        if(file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1) return true
         const isLt10M = file.size / 1024 / 1024 < 10;
         if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -
@@ -290,6 +297,13 @@
         let newArr = [];
         newArr.push(file.file);
         var path = "/Upload/WebSite/";
+        if(file.file.type.indexOf('video')!=-1&&FileType==1) {
+          FileType=2
+        }
+        else if(file.file.type.indexOf('video')==-1&&FileType==2) {
+          FileType=1
+        }
+        this.plugData.NavList[this.clickIndex].FileType = FileType
         if(FileType==1){
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;