Skip to content

S
SuperMan
Commit 8c8ad3f3 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 0ffca828 04101f7f
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 93 deletions
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 8c8ad3f3
......@@ -685,10 +685,15 @@
this.journeyList.isFileUpload = true;
this.journeyList.DayNum = configData.Days.length;
this.journeyList.NightNum = this.journeyList.DayNum - 1;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
x.zoom = 0.44
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
x.zoom = 0.285
}
})
}
arrDayList(dayList)
......@@ -949,10 +954,15 @@
this.journeyList.NightNum = tempData.NightNum;
this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
this.journeyList.StartCityId = tempData.StartCityId;
let _this = this
let arrDayList = function(list){
list.forEach(x=>{
x.IsBlowUp = false
x.zoom = 0.44
if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
x.zoom = 0.44
}else if(_this.journeyList.FeaturePageType==1){
x.zoom = 0.285
}
})
}
arrDayList(tempData.DayList)
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ 8c8ad3f3
......@@ -2,10 +2,10 @@
<div :style="{'height':item.zoom==1?'auto':'100%',
'overflow':item.zoom==1?'auto':'hidden'}"
v-if="RenderingOk">
<div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" :style="{'zoom': item.zoom}">
<div class="UpgradedVersionHV-box2 relative" :style="{'zoom': item.zoom}">
<div class="z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<div :id="'LineOfTravel'+(item*4)+'_0'+index">
<div class="travelDaysTitlle row-aic" style="min-height: 122px;" :style="{'background': backgroundColor}">
<div class="travelDaysTitlle row-aic" style="min-height: 190px;" :style="{'background': backgroundColor}">
<div class="travelDaysHVTitlle-left flexS">
<div class="relative">
<div class="travelDaysHVTitlle-left-text column-ajc">
......@@ -30,34 +30,33 @@
{{item.TitleObj.Title}}
</span>
</div>
<div class="HVTitlle-header1" v-if="item.TitleObj.Description">
<div class="HVTitlle-header1" v-if="!item.TitleObj.Description">
{{item.TitleObj.Description}}
</div>
</div>
</div>
</div>
<div style="min-height:672px">
<!-- 一张图 1-单张图，2-多张图-->
<template v-if="
(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))">
<div style="min-height:1050px">
<div class="travelDaysHVMasterMap2-box">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
<!-- 一张图 1-单张图，2-多张图-->
<div v-if="(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))" :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysHVMasterMap relative hidden"
style="margin-top: 0;">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="1123" :y="512"></FeatureControls>
@toSelectImg="SelectImg(0)" :x="1750" :y="800"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic">
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1123"
:h="512" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1750"
:h="800" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
: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"
......@@ -103,11 +102,244 @@
</div>
</div>
</div>
<div v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1"
class="travelDaysHV-box">
<!-- 2张 -->
<div v-if="item.ScenicArray.length==2" class="travelDaysHV2 row">
<div class="travelDaysHV2-imgBox">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysHVMasterMap2 hidden relative borderRadius18">
<div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="786" :y="524"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic">
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
:h="524" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
: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"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img
v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</template>
<img v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
<div style="margin-top: 23px;" v-if="item.ScenicArray.length>0">
<div class="fz21 fontBold travelDaysHV-CouponsName color2A2A2A"
:style="{'color':dataAll.TripColor}">【{{item.ScenicArray[0].CouponsName}}】</div>
<div class="travelDaysHV-Description" style="margin-top: 21px;">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div>
</div>
</div>
<div class="travelDaysHV2-imgBox" v-if="ScenicArrayList.length>1" style="margin-left: 74px;">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_1'+index"
class="travelDaysHVMasterMap2 hidden relative borderRadius18">
<div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="786" :y="524"></FeatureControls>
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
:h="524" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(1)"
: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"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>1">
<img
v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_1'+index">
</template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_1'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
</div>
<div class="ML26 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>
</template>
</div>
</div>
</div>
<!-- 3张 -->
<div v-if="item.ScenicArray.length>2">
<div class="row MB32">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="517" :y="280"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic">
</div>
<VueDraggableResizable v-if="item.ScenicArray.length==3" :w="517" :h="280"
:ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(1)"
: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"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>0">
<img
v-if="!ScenicArrayList[0].NewImaArray[0].FileType&&ScenicArrayList[0].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[0].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_0'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
</div>
<div class="ML26 flexG">
<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>
</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>
</template>
</div>
<div class="ML26 flexS">
<div :id="'viewSpotBox_'+(item*4)+'_1'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="517" :y="280"></FeatureControls>
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>1||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
:h="280" :ref="'viewSpotVds_' + item * 4 + '_1'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(1)"
: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"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>1">
<img
v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[1].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_1'+index">
</template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_1'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_2'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
@toSelectImg="SelectImg(2)" :x="517" :y="280"></FeatureControls>
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>2||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="517"
:h="280" :ref="'viewSpotVds_' + item * 4 + '_2'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(2)"
: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"
:z="2" @dragstop="onViewSpotDragstop">
<template v-if="ScenicArrayList&&ScenicArrayList.length>2">
<img
v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
class="absolute img100" :src="ScenicArrayList[2].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_2'+index">
</template>
<img v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2" class="absolute img100"
:src="item.TrafficObj.trafficIntroduce.IntroduceImage"
:id="'viewSpotImg_'+(item*4)+'_2'+index">
</VueDraggableResizable>
<img
v-if="ScenicArrayList.length==2&&item.ScenicArray.length==2&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute img100"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div>
</div>
</div>
</div>
<div class="ML26 flexG">
<template v-if="item.ScenicArray.length>2">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
</div>
</template>
</div>
</div>
</div>
</div>
<div class="travelDaysHVdetails">
<div class="travelDaysHVdetailsBJ column">
<div class="travelDaysdetails-textBox row-sb">
<div class="travelDaysHVTdetails-textBox row-sb">
<div class="travelDaysdetails-text row">
<div class="travelDaysHVdetails-icon">
<span class="iconfont icon-b-meals"
......@@ -138,11 +370,11 @@
</div>
</div>
<div class="travelDaysHVdetails-textBox"></div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysHVTdetails-textBox row">
<div class="travelDaysdetails-text right0 row">
<div class="travelDaysHVdetails-icon">
<span class="iconfont icon-zhusu"
:style="{'color':backgroundColor2}" style="margin-left: 0; margin-top: 3px;"></span>
:style="{'color':backgroundColor2}"></span>
</div>
<span class="travelDaysHVdetails-text0">住宿：</span>
<div class="trtravelDaysHVdetails-textC" v-if="item.HotelArray">
......@@ -158,28 +390,26 @@
</div>
</div>
</div>
</template>
<template v-if="false">
<template v-if="item.TitleObj.ShowTripType==2&&item.ScenicArray.length>1">
<div style="display: none;"></div>
<div class="column travelDaysMasterMap2-box">
<div class="column travelDaysHVMasterMap2-box">
<!-- 2张 -->
<div v-if="item.ScenicArray.length==2">
<div class="MB25">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysMasterMap2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
class="travelDaysHVMasterMap2 hidden relative">
<div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="1060" :y="583"></FeatureControls>
@toSelectImg="SelectImg(0)" :x="786" :y="524"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index"
@change="uploadpic">
</div>
<VueDraggableResizable
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="1060"
:h="583" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage" :w="786"
:h="524" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
: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"
......@@ -214,7 +444,7 @@
class="travelDaysMasterMap2_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="524" :y="250"></FeatureControls>
......@@ -256,14 +486,14 @@
</div>
<!-- 3张 -->
<div v-if="item.ScenicArray.length==3">
<div v-if="item.ScenicArray.length>2">
<div class="row MB32">
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="517" :y="280"></FeatureControls>
......@@ -317,7 +547,7 @@
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="517" :y="280"></FeatureControls>
......@@ -354,7 +584,7 @@
class="travelDaysMasterMap3_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(2)"
@toSelectImg="SelectImg(2)" :x="517" :y="280"></FeatureControls>
......@@ -394,6 +624,7 @@
</div>
</div>
</div>
<template v-if="false">
<!-- 4张 -->
<template v-if="item.ScenicArray.length==4">
<div class="row">
......@@ -402,7 +633,7 @@
class="travelDaysMasterMap4_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="696" :y="449"></FeatureControls>
......@@ -450,7 +681,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(1)" @toSelectImg="SelectImg(1)" :x="331" :y="214">
......@@ -497,7 +728,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
......@@ -544,7 +775,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
......@@ -595,7 +826,7 @@
class="travelDaysMasterMap5_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)"
@toSelectImg="SelectImg(0)" :x="514" :y="291"></FeatureControls>
......@@ -638,7 +869,7 @@
class="travelDaysMasterMap5_1 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(1)"
@toSelectImg="SelectImg(1)" :x="514" :y="291"></FeatureControls>
......@@ -682,7 +913,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(2)" @toSelectImg="SelectImg(2)" :x="331" :y="214">
......@@ -729,7 +960,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(3)" @toSelectImg="SelectImg(3)" :x="331" :y="214">
......@@ -776,7 +1007,7 @@
class="travelDaysMasterMap4_2 hidden relative borderRadius18">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:4">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'"
:isTemplate="false" :isUploadImg="true" :isSelectImg="true"
@toUploadImg="UploadImg(4)" @toSelectImg="SelectImg(4)" :x="331" :y="214">
......@@ -819,9 +1050,10 @@
</div>
</div>
</div>
</template>
</div>
</template>
<template v-if="false">
<div class="travelDaysdetails-tsTextBox"
v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
<div :id="'WarmTip_'+index" class="travelDaysdetails-tsText row relative"
......@@ -836,7 +1068,7 @@
</div>
<!-- otherJourney-footer -->
<div v-if="item.zoom!=1" :class="[item.zoom==1?'':'footer']">
<div v-if="false" :class="[item.zoom==1?'':'footer']">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.TripColor}">&nbsp;</div>
......@@ -850,12 +1082,12 @@
</div>
</div>
<div class="UpgradedVersion2Line UpgradedVersion2LineHV absolute z-index3 row-ajc">
<span>{{pageHeight>794?'超出内容分割到下一页':'底线'}}</span>
<span>{{pageHeight>1240?'内容已超出底线':'底线'}}</span>
</div>
<div v-if="pageHeight>(794+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
:style="{'top': pageHeight>794&&pageHeight<1588?pageHeight+'px':'1588px'}">
<!-- <div v-if="pageHeight>(1240+20)" class="UpgradedVersion2Line absolute z-index3 row-ajc"
:style="{'top': pageHeight>1240&&pageHeight<2480?pageHeight+'px':'2480px'}">
<span>底线</span>
</div>
</div> -->
</div>
<el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
......@@ -1130,74 +1362,107 @@
</script>
<style>
.travelDaysHV-Description{
font-size: 24px;
line-height: 34px;
color: #484647;
font-family: DengXian;
font-weight: 400;
}
.travelDaysHV-CouponsName{
font-size: 30px;
text-align: center;
font-family: Microsoft YaHei;
}
.travelDaysHVMasterMap-one{
height: 524px;
}
.travelDaysHVMasterMap2 {
height: 524px;
border-radius: 50px 0px 50px 0px;
}
.travelDaysHV2-imgBox{
width: 767px;
}
.travelDaysHV-box{
padding: 47px 54px 0 54px;
}
.travelDaysHVdetails-icon span{
margin-left: 1px;
font-size: 20px;
}
.travelDaysHVdetails-icon{
width: 23px;
height: 23px;
width: 36px;
height: 36px;
border-radius: 50%;
background: #D6CEC1;
font-size: 15px;
text-align: center;
line-height: 18px;
margin-right: 19px;
line-height: 34px;
margin-right: 30px;
}
.trtravelDaysHVdetails-textC{
font-size: 17px;
font-size: 26px;
font-family: DengXian;
font-weight: 400;
color: #484647;
line-height: 18px;
line-height: 28px;
}
.travelDaysHVdetails-text0{
font-size: 17px;
font-size: 26px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #484647;
line-height: 18px;
line-height: 28px;
}
.travelDaysHVTdetails-textBox{
min-height: 53px;
align-items: center;
}
.travelDaysHVdetails-textBox{
width: 100%;
height: 1px;
border-bottom: 1px solid #E8E8E8;
margin: 9px 0;
height: 2px;
background:#E8E8E8;
margin: 14px 0;
}
.travelDaysHVContent-text .textBold{
font-size: 19px;
margin-bottom: 10px;
font-size: 30px;
margin-bottom: 29px;
}
.travelDaysHVContent-text:last-child{
margin-bottom: 0;
}
.travelDaysHVContent-text{
font-size: 17px;
font-size: 26px;
font-family: DengXian;
font-weight: bold;
color: #FFFFFF;
line-height: 26px;
margin-bottom: 40px;
}
.travelDaysHVdetailsBJ{
background: rgba(255,255,255, 0.8);
padding: 15px 35px;
border-radius: 13px;
padding: 16px 55px;
border-radius: 20px;
}
.travelDaysHVdetails{
margin: 0;
padding: 26px 30px;
margin-top: 20px;
padding: 0 47px 40px 47px;
margin-top: 42px;
}
.travelDaysHVContent{
padding: 27px 35px;
padding: 42px 55px;
background: rgba(23,23,23,0.4);
margin: 0 36px;
margin-bottom: 32px;
margin: 0 57px;
margin-bottom: 50px;
}
.travelDaysHVMasterMap img{
width: 100%;
}
.travelDaysHVMasterMap{
height: 512px;
height: 800px;
}
.travelDaysHVMasterMap2-box{
height: 672px;
height: 1050px;
background: url('http://imgfile.oytour.com/Static/bjHV.png')no-repeat;
background-size: 100% 100%;
}
......@@ -1208,16 +1473,15 @@
right: 0;
}
.UpgradedVersion2Line.UpgradedVersion2LineHV{
top: 794px;
top: 1240px;
}
.HVTitlle-header1{
width: 855px;
font-size: 20px;
width: 1342px;
font-size: 26px;
font-family: DengXian;
font-weight: bold;
color: #242424;
margin-top: 16px;
margin-left: 25px;
margin-top: 22px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -1225,17 +1489,17 @@
-webkit-line-clamp: 2;
overflow: hidden;
text-align: left;
line-height: 24px;
line-height: 38px;
}
.HVTitlle-header0 img{
width: 19px;
height: 20px;
margin-right: 10px;
top: 3px;
width: 29px;
height: 32px;
margin-right: 23px;
top: 7px;
}
.HVTitlle-header0 span{
width: 855px;
font-size: 20px;
width: 1342px;
font-size: 32px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #242424;
......@@ -1244,7 +1508,7 @@
overflow: hidden;
}
.travelDaysHVTitlle-right{
margin-left: 39px;
margin-left: 54px;
flex-wrap: nowrap;
flex: 1;
overflow: hidden;
......@@ -1259,7 +1523,7 @@
padding: 5px 0;
}
.travelDaysHVTitlle-right-text{
padding-left: 39px;
padding-left: 72px;
justify-content: center;
}
.travelDaysHVTitlle-left-textOne img{
......@@ -1267,18 +1531,22 @@
display: block;
}
.travelDaysHVTitlle-left-textOne{
width: 80px;
height: 23px;
margin-top: 4px;
width: 125px;
height: 36px;
margin-top: 6px;
}
.travelDaysHVTitlle-left-textTwo{
font-family: Microsoft YaHei;
font-size: 33px;
font-size: 52px;
font-weight: bold;
color: #242424;
}
.travelDaysHVTitlle-left{
margin-left: 39px;
margin-left: 61px;
}
.UpgradedVersionHV-box2{
width: 1750px;
background: #fff;
}
......
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