Skip to content

S
SuperMan
Commit f695eb98 authored by youjie's avatar youjie
Browse files
Options

行程线路 横版 及横版 、竖版查询

parent 0c3380e5
Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 129 deletions
src/components/commonPage/pptIframe/index.vue
View file @ f695eb98
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="dialogPptistVisible-box" <div class="dialogPptistVisible-box"
style="width: 100%;height: 100%;"> style="width: 100%;height: 100%;">
<div class="closePptist-box"> <div class="closePptist-box">
<div class="closePptist"> <div class="closePptist">
<el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom"> <el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom">
<i class="el-icon-close" <i class="el-icon-close"
...@@ -11,14 +12,14 @@ ...@@ -11,14 +12,14 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<iframe :src="Url" <iframe name="myTemplateUrl" :src="Url"
class="TemplateIframe"> class="TemplateIframe">
</iframe> </iframe>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:['Url'], props:['Url','FeaturePageType'],
data() { data() {
return { return {
dialogPptistVisible: false, dialogPptistVisible: false,
...@@ -27,6 +28,21 @@ ...@@ -27,6 +28,21 @@
TemplateUrlImg:'', TemplateUrlImg:'',
isPostMessage: false isPostMessage: false
} }
},
watch: {
FeaturePageType: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if(document.all.myTemplateUrl){
document.all.myTemplateUrl.src = this.Url
}
},
deep: true,
immediate:true
},
},
mounted() {
}, },
methods: { methods: {
close() { close() {
......
src/components/index.vue
View file @ f695eb98
...@@ -1991,7 +1991,7 @@ ...@@ -1991,7 +1991,7 @@
// 添加编辑模版 // 添加编辑模版
journeyTemplate(){ journeyTemplate(){
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1&TempType=0`
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
GetExaminePriceOrderPageList(type) { GetExaminePriceOrderPageList(type) {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ f695eb98
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</div> </div>
<!-- ppt 模版新增编辑窗口 --> <!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" <pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl"
@close="closeIframe()"></pptIframe> @close="closeIframe()"></pptIframe>
</div> </div>
</template> </template>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
UpgradedVersion, UpgradedVersion,
pptIframe pptIframe
}, },
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"], props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType", "dataAll"],
inject: ['loadConfigInfo'], inject: ['loadConfigInfo'],
data() { data() {
return { return {
...@@ -336,12 +336,13 @@ ...@@ -336,12 +336,13 @@
}, },
// 添加编辑模版 // 添加编辑模版
journeyTemplate(type){ journeyTemplate(type){
console.log(this.dataAll.FeaturePageType,'-===FeaturePageType')
this.isPostMessage = false this.isPostMessage = false
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
if(type&&type==1){ if(type&&type==1){
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
}else{ }else{
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0` this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
} }
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
...@@ -674,6 +675,12 @@ ...@@ -674,6 +675,12 @@
} }
}, },
watch: { watch: {
dataAll:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
},
FeatureData: { FeatureData: {
//深度监听，可监听到对象、数组的变化 //深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) { handler: function (val, oldVal) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ f695eb98
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
:IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity"
:UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"
:TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect> :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature" <TravelFeature :TripColor="PostConfig.TripColor" :dataAll="PostConfig" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"
@ConfigInfo="firstLoadConfigInfo"> @ConfigInfo="firstLoadConfigInfo">
...@@ -222,6 +222,7 @@ ...@@ -222,6 +222,7 @@
TripCityList: [], //行程城市 TripCityList: [], //行程城市
TripMapList: [], TripMapList: [],
NotQueryCityList:[],//使用系统中的经纬度城市 NotQueryCityList:[],//使用系统中的经纬度城市
FeaturePageType:0,//1横版 2竖版
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -422,6 +423,7 @@ ...@@ -422,6 +423,7 @@
basicData.RemoveChild = this.PostConfig.RemoveChild; basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.OfferId = this.PostConfig.OfferId; basicData.OfferId = this.PostConfig.OfferId;
basicData.TeamType = this.PostConfig.TeamType; basicData.TeamType = this.PostConfig.TeamType;
basicData.FeaturePageType = this.PostConfig.FeaturePageType
basicData.TripMapList = this.PostConfig.TripMapList; basicData.TripMapList = this.PostConfig.TripMapList;
basicData.TripCountryList = this.PostConfig.TripCountryList; basicData.TripCountryList = this.PostConfig.TripCountryList;
...@@ -457,7 +459,6 @@ ...@@ -457,7 +459,6 @@
basicData.WCountryId = this.PostConfig.WCountryId; basicData.WCountryId = this.PostConfig.WCountryId;
basicData.WLocationId = this.PostConfig.WLocationId; basicData.WLocationId = this.PostConfig.WLocationId;
basicData.WCityId = this.PostConfig.WCityId; basicData.WCityId = this.PostConfig.WCityId;
this.journeyList.FeaturePageType = this.PostDaysTrip.FeaturePageType;
this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip; this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
//行程特色数据 //行程特色数据
var TripFeature = {}; var TripFeature = {};
...@@ -685,13 +686,12 @@ ...@@ -685,13 +686,12 @@
this.journeyList.isFileUpload = true; this.journeyList.isFileUpload = true;
this.journeyList.DayNum = configData.Days.length; this.journeyList.DayNum = configData.Days.length;
this.journeyList.NightNum = this.journeyList.DayNum - 1; this.journeyList.NightNum = this.journeyList.DayNum - 1;
let _this = this
let arrDayList = function(list){ let arrDayList = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.IsBlowUp = false x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){ if(this.PostConfig.FeaturePageType==2){
x.zoom = 0.44 x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){ }else if(this.PostConfig.FeaturePageType==1){
x.zoom = 0.285 x.zoom = 0.285
} }
}) })
...@@ -883,6 +883,7 @@ ...@@ -883,6 +883,7 @@
this.PostConfig.LineteamId = tempData.LineteamId; this.PostConfig.LineteamId = tempData.LineteamId;
this.PostConfig.CountryID = tempData.CountryID; this.PostConfig.CountryID = tempData.CountryID;
this.PostConfig.TeamType = tempData.TeamType; this.PostConfig.TeamType = tempData.TeamType;
this.PostConfig.FeaturePageType = tempData.FeaturePageType;
//视频地址 //视频地址
this.PostConfig.VideoStr = tempData.VideoStr; this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe; this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
...@@ -949,18 +950,16 @@ ...@@ -949,18 +950,16 @@
//默认不联动行程特色 //默认不联动行程特色
this.journeyList.IsUpdateTrip = 0; this.journeyList.IsUpdateTrip = 0;
this.journeyList.FeaturePageType = 2;
this.journeyList.DayNum = tempData.DayNum; this.journeyList.DayNum = tempData.DayNum;
this.journeyList.NightNum = tempData.NightNum; this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId; this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
this.journeyList.StartCityId = tempData.StartCityId; this.journeyList.StartCityId = tempData.StartCityId;
let _this = this
let arrDayList = function(list){ let arrDayList = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.IsBlowUp = false x.IsBlowUp = false
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){ if(tempData.FeaturePageType==2){
x.zoom = 0.44 x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){ }else if(tempData.FeaturePageType==1){
x.zoom = 0.285 x.zoom = 0.285
} }
}) })
...@@ -1055,6 +1054,13 @@ ...@@ -1055,6 +1054,13 @@
'$route'(to, from) { //监听路由是否变化 '$route'(to, from) { //监听路由是否变化
location.reload() location.reload()
}, },
PostDaysTrip:{
handler: function (val, oldVal) {
},
deep: true,
immediate:true
}
}, },
mounted() { mounted() {
this.CurrentUserInfo = this.getLocalStorage();; this.CurrentUserInfo = this.getLocalStorage();;
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ f695eb98
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.ReturnCity')}}</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId" <el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue"></el-option> <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 v-for="item in StartCity" :label="item.startCityName" :value="item.ID" :key="item.ID">
...@@ -173,18 +173,18 @@ ...@@ -173,18 +173,18 @@
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip"> <el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option> <el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option> <el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</span> </span>
<template v-if="false"> <template v-if="true">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span> <span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}"> <span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="FeaturePageType">
<el-select placeholder="请选择版型" v-model="subConfig.FeaturePageType" <el-select class="w90" placeholder="请选择版型" v-model="dataAll.FeaturePageType"
style="width: 80px;"> @change="getFeaturePageType()">
<el-option label="横版" :value="1"></el-option> <el-option label="横版" :value="1"></el-option>
<el-option label="竖版" :value="2"></el-option> <el-option label="竖版" :value="2"></el-option>
</el-select> </el-select>
...@@ -206,14 +206,14 @@ ...@@ -206,14 +206,14 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays" <span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span> @click="clickBlowUpTravelDays(item)"></span>
</el-tooltip> </el-tooltip>
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item"> <travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV> </travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item"> <travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays> </travelDays>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox"> <div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDaysHV v-if="subConfig.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item"> <travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV> </travelDaysHV>
<travelDays v-if="subConfig.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item"> <travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays> </travelDays>
<span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose" <span v-if="item.IsBlowUp" class="el-icon-error BlowUpTravelDaysClose"
@click="clickBlowUpTravelDays(item)"></span> @click="clickBlowUpTravelDays(item)"></span>
...@@ -270,10 +270,24 @@ ...@@ -270,10 +270,24 @@
travelDaysHV travelDaysHV
}, },
methods: { methods: {
getFeaturePageType(){
this.subConfig.DayList.forEach(x=>{
if(this.dataAll.FeaturePageType==1){
x.zoom = 0.285
}
if(this.dataAll.FeaturePageType==2){
x.zoom = 0.44
}
})
this.$forceUpdate()
},
clickBlowUpTravelDays(item){ clickBlowUpTravelDays(item){
item.IsBlowUp=!item.IsBlowUp item.IsBlowUp=!item.IsBlowUp
if(item.IsBlowUp) item.zoom = 1 if(item.IsBlowUp) item.zoom = 1
else item.zoom = 0.44 else{
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
}
this.$forceUpdate() this.$forceUpdate()
}, },
handlerChangeDateList(data) { handlerChangeDateList(data) {
...@@ -443,6 +457,7 @@ ...@@ -443,6 +457,7 @@
WarmTipList: WarmTipList, WarmTipList: WarmTipList,
TitleList: TitleList, TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip, IsUpdateTrip:this.subConfig.IsUpdateTrip,
FeaturePageType: this.dataAll.FeaturePageType
}; };
this.HotelList = HotelList; this.HotelList = HotelList;
this.DinnerList = DinnerList; this.DinnerList = DinnerList;
...@@ -466,6 +481,14 @@ ...@@ -466,6 +481,14 @@
} }
}, },
watch: { watch: {
'dataAll.FeaturePageType': {
deep: true,
immediate: true,
handler: function (newVal, oldVal) {
}
},
'subConfig.DayList': { 'subConfig.DayList': {
deep: true, deep: true,
handler: function (newVal, oldVal) { handler: function (newVal, oldVal) {
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ f695eb98
...@@ -142,10 +142,14 @@ ...@@ -142,10 +142,14 @@
</div> </div>
</div> </div>
</div> </div>
<div style="margin-top: 23px;" v-if="item.ScenicArray.length>0"> <div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold travelDaysHV-CouponsName color2A2A2A" <div class="fz21 fontBold travelDaysHV-CouponsName"
:style="{'color':dataAll.TripColor}">【{{item.ScenicArray[0].CouponsName}}】</div> :style="{'color':dataAll.TripColor}">
<div class="travelDaysHV-Description" style="margin-top: 21px;"> <span class="CouponsNameM">【</span>
<span class="CouponsNameT">{{item.ScenicArray[0].CouponsName}}</span>
<span class="CouponsNameM">】</span>
</div>
<div class="travelDaysHV-Description" >
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan> <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div> </div>
</div> </div>
...@@ -186,95 +190,95 @@ ...@@ -186,95 +190,95 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ML26 flexG"> <div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
<template v-if="item.ScenicArray.length>1"> <div class="fz21 fontBold travelDaysHV-CouponsName"
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div> :style="{'color':dataAll.TripColor}">
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI"> <span class="CouponsNameM">【</span>
<span class="CouponsNameT">{{item.ScenicArray[1].CouponsName}}</span>
<span class="CouponsNameM">】</span>
</div>
<div class="travelDaysHV-Description" >
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan> <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div> </div>
</template>
</div> </div>
</div> </div>
</div> </div>
<!-- 3张 --> <!-- 3张 -->
<div v-if="item.ScenicArray.length>2"> <div v-if="item.ScenicArray.length>2" class="travelDaysHV2 row">
<div class="row MB32"> <div class="travelDaysHV2-imgBox">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" <div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18"> class="travelDaysHVMasterMap3 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}"> <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"> <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="517" :y="280"></FeatureControls> @toSelectImg="SelectImg(0)" :x="516" :y="388"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" <input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic"> @change="uploadpic">
</div> </div>
<VueDraggableResizable v-if="item.ScenicArray.length==3" :w="517" :h="280" <VueDraggableResizable
:ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false" v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
:active="false" :parent="false" axis="y" @activated="onActivated(1)" :h="388" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="x" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x" :x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y" :y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop"> :z="2" @dragstop="onViewSpotDragstopY">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0"> <template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img <img
v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url" v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url" class="absolute" :src="ScenicArrayList[0].NewImaArray[0].Url"
style="height: 100%;"
:id="'viewSpotImg_'+(item*4)+'_0'+index"> :id="'viewSpotImg_'+(item*4)+'_0'+index">
</template> </template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100" <img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_0'+index"> :id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable> </VueDraggableResizable>
<img <img
v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage" v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100" class="absolute"
style="height: 100%;"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"> :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div> </div>
</div> </div>
</div> </div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold travelDaysHV-CouponsName"
:style="{'color':dataAll.TripColor}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">{{item.ScenicArray[0].CouponsName}}</span>
<span class="CouponsNameM">】</span>
</div> </div>
<div class="ML26 flexG"> <div class="travelDaysHV-Description travelDaysHV-Description3">
<template v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan> <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div> </div>
</template>
</div>
</div>
<div class="row MB32">
<div class="flexG">
<template v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div> </div>
</template>
</div> </div>
<div class="ML26 flexS"> <div class="travelDaysHV2-imgBox" style="margin-left: 49px;">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_1'+index" <div :id="'viewSpotBox_'+(item*4)+'_1'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18"> class="travelDaysHVMasterMap3 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}"> <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"> <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="517" :y="280"></FeatureControls> @toSelectImg="SelectImg(1)" :x="516" :y="388"></FeatureControls>
</div> </div>
<VueDraggableResizable <VueDraggableResizable
v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517" v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
:h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false" :h="388" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(1)" :active="false" :parent="false" axis="x" @activated="onActivated(1)"
:x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x" :x="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y" :y="ScenicArrayList&&ScenicArrayList.length>1?ScenicArrayList[1].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop"> :z="2" @dragstop="onViewSpotDragstopY">
<template v-if="ScenicArrayList&&ScenicArrayList.length>1"> <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
<img <img
v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url" v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url" class="absolute"
style="height: 100%;" :src="ScenicArrayList[1].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_1'+index"> :id="'viewSpotImg_'+(item*4)+'_1'+index">
</template> </template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100" <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
...@@ -283,68 +287,90 @@ ...@@ -283,68 +287,90 @@
</VueDraggableResizable> </VueDraggableResizable>
<img <img
v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage" v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100" class="absolute"
style="height: 100%;"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"> :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div style="margin-top: 18px;" v-if="item.ScenicArray.length>1">
<div class="fz21 fontBold travelDaysHV-CouponsName"
:style="{'color':dataAll.TripColor}">
<span class="CouponsNameM">【</span>
<span class="CouponsNameT">{{item.ScenicArray[1].CouponsName}}</span>
<span class="CouponsNameM">】</span>
</div> </div>
<div class="row"> <div class="travelDaysHV-Description travelDaysHV-Description3">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div>
</div>
</div>
<div class="travelDaysHV2-imgBox" v-if="ScenicArrayList.length>2" style="margin-left: 49px;">
<div class="flexS"> <div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_2'+index" <div :id="'viewSpotBox_'+(item*4)+'_2'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18"> class="travelDaysHVMasterMap3 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}"> <div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover"> <div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4"> <div class="featureDay-vToolBar absolute z-index3" style="zoom:3">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" <FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)" :isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
@toSelectImg="SelectImg(2)" :x="517" :y="280"></FeatureControls> @toSelectImg="SelectImg(2)" :x="516" :y="388"></FeatureControls>
</div> </div>
<VueDraggableResizable <VueDraggableResizable
v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517" v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="516"
:h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false" :h="388" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(2)" :active="false" :parent="false" axis="x" @activated="onActivated(2)"
:x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x" :x="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y" :y="ScenicArrayList&&ScenicArrayList.length>2?ScenicArrayList[2].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
:z="2" @dragstop="onViewSpotDragstop"> :z="2" @dragstop="onViewSpotDragstopY">
<template v-if="ScenicArrayList&&ScenicArrayList.length>2"> <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
<img <img
v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url" v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url" class="absolute"
style="height: 100%;" :src="ScenicArrayList[2].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_2'+index"> :id="'viewSpotImg_'+(item*4)+'_2'+index">
</template> </template>
<img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2" class="absolute img100" <img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage" :src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_2'+index"> :id="'viewSpotImg_'+(item*4)+'_2'+index">
</VueDraggableResizable> </VueDraggableResizable>
<img <img
v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage" v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100" class="absolute"
style="height: 100%;"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"> :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ML26 flexG"> <div style="margin-top: 18px;">
<template v-if="item.ScenicArray.length>2"> <div class="fz21 fontBold travelDaysHV-CouponsName"
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div> :style="{'color':dataAll.TripColor}">
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI"> <span class="CouponsNameM">【</span>
<span class="CouponsNameT">{{item.ScenicArray[2].CouponsName}}</span>
<span class="CouponsNameM">】</span>
</div>
<div class="travelDaysHV-Description travelDaysHV-Description3">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan> <vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
</div> </div>
</template>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="travelDaysHVdetails"> <div class="travelDaysHVdetails" :style="{'margin-top':(item.TitleObj.ShowTripType==2&&
(item.ScenicArray.length==1||item.ScenicArray.length==0))
||((item.TitleObj.ShowTripType==1||item.TitleObj.ShowTripType==0)&&
(item.ScenicArray.length>0||item.ScenicArray.length==0))?'47px':'33px'}">
<div class="travelDaysHVdetailsBJ column"> <div class="travelDaysHVdetailsBJ column">
<div class="travelDaysHVTdetails-textBox row-sb"> <div class="travelDaysHVTdetails-textBox row-sb">
<div class="travelDaysdetails-text row"> <div class="travelDaysdetails-text row nowrap">
<div>
<div class="travelDaysHVdetails-icon"> <div class="travelDaysHVdetails-icon">
<span class="iconfont icon-b-meals" <span class="iconfont icon-b-meals"
:style="{'color':backgroundColor2}"></span> :style="{'color':backgroundColor2}"></span>
</div> </div>
</div>
<span class="travelDaysHVdetails-text0">早餐：</span> <span class="travelDaysHVdetails-text0">早餐：</span>
<div class="trtravelDaysHVdetails-textC"> <div class="trtravelDaysHVdetails-textC">
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0"> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
...@@ -352,7 +378,7 @@ ...@@ -352,7 +378,7 @@
</template> </template>
</div> </div>
</div> </div>
<div class="travelDaysdetails-text row"> <div class="travelDaysdetails-text row nowrap">
<span class="travelDaysHVdetails-text0">午餐：</span> <span class="travelDaysHVdetails-text0">午餐：</span>
<div class="trtravelDaysHVdetails-textC"> <div class="trtravelDaysHVdetails-textC">
<template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1"> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
...@@ -361,7 +387,7 @@ ...@@ -361,7 +387,7 @@
</div> </div>
</div> </div>
<div class="travelDaysdetails-text row"> <div class="travelDaysdetails-text row">
<span class="travelDaysHVdetails-text0 iconfont icon-qianming">晚餐：</span> <span class="travelDaysHVdetails-text0">晚餐：</span>
<div class="trtravelDaysHVdetails-textC"> <template <div class="trtravelDaysHVdetails-textC"> <template
v-if="item&&item.DinnerArray&&item.DinnerArray.length>2"> v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}} {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
...@@ -371,11 +397,13 @@ ...@@ -371,11 +397,13 @@
</div> </div>
<div class="travelDaysHVdetails-textBox"></div> <div class="travelDaysHVdetails-textBox"></div>
<div class="travelDaysHVTdetails-textBox row"> <div class="travelDaysHVTdetails-textBox row">
<div class="travelDaysdetails-text right0 row"> <div class="travelDaysdetails-text right0 row nowrap">
<div>
<div class="travelDaysHVdetails-icon"> <div class="travelDaysHVdetails-icon">
<span class="iconfont icon-zhusu" <span class="iconfont icon-zhusu"
:style="{'color':backgroundColor2}"></span> :style="{'color':backgroundColor2}"></span>
</div> </div>
</div>
<span class="travelDaysHVdetails-text0">住宿：</span> <span class="travelDaysHVdetails-text0">住宿：</span>
<div class="trtravelDaysHVdetails-textC" v-if="item.HotelArray"> <div class="trtravelDaysHVdetails-textC" v-if="item.HotelArray">
<template v-if="item.HotelArray.length==1"> <template v-if="item.HotelArray.length==1">
...@@ -1081,7 +1109,7 @@ ...@@ -1081,7 +1109,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="UpgradedVersion2Line UpgradedVersion2LineHV absolute z-index3 row-ajc"> <div v-if="!item.IsBlowUp" class="UpgradedVersion2Line UpgradedVersion2LineHV absolute z-index3 row-ajc">
<span>{{pageHeight>1240?'内容已超出底线':'底线'}}</span> <span>{{pageHeight>1240?'内容已超出底线':'底线'}}</span>
</div> </div>
<!-- <div v-if="pageHeight>(1240+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc" <!-- <div v-if="pageHeight>(1240+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
...@@ -1244,6 +1272,46 @@ ...@@ -1244,6 +1272,46 @@
"viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index "viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
]._data.top = y; ]._data.top = y;
}, },
onViewSpotDragstopY(x, y) {
let imgWidth = document.querySelector(
"#viewSpotImg_" + (this.item * 4) + "_" + this.imgIndex + this.index
).width;
let boxWidth = document.querySelector(
"#viewSpotBox_" + (this.item * 4) + "_" + this.imgIndex + this.index
).offsetWidth;
let cha = boxWidth - imgWidth;
if (cha <= 0) {
if (x < 0 && x < cha) {
x = cha;
} else if (x > 0) {
x = 0;
}
} else {
if (x < 0) {
x = 0;
} else if (x > 0 && x > cha) {
x = cha;
}
}
if (this.ScenicArrayList && this.ScenicArrayList.length > 0) {
this.ScenicArrayList[this.imgIndex].ScenicJson.x = x
this.item.ScenicArray.forEach(x => {
this.ScenicArrayList.forEach(y => {
if (x.CouponsId == y.CouponsId) {
x.ScenicJson.x = y.ScenicJson.x
}
})
})
} else {
this.item.TrafficObj.trafficIntroduce.x = x
this.item.TrafficObj.trafficIntroduce.y = 0
this.item.TrafficObj.Introduce = JSON.stringify(this.item.TrafficObj.trafficIntroduce);
}
this.$refs[
"viewSpotVds_" + (this.item * 4) + "_" + this.imgIndex + this.index
]._data.left = x;
},
SelectImg(index) { SelectImg(index) {
this.imgIndex = index this.imgIndex = index
this.isShowScenicImg = true this.isShowScenicImg = true
...@@ -1362,12 +1430,39 @@ ...@@ -1362,12 +1430,39 @@
</script> </script>
<style> <style>
.travelDaysHVMasterMap3{
height: 388px;
border-radius: 60px 0px 60px 0px;
}
.travelDaysHV-Description{ .travelDaysHV-Description{
font-size: 24px; font-size: 24px;
line-height: 34px; line-height: 34px;
color: #484647; color: #484647;
font-family: DengXian; font-family: DengXian;
font-weight: 400; font-weight: 400;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
margin-top: 10px;
}
.travelDaysHV-Description.travelDaysHV-Description3{
height: 295px;
-webkit-line-clamp: 9;
margin-top: 20px;
}
.travelDaysHV-CouponsName span.CouponsNameM{
position: relative;
top: -5px;
}
.travelDaysHV-CouponsName span.CouponsNameT{
display: inline-block;
max-width: 650px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.travelDaysHV-CouponsName{ .travelDaysHV-CouponsName{
font-size: 30px; font-size: 30px;
...@@ -1405,7 +1500,6 @@ ...@@ -1405,7 +1500,6 @@
font-family: DengXian; font-family: DengXian;
font-weight: 400; font-weight: 400;
color: #484647; color: #484647;
line-height: 28px;
} }
.travelDaysHVdetails-text0{ .travelDaysHVdetails-text0{
font-size: 26px; font-size: 26px;
...@@ -1413,6 +1507,7 @@ ...@@ -1413,6 +1507,7 @@
font-weight: bold; font-weight: bold;
color: #484647; color: #484647;
line-height: 28px; line-height: 28px;
white-space: nowrap;
} }
.travelDaysHVTdetails-textBox{ .travelDaysHVTdetails-textBox{
min-height: 53px; min-height: 53px;
...@@ -1447,7 +1542,6 @@ ...@@ -1447,7 +1542,6 @@
.travelDaysHVdetails{ .travelDaysHVdetails{
margin: 0; margin: 0;
padding: 0 47px 40px 47px; padding: 0 47px 40px 47px;
margin-top: 42px;
} }
.travelDaysHVContent{ .travelDaysHVContent{
padding: 42px 55px; padding: 42px 55px;
......
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