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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -123,17 +123,18 @@
             </UpgradedVersion>
           </div>
           <!-- ppt 模版行程 -->
-          <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag">
-            <!-- <iframe :src="TemplateUrlImg" style="width: 100%;height: 1000px;border: 0;">
-            </iframe> -->
-            <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
+          <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
+            <iframe :src="TemplateUrlImg" style="width: 100%;border: 0;"
+            :style="{'height':TemplateUrlImgH+'px'}">
+            </iframe>
+            <!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
               <template v-for="url in FeatureData.TripImageListNew">
                 <el-image
                 style="width: 100%; height: auto"
                 :src="url"
                 :preview-src-list="FeatureData.TripImageListNew"></el-image>
               </template>
-            </div>
+            </div> -->
             <div v-if="FeatureData.TripImageListNew.length==0" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
           </div>
         </div>
@@ -283,9 +284,11 @@
         CurrentUserInfo: {},
         dialogPptistVisible: false,
         userInfo: {},
-        TemplateUrl:'',
-        TemplateUrlImg:'',
-        isPostMessage: false
+        TemplateUrl:'',// 模版 修改url
+        TemplateUrlImg:'',//行程特色url
+        TemplateUrlImgH: 0,
+        isPostMessage: false,
+        iframeLoading: false,
       };
     },
     created: function () {},
@@ -300,6 +303,10 @@
           // this.dialogPptistVisible = false
           this.isPostMessage = true
           this.$emit('ConfigInfo')
+        }else if(event.data.indexOf('行程特色高')!=-1){
+          this.iframeLoading = false
+          let datas = event.data.split('-')
+          this.TemplateUrlImgH = datas[1]
         }
       },
       // 添加编辑模版
@@ -307,9 +314,9 @@
         this.isPostMessage = false
         let href = this.domainManager().PptUrl
         if(type&&type==1){
-          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1`
+          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1`
         }else{
-          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}`
+          this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0`
         }
         this.dialogPptistVisible = true
       },
@@ -544,6 +551,9 @@
           });
         }
         this.initFileList();
+        if(this.FeatureData.FeatureType==9) {
+          this.iframeLoading = true
+        }
       },
       //点击折叠
       fold() {
@@ -622,7 +632,7 @@
       this.MsgBus.$on('FeatureDataFlag', () => {
         this.FeatureDataFlag = true
       });
-      this.TemplateUrlImg = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=3&TempId=${this.FeatureData.TemplateId}`
+      this.TemplateUrlImg = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=3&TempId=${this.FeatureData.TemplateId}&w=1108`
     },
     watch: {
       FeatureData: {