Commit 97f64586 authored by youjie's avatar youjie

修复 行程放大

parent b21fb778
......@@ -299,7 +299,6 @@
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&&event.data=='行程数据保存成功'){
......
......@@ -269,6 +269,7 @@
DayList: [],
isFileUpload: false, //是否是一键上传行程
IsUpdateTrip: 0, //是否联动行程特色
FeaturePageType: 1, //1横版 2竖版
},
PostPrice: "", //报价信息
//线路
......@@ -456,6 +457,7 @@
basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId;
this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据
var TripFeature = {};
......@@ -942,6 +944,7 @@
//默认不联动行程特色
this.journeyList.IsUpdateTrip = 0;
this.journeyList.FeaturePageType = 2;
this.journeyList.DayNum = tempData.DayNum;
this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
......
......@@ -327,7 +327,7 @@
}
},
created() {
},
computed: {
//获取行程天数
......
......@@ -152,7 +152,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('sm.jhcfchengshi')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="StartCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" filterable>
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
</el-option>
......@@ -162,7 +162,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option>
<el-option v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
......@@ -173,12 +173,25 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span>
<template v-if="false">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType"
style="width: 80px;">
<el-option label="横版" :value="1"></el-option>
<el-option label="竖版" :value="2"></el-option>
</el-select>
</el-form-item>
</span>
</template>
</div>
<div class="newTravelDayContent TravelDayContentThree clearfix" style="padding-left: 0;">
<div class="vertical-line" style="left: 23px;"></div>
......@@ -193,10 +206,14 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span>
</el-tooltip>
<travelDays :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDays :index="index" :dataAll="dataAll" :item="item">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
<span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
@click="clickBlowUpTravelDays(item)"></span>
......@@ -223,6 +240,7 @@
<script>
import travelDaysTrip from "../travelLineTrip/travelDaysTripThree";
import travelDays from './components/travelDays'
import travelDaysHV from './components/travelDaysHV'
export default {
props: [
......@@ -248,7 +266,8 @@
},
components: {
travelDaysTrip: travelDaysTrip,
travelDays
travelDays,
travelDaysHV
},
methods: {
clickBlowUpTravelDays(item){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment