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

src/assets/css/tripIndexNew2.css

@@ -161,7 +161,7 @@ html, body{
   height: 0px;
   border-bottom: 2px dashed red;
   left: 0;
-  top: 1375px;
+  top: 1453px;
   right: 0;
 }
 .UpgradedVersion2Line span{

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -133,7 +133,7 @@
                 :preview-src-list="FeatureData.TripImageListNew"></el-image>
               </template>
             </div> -->
-            <div v-if="PostMessageText" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
+            <div v-show="PostMessageText=='暂无行程数据'" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
           </div>
         </div>
       </div>
@@ -299,19 +299,24 @@
         this.dialogPptistVisible = false
       },
       handleMessage(event,targetOrigin) {
+        console.log(event.data,'-----------event.data')
+        if(event.data&&event.data.data&&!event.data.data) return
         if(this.isPostMessage) return
-        if(event.data=='行程数据保存成功'){
+        if(event.data&&event.data=='行程数据保存成功'){
           // this.dialogPptistVisible = false
-          this.isPostMessage = true
           this.$emit('ConfigInfo')
-        }else if(event.data.indexOf('行程特色高')!=-1){
+          if(document.all.myIframe){
+            document.all.myIframe.src = this.myIframeUrl
+          }
+        }else if(event.data&&event.data.indexOf('行程特色高')!=-1){
+          this.PostMessageText = ''
           let datas = event.data.split('-')
           this.myIframeHeigth = datas[1]
-          this.iframeLoading = false
-        }else if(event.data=='暂无行程数据'){
+        }else if(event.data&&event.data=='暂无行程数据'){
           this.PostMessageText = event.data
-          this.iframeLoading = false
         }
+        this.isPostMessage = true
+        this.iframeLoading = false
       },
       // 添加编辑模版
       journeyTemplate(type){
@@ -559,6 +564,7 @@
           // this.iframeLoading = true
           if(document.all.myIframe){
             document.all.myIframe.src = this.myIframeUrl
+            this.isPostMessage = false
           }
         }
       },
@@ -648,6 +654,7 @@
       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
+        this.isPostMessage = false
       }
     },
     watch: {

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -823,10 +823,10 @@
         </div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
-        <span>{{pageHeight>1375?'超出内容分割到下一页':'底线'}}</span>
+        <span>{{pageHeight>1453?'超出内容分割到下一页':'底线'}}</span>
       </div>
-      <div v-if="pageHeight>(1375+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
-        :style="{'top': pageHeight>1375&&pageHeight<2750?pageHeight+'px':'2750px'}">
+      <div v-if="pageHeight>(1453+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
+        :style="{'top': pageHeight>1453&&pageHeight<2906?pageHeight+'px':'2906px'}">
         <span>底线</span>
       </div>
     </div>