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

src/components/WebSet/WebSiteEdit.vue

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

src/components/WebSet/WebSiteUpdate.vue

@@ -94,17 +94,16 @@ export default {
           for(let j=0;j<obj.plugData.MenuList.length;j++){
             let y = obj.plugData.MenuList[j]
             if(!y.MenuName||!y.MenuSubName||!y.FileUrl||!y.LinkUrl||y.SubMenuList.length==0) {
-              return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-'+(i+1)+'-'+(j+1))
+              //return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-'+(i+1)+'-'+(j+1))
             }
             for(let g=0;g<y.SubMenuList.length;g++){
               let z = y.SubMenuList[g]
               if(!z.MenuName||!z.MenuSubName||!z.LinkUrl) {
-                return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-'+(i+1)+'-'+(j+1)+'-'+(g+1))
+                //return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-'+(i+1)+'-'+(j+1)+'-'+(g+1))
               }
             }
           }
         }
-
       }
       this.apipost(
         "ws_post_SetPage",