Skip to content

S
SuperMan
Commit 76f8bc81 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 51aa63a1
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 222 deletions
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 76f8bc81
......@@ -106,7 +106,8 @@
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div>
<!--行程特色第三版 -->
<UpgradedVersion :TripColor="TripColor" v-if="FeatureData.FeatureType==8" :FeatureData='FeatureData'></UpgradedVersion>
<UpgradedVersion :TripColor="FeatureData.TripColor" v-if="FeatureData.FeatureType==8"
:FeatureData='FeatureData'></UpgradedVersion>
</div>
</div>
</div>
......@@ -149,7 +150,7 @@
// newFeature3,
UpgradedVersion
},
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType","TripColor"],
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
inject: ['loadConfigInfo'],
data() {
return {
......@@ -567,6 +568,7 @@
}
}
};
</script>
<style>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 76f8bc81
......@@ -39,9 +39,10 @@
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor"
@featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
@unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"></TravelFeature>
<TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature"
id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo">
</TravelFeature>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
:subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
......@@ -179,9 +180,12 @@
Title: "",
Subtitle: "",
LineName: "",
LineShortName: "",
DayList: [],
TemplateId: 1,
IsSave: false //是否保存
IsSave: false, //是否保存
TripColor: "", //行程特色主色
LtName:"",//系列名称
},
//线路行程
journeyList: {
......@@ -270,7 +274,7 @@
/*获取组件配置信息【回调方法】*/
getConfig(configObj) {
this.PostConfig = configObj;
this.PostConfig.TripColor = configObj.TripColor?configObj.TripColor:'#CC6900'//#CC0066
this.PostConfig.TripColor = configObj.TripColor ? configObj.TripColor : '#CC6900' //#CC0066
//没有报价单根据线路设置直采和非直采方式生成线路行程
if (this.IsHaveOffer == 0) {
this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
......@@ -800,9 +804,20 @@
}
this.PriceList.push(priceObj);
}
this.FeatureData.Subtitle = tempData.LtName;
this.FeatureData.LineName = tempData.LineName;
if (tempData.LineShortName && tempData.LineShortName != '') {
this.FeatureData.LineShortName = tempData.LineShortName;
} else {
this.FeatureData.LineShortName = tempData.LineName;
}
//如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
if (tempData.TripColor && tempData.TripColor != '') {
this.FeatureData.TripColor = tempData.TripColor;
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.FeatureData.TripColor = tempData.LineTripColor;
}
this.FeatureData.LtName=tempData.LtName;
this.FeatureData.DayList = tempData.DayList;
this.ConfigId = tempData.ID;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/header.vue
View file @ 76f8bc81
<template>
<div class="UpgradedVersion-header absolute row-sb z-index1">
<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="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogoTwo.png"/>
<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="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogoTwo.png" />
</div>
<div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureData.LineShortName"></vEditDiv>
</div>
</div>
</div>
</template>
<script>
import vEditDiv from "../../TravelTemp/VEditDiv";
export default {
......@@ -21,15 +19,14 @@
},
props: [
'TripColor',
// FeatureData
'FeatureData'
],
data() {
return {
first: '欧洲线',
canEdit: true,
backgroundImg: '',
backgroundImgBj1: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjOne.png',//花纹背景
backgroundImgBj2: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjTwo.png',//白色背景
backgroundImgBj1: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjOne.png', //花纹背景
backgroundImgBj2: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjTwo.png', //白色背景
};
},
methods: {
......@@ -53,45 +50,51 @@
</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;
}
.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>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 76f8bc81
......@@ -2,16 +2,16 @@
<div class="featureHome-form">
<div class="featureHome-text absolute z-index1">
<div class="featureHome-text-title">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureData.LineName"></vEditDiv>
</div>
<div class="featureHome-text-box">
<div class="featureHome-text-box-sod"
:style="{'border':borderBox,'color':TripColor}">
<vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv>
<vEditDiv :canEdit='canEdit1' v-model="FeatureData.LtName"></vEditDiv>
</div>
</div>
<div class="featureHome-text-titleTwo">
<vEditDiv :canEdit='canEdit2' v-model="first2"></vEditDiv>
<vEditDiv :canEdit='canEdit2' v-model="FeatureData.Title"></vEditDiv>
</div>
</div>
<div class="featureHome-left UpgradedVersion-Hover">
......@@ -120,9 +120,7 @@
],
data() {
return {
first: '森之京都~椿山庄.',
first1: '风景美术馆日本平系列',
first2: '顶鸠级住屋宿.温泉.美食.铁道之旅',
first3: '秋 季 国 庆 森 之 京 都 七 日',
first4: '枫叶隧道列车之旅,日本米其林星级美食与住宿追寻,秋季赏枫+网红打卡漫游 印象日本全新改版行程日本旅游新体验',
first5: '在古老的日本樱花街道',
......@@ -141,30 +139,8 @@
name: '',
currentIndex: 0,
imgIndex: 0,
hotelObj: {
title:{
first: '',
second: ''
},
pageList: [],
list: []
},
viewSpotObj: {
title:{
first: '',
second: ''
},
pageList: [],
list: []
},
restaurantObj: {
title:{
first: '',
second: ''
},
pageList: [],
list: []
},
//选取弹窗
isShowScenicImg: false,
choseType:0,
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 76f8bc81
......@@ -2,55 +2,35 @@
<div id="newFeatureBox3">
<!-- UpgradedVersion-homebj 首页、介绍、食、宿、景 UpgradedVersion-otherBj 餐介绍 -->
<div class="UpgradedVersion-box UpgradedVersion-homebj relative"
:class="{'UpgradedVersion-otherBj':item.name=='食详情'}"
v-for="(item,index) in pageList">
:class="{'UpgradedVersion-otherBj':item.name=='食详情'}" v-for="(item,index) in pageList" :key="index+1000">
<!-- logo -->
<Header :TripColor="TripColor"></Header>
<Header :TripColor="TripColor" :FeatureData="FeatureData"></Header>
<!-- 首页 -->
<featureHome
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
v-if="item.name=='首页'"></featureHome>
<featureHome v-if="item.name=='首页'" :index="index" :FeatureData="FeatureData" :TripColor="TripColor"
@toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
<!-- 其余页 -->
<div v-else>
<headerTitle :FeatureData="item" :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
@setTemplate="setTemplate"
v-if="item.name=='介绍'||item.name=='宿'||item.name=='食'||item.name=='景'"></otherJourney>
<otherJourney :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" @setTemplate="setTemplate"
v-if="item.name=='介绍'||item.name=='宿'||item.name=='食'||item.name=='景'"></otherJourney>
<!-- 食详情页 -->
<UpgradedVersionDetails
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
v-if="item.name=='食详情'"></UpgradedVersionDetails>
<UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" v-if="item.name=='食详情'"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<div v-if="item.name!='首页'" :class="{'otherJourney-footer':item.name=='食'||item.name=='景'||item.name=='食详情'}">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':item.name=='食'||item.name=='景'||item.name=='食详情'?TripColor:''}">
:style="{'background':item.name=='食'||item.name=='景'||item.name=='食详情'?TripColor:''}">
<template v-if="item.name!=='食'&&item.name!=='景'&&item.name!=='食详情'">
<div class="introduceFooterBJ introduceFooterOne"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/footerLogo.png" />
<vEditDiv class="z-index2" :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
<div class="introduceFooterBJ introduceFootertThree"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/footerLogo.png" />
<vEditDiv class="z-index2" :canEdit='canEdit' v-model="FeatureData.LineShortName"></vEditDiv>
</div>
<div class="introduceFooterBJ introduceFootertThree" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour" :style="{'background':TripColor}">&nbsp;</div>
</template>
</div>
</div>
......@@ -78,94 +58,94 @@
},
props: [
'TripColor',
// FeatureData
'FeatureData'
],
data() {
return {
first: '欧洲线',
canEdit: true,
pageData:{
name:'首页',
id:0,
tyep:1,
Template:0,
pageData: {
name: '首页',
id: 0,
tyep: 1,
Template: 0,
isDeletePage: false
},
pageList:[
{
pageList: [{
name: '首页',
id:1,
type:1,
Template:0,
id: 1,
type: 1,
Template: 0,
isDeletePage: false
},
{
name: '介绍',
id:2,
type:2,
Template:0,
id: 2,
type: 2,
Template: 0,
isDeletePage: false
},
{
name: '食详情',
id:3,
type:3,
Template:0,
id: 3,
type: 3,
Template: 0,
isDeletePage: false
},
{
name: '宿',
id:4,
type:4,
id: 4,
type: 4,
isDeletePage: false,
Template:1
Template: 1
},
{
name: '食',
id:5,
type:5,
id: 5,
type: 5,
isDeletePage: false,
Template: 2
},
{
name: '景',
id:6,
type:6,
id: 6,
type: 6,
isDeletePage: false,
Template:3
Template: 3
}
]
};
},
methods: {
AddPages(index,FeatureData){
AddPages(index, FeatureData) {
this.pageData = JSON.parse(JSON.stringify(FeatureData))
this.pageData.id = 0
this.pageData.isDeletePage = true
if(this.pageData.type>3){
if (this.pageData.type > 3) {
this.pageData.Template = 1
}
this.pageList.splice(index,0,this.pageData)
this.pageList.splice(index, 0, this.pageData)
},
DeletePages(index,FeatureData){
this.pageList.splice(1,index)
DeletePages(index, FeatureData) {
this.pageList.splice(1, index)
},
setTemplate(index,TemplateType){
setTemplate(index, TemplateType) {
this.pageList[index].Template = TemplateType
this.$forceUpdate()
}
},
computed: {},
watch: {
// FeatureData: {
// handler(val, oldVal) {
computed: {
// },
// deep: true
// },
},
watch: {
FeatureData: {
handler(val, oldVal) {
console.log("UpgradedVersion_Feature", this.FeatureData);
},
deep: true
},
},
mounted() {
console.log("UpgradedVersion_Feature", this.FeatureData);
}
};
......@@ -173,59 +153,70 @@
<style>
@import url("../../../../assets/css/UpgradedVersion.css");
.UpgradedVersion-box .edit_div{
min-width: 30px;
height: 100%;
}
.otherJourney-introduceFooter{
left: 0;
right: 0;
bottom: 32px;
width: 100%;
height: 34px;
/* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/introduceButtom.png')no-repeat center; */
background-size: 100% 100%;
}
.introduceFooterBJ{
height: 100%;
}
.introduceFooterOne{
flex-grow: 1;
margin-right: 5px;
}
.introduceFootertTwo,.introduceFootertThree{
width: 7px;
}
.introduceFootertFour{
width: 120px;
margin-left: 5px;
}
.introduceFooter-text{
}
.introduceFooter-text img{
width: 28px;
height: 28px;
display: inline-block;
margin: 0 9px;
}
.introduceFooter-text .edit_div{
line-height: 34px;
text-align: center;
overflow: hidden;
font-size: 22px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
margin: 0 9px 0 0;
}
.otherJourney-footer .otherJourney-introduceFooter{
/* background: #CC0066; */
}
.otherJourney-footer .edit_div{
display: none;
}
img{
pointer-events: none;
}
.UpgradedVersion-box .edit_div {
min-width: 30px;
height: 100%;
}
.otherJourney-introduceFooter {
left: 0;
right: 0;
bottom: 32px;
width: 100%;
height: 34px;
background-size: 100% 100%;
}
.introduceFooterBJ {
height: 100%;
}
.introduceFooterOne {
flex-grow: 1;
margin-right: 5px;
}
.introduceFootertTwo,
.introduceFootertThree {
width: 7px;
}
.introduceFootertFour {
width: 120px;
margin-left: 5px;
}
.introduceFooter-text {}
.introduceFooter-text img {
width: 28px;
height: 28px;
display: inline-block;
margin: 0 9px;
}
.introduceFooter-text .edit_div {
line-height: 34px;
text-align: center;
overflow: hidden;
font-size: 22px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
margin: 0 9px 0 0;
}
.otherJourney-footer .otherJourney-introduceFooter {
/* background: #CC0066; */
}
.otherJourney-footer .edit_div {
display: none;
}
img {
pointer-events: none;
}
</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