Commit db96ed92 authored by youjie's avatar youjie

no message

parent 04810a41
......@@ -184,9 +184,11 @@
background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center;
background-size: 100% 100%;
}
.travelDaysTitlle-left-text span{
font-family: FZCuSong-B09S !important;
}
.travelDaysTitlle-left-textOne{
font-size: 79px;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
line-height: 55px;
......@@ -194,12 +196,14 @@
}
.travelDaysTitlle-left-textTwo{
font-size: 47px;
font-family: PingFang SC !important;
font-weight: 800;
color: #2A2A2A;
line-height: 55px;
margin-top: 10px;
}
.travelDaysTitlle-left-textTwo span{
font-family: PingFang SC !important;
}
.travelDaysTitlle-right{
flex-grow: 1;
margin-left: 21px;
......@@ -215,8 +219,9 @@
-o-border-radius: 100px 0px 0px 100px;
}
.travelDaysMasterMap{
height: 632px;
margin-top: 14px;
margin-bottom: 41px;
height: 632px;
overflow: hidden;
}
.travelDaysMasterMap img{
......@@ -249,8 +254,8 @@
right: 50px;
}
.travelDaysMasterMap-twoImg{
width: 335px;
height: 189px;
max-width: 335px;
max-height: 189px;
overflow: hidden;
border: 2px solid #FFFFFF;
border-radius: 18px;
......@@ -262,11 +267,10 @@
line-height: 34px;
}
.travelDaysContent{
max-height: 468px;
/* flex-grow: 1; */
line-height: 38px;
padding: 0 44px 0 44px;
margin: 41px 0 47px 0;
overflow: hidden;
/* margin: 41px 0 47px 0; */
}
.travelDaysContent-text{
font-size: 21px;
......@@ -279,7 +283,7 @@
font-weight: bold;
}
.travelDaysdetails{
padding: 0 36px 115px 36px;
padding: 47px 36px 115px 36px;
}
.travelDaysdetailsBJ{
border-radius: 100px;
......@@ -331,6 +335,52 @@
margin: 0 !important;
line-height: 160%;
}
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
.UpgradedVersion-box{
width: 1123px;
height: 1588px;
......
<template>
<div class="UpgradedVersion-header absolute row-sb z-index1">
<div class="UpgradedVersion-header row-sb">
<div class="UpgradedVersion-header-left relative row-aic" :style="{'background':TripColor}">
<img class="header-leftBj absolute z-index2" :src="backgroundImgBj2" />
<img class="header-leftImg" src="https://imgfile.oytour.com/Static/NewTripFeature/headerLogoTwo.png" />
......@@ -57,51 +57,6 @@
</script>
<style>
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
</style>
......@@ -11,8 +11,8 @@
</div> -->
<div class="UpgradedVersion-box UpgradedVersion-homebj relative"
v-for="(item,index) in tripList">
<div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
<Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
<div class="travelDays-form absolute column z-index1">
<div class="travelDaysTitlle row-aic">
<div class="travelDaysTitlle-left">
<div class="travelDaysTitlle-left-text column-ajc">
......@@ -31,17 +31,18 @@
</div>
</div>
</div>
<div class="travelDaysMasterMap relative">
<div class="travelDaysMasterMap-one" :style="{'color':getImgColor(item.details[0].img,'travelDaysImg_one'+index)}">
<div :id="'travelDaysMasterMap_'+index" class="travelDaysMasterMap relative">
<div style="display: none;">{{getHeigthNum('travelDaysMasterMap_'+index,item)}}</div>
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6" :id="'travelDaysImg_one'+index">
<img class="absolute" :src="item.details[0].img">
</div>
<div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2">
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgOne">
<div class="travelDaysMasterMap-twoImg relative bjF6"
:style="{'color':getImgColor(item.details[0].img,'travelDaysImg_two'+index)}"
:style="{'color':'#fff'}"
:id="'travelDaysImg_two'+index"
v-if="(item.details&&item.details.length>1&&item.details[1].img)||(item.jiu2&&item.jiu2.length>0&&item.jiu2[0].url)">
<template v-if="item.details.length>1&&item.details[1].img">
......@@ -60,8 +61,10 @@
</template>
</template>
</div>
</template>
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgTwo">
<div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
:style="{'color':getImgColor(item.details[0].img,'travelDaysImg_three'+index)}"
:style="{'color':'#fff'}"
:id="'travelDaysImg_three'+index"
v-if="(item.details&&item.details.length>2&&item.details[2].img)||(item.jiu2&&item.jiu2.length>1&&item.jiu2[0].url)">
<template v-if="item.details.length>2&&item.details[2].img">
......@@ -80,10 +83,12 @@
</template>
</template>
</div>
</template>
</div>
</div>
<div class="travelDaysContent">
<div class="travelDaysContent column">
<!-- <template v-for="i in 1"></template> -->
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
<span>【{{jindian.title}}】</span>
{{jindian.content}}
......@@ -113,7 +118,7 @@
</div>
<!-- otherJourney-footer -->
<div>
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
<div class="otherJourney-introduceFooter 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>
......@@ -125,8 +130,8 @@
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.tripColor}">&nbsp;</div>
</div>
</div>
</div>
</div>
</div>
......@@ -150,6 +155,32 @@
},
methods: {
getShow(Id,HeightNum,item){
item.imgMapId = Id
if(HeightNum>=243){
item.showImgOne = true
}else{
item.showImgOne = false
}
if(HeightNum>=478){
item.showImgTwo = true
}else{
item.showImgTwo = false
}
this.$forceUpdate()
return
},
getHeigthNum(Id,item){
let that = this
setTimeout(()=>{
var Height = document.getElementById(Id);
if(Height){
let HeightNum = Height.offsetHeight
that.getShow(Id,HeightNum,item)
}
},300)
},
getFontSize(title){
if(title.length>60){
return 929/60 +'px'
......@@ -256,7 +287,14 @@
},
tripList: {
handler(val, oldVal) {
let arrlist = function(arr){
arr.forEach(x=>{
x.showImgOne = true
x.showImgTwo = true
x.imgMapId = null
})
}
arrlist(this.tripList)
},
deep: true,
immediate: true
......
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