Skip to content

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

no message

parent b1f7a346
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 51 deletions
src/assets/css/UpgradedVersion.css
View file @ 9150cb71
......@@ -64,16 +64,15 @@
height: 1588px;
}
.UpgradedVersion-homebj{
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png')no-repeat center;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
}
.UpgradedVersion-introduceBj{
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/introduceBj.png')no-repeat center;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
}
.UpgradedVersion-otherBj{
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBj.png')no-repeat center;
background-size: 100% 100%;
background: #fff;
}
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 9150cb71
<template>
<div class="UpgradedVersionDetails-form absolute row-sb z-index1">
<div class="UpgradedVersionDetails-form absolute row-sb z-index1"
:style="{'background':backgroundColor}">
<div class="UpgradedVersionDetails-box column" v-for="item in 3">
<div class="UpgradedVersionDetails-imgbox row-aic">
<div class="UpgradedVersionDetails-img relative">
......@@ -35,30 +36,31 @@
subheading,
vEditDiv
},
props: {
props: [
'TripColor'
// FeatureData
},
],
data() {
return {
first: '印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺！ 房型 多样 设 计， 京都千饭店外观为京町家的格子风格，非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造，意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道，便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看，眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下，一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华，但连小细节都做得非常精致，散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻，同時享受頂級的休閒時光。 ',
canEdit: true,
first1: '日本料理',
canEdit1: true,
backgroundColor: null
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
TripColor: {
handler(val, oldVal) {
this.backgroundColor = this.hexToRgb(val,0.15)
},
deep: false,
immediate: true
},
},
mounted() {
......@@ -70,9 +72,9 @@
<style>
.UpgradedVersionDetails-form{
left: 0;
top: 341px;
top: 301px;
right: 0;
padding: 0 35px;
padding: 43px 35px 0 35px;
}
.UpgradedVersionDetails-imgbox{
......@@ -108,7 +110,7 @@
}
.UpgradedVersionDetails-Title{
width: 276px;
margin: 111px auto;
margin: 111px auto 44px;
padding: 0 26px;
}
.UpgradedVersionDetails-Img-one{
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/header.vue
View file @ 9150cb71
<template>
<div class="UpgradedVersion-header absolute row-sb z-index1">
<div class="UpgradedVersion-header-left">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogo.png"/>
<div class="UpgradedVersion-header-left row-ajc"
:style="{'background':backgroundImg}">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogoTwo.png"/>
</div>
<div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title">
......@@ -17,13 +18,15 @@
components: {
vEditDiv
},
props: {
props: [
'TripColor',
// FeatureData
},
],
data() {
return {
first: '欧洲线',
canEdit: true,
backgroundImg: ''
};
},
methods: {
......@@ -31,12 +34,14 @@
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
TripColor: {
handler(val, oldVal) {
this.backgroundImg = `url('http://192.168.10.214:8130/Upload/NewTripFeature/logoBj.png') no-repeat right ${val}`
console.log(this.backgroundImg,'=======')
},
deep: false,
immediate: true
},
},
mounted() {
......@@ -51,9 +56,16 @@
left: 0;
right: 0;
}
.UpgradedVersion-header img{
.UpgradedVersion-header-left{
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
background-size: 27px 65px;
}
.UpgradedVersion-header img{
width: 292px;
height: auto;
display: block;
}
.UpgradedVersion-header-title{
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/headerTitle.vue
View file @ 9150cb71
......@@ -6,7 +6,10 @@
<div class="UpgradedVersion-headerTitle-two absolute z-index2">
<vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv>
</div>
<img class="UpgradedVersion-headerTitle-three absolute z-index1" src="http://192.168.10.214:8130/Upload/NewTripFeature/textBj.png" />
<div class="UpgradedVersion-headerTitle-three absolute z-index1"
:style="{'background':TripColor}">&nbsp;</div>
<!-- <img class="UpgradedVersion-headerTitle-three absolute z-index1"
src="http://192.168.10.214:8130/Upload/NewTripFeature/textBj.png" /> -->
</div>
</template>
......@@ -16,9 +19,10 @@
components: {
vEditDiv
},
props: {
props: [
'TripColor',
// FeatureData
},
],
data() {
return {
first: '森之京都~椿山庄.风景美术馆日本平系列',
......@@ -77,9 +81,10 @@
height: 40px;
}
.UpgradedVersion-headerTitle-three{
top: 228px;
top: 237px;
left: 370px;
width: 384px;
height: 25px;
width: 379px;
height: 14px;
border-radius: 7px;
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 9150cb71
......@@ -2,9 +2,12 @@
<div class="UpgradedVersion-subheading">
<div class="UpgradedVersion-subIde absolute z-index3">
<!-- UpgradedVersion-otherSubheading 宿、食、景 标记 -->
<div class="UpgradedVersion-otherSubheading">
<div class="">
<div class="UpgradedVersion-subIdeBj relative z-index2">
<div class="UpgradedVersion-subIdeBj-h absolute">
<div class="UpgradedVersion-subIdeBj1 absolute z-index2"
:style="{'background':TripColor}">&nbsp;</div>
<!-- <div class="UpgradedVersion-subIdeBj2 absolute z-index1">&nbsp;</div> -->
<div class="UpgradedVersion-subIdeBj-h absolute z-index3">
<vEditDiv :canEdit='canEdit2' v-model="first2"></vEditDiv>
</div>
</div>
......@@ -36,8 +39,9 @@
<!-- subIdeImgBox 食景副标题图 -->
<div class="subIdeImgBox">
<div class="UpgradedVersion-subIdeImgBox absolute row z-index1">
<div class="UpgradedVersion-subIdeImgBoxL">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/subheadingBj.png"/>
<div class="UpgradedVersion-subIdeImgBoxL"
:style="{'background':TripColor}">
<!-- <img src="http://192.168.10.214:8130/Upload/NewTripFeature/subheadingBj.png"/> -->
</div>
<div class="UpgradedVersion-subIdeImgBoxR"
:style="{'background':TripColor}">&nbsp;</div>
......@@ -45,14 +49,15 @@
</div>
<div class="UpgradedVersion-subIdeImgForm">
<!-- subIdeImgForm2 食 subIdeImgForm3 景 -->
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm3 absolute z-index2">
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm2 absolute z-index2">
<div class="subIdeImg1">
<div class="relative">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm3-two absolute z-index2">
<!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 -->
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm2-two absolute z-index2">
<div class="subIdeImg1">
<div class="relative">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
......@@ -105,7 +110,7 @@
handler(val, oldVal) {
},
deep: true,
deep: false,
immediate: true
},
},
......@@ -125,22 +130,39 @@
top: 827px;
width: 154px;
height: 155px;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/titleBj.png')no-repeat center;
background-size: 100% 100%;
overflow: hidden;
/* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/titleBj.png')no-repeat center;
background-size: 100% 100%; */
/* overflow: hidden; */
}
.UpgradedVersion-subIdeBj1{
right: 7px;
left: 0;
top: 0;
width: 100%;
height: 100%;
border-radius: 100%;
}
/* .UpgradedVersion-subIdeBj2{
right: 0;
left: 7px;
top: 10px;
width: 100%;
height: 100%;
border-radius: 50%;
background: black;
} */
.UpgradedVersion-subIdeBj-h{
width: 109px;
height: 71px;
overflow: hidden;
left: 18px;
top: 35px;
left: 22px;
top: 41px;
}
.UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj-h{
width: 54px;
height: 71px;
text-align: center;
left: 30px;
left: 34px;
top: 20px;
}
.UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj{
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 9150cb71
......@@ -223,7 +223,7 @@
handler(val, oldVal) {
this.borderBox = '2px solid '+val
},
deep: true,
deep: false,
immediate: true
},
},
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 9150cb71
......@@ -5,12 +5,12 @@
:class="{'UpgradedVersion-introduceBj':index==1,'UpgradedVersion-otherBj':index>1}"
v-for="(item,index) in 4">
<!-- logo -->
<Header></Header>
<Header :TripColor="TripColor"></Header>
<!-- 首页 -->
<featureHome :TripColor="TripColor" v-if="index==0"></featureHome>
<!-- 其余页 -->
<div v-if="index>0">
<headerTitle></headerTitle>
<headerTitle :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :TripColor="TripColor" v-if="index==1||index==3"></otherJourney>
<!-- 行程详情页 -->
......
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