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

src/components/Hotel/roomReservationsDetails.vue

@@ -1000,6 +1000,7 @@
           }
         }
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
+          console.log("dmcstatistics_get_GetHotelStaticsDetail_V2",res.data);
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
             if (this.IsEditHotel == 0) {

src/components/WebSet/home/indexRoll1.vue

@@ -151,8 +151,7 @@
             <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
-                  <el-upload
-                  :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
+                  <el-upload :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
                     :http-request="(file)=>UploadAttachment(file,item.FileType)" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                     <img v-if="item.FileType==1&&item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
@@ -207,7 +206,8 @@
         </tbody>
       </table>
     </el-form>
-    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" class="webset_choosemenu" append-to-body>
+    <el-dialog :title="$t('objFill.qingxzcd')" :visible.sync="isShowMenuDialog" width="1000px" class="webset_choosemenu"
+      append-to-body>
       <!-- 行程选中 -->
       <chooseMenu ref="chooseMenu"></chooseMenu>
       <span slot="footer" class="dialog-footer">
@@ -259,7 +259,7 @@
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.MLogo = imgUrl;
-        },2);
+        }, 2);
       },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
@@ -270,15 +270,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo(file,FileType) { // 视频验证
-        if(file.type.indexOf('video')!=-1&&FileType==1) {
-          FileType=2
-        }
-        else if(file.type.indexOf('video')==-1&&FileType==2) {
-          FileType=1
+      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
+        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) === -
           1) {
@@ -291,32 +290,31 @@
         }
       },
       //上传图片
-      UploadAttachment(file,FileType) {
+      UploadAttachment(file, FileType) {
         let newArr = [];
         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
+        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){
+        if (FileType == 1) {
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().ViittoFileUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
             this.$message.success(this.$t('tips.scchenggong'));
-          },2);
-        }else{
+          }, 2);
+        } else {
           this.UploadFileToAli2024(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().OSSUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
             this.$message.success(this.$t('tips.scchenggong'));
-          },2);
+          }, 2);
         }
       },
       //显示菜单弹窗
@@ -330,6 +328,9 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
+          if (chooseMenuObj.MenuSubName) {
+            this.clickItem.SubDescribe = chooseMenuObj.MenuSubName;
+          }
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
           if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
             this.clickItem.FileUrl = chooseMenuObj.ImgUrl;

src/components/WebSet/home/indexRoll2.vue

@@ -152,8 +152,7 @@
             <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
-                  <el-upload
-                  :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
+                  <el-upload :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
                     :http-request="(file)=>UploadAttachment(file,item.FileType)" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                     <img v-if="item.FileType==1&&item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
@@ -262,7 +261,7 @@
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.MLogo = imgUrl;
           this.$message.success(this.$t('tips.scchenggong'));
-        },2);
+        }, 2);
       },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
@@ -273,15 +272,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo (file,FileType) { // 视频验证
-        if(file.type.indexOf('video')!=-1&&FileType==1) {
-          FileType=2
-        }
-        else if(file.type.indexOf('video')==-1&&FileType==2) {
-          FileType=1
+      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
+        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) === -
           1) {
@@ -294,32 +292,31 @@
         }
       },
       //上传图片
-      UploadAttachment(file,FileType) {
+      UploadAttachment(file, FileType) {
         let newArr = [];
         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
+        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){
+        if (FileType == 1) {
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().ViittoFileUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
             this.$message.success(this.$t('tips.scchenggong'));
-          },2);
-        }else{
+          }, 2);
+        } else {
           this.UploadFileToAli2024(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().OSSUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
             this.$message.success(this.$t('tips.scchenggong'));
-          },2);
+          }, 2);
         }
       },
       //显示菜单弹窗
@@ -333,6 +330,9 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
+          if (chooseMenuObj.MenuSubName) {
+            this.clickItem.SubDescribe = chooseMenuObj.MenuSubName;
+          }
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
           if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
             this.clickItem.FileUrl = chooseMenuObj.ImgUrl;

src/components/WebSet/home/indexSlider1.vue

@@ -151,8 +151,7 @@
             <td class="w350" rowspan="3">
               <el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
                 <div class="webSliderDiv" @click="clickIndex=index">
-                  <el-upload
-                  :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
+                  <el-upload :before-upload="(file)=>beforeUploadVideo(file,item.FileType)"
                     :http-request="(file)=>UploadAttachment(file,item.FileType)" :multiple="true"
                     accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
                     <img v-if="item.FileType==1&&item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
@@ -260,7 +259,7 @@
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.MLogo = imgUrl;
-        },2);
+        }, 2);
       },
       addMenu() {
         this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
@@ -271,15 +270,14 @@
           that.plugData.NavList.splice(index, 1)
         });
       },
-      beforeUploadVideo (file,FileType) { // 视频验证
-        if(file.type.indexOf('video')!=-1&&FileType==1) {
-          FileType=2
-        }
-        else if(file.type.indexOf('video')==-1&&FileType==2) {
-          FileType=1
+      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
+        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) === -
           1) {
@@ -292,31 +290,30 @@
         }
       },
       //上传图片
-      UploadAttachment(file,FileType) {
+      UploadAttachment(file, FileType) {
         console.log()
         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
+        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){
+        if (FileType == 1) {
           this.UploadSelfFileT(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().ViittoFileUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
-          },2);
-        }else{
+          }, 2);
+        } else {
           this.UploadFileToAli2024(path, newArr, x => {
             var str = x.data.FilePath;
             var imgUrl = this.domainManager().OSSUrl + str;
             this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
             this.$message.success(this.$t('tips.scchenggong'));
-          },2);
+          }, 2);
         }
 
       },
@@ -328,7 +325,7 @@
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + str;
           this.plugData.MLogo = imgUrl;
-        },2);
+        }, 2);
       },
       //显示菜单弹窗
       ShowMenuDialog(item) {
@@ -341,6 +338,9 @@
         this.isShowMenuDialog = false;
         if (chooseMenuObj) {
           this.clickItem.SubName = chooseMenuObj.MenuName;
+          if (chooseMenuObj.MenuSubName) {
+            this.clickItem.SubDescribe = chooseMenuObj.MenuSubName;
+          }
           this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
           if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
             this.clickItem.FileUrl = chooseMenuObj.ImgUrl;

src/components/WebSet/plug-in/choose_menu.vue

@@ -331,6 +331,7 @@
           MenuName: "",
           MenuUrl: "",
           ImgUrl: "",
+          MenuSubName: "",
         };
         var domainUrl = this.getLocalStorage().B2BDomain;
         //自定义页面
@@ -354,7 +355,10 @@
           this.dataList.forEach((item) => {
             if (item.Checked) {
               obj.MenuName = item.Title;
-              // obj.MenuUrl = this.$tripUtils.GetB2BUrl(domainUrl, item.ConfigId, item.TCID);
+              console.log("item.ProductRecommend",item.ProductRecommend)
+              if (item.ProductRecommend && item.ProductRecommend != '') {
+                obj.MenuSubName = item.ProductRecommend;
+              }
               obj.MenuUrl = this.$tripUtils.GetB2CHomeSeriesUrl(domainUrl, item.ID, item.TCIDEnStr);
               if (item.ImgCover && item.ImgCover.length > 0) {
                 obj.ImgUrl = item.ImgCover[0].Url;
@@ -367,6 +371,7 @@
             obj.MenuUrl = domainUrl + obj.MenuUrl;
           }
         }
+        console.log("chooseObj",obj);
         return obj;
       },
       //选中切换