Skip to content

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

no message

parent bc26660d
Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 141 deletions
src/assets/css/UpgradedVersion.css
View file @ 30943628
.bjE6{
background: #e6e6e6;
}
.relative{ .relative{
position: relative; position: relative;
} }
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 30943628
<template> <template>
<div class="UpgradedVersionDetails-form absolute row-sb z-index1" <div class="UpgradedVersionDetails-form absolute row-sb z-index1"
:style="{'background':backgroundColor}"> :style="{'background':backgroundColor}">
<div class="UpgradedVersionDetails-form-Box absolute UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-formBox1 absolute">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'row'"
:isDeletePage="FeatureData.isDeletePage"
:pagesType="3"
@toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" id='restaurantfile' @change="uploadpic">
</div>
</div>
<div class="UpgradedVersionDetails-box column" v-for="(item,index) in 3"> <div class="UpgradedVersionDetails-box column" v-for="(item,index) in 3">
<div class="UpgradedVersionDetails-imgbox row-aic"> <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative"> <div class="UpgradedVersionDetails-img relative">
<div> <div class="UpgradedVersionDetails1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="false"
@toUploadImg="UploadImg"
@toSelectImg="SelectImg"
@toAddImg="AddImg"
@toDeleteImg="DeleteImg"/>
</div>
<div class="UpgradedVersionDetails-imgOne bjE6">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div> <div class="UpgradedVersionDetails-detailsTop absolute"></div>
...@@ -41,15 +66,20 @@ ...@@ -41,15 +66,20 @@
import MasterMapList from "./components/MasterMapList"; import MasterMapList from "./components/MasterMapList";
import subheading from "./components/subheading"; import subheading from "./components/subheading";
import vEditDiv from "../TravelTemp/VEditDiv"; import vEditDiv from "../TravelTemp/VEditDiv";
import imgControls from "./components/imgControls";
import FeatureControls from "./components/featureControls";
export default { export default {
components: { components: {
MasterMapList, MasterMapList,
subheading, subheading,
vEditDiv vEditDiv,
FeatureControls,
imgControls
}, },
props: [ props: [
'TripColor' 'index',
// FeatureData 'TripColor',
'FeatureData'
], ],
data() { data() {
return { return {
...@@ -66,7 +96,44 @@ ...@@ -66,7 +96,44 @@
}; };
}, },
methods: { methods: {
UploadImg(){
},
uploadpic(e) {
let that = this;
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
var reader = new FileReader();
reader.onload = function (event) {
let blob = that.base64ToBlob(event.target.result);
let newArr = [];
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.imgUrlChange(allPath);
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg(){
this.isShowScenicImg = true
},
AddImg(){
},
DeleteImg(){
},
toAddPages(index,FeatureData){
this.$emit('toAddPages',index,FeatureData)
},
toDeletePages(index,FeatureData){
this.$emit('toDeletePages',index,FeatureData)
},
}, },
computed: {}, computed: {},
watch: { watch: {
...@@ -92,6 +159,15 @@ ...@@ -92,6 +159,15 @@
right: 0; right: 0;
padding: 43px 35px 0 35px; padding: 43px 35px 0 35px;
} }
.UpgradedVersionDetails-form-Box{
width: 100%;
height: 438px;
left: 0;
top: -40px;
}
.UpgradedVersionDetails-formBox1{
top: 11px;
}
.UpgradedVersionDetails-imgbox{ .UpgradedVersionDetails-imgbox{
} }
...@@ -102,7 +178,7 @@ ...@@ -102,7 +178,7 @@
border-radius: 50%; border-radius: 50%;
padding: 10px; padding: 10px;
} }
.UpgradedVersionDetails-img div:first-child{ .UpgradedVersionDetails-imgOne{
left: 0; left: 0;
top: 0; top: 0;
width: 312px; width: 312px;
...@@ -110,7 +186,7 @@ ...@@ -110,7 +186,7 @@
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
} }
.UpgradedVersionDetails-img div img{ .UpgradedVersionDetails-imgOne img{
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
...@@ -197,4 +273,8 @@ ...@@ -197,4 +273,8 @@
color: #444444; color: #444444;
line-height: 42px; line-height: 42px;
} }
.UpgradedVersionDetails1{
left: 16px;
top: 122px;
}
</style> </style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 30943628
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<div class="column featureControls-bottom featureControls-bottomTwo" <div class="column featureControls-bottom featureControls-bottomTwo"
v-else> v-else>
<div v-if="isTemplate"> <div v-if="isTemplate">
<el-tooltip class="item" effect="dark" content="选模版" placement="top">
<el-popover trigger="hover" placement="right"> <el-popover trigger="hover" placement="right">
<div class="featureControls-Template"> <div class="featureControls-Template">
<div class="Template-img relative" v-for="(item,index) in TemplateList" <div class="Template-img relative" v-for="(item,index) in TemplateList"
...@@ -24,12 +25,11 @@ ...@@ -24,12 +25,11 @@
<div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div> <div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div>
</div> </div>
</div> </div>
<el-tooltip class="item" effect="dark" content="选模版" placement="top"> <div slot="reference" style="padding: 0;">
<div slot="reference" style="padding: 0;"> <i class="el-icon-copy-document"></i>
<i class="el-icon-copy-document"></i> </div>
</div>
</el-tooltip>
</el-popover> </el-popover>
</el-tooltip>
</div> </div>
<el-tooltip class="item" effect="dark" content="上传图" placement="top"> <el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg"> <div @click="toUploadImg" v-if="isUploadImg">
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
data() { data() {
return { return {
TemplateType: 1, TemplateType: 1,
TemplateImg: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
TemplateList:[ TemplateList:[
{ {
url:'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png', url:'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
...@@ -85,7 +84,7 @@ ...@@ -85,7 +84,7 @@
methods: { methods: {
setTemplate(item){ setTemplate(item){
this.TemplateType = item.id this.TemplateType = item.id
this.TemplateImg = item.url this.$emit('setTemplate',this.TemplateType)
}, },
toUploadImg(){ toUploadImg(){
this.$emit('toUploadImg') this.$emit('toUploadImg')
...@@ -109,12 +108,20 @@ ...@@ -109,12 +108,20 @@
}, },
computed: {}, computed: {},
watch: { watch: {
// FeatureData: { Template: {
// handler(val, oldVal) { handler(val, oldVal) {
this.TemplateType = val
},
deep: false,
immediate: true
},
FeatureData: {
handler(val, oldVal) {
// }, },
// deep: true deep: true,
// }, immediate: true
},
}, },
mounted() { mounted() {
...@@ -125,7 +132,7 @@ ...@@ -125,7 +132,7 @@
<style> <style>
.featureControls{ .featureControls{
opacity: 1; opacity: 0;
transition: opacity 2s ease; transition: opacity 2s ease;
-webkit-transition: opacity 2s ease; -webkit-transition: opacity 2s ease;
-moz-transition: opacity 2s ease; -moz-transition: opacity 2s ease;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/imgControls.vue
View file @ 30943628
...@@ -7,48 +7,26 @@ ...@@ -7,48 +7,26 @@
:isUploadImg="true" :isUploadImg="true"
:isSelectImg="true" :isSelectImg="true"
:isAddImg="false" :isAddImg="false"
:isDeleteImg="true" :isDeleteImg="isDeleteImg"
@toUploadImg="toUploadImg" @toUploadImg="toUploadImg"
@toSelectImg="toSelectImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toAddImg="toAddImg"
@toDeleteImg="toDeleteImg" @toDeleteImg="toDeleteImg"
></FeatureControls> ></FeatureControls>
<el-dialog custom-class="resourceImgAdd"
:title="$t('sm.chooseImg')"
center
:visible.sync="isShowScenicImg">
<!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
<DMCchooseImg
@closeImg="closeDMCchooseImg"
ref="DMCchooseImg1"
@headCallBack="getDMCimg"
v-bind:isCheckmore="1"
v-bind:imgType="choseType"
v-bind:queryItem="queryItem"
v-bind:IsShowAdd="true"
v-bind:IsShowVideo="true"></DMCchooseImg>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import FeatureControls from "./featureControls"; import FeatureControls from "./featureControls";
import DMCchooseImg from "../../../../commonPage/DMCchooseImg.vue";
export default { export default {
components: { components: {
FeatureControls, FeatureControls
DMCchooseImg
}, },
props: ['index','FeatureData','ControlsType','pagesType','isDeletePage', props: ['index','FeatureData','ControlsType','pagesType','isDeletePage',
'isUploadImg','isSelectImg','isAddImg','isDeleteImg','isTemplate','Template'], 'isUploadImg','isSelectImg','isAddImg','isDeleteImg','isTemplate','Template'],
data() { data() {
return { return {
isShowScenicImg: false,
choseType: 0,
queryItem:{
queryName:'',
queryId:0,
}
}; };
}, },
methods: { methods: {
...@@ -56,7 +34,7 @@ ...@@ -56,7 +34,7 @@
this.$emit('toUploadImg') this.$emit('toUploadImg')
}, },
toSelectImg(){ toSelectImg(){
this.isShowScenicImg = true this.$emit('toSelectImg')
}, },
toAddImg(){ toAddImg(){
this.$emit('toAddImg') this.$emit('toAddImg')
...@@ -71,14 +49,6 @@ ...@@ -71,14 +49,6 @@
toDeletePages(){ toDeletePages(){
this.$emit('toDeletePages',this.index,this.FeatureData) this.$emit('toDeletePages',this.index,this.FeatureData)
}, },
closeDMCchooseImg(){
this.isShowScenicImg = false
},
getDMCimg(selectImgArr){
console.log(selectImgArr,'已选图')
this.isShowScenicImg = false
this.$emit('toSelectedImg',selectImgArr)
}
}, },
computed: {}, computed: {},
watch: { watch: {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/imgList/List1.vue
View file @ 30943628
<template> <template>
<div class="MasterMapList-1 relative"> <div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index3 UpgradedVersion-Hover"> <div class="MasterMapList1 absolute z-index1">
<imgControls <imgControls
v-if="FeatureData" v-if="FeatureData"
:index="index" :index="index"
:FeatureData="FeatureData" :FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg" @toUploadImg="toUploadImg"
@toSelectedImg="toSelectedImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/> @toDeleteImg="toDeleteImg"/>
</div> </div>
...@@ -32,8 +33,8 @@ ...@@ -32,8 +33,8 @@
toUploadImg(){ toUploadImg(){
this.$emit('toUploadImg') this.$emit('toUploadImg')
}, },
toSelectedImg(selectImgArr){ toSelectImg(){
this.$emit('toSelectedImg',selectImgArr) this.$emit('toSelectImg')
}, },
toAddImg(){ toAddImg(){
this.$emit('toAddImg') this.$emit('toAddImg')
...@@ -59,7 +60,5 @@ ...@@ -59,7 +60,5 @@
</script> </script>
<style> <style>
.MasterMapList1{
}
</style> </style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/imgList/List2.vue
View file @ 30943628
<template> <template>
<div class="MasterMapList-2 row-sb"> <div class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative"> <div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
<div class="MasterMapList-1 relative marginL20"> <div class="MasterMapList-1 relative bjE6 marginL20 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
</div> </div>
...@@ -11,22 +33,31 @@ ...@@ -11,22 +33,31 @@
<script> <script>
import vEditDiv from "../../../TravelTemp/VEditDiv"; import vEditDiv from "../../../TravelTemp/VEditDiv";
import imgControls from "../imgControls";
export default { export default {
components: { components: {
vEditDiv, vEditDiv,
imgControls
}, },
props: { props: ['index','FeatureData'],
// FeatureData
},
data() { data() {
return { return {
}; };
}, },
methods: { methods: {
toUploadImg(){
this.$emit('toUploadImg')
},
toSelectImg(){
this.$emit('toSelectImg')
},
toAddImg(){
this.$emit('toAddImg')
},
toDeleteImg(){
this.$emit('toDeleteImg')
},
}, },
computed: {}, computed: {},
watch: { watch: {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/imgList/List3.vue
View file @ 30943628
<template> <template>
<div class="MasterMapList-3 row-sb-nowrap"> <div class="MasterMapList-3 row-sb-nowrap">
<div class="MasterMapList-1 relative"> <div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
<div class="MasterMapList-2 column marginL20"> <div class="MasterMapList-2 column marginL20">
<div class="MasterMapList-1 relative"> <div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
<div class="MasterMapList-1 relative marginT20"> <div class="MasterMapList-1 relative marginT20 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="true"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
</div> </div>
...@@ -16,31 +49,41 @@ ...@@ -16,31 +49,41 @@
<script> <script>
import vEditDiv from "../../../TravelTemp/VEditDiv"; import vEditDiv from "../../../TravelTemp/VEditDiv";
import imgControls from "../imgControls";
export default { export default {
components: { components: {
vEditDiv, vEditDiv,
imgControls
}, },
props: { props: ['index','FeatureData'],
// FeatureData
},
data() { data() {
return { return {
}; };
}, },
methods: { methods: {
toUploadImg(){
console.log(this.index,'==-==')
this.$emit('toUploadImg')
},
toSelectImg(){
this.$emit('toSelectImg')
},
toAddImg(){
this.$emit('toAddImg')
},
toDeleteImg(){
this.$emit('toDeleteImg')
},
}, },
computed: {}, computed: {},
watch: { watch: {
// FeatureData: { FeatureData: {
// handler(val, oldVal) { handler(val, oldVal) {
// }, },
// deep: true deep: true
// }, },
}, },
mounted() { mounted() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 30943628
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:style="{'background':TripColor}">&nbsp;</div> :style="{'background':TripColor}">&nbsp;</div>
<!-- <div class="UpgradedVersion-subIdeBj2 absolute z-index1">&nbsp;</div> --> <!-- <div class="UpgradedVersion-subIdeBj2 absolute z-index1">&nbsp;</div> -->
<div class="UpgradedVersion-subIdeBj-h absolute z-index3"> <div class="UpgradedVersion-subIdeBj-h absolute z-index3">
<vEditDiv :canEdit='canEdit2' v-model="first2"></vEditDiv> <vEditDiv :canEdit='canEdit2' v-model="FeatureData.name"></vEditDiv>
</div> </div>
</div> </div>
<img class="UpgradedVersion-titleIcon relative" src="http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"/> <img class="UpgradedVersion-titleIcon relative" src="http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"/>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</div> </div>
<!-- subIdeImgBox 食景副标题图 --> <!-- subIdeImgBox 食景副标题图 -->
<template v-if="FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'"> <template v-if="FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'">
<div class="subIdeImgBox"> <div :class="[Template==1?'':'subIdeImgBox']">
<div class="UpgradedVersion-subIdeImgBox absolute row z-index1"> <div class="UpgradedVersion-subIdeImgBox absolute row z-index1">
<div class="UpgradedVersion-subIdeImgBoxL" <div class="UpgradedVersion-subIdeImgBoxL"
:style="{'background':TripColor}"> :style="{'background':TripColor}">
...@@ -49,18 +49,64 @@ ...@@ -49,18 +49,64 @@
</div> </div>
</div> </div>
<div class="UpgradedVersion-subIdeImgForm"> <div class="UpgradedVersion-subIdeImgForm">
<div class="subIdeImgFormRelative relative UpgradedVersion-Hover"
:class="[Template==1?'':Template==2?'subIdeImgFormRelative2':'subIdeImgFormRelative3']">
<div class="subIdeImgForm2Box absolute z-index2"
:class="[Template==1?'':Template==2?'subIdeImgForm2Box2':'subIdeImgForm2Box3']">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'column'"
:isTemplate="true"
:isUploadImg="false"
:isSelectImg="false"
:isAddImg="false"
:isDeleteImg="false"
:Template="Template"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"
@setTemplate="setTemplate"
></FeatureControls>
</div>
</div>
<!-- subIdeImgForm2 食 subIdeImgForm3 景 --> <!-- subIdeImgForm2 食 subIdeImgForm3 景 -->
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm2 absolute z-index2"> <div class="UpgradedVersion-subIdeImgForm1 absolute z-index2"
<div class="subIdeImg1"> :class="[Template==1?'':Template==2?'subIdeImgForm2':'subIdeImgForm3']">
<div class="relative"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative UpgradedVersion-Hover">
<div class="subIdeImgForm1Box absolute">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="false"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
</div> </div>
</div> </div>
<!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 --> <!-- subIdeImgForm2-two 食 subIdeImgForm3-two 景 -->
<div class="UpgradedVersion-subIdeImgForm1 subIdeImgForm2-two absolute z-index2"> <div class="UpgradedVersion-subIdeImgForm1 absolute z-index2"
<div class="subIdeImg1"> :class="[Template==1?'':Template==2?'subIdeImgForm2-two':'subIdeImgForm3-two']">
<div class="relative"> <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
<div class="subIdeImg1relative relative">
<div class="subIdeImgForm1Box absolute">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
:isDeleteImg="false"
@toUploadImg="toUploadImg"
@toSelectImg="toSelectImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/> <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div> </div>
</div> </div>
...@@ -81,11 +127,17 @@ ...@@ -81,11 +127,17 @@
<script> <script>
import vEditDiv from "../../TravelTemp/VEditDiv"; import vEditDiv from "../../TravelTemp/VEditDiv";
import imgControls from "./imgControls";
import FeatureControls from "./featureControls";
export default { export default {
components: { components: {
vEditDiv vEditDiv,
imgControls,
FeatureControls
}, },
props: [ props: [
'Template',
'index',
'TripColor', 'TripColor',
'FeatureData' 'FeatureData'
], ],
...@@ -104,7 +156,21 @@ ...@@ -104,7 +156,21 @@
}; };
}, },
methods: { methods: {
toUploadImg(){
this.$emit('toUploadImg')
},
toSelectImg(){
this.$emit('toSelectImg')
},
toAddImg(){
this.$emit('toAddImg')
},
toDeleteImg(){
this.$emit('toDeleteImg')
},
setTemplate(TemplateType){
this.$emit('setTemplate',this.index,TemplateType)
}
}, },
computed: {}, computed: {},
watch: { watch: {
...@@ -115,6 +181,13 @@ ...@@ -115,6 +181,13 @@
deep: false, deep: false,
immediate: true immediate: true
}, },
FeatureData: {
handler(val, oldVal) {
},
deep: true,
immediate: true
},
}, },
mounted() { mounted() {
...@@ -311,22 +384,58 @@ ...@@ -311,22 +384,58 @@
width: 270px; width: 270px;
height: 207px; height: 207px;
} }
.subIdeImgBox1{
left: 0;
top: 0;
}
.subIdeImg1{ .subIdeImg1{
height: 187px; height: 187px;
border-radius: 14px; border-radius: 14px;
overflow: hidden; overflow: hidden;
} }
.subIdeImg1 div{ .subIdeImg1relative{
left: 0px; left: 0px;
top: 0px; top: 0px;
} }
.subIdeImg1 div img{ .subIdeImg1relative img{
left: 0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.subIdeImgForm1Box{
left: 0;
top: 0;
}
.subIdeImgFormRelative{
width: 478px;
height: 214px;
left: 647px;
top: 911px;
}
.subIdeImgFormRelative2{
width: 478px;
height: 295px;
left: 526px;
top: 843px;
}
.subIdeImgFormRelative3{
height: 198px;
left: 526px;
top: 944px;
}
.subIdeImgForm2Box{
left: 0px;
top: 20px;
}
.subIdeImgForm2Box2{
left: 0px;
top: 99px;
}
.subIdeImgForm2Box3{
left: 0px;
top: 0;
}
.UpgradedVersion-intTitle{ .UpgradedVersion-intTitle{
text-align: center; text-align: center;
} }
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 30943628
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<div class="featureHome-text-title"> <div class="featureHome-text-title">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div> </div>
<div class="featureHome-text-box"> <div class="featureHome-text-box">
<div class="featureHome-text-box-sod" <div class="featureHome-text-box-sod"
:style="{'border':borderBox,'color':TripColor}"> :style="{'border':borderBox,'color':TripColor}">
...@@ -33,6 +32,7 @@ ...@@ -33,6 +32,7 @@
:index="index" :index="index"
:FeatureData="FeatureData" :FeatureData="FeatureData"
:ControlsType="'column'" :ControlsType="'column'"
:isTemplate="true"
:isUploadImg="true" :isUploadImg="true"
:isSelectImg="true" :isSelectImg="true"
:isAddImg="false" :isAddImg="false"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
@toDeleteImg="DeleteImg" @toDeleteImg="DeleteImg"
></FeatureControls> ></FeatureControls>
</div> </div>
<div class="featureHome-left-one absolute z-index2"> <div class="featureHome-left-one bjE6 absolute z-index2">
<img src="https://imgfile.oytour.com/Upload/Temporary/202308161225403150000000099.jpg"/> <img src="https://imgfile.oytour.com/Upload/Temporary/202308161225403150000000099.jpg"/>
</div> </div>
<div class="featureHome-left-two absolute z-index1" <div class="featureHome-left-two absolute z-index1"
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 30943628
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
:TripColor="TripColor" :TripColor="TripColor"
@toAddPages="AddPages" @toAddPages="AddPages"
@toDeletePages="DeletePages" @toDeletePages="DeletePages"
@setTemplate="setTemplate"
v-if="item.name=='介绍'||item.name=='宿'||item.name=='食'||item.name=='景'"></otherJourney> v-if="item.name=='介绍'||item.name=='宿'||item.name=='食'||item.name=='景'"></otherJourney>
<!-- 行程详情页 --> <!-- 食详情页 -->
<UpgradedVersionDetails <UpgradedVersionDetails
:index="index" :index="index"
:FeatureData="item" :FeatureData="item"
...@@ -87,6 +88,7 @@ ...@@ -87,6 +88,7 @@
name:'首页', name:'首页',
id:0, id:0,
tyep:1, tyep:1,
Template:0,
isDeletePage: false isDeletePage: false
}, },
pageList:[ pageList:[
...@@ -94,37 +96,43 @@ ...@@ -94,37 +96,43 @@
name: '首页', name: '首页',
id:1, id:1,
type:1, type:1,
Template:0,
isDeletePage: false isDeletePage: false
}, },
{ {
name: '介绍', name: '介绍',
id:2, id:2,
type:2, type:2,
Template:0,
isDeletePage: false isDeletePage: false
}, },
{ {
name: '食详情', name: '食详情',
id:3, id:3,
type:3, type:3,
Template:0,
isDeletePage: false isDeletePage: false
}, },
{ {
name: '宿', name: '宿',
id:4, id:4,
type:4, type:4,
isDeletePage: false isDeletePage: false,
Template:1
}, },
{ {
name: '食', name: '食',
id:5, id:5,
type:5, type:5,
isDeletePage: false isDeletePage: false,
Template: 2
}, },
{ {
name: '景', name: '景',
id:6, id:6,
type:6, type:6,
isDeletePage: false isDeletePage: false,
Template:3
} }
] ]
}; };
...@@ -134,11 +142,18 @@ ...@@ -134,11 +142,18 @@
this.pageData = JSON.parse(JSON.stringify(FeatureData)) this.pageData = JSON.parse(JSON.stringify(FeatureData))
this.pageData.id = 0 this.pageData.id = 0
this.pageData.isDeletePage = true this.pageData.isDeletePage = true
this.pageList.splice(index+1,0,this.pageData) if(this.pageData.type>3){
this.pageData.Template = 1
}
this.pageList.splice(index,0,this.pageData)
}, },
DeletePages(index,FeatureData){ DeletePages(index,FeatureData){
this.pageList.splice(1,index) this.pageList.splice(1,index)
}, },
setTemplate(index,TemplateType){
this.pageList[index].Template = TemplateType
this.$forceUpdate()
}
}, },
computed: {}, computed: {},
watch: { watch: {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ 30943628
<template> <template>
<div class="otherJourney-form"> <div class="otherJourney-form" :class="[FeatureData.name=='介绍'?'UpgradedVersion-Hover':'']">
<!-- 主图 --> <!-- 主图 -->
<div class="MasterMapList-form absolute z-index1"> <div class="MasterMapList-boxRelative absolute z-index1"
<div class="MasterMapList-box UpgradedVersion-Hover"> :class="[FeatureData.name=='介绍'?'':'UpgradedVersion-Hover']">
<div class="MasterMapList-box-one absolute z-index3"> <div class="MasterMapList-box-one absolute">
<FeatureControls <FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'row'"
:isDeletePage="FeatureData.isDeletePage"
:pagesType="1"
@toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" id='restaurantfile' @change="uploadpic">
</div>
<div class="MasterMapList-box-two absolute z-index3">
<FeatureControls
:index="index" :index="index"
:FeatureData="FeatureData" :FeatureData="FeatureData"
:ControlsType="'row'" :ControlsType="'column'"
:isDeletePage="FeatureData.isDeletePage" :isUploadImg="FeatureData.name=='介绍'?true:false"
:pagesType="1" :isSelectImg="FeatureData.name=='介绍'?true:false"
@toAddPages="toAddPages" :isAddImg="FeatureData.name=='介绍'?false:true"
@toDeletePages="toDeletePages"> :isDeleteImg="false"
</FeatureControls> @toUploadImg="UploadImg"
<input type="file" style="display:none" id='restaurantfile' @change="uploadpic"> @toSelectImg="SelectImg"
</div> @toAddImg="AddImg"
<div class="MasterMapList-box-two absolute z-index3"> @toDeleteImg="DeleteImg"
<FeatureControls ></FeatureControls>
</div>
</div>
<div class="MasterMapList-form absolute z-index1">
<div class="MasterMapList-box">
<List1 v-if="FeatureData.name=='介绍'"></List1>
<template v-else>
<List3
:index="index" :index="index"
:FeatureData="FeatureData" :FeatureData="FeatureData"
:ControlsType="'column'"
:isUploadImg="FeatureData.name=='介绍'?true:false"
:isSelectImg="FeatureData.name=='介绍'?true:false"
:isAddImg="FeatureData.name=='介绍'?false:true"
:isDeleteImg="false"
@toUploadImg="UploadImg" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toSelectImg="SelectImg"
@toAddImg="AddImg" @toAddImg="AddImg"
@toDeleteImg="DeleteImg" @toDeleteImg="DeleteImg"
></FeatureControls> ></List3>
</div>
<List1 v-if="FeatureData.name=='介绍'"></List1>
<template v-else>
<List1
:index="index"
:FeatureData="FeatureData"
></List1>
</template> </template>
</div> </div>
</div> </div>
<!-- <MasterMapList></MasterMapList> --> <!-- <MasterMapList></MasterMapList> -->
<!-- 副标题 --> <!-- 副标题 -->
<subheading :FeatureData="FeatureData" :TripColor="TripColor"></subheading> <subheading
:Template="FeatureData.Template"
:index="index"
:FeatureData="FeatureData"
:TripColor="TripColor"
@toUploadImg="UploadImg"
@toSelectImg="SelectImg"
@setTemplate="setTemplate"></subheading>
<!-- otherJourney-otherDetails 宿、食 景详情 --> <!-- otherJourney-otherDetails 宿、食 景详情 -->
<div :class="[FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'?'otherJourney-otherDetails':'']"> <div :class="[FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'?'otherJourney-otherDetails':'']">
<div class="otherJourney-details absolute z-index1"> <div class="otherJourney-details absolute z-index1">
...@@ -156,6 +170,9 @@ ...@@ -156,6 +170,9 @@
toDeletePages(index,FeatureData){ toDeletePages(index,FeatureData){
this.$emit('toDeletePages',index,FeatureData) this.$emit('toDeletePages',index,FeatureData)
}, },
setTemplate(index,TemplateType){
this.$emit('setTemplate',index,TemplateType)
},
closeDMCchooseImg(){ closeDMCchooseImg(){
this.isShowScenicImg = false this.isShowScenicImg = false
}, },
...@@ -168,12 +185,13 @@ ...@@ -168,12 +185,13 @@
}, },
computed: {}, computed: {},
watch: { watch: {
// FeatureData: { FeatureData: {
// handler(val, oldVal) { handler(val, oldVal) {
// }, },
// deep: true deep: true,
// }, immediate: true
},
}, },
mounted() { mounted() {
...@@ -200,13 +218,23 @@ ...@@ -200,13 +218,23 @@
border-radius: 14px; border-radius: 14px;
overflow: hidden; overflow: hidden;
} }
.MasterMapList-boxRelative{
width: 100%;
height: 684px;
left: 0px;
top: 251px;
}
.MasterMapList-box-one{ .MasterMapList-box-one{
left: -33px; left: 0px;
top: 4px; top: -10px;
} }
.MasterMapList-box-two{ .MasterMapList-box-two{
left: -64px; left: -31px;
top: 118px; top: 104px;
}
.MasterMapList-2 .MasterMapList-1{
border-radius: 14px;
overflow: hidden;
} }
.MasterMapList-1,.MasterMapList-2, .MasterMapList-1,.MasterMapList-2,
.MasterMapList-3,.MasterMapList-4, .MasterMapList-3,.MasterMapList-4,
......
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