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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -125,6 +125,14 @@
           <!-- ppt 模版行程 -->
           <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag">
             <div style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
+            <div v-if="FeatureData.TripImageList.length>0">
+              <template v-for="url in FeatureData.TripImageList">
+                <el-image
+                style="width: 100%; height: auto"
+                :src="url"
+                :preview-src-list="FeatureData.TripImageList"></el-image>
+              </template>
+            </div>
           </div>
         </div>
       </div>
@@ -302,12 +310,11 @@
       // 添加编辑模版
       journeyTemplate(type){
         this.isPostMessage = false
-        // console.log(this.userInfo.EmployeeId,'-----',this.FeatureData.ConfigId)
-        let href = window.location.href.indexOf('localhost:')!=-1?'http://localhost:8080/':'http://localhost:8080/'
+        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}&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}`
         }
         this.dialogPptistVisible = true
       },

src/plug/index.js

@@ -183,6 +183,7 @@ export default {
           lxymallUrl: lxymallUrl,
           crmUrl: crmUrl,
           crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
+          PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8080",
         };
         return obj;
       },