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

src/components/WebSet/WebSiteConfig.vue

@@ -213,6 +213,20 @@
                     </div>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item :label="'Foot '+$t('objFill.v101.FinancialModule.qiye')+' LOGO'">
+                    <div>{{$t('objFill.v101.caistpccjs')}}</div>
+                    <div class="webLogoDiv" @click="commonType=5">
+                      <el-upload :http-request="UploadAttachment" :multiple="true"
+                        accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+                        <img v-if="PostMsg.FootLogo2" :src="PostMsg.FootLogo2" class="web_imgUrl" alt="" />
+                        <div class="addIconDiv">
+                          <i class="web_addImg iconfont icon-img_haha"></i>
+                        </div>
+                      </el-upload>
+                    </div>
+                  </el-form-item>
+                </el-col>
 
                 <el-col :span="8">
                   <el-form-item :label="$t('objFill.v101.wangxan')+' icon'">
@@ -618,6 +632,7 @@
           TAType: 1, //旅行社類型
           TALogo: "", //企业Logo(彩色)
           TALogo2: "", //企业Logo(黑白)
+          FootLogo2:"",//底部LOGO
           TAIcon: "", //企业Icon
           TATel: "", //联系电话
           TAFax: "", //传真
@@ -792,6 +807,9 @@
                 if (tempData.TALogo2) {
                   this.PostMsg.TALogo2 = tempData.TALogo2;
                 }
+                if (tempData.FootLogo2) {
+                  this.PostMsg.FootLogo2 = tempData.FootLogo2;
+                }
                 if (tempData.TAIcon) {
                   this.PostMsg.TAIcon = tempData.TAIcon;
                 }
@@ -900,8 +918,10 @@
             this.PostMsg.TALogo2 = imgUrl;
           } else if(this.commonType == 3) {
             this.PostMsg.TAIcon = imgUrl;
-          } else {
+          } else if(this.commonType == 4) {
             this.PostMsg.LicensePath = imgUrl;
+          } else {
+            this.PostMsg.FootLogo2 = imgUrl;
           }
         });
       },

src/components/WebSet/WebSiteEdit.vue

@@ -460,8 +460,31 @@
       },
       //获取数据
       setSubPlugData() {
-        this.isShowDialog = false;
         this.currentEditItem.plugData = JSON.parse(JSON.stringify(this.currentEditItemData));
+        if(!this.currentEditItem.plugData.Logo) return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-Web LOGO')
+        if(!this.currentEditItem.plugData.MLogo) return this.Error(this.$t('objFill.v101.qingwspzxxi')+'-Mobile LOGO')
+        if(this.currentEditItem.plugData.MenuList.length>0){
+          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))
+            }
+            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')+'-'+(j+1)+'-'+(g+1))
+              }
+            }
+          }
+        }
+        if(this.currentEditItem.plugData.BottomList.length>0){
+          for(let i=0;i<this.currentEditItem.plugData.BottomList.length;i++){
+            let x = this.currentEditItem.plugData.BottomList[i]
+            if(!x.LinkTitle||!x.LinkUrl) return this.Error('Foot Menu'+ this.$t('objFill.v101.qingwspzxxi')+'-'+(i+1))
+          }
+        }
+        this.isShowDialog = false;
+
       },
       //删除插件
       deletePlug(index) {

src/components/WebSet/WebSiteUpdate.vue

@@ -87,6 +87,25 @@ export default {
     },
     //新增、修改广告
     saveData() {
+      for(let i=0;i<this.postMsg.PageDataList.length;i++){
+        if(this.postMsg.PageDataList.length==0) return this.Error(this.$t('objFill.v101.qingwspzxxi'))
+        let obj = this.postMsg.PageDataList[i]
+        if(obj.plugData.MenuList&&obj.plugData.MenuList.length>0){
+          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))
+            }
+            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))
+              }
+            }
+          }
+        }
+
+      }
       this.apipost(
         "ws_post_SetPage",
         this.postMsg,

src/components/WebSet/home/indexSlider1.vue

@@ -265,7 +265,7 @@
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.MLogo = imgUrl;
-        });
+        },2);
       },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))