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

src/components/commonPage/pptIframe/index.vue

@@ -11,14 +11,14 @@
         </el-tooltip>
       </div>
     </div>
-    <iframe :src="TemplateUrl"
+    <iframe :src="Url"
       class="TemplateIframe">
     </iframe>
   </div>
 </template>
 <script>
   export default {
-    props:['TemplateUrl'],
+    props:['Url'],
     data() {
       return {
         dialogPptistVisible: false,

src/components/index.vue

@@ -1217,7 +1217,7 @@
       :ChangeThePriceObj="ChangeThePriceObj"
       @ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
     <!-- ppt 模版新增编辑窗口 -->
-    <pptIframe v-show="dialogPptistVisible" :TemplateUrl="TemplateUrl"
+    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl"
     @close="closeIframe()"></pptIframe>
   </div>
 </template>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -7,9 +7,6 @@
       <span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
       <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
       <template v-if="true">
-        <!-- <span class="foldList" style="margin-right: 5px;"
-        v-if="userInfo.IsEditTripTemplate"
-        @click="journeyTemplate(1)">添加/编辑模版</span> -->
         <span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
         @click="journeyTemplate(0)">编辑行程</span>
       </template>
@@ -123,9 +120,10 @@
             </UpgradedVersion>
           </div>
           <!-- ppt 模版行程 -->
+          <!--  -->
           <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
-            <iframe :src="TemplateUrlImg" style="width: 100%;border: 0;"
-            :style="{'height':TemplateUrlImgH+'px'}">
+            <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
+            :style="{'height':myIframeHeigth+'px'}" >
             </iframe>
             <!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
               <template v-for="url in FeatureData.TripImageListNew">
@@ -135,14 +133,14 @@
                 :preview-src-list="FeatureData.TripImageListNew"></el-image>
               </template>
             </div> -->
-            <div v-if="FeatureData.TripImageListNew.length==0" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
+            <div v-if="PostMessageText" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
           </div>
         </div>
       </div>
     </div>
 
     <!-- ppt 模版新增编辑窗口 -->
-    <pptIframe v-show="dialogPptistVisible" :TemplateUrl="TemplateUrl"
+    <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl"
     @close="closeIframe()"></pptIframe>
   </div>
 </template>
@@ -285,13 +283,16 @@
         dialogPptistVisible: false,
         userInfo: {},
         TemplateUrl:'',// 模版 修改url
-        TemplateUrlImg:'',//行程特色url
-        TemplateUrlImgH: 0,
+        myIframeUrl:'',//行程特色url
+        myIframeHeigth: 0,
         isPostMessage: false,
+        PostMessageText: '',
         iframeLoading: false,
       };
     },
-    created: function () {},
+    created: function () {
+
+    },
 
     methods: {
       closeIframe(){
@@ -304,9 +305,12 @@
           this.isPostMessage = true
           this.$emit('ConfigInfo')
         }else if(event.data.indexOf('行程特色高')!=-1){
-          this.iframeLoading = false
           let datas = event.data.split('-')
-          this.TemplateUrlImgH = datas[1]
+          this.myIframeHeigth = datas[1]
+          this.iframeLoading = false
+        }else if(event.data=='暂无行程数据'){
+          this.PostMessageText = event.data
+          this.iframeLoading = false
         }
       },
       // 添加编辑模版
@@ -552,7 +556,10 @@
         }
         this.initFileList();
         if(this.FeatureData.FeatureType==9) {
-          this.iframeLoading = true
+          // this.iframeLoading = true
+          if(document.all.myIframe){
+            document.all.myIframe.src = this.myIframeUrl
+          }
         }
       },
       //点击折叠
@@ -632,7 +639,16 @@
       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}&w=1108`
+      let obj = this.TypeArray.find(x=>{
+        return x.TypeState == this.FeatureData.FeatureType
+      })
+      if(obj){
+        this.clickFeature(obj)
+      }
+      this.myIframeUrl = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108`
+      if(document.all.myIframe){
+        document.all.myIframe.src = this.myIframeUrl
+      }
     },
     watch: {
       FeatureData: {
@@ -640,8 +656,10 @@
         handler: function (val, oldVal) {
           this.$emit("featureCallBack", this.FeatureData);
           this.initFeature();
+
         },
-        deep: true
+        deep: true,
+        immediate:true
       },
       "FeatureData.fileList": {
         handler: function (val, oldval) {