Skip to content

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

no message

parent 3913bcd7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1328 additions and 1 deletion
src/assets/css/UpgradedVersion.css 0 → 100644
View file @ 85e73afe
.relative{
position: relative;
}
.absolute{
position: absolute;
}
.z-index1{
z-index: 1;
}
.z-index2{
z-index: 2;
}
.z-index3{
z-index: 3;
}
.row-aic{
display: flex;
align-items: center;
}
.row-sb{
display:flex;
justify-content: space-between;
}
.row-sb-nowrap{
display:flex;
justify-content: space-between;
flex-wrap: nowrap;
}
.column{
display:flex;
flex-direction: column;
}
.marginL20{
margin-left: 20px;
}
.marginL11{
margin-left: 11px;
}
.marginL15{
margin-left: 15px;
}
.marginT20{
margin-top: 20px;
}
.marginT10{
margin-top: 10px;
}
.marginT13{
margin-top: 13px;
}
.marginT14{
margin-top: 14px;
}
.UpgradedVersion-box{
width: 1123px;
height: 1588px;
}
.UpgradedVersion-homebj{
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.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-size: 100% 100%;
}
.UpgradedVersion-otherBj{
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBj.png')no-repeat center;
background-size: 100% 100%;
}
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 85e73afe
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<div class="TrfList clearfix"> <div class="TrfList clearfix">
<div class="TFslide" v-for="item in TypeArray" <div class="TFslide" v-for="item in TypeArray"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode" v-if="(item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3"> @click="clickFeature(item)" :key="item.subCode"
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)&&item.TypeState!=8">
<img v-bind:src="item.imgUrl"> <img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div> <div>{{item.ckTitle}}</div>
</div> </div>
...@@ -97,6 +98,7 @@ ...@@ -97,6 +98,7 @@
v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag"> v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2> <newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div> </div>
<UpgradedVersion v-if="FeatureData.FeatureType==8"></UpgradedVersion>
</div> </div>
</div> </div>
</div> </div>
...@@ -119,6 +121,7 @@ ...@@ -119,6 +121,7 @@
import newFeature from './travelFeature/index'; import newFeature from './travelFeature/index';
// import newFeature2 from './TravelTemp/travelFeature2'; // import newFeature2 from './TravelTemp/travelFeature2';
import newFeature2 from './TravelTemp/travelFeature3'; import newFeature2 from './TravelTemp/travelFeature3';
import UpgradedVersion from './UpgradedVersion/index';
import { import {
setTimeout setTimeout
} from 'timers'; } from 'timers';
...@@ -138,6 +141,7 @@ ...@@ -138,6 +141,7 @@
newFeature, newFeature,
newFeature2, newFeature2,
// newFeature3, // newFeature3,
UpgradedVersion
}, },
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"], props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
inject: ['loadConfigInfo'], inject: ['loadConfigInfo'],
...@@ -202,6 +206,12 @@ ...@@ -202,6 +206,12 @@
isShow: false, isShow: false,
imgUrl: Travelslider, imgUrl: Travelslider,
TypeState: 7 TypeState: 7
},
{
ckTitle: "行程特色-新",
isShow: false,
imgUrl: Travelslider,
TypeState: 8
} }
], //tab数组 ], //tab数组
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue 0 → 100644
View file @ 85e73afe
<template>
<div class="MasterMapList-form absolute z-index1">
<div class="MasterMapList-box">
<!-- <div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> -->
<!-- <div class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL20">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div> -->
<!--
<div class="MasterMapList-4 relative">
<div class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL20">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
<div class="MasterMapList-2 row-sb marginT20">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL20">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
-->
<!--
<div class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginT14">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginT14">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
<div class="MasterMapList-8-two marginT13">
<div class="MasterMapList-8-oneR row-sb">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
</div> -->
<div class="MasterMapList-9 relative">
<div class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL row-sb">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL11">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginT14">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginT14">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
<div class="MasterMapList-8-two marginT13">
<div class="MasterMapList-8-oneR row-sb">
<div class="MasterMapList-1 relative">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
<div class="MasterMapList-1 relative marginL15">
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import vEditDiv from "../../TravelTemp/VEditDiv";
export default {
components: {
vEditDiv,
},
props: {
// FeatureData
},
data() {
return {
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
.MasterMapList-form{
left: 33px;
top: 268px;
width: 1054px;
height: 643px;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/imgListBj.png')no-repeat center;
background-size: 100% 100%;
}
.MasterMapList-box{
width: 1019px;
height: 577px;
margin-left: 18px;
margin-top: 34px;
/* background: ##E8E8E8; */
border-radius: 14px;
overflow: hidden;
}
.MasterMapList-1,.MasterMapList-2,.MasterMapList-4,.MasterMapList-8{
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.MasterMapList-1 img{
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.MasterMapList-4 .MasterMapList-2{
height: 279px;
}
.MasterMapList-4 .MasterMapList-2 .MasterMapList-1,
.MasterMapList-8 .MasterMapList-1{
border-radius: 14px;
overflow: hidden;
}
.MasterMapList-8-oneL{
width: 776px;
height: 427px;
}
.MasterMapList-8-oneR{
width: 240px;
}
.MasterMapList-8-two .MasterMapList-8-oneR{
width: 100%;
height: 136px;
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/header.vue 0 → 100644
View file @ 85e73afe
<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>
<div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
</div>
</div>
</template>
<script>
import vEditDiv from "../../TravelTemp/VEditDiv";
export default {
components: {
vEditDiv
},
props: {
// FeatureData
},
data() {
return {
first: '欧洲线',
canEdit: true,
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
.UpgradedVersion-header{
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header img{
width: 341px;
height: 65px;
display: block;
}
.UpgradedVersion-header-title{
padding: 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>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/headerTitle.vue 0 → 100644
View file @ 85e73afe
<template>
<div class="UpgradedVersion-headerTitle">
<div class="UpgradedVersion-headerTitle-one absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
<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>
</template>
<script>
import vEditDiv from "../../TravelTemp/VEditDiv";
export default {
components: {
vEditDiv
},
props: {
// FeatureData
},
data() {
return {
first: '森之京都~椿山庄.风景美术馆日本平系列',
first1: '温泉.美食.叡山铁道秋枫漫游之旅',
canEdit: true,
canEdit1: true,
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
.UpgradedVersion-headerTitle{
text-align: center;
}
.UpgradedVersion-headerTitle-one{
top: 139px;
left: 124px;
right: 124px;
height: 49px;
overflow: hidden;
font-size: 49px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-headerTitle-two{
top: 205px;
left: 144px;
right: 144px;
font-size: 34px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-headerTitle-two .edit_div{
height: 40px;
overflow: hidden;
}
.UpgradedVersion-headerTitle-three{
top: 228px;
left: 370px;
width: 384px;
height: 25px;
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue 0 → 100644
View file @ 85e73afe
<template>
<div class="UpgradedVersion-subheading">
<div class="UpgradedVersion-subIde absolute z-index3">
<div class="UpgradedVersion-subIdeBj relative">
<vEditDiv class="absolute" :canEdit='canEdit2' v-model="first2"></vEditDiv>
</div>
<img class="UpgradedVersion-titleIcon relative" src="http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"/>
<!-- 副标题 -->
<div>
<div class="UpgradedVersion-subIdeText relative">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
<div class="UpgradedVersion-subIdeTitle relative">
<div class="UpgradedVersion-subIdeTitleBj absolute z-index1"></div>
<div class="UpgradedVersion-sT relative row-aic z-index2">
<div class="UpgradedVersion-sTL"></div>
<div class="UpgradedVersion-sTR marginL20">
<vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv>
</div>
</div>
</div>
</div>
</div>
<!-- 介绍标题 -->
<!-- <div class="UpgradedVersion-intTitle">
<div class="UpgradedVersion-intTitle-one absolute">
<vEditDiv :canEdit='canEdit3' v-model="first3"></vEditDiv>
</div>
<div class="UpgradedVersion-intTitle-two absolute">
<vEditDiv :canEdit='canEdit4' v-model="first4"></vEditDiv>
</div>
</div> -->
</div>
</template>
<script>
import vEditDiv from "../../TravelTemp/VEditDiv";
export default {
components: {
vEditDiv
},
props: {
// FeatureData
},
data() {
return {
first: '五星级风景美术馆',
first1: '新仓山浅间公园',
first2: '介绍',//介绍
first3: '日本旅行专家',
first4: '『印象日本』日本豪华游代名词 ',
canEdit: true,
canEdit1: true,
canEdit2: true,
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
.UpgradedVersion-subIde{
left: 72px;
top: 827px;
}
.UpgradedVersion-subIdeBj{
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;
}
.UpgradedVersion-subIdeBj .edit_div{
left: 18px;
top: 37px;
font-size: 53px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #FFFFFF;
}
.UpgradedVersion-titleIcon{
width: 64px;
height: 28px;
left: 189px;
top: -80px;
}
.UpgradedVersion-subIdeText{
left: 189px;
right: 350px;
top: -70px;
height: 38px;
overflow: hidden;
font-size: 30px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-subIdeTitle{
left: 31px;
top: -80px;
}
.UpgradedVersion-subIdeTitleBj{
width: 233px;
height: 234px;
background: #D23181;
opacity: 0.2;
border-radius: 50%;
left: -41px;
top: -69px;
}
.UpgradedVersion-sT{
left: -6px;
top: 29px;
}
.UpgradedVersion-sTL{
width: 17px;
height: 63px;
background: #CC0066;
border-radius: 9px;
}
.UpgradedVersion-sTR{
font-size: 45px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-intTitle{
text-align: center;
}
.UpgradedVersion-intTitle-one{
top: 944px;
left: 300px;
right: 300px;
height: 70px;
overflow: hidden;
font-size: 60px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-intTitle-two{
top: 1046px;
left: 200px;
right: 200px;
height: 50px;
overflow: hidden;
font-size: 42px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #2A2A2A;
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue 0 → 100644
View file @ 85e73afe
<template>
<div id="newFeatureBox">
<!-- UpgradedVersion-introduceBj UpgradedVersion-otherBj -->
<div class="UpgradedVersion-box UpgradedVersion-homebj relative">
<!-- logo -->
<Header></Header>
<!-- 首页 -->
<featureHome></featureHome>
<!-- 其余页 -->
<!-- <div>
<headerTitle></headerTitle>
<otherJourney></otherJourney>
</div> -->
</div>
</div>
</template>
<script>
import Header from "./components/header";
import headerTitle from "./components/headerTitle";
import featureHome from "./featureHome";
import otherJourney from "./otherJourney";
export default {
components: {
Header,
headerTitle,
featureHome,
otherJourney,
},
props: {
// FeatureData
},
data() {
return {
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
@import url("../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue 0 → 100644
View file @ 85e73afe
<template>
<div class="otherJourney-form">
<MasterMapList></MasterMapList>
<subheading></subheading>
</div>
</template>
<script>
import MasterMapList from "./components/MasterMapList";
import subheading from "./components/subheading";
export default {
components: {
MasterMapList,
subheading
},
props: {
// FeatureData
},
data() {
return {
first: '森之京都~椿山庄.',
first1: '风景美术馆日本平系列',
first2: '顶鸠级住屋宿.温泉.美食.铁道之旅',
first3: '秋 季 国 庆 森 之 京 都 七 日',
first4: '枫叶隧道列车之旅,日本米其林星级美食与住宿追寻,秋季赏枫+网红打卡漫游 </br> 印象日本全新改版行程日本旅游新体验',
first5: '在古老的日本樱花街道',
first6: '遇见最美好的自己',
first7: '冲绳 大阪城公园湖 伊豆 大阪',
first8: '大阪 京都 富士山 伊豆 东京 京都',
canEdit: true,
canEdit1: true,
canEdit2: true,
canEdit3: true,
canEdit4: true,
canEdit5: true,
canEdit6: true,
canEdit7: true,
canEdit8: true,
};
},
methods: {
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
// },
// deep: true
// },
},
mounted() {
}
};
</script>
<style>
</style>
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