团行程特色，旅客设置领队

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -497,6 +497,11 @@
     margin-top: 3px;
     font-size: 12px;
     padding-left: 10px;
+    padding-right: 10px;
+    max-height: 21px;
+    border-radius: 4px;
+    margin-right: 5px;
+    margin-left: 5px;
   }
 
   .LeaderSpan:hover {
@@ -521,8 +526,13 @@
     width: 100%;
     height: 174px;
     overflow: auto;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+  .RL_LeaderNameBox{
+    cursor: pointer;
   }
-
   .RL_LeaderName {
     display: inline-block;
     min-width: 50px;
@@ -3640,10 +3650,22 @@
             <div class="RL_ListDiv">
               <div class="LeaderSpan" :class="{ ckedClass: ckedIndex == index }" v-for="(item, index) in leaderListArr"
                 @click="getLeaderInfo(index, item.LeaderId)" :key="item.subCode">
-                <span class="RL_LeaderName">{{ item.LeaderName }}【{{
-                    getLeaderTypeStr(item.Type, item.LeaderGuidClass)
-                  }}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}}
-                  {{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】</span>
+                <span class="RL_LeaderName">{{ item.LeaderName }}</span>
+                <el-popover placement="top" width="auto" v-model="item.show" trigger="click">
+                  <div>
+                    【{{
+                      getLeaderTypeStr(item.Type, item.LeaderGuidClass)
+                    }}】【{{$t('salesModule.Passport')}}：{{item.Passport}} {{$t('hotel.table_tel')}}:{{item.MobilePhone}}
+                    {{$t('objFill.shengfenzheng')}}:{{item.IdCard}}】
+                  </div>
+                  <template slot="reference">
+                    <span class="RL_LeaderNameBox">
+                      <i class="el-icon-view"></i>
+                    </span>
+                  </template>
+                </el-popover>
+                
+                
               </div>
             </div>
           </div>
@@ -6678,6 +6700,13 @@
           (res) => {
             this.loadingSet = false;
             if (res.data.resultCode == 1) {
+              let arrList = function (arr) {
+                arr.forEach((item) => {
+                  item.show = false;
+                });
+              }
+              arrList(res.data.data.LeaderData)
+              arrList(res.data.data.ScheduleData)
               this.leaderListArr = res.data.data.LeaderData;
               this.ScheduleArray = res.data.data.ScheduleData;
               if (this.leaderQueryMsg.LeaderType == 1) {

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -201,10 +201,18 @@
           </div>
           <!-- ppt 模版行程 -->
           <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
-            <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
-              :style="{'height':myIframeHeigth+'px'}">
-            </iframe>
-            <div v-show="PostMessageText=='暂无行程数据'"
+            <div style="opacity: 0;position: fixed;left: 0;right: 0; top: 0;bottom: 0; z-index: -1;">
+              <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
+                :style="{'height':myIframeHeigth+'px'}">
+              </iframe> 
+            </div>
+            <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length">
+              <template v-for="(item,index) in FeatureData.TripImageListNew">
+                <el-image style="width: 100%; height:auto;display: block;" :src="item" fit="contain" />
+              </template>
+            </div>
+            <!-- PostMessageText=='暂无行程数据' -->
+            <div v-else
               style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">
               {{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
           </div>
@@ -427,22 +435,24 @@
         this.dialogPptistVisible = false
       },
       handleMessage(event, targetOrigin) {
-        if (this.isPostMessage) return
+        // if (this.isPostMessage) return
         if (event.data && event.data.data && !event.data.data) return
         if (event && event.data) {
           try {
             if (event.data == '行程数据保存成功' || event.data.indexOf('行程特色高') != -1) {
+
               this.PostMessageText = ''
               //行程特色高
-              if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) {
-                let datas = event.data.split('-')
-                this.myIframeHeigth = datas[1];
-                this.isPostMessage = true
-              }
-              if (this.myIframeUrl && this.myIframeUrl != '') {
-                document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
-              }
-              this.$emit('pptJourney', true)
+              // if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) {
+              //   let datas = event.data.split('-')
+              //   this.myIframeHeigth = datas[1];
+              //   this.isPostMessage = true
+              // }
+              // if (this.myIframeUrl && this.myIframeUrl != '') {
+              //   document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
+              // }
+              this.$emit('ConfigInfo')
+              // this.$emit('pptJourney', true)
             } else if (event.data == '暂无行程数据') {
               this.PostMessageText = event.data
               this.$emit('pptJourney', false)

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -945,6 +945,7 @@
                 }
                 this.FeatureData.LtName = tempData.LtName;
                 this.FeatureData.DayList = tempData.DayList;
+                this.FeatureData.TripImageListNew = tempData.Feature.TripImageListNew?tempData.Feature.TripImageListNew:[]; //特色图片
 
                 this.ConfigId = tempData.ID;
                 //HK 2019-01-08添加 NewConfigId B2B预览使用