Skip to content

S
SuperMan
Commit a7e44f10 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 2733884c dcf4d079
Hide whitespace changes
Inline Side-by-side
Showing with 658 additions and 384 deletions
src/assets/css/UpgradedVersion.css
View file @ a7e44f10
.bjE6{
background: #e6e6e6;
}
.bjF6{
background: #f6f6f6;
}
.relative{
position: relative;
}
......
src/components/commonPage/DMCchooseImg.vue
View file @ a7e44f10
......@@ -182,7 +182,7 @@
placeholder="请输入关键字" />
<span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="getList"></i></span>
</span>
<div class="addimgContent test-1">
<div class="addimgContent test-1" v-loading="loading">
<div class="addimgDiv" v-for="(item, index) in imglistArry" :key="item.subCode"
v-if="item.isShowImgDiv && item.Path != null">
<div class="itemImgdiv" @click="selectImg(index)">
......@@ -246,6 +246,7 @@ export default {
props: ["imgType", "isCheckmore", 'queryItem', 'IsShowAdd', 'IsShowVideo', 'checkType'],
data() {
return {
loading: false,
queryMsg: {
pageSize: 50,
pageIndex: 1,
......@@ -280,6 +281,7 @@ export default {
getList() {
//初始化弹窗图片列表
this.imglistArry = [];
this.loading = true
this.apipost(
"hotel_post_GetPicList",
this.queryMsg,
......@@ -290,6 +292,9 @@ export default {
x.isShowImgDiv = true;
})
this.queryMsg.total = res.data.data.count;
this.loading = false
}else{
this.loading = false
}
},
null
......@@ -452,6 +457,9 @@ export default {
},
//点击确定选择
chkedVideoList() {
if(this.isCheckmore>1&&this.selectVideoArr.length>this.isCheckmore){
return this.Error(`最多选${this.isCheckmore}张图`);
}
this.$emit("headCallBack", this.selectVideoArr);
this.$emit("closeImg");
}
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ a7e44f10
......@@ -7,11 +7,11 @@
<span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<div class="TrfList clearfix">
<!--&&item.TypeState!=8-->
<!--&&item.TypeState!=8-->
<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)}"
@click="clickFeature(item)" :key="item.subCode"
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)&&item.TypeState!=8">
v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
......@@ -105,9 +105,11 @@
v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div>
<!--行程特色第三版 -->
<UpgradedVersion :TripColor="FeatureData.TripColor" v-if="FeatureData.FeatureType==8"
:FeatureData='FeatureData'></UpgradedVersion>
<div v-if="FeatureData.FeatureType==8&&FeatureDataFlag">
<!--行程特色第三版 -->
<UpgradedVersion ref="UpgradedVersion" :TripColor="FeatureData.TripColor" :FeatureData='FeatureData'>
</UpgradedVersion>
</div>
</div>
</div>
</div>
......@@ -119,7 +121,6 @@
import userDefined from "../../../assets/img/userDefined.png";
import MyEdit from "../../EditTemplate.vue";
import vEditDiv from "./TravelTemp/VEditDiv";
import travelHotel1 from "./TravelTemp/TravelHotel1";
import travelHotel2 from "./TravelTemp/TravelHotel2";
import travelHotel3 from "./TravelTemp/TravelHotel3";
......@@ -136,7 +137,6 @@
} from 'timers';
export default {
components: {
vEditDiv,
travelHotel1,
travelHotel2,
travelHotel3,
......@@ -336,9 +336,22 @@
FeatureData.FeatureHtmlJsonDelete = JSON.stringify(obj.deleteArray);
} catch (err) {}
}
//新版行程特色
if (this.$refs.UpgradedVersion != undefined) {
obj = this.$refs.UpgradedVersion.getFeatureData()
FeatureData.FeatureHtmlJson = JSON.stringify(obj.basicData);
FeatureData.FeatureHtmlJsonDelete = "";
}
setTimeout(() => {
try {
FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
var newHtml = "";
if (document.getElementById("newFeatureBox")) {
newHtml = document.getElementById("newFeatureBox").innerHTML;
}
if (document.getElementById("newFeatureBox3")) {
newHtml = document.getElementById("newFeatureBox3").innerHTML;
}
FeatureData.FeatureHtml = newHtml;
} catch (err) {}
this.apipost("travel_post_SetFeature", FeatureData, res => {
try {
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ a7e44f10
......@@ -185,7 +185,7 @@
TemplateId: 1,
IsSave: false, //是否保存
TripColor: "", //行程特色主色
LtName:"",//系列名称
LtName: "", //系列名称
},
//线路行程
journeyList: {
......@@ -817,7 +817,7 @@
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.FeatureData.TripColor = tempData.LineTripColor;
}
this.FeatureData.LtName=tempData.LtName;
this.FeatureData.LtName = tempData.LtName;
this.FeatureData.DayList = tempData.DayList;
this.ConfigId = tempData.ID;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue
View file @ a7e44f10
......@@ -5,7 +5,7 @@
</template>
<script>
export default {
props: ["value", "canEdit","textLength"],
props: ["value", "canEdit", "textLength"],
data() {
return {
innerText: this.value,
......@@ -21,26 +21,19 @@
},
methods: {
changeText: function () {
let sel = window.getSelection()
let offset = sel.anchorOffset
if(this.$el.innerText.length>this.textLength){
this.$el.innerText = this.$el.innerText.slice(0,3)
let sel = window.getSelection();
let offset = sel.anchorOffset;
if (this.textLength&&this.$el.innerText.length > this.textLength) {
this.$el.innerText = this.$el.innerText.slice(0, this.textLength);
}
if(this.textLength) this.$el.innerText = this.$el.innerText.slice(0,this.textLength)
this.$emit("input", this.$el.innerText);
setTimeout(() => {
var range = sel.getRangeAt(0);
if (range) {
var textNode = range.startContainer;
if (textNode) {
range.setStart(textNode, offset)
}
if (sel) {
sel.removeAllRanges()
sel.addRange(range)
}
}
}, 0)
var textNode = range.startContainer;
range.setStart(textNode, offset);
sel.removeAllRanges();
sel.addRange(range);
}, 0);
}
}
};
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ a7e44f10
<template>
<div class="UpgradedVersionDetails-form absolute row-sb z-index1" :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 class="UpgradedVersionDetails-form absolute row-sb z-index1" :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="'GouDetaFile_'+(index * 2 + 1)+'_0'" @change="uploadpic">
</div>
</div>
</div>
<div class="UpgradedVersionDetails-box column" v-for="(item,index) in FeatureData.dataObj.SubList">
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg"
@toDeleteImg="DeleteImg" />
</div>
<div class="UpgradedVersionDetails-imgOne bjE6">
<template v-if="item.ImgList&&item.ImgList.length>0">
<img :src="item.ImgList[0].url" />
</template>
<template v-else>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
</template>
<div class="UpgradedVersionDetails-box column" v-for="(item,i) in FeatureData.dataObj.SubList">
<div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
<div class="UpgradedVersionDetails-img relative">
<div class="UpgradedVersionDetails1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
@toDeleteImg="DeleteImg(i)" />
</div>
<div class="UpgradedVersionDetails-imgOne bjE6">
<template v-if="item.ImgList&&item.ImgList.length>0">
<img :src="item.ImgList[0].url" />
</template>
<template v-else>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
</template>
</div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div>
</div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div>
</div>
</div>
<!-- UpgradedVersionDetails-two 02 UpgradedVersionDetails-three 03-->
<div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
<div class="UpgradedVersionDetails-Img-one relative">
<div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}">
<span class="absolute">{{'0'+(index+1)}}</span>
<!-- UpgradedVersionDetails-two 02 UpgradedVersionDetails-three 03-->
<div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
<div class="UpgradedVersionDetails-Img-one relative">
<div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}">
<span class="absolute">{{'0'+(i+1)}}</span>
</div>
<div class="UpgradedVersionDetails-T absolute">
<vEditDiv :canEdit='canEdit1' v-model="item.MainDesc"></vEditDiv>
</div>
</div>
<div class="UpgradedVersionDetails-T absolute">
<vEditDiv :canEdit='canEdit1' v-model="item.MainDesc"></vEditDiv>
<div class="UpgradedVersionDetails-Img-two relative">
<template v-for="(items,indexs) in subscriptText">
<p :key="indexs+10000" class="absolute row-sb" v-if="indexs==index" :style="{'color':TripColor}">
<span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span>
</p>
</template>
</div>
<div class="UpgradedVersionDetails-T-two">
<vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
</div>
</div>
<div class="UpgradedVersionDetails-Img-two relative">
<template v-for="(items,indexs) in subscriptText">
<p :key="indexs+10000" class="absolute row-sb" v-if="indexs==index" :style="{'color':TripColor}">
<span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span>
</p>
</template>
</div>
<div class="UpgradedVersionDetails-T-two">
<vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
</div>
</div>
</div>
<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>
</template>
......@@ -59,8 +66,10 @@
import subheading from "./components/subheading";
import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
export default {
components: {
DMCchooseImg,
MasterMapList,
subheading,
vEditDiv,
......@@ -88,12 +97,20 @@
Name: 'DELICIOUS',
Id: 2
}
]
],
choseType: 0,
queryItem: {
queryName: '',
queryId: 0,
},
isShowScenicImg: false,
MasterMapIndex: null,//主图下标
};
},
methods: {
UploadImg() {
UploadImg(index) {
this.MasterMapIndex = index
document.querySelector(`#GouDetaFile_${(this.index * 2 + 1)}_0`).click();
},
uploadpic(e) {
let that = this;
......@@ -109,13 +126,19 @@
that.uploadSelfBlob(path, newArr, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.imgUrlChange(allPath);
that.FeatureData.dataObj.SubList[that.MasterMapIndex].ImgList[0].url = allPath
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg() {
SelectImg(index) {
this.MasterMapIndex = index?index:0
if(this.FeatureData.pageType==3) this.choseType = 2
else if(this.FeatureData.pageType==4) this.choseType = 1
else if(this.FeatureData.pageType==5) this.choseType = 2
else if(this.FeatureData.pageType==6) this.choseType = 3
else this.choseType = 0
this.isShowScenicImg = true
},
AddImg() {
......@@ -124,12 +147,20 @@
DeleteImg() {
},
toAddPages(index, FeatureData) {
this.$emit('toAddPages', index, FeatureData)
toAddPages() {
this.$emit('toAddPages', this.index, this.FeatureData)
},
toDeletePages(index, FeatureData) {
this.$emit('toDeletePages', index, FeatureData)
toDeletePages() {
this.$emit('toDeletePages', this.index)
},
closeDMCchooseImg() {
this.isShowScenicImg = false
},
getDMCimg(selectImgArr) {
let Path = selectImgArr[0].Path
this.FeatureData.dataObj.SubList[this.MasterMapIndex].ImgList[0].url = Path
this.isShowScenicImg = false
}
},
computed: {},
watch: {
......@@ -140,6 +171,13 @@
deep: false,
immediate: true
},
FeatureData: {
handler(val, oldVal) {
},
deep: true,
immediate: true
},
},
mounted() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue
View file @ a7e44f10
<template>
<div class="MasterMapList-form absolute z-index1">
<div class="MasterMapList-box">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==1" class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData"
:isUploadImg="FeatureData.pageType==2?false:true" :isSelectImg="FeatureData.pageType==2?false:true"
:isDeleteImg="FeatureData.pageType==2?false:true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isUploadImg="pageType==2?false:true" :isSelectImg="pageType==2?false:true"
:isDeleteImg="pageType==2?false:true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img v-if="FeatureData.dataObj.ImgList.length>0" class="absolute" :src="FeatureData.dataObj.ImgList[0].url" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==2" class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==2" class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative bjE6 marginL20 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 marginL20 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==3" class="MasterMapList-3 row-sb-nowrap">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==3" class="MasterMapList-3 row-sb-nowrap">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-2 column marginL20">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
<div class="MasterMapList-1 relative marginT20 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT20 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==4" class="MasterMapList-4 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==4" class="MasterMapList-4 relative">
<div class="MasterMapList-2 row-sb">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative marginL20 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL20 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div class="MasterMapList-2 row-sb marginT20">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginL20 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL20 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" />
</div>
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==5" class="MasterMapList-5 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==5" class="MasterMapList-5 relative">
<div class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL column">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[3].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div>
</div>
</div>
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==6" class="MasterMapList-6 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==6" class="MasterMapList-6 relative">
<div class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL column">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-2 row-sb-nowrap">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginL11 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL11 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
</div>
<div class="MasterMapList-2 row-sb-nowrap marginT14">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div>
<div class="MasterMapList-1 relative marginL11 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL11 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div>
</div>
</div>
......@@ -212,235 +212,235 @@
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==7" class="MasterMapList-7 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==7" class="MasterMapList-7 relative">
<div class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL column">
<div class="MasterMapList-2 row-sb-nowrap">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative marginL11 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL11 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div class="MasterMapList-2 row-sb-nowrap marginT14">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginL11 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL11 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div>
</div>
</div>
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==8" class="MasterMapList-8 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==8" class="MasterMapList-8 relative">
<div class="MasterMapList-8-one row-sb">
<div class="MasterMapList-8-oneL">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
</div>
</div>
<div class="MasterMapList-8-two marginT13">
<div class="MasterMapList-8-oneR row-sb">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" />
</div>
</div>
</div>
</div>
<div v-if="FeatureData.imgList&&FeatureData.imgList.length==9" class="MasterMapList-9 relative">
<div v-if="FeatureData.ImgList&&FeatureData.ImgList.length==9" 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 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[0].url" class="absolute" :src="FeatureData.ImgList[0].url" />
</div>
<div class="MasterMapList-1 relative marginL11 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL11 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[1].url" class="absolute" :src="FeatureData.ImgList[1].url" />
</div>
</div>
<div class="MasterMapList-8-oneR column marginL11">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(2)" @toSelectImg="toSelectImg(2)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(2)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[2].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(3)" @toSelectImg="toSelectImg(3)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(3)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[3].url" class="absolute" :src="FeatureData.ImgList[2].url" />
</div>
<div class="MasterMapList-1 relative marginT14 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginT14 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(4)" @toSelectImg="toSelectImg(4)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(4)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[4].url" class="absolute" :src="FeatureData.ImgList[4].url" />
</div>
</div>
</div>
<div class="MasterMapList-8-two marginT13">
<div class="MasterMapList-8-oneR row-sb">
<div class="MasterMapList-1 relative bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(5)" @toSelectImg="toSelectImg(5)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(5)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[5].url" class="absolute" :src="FeatureData.ImgList[5].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(6)" @toSelectImg="toSelectImg(6)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(6)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[6].url" class="absolute" :src="FeatureData.ImgList[6].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(7)" @toSelectImg="toSelectImg(7)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(7)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[7].url" class="absolute" :src="FeatureData.ImgList[7].url" />
</div>
<div class="MasterMapList-1 relative marginL15 bjE6 UpgradedVersion-Hover">
<div class="MasterMapList-1 relative marginL15 bjF6 UpgradedVersion-Hover">
<div class="MasterMapList1 absolute z-index1">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="true" @toUploadImg="toUploadImg(8)" @toSelectImg="toSelectImg(8)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(8)" />
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.ImgList[8].url" class="absolute" :src="FeatureData.ImgList[8].url" />
</div>
</div>
</div>
......@@ -462,7 +462,8 @@
},
props: [
'index',
'FeatureData'
'FeatureData',
'pageType'
],
data() {
return {
......@@ -470,17 +471,17 @@
};
},
methods: {
toUploadImg() {
this.$emit('toUploadImg')
toUploadImg(index) {
this.$emit('toUploadImg',index)
},
toSelectImg() {
this.$emit('toSelectImg')
toSelectImg(index) {
this.$emit('toSelectImg',index)
},
toAddImg() {
this.$emit('toAddImg')
},
toDeleteImg() {
this.$emit('toDeleteImg')
toDeleteImg(index) {
this.$emit('toDeleteImg',index)
},
......@@ -492,7 +493,7 @@
},
deep: true,
immediate: false
immediate: true
},
},
mounted() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ a7e44f10
......@@ -62,10 +62,10 @@
<div class="subIdeImg1relative relative UpgradedVersion-Hover">
<div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[0].url" />
</div>
</div>
</div>
......@@ -76,10 +76,10 @@
<div class="subIdeImg1relative relative">
<div class="subIdeImgForm1Box absolute">
<FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isUploadImg="true"
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg" @toSelectImg="toSelectImg"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg" />
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[1].url" />
</div>
</div>
</div>
......@@ -121,20 +121,20 @@
};
},
methods: {
toUploadImg() {
this.$emit('toUploadImg')
toUploadImg(index) {
this.$emit('toUploadImg',index,'模版图')
},
toSelectImg() {
this.$emit('toSelectImg')
toSelectImg(index) {
this.$emit('toSelectImg',index,'模版图')
},
toAddImg() {
this.$emit('toAddImg')
},
toDeleteImg() {
this.$emit('toDeleteImg')
toDeleteImg(index) {
this.$emit('toDeleteImg',index,'模版图')
},
setTemplate(TemplateType) {
this.$emit('setTemplate', this.index, TemplateType)
this.$emit('setTemplate',TemplateType)
}
},
computed: {},
......@@ -388,6 +388,8 @@
.subIdeImg1relative {
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.subIdeImg1relative img {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ a7e44f10
......@@ -31,7 +31,7 @@
:isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
</div>
<div class="featureHome-left-one bjE6 absolute z-index2">
<div class="featureHome-left-one bjF6 absolute z-index2">
<template v-if="FeatureItem.dataObj.ImgList&&FeatureItem.dataObj.ImgList.length>0">
<img :src="FeatureItem.dataObj.ImgList[0].url" />
</template>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ a7e44f10
......@@ -10,18 +10,20 @@
@toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
<!-- 其余页 -->
<div v-else>
<headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" @setTemplate="setTemplate" v-if="item.pageType!=1&&item.pageType!=3"></otherJourney>
<!-- 食详情页 -->
<UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" v-if="item.pagesType==3"></UpgradedVersionDetails>
<headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3">
</otherJourney>
<!-- 食详情页 -->
<UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
@toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<div v-if="item.pagesType!=1" :class="{'otherJourney-footer':item.pagesType==5||item.pagesType==6||item.pagesType==3}">
<div v-if="item.pageType!=1"
:class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':item.pagesType==5||item.pagesType==6||item.pagesType==3?TripColor:''}">
<template v-if="item.pagesType!==5&&item.pagesType!==6&&item.pagesType!==3">
:style="{'background':item.pageType==5||item.pageType==6||item.pageType==3?TripColor:''}">
<template v-if="item.pageType!==5&&item.pageType!==6&&item.pageType!==3">
<div class="introduceFooterBJ introduceFooterOne" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo" :style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic">
......@@ -118,21 +120,19 @@
};
return pageObj;
},
//添加页面
AddPages(index, FeatureData) {
this.pageData = JSON.parse(JSON.stringify(FeatureData))
this.pageData.id = 0
this.pageData.isDeletePage = true
if (this.pageData.type > 3) {
this.pageData.Template = 1
var pageData = this.getPageObj();
pageData.isDeletePage = true
pageData.pageType = FeatureData.pageType
if (FeatureData.pageType > 3) {
pageData.pageTemplate = 1
}
this.pageList.splice(index, 0, this.pageData)
this.pageList.splice(index, 0, pageData);
},
DeletePages(index, FeatureData) {
this.pageList.splice(1, index)
},
setTemplate(index, TemplateType) {
this.pageList[index].Template = TemplateType
this.$forceUpdate()
//删除页面
DeletePages(index) {
this.pageList.splice(1, index);
},
getDetailsObj() {
var detailsObj = {
......@@ -153,8 +153,9 @@
var oldJson = this.FeatureData.FeatureHtmlJson ?
JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
"";
if (JSON.stringify(oldJson) !== "{}" && oldJson) {
console.log("oldJson", oldJson);
if (oldJson && oldJson.length > 0) {
this.pageList = oldJson;
} else {
var tripObj = this.getTripData();
console.log("tripObj", tripObj);
......@@ -166,23 +167,28 @@
newObj.LineShortName = this.FeatureData.LineShortName;
//首页
if (pItem.pageType == 1) {
newObj.MainName = tripObj.cityStr; //地区1
newObj.SubName = tripObj.cityStr2; //地区2
if (tripObj.cityStr && tripObj.cityStr != '') {
newObj.MainName = tripObj.cityStr; //地区1
} else {
newObj.MainName = "大阪";
}
if (tripObj.cityStr2 && tripObj.cityStr2 != '') {
newObj.SubName = tripObj.cityStr2; //地区2
} else {
newObj.SubName = "东京";
}
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
newObj.DetailsName = tripObj.scenicArray[0].MainName;
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.ImgList = tripObj.scenicArray[0].ImgList;
newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} else {
newObj.DetailsName = "浅草寺 Senso-ji Temple";
newObj.ShadowName = "遇见最美好的自己";
newObj.SubShadowName = "在古老的日本樱花街道";
newObj.DetailsName = "景点介绍";
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/DsrkBYw5MnQnzk2WzksZ4knrrKFbeP3a.jpg"
}];
newObj.MainDesc =
"东京最著名、最古老的寺庙，也是日本的门脸、浅草的象征。频繁的庙会活动让你零距离感受日本江户风俗。据说寺内有一座在公元628年偶然被当地渔民打捞上来的观音金像，每年都有许多人前来寺庙祈福保平安。院内有雷门、五重塔等著名古迹；还有90余家商铺的仲见世商店街，可以买到当地特产和吉祥物。在浅草寺可以求签问凶吉，如果不走运抽到了“凶”，和当地人一样系在抽签的地方就可以驱散霉运了。";
newObj.MainDesc = "景点描述";
}
}
//介绍页面
......@@ -192,8 +198,7 @@
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
}];
newObj.MainDesc =
"印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺！ 房型 多样 设 计， 京都千饭店外观为京町家的格子风格，非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造，意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道，便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看，眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下，一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华，但连小细节都做得非常精致，散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻，同時享受頂級的休閒時光。 ";
newObj.MainDesc = "描述信息";
}
//详情页面
else if (pItem.pageType == 3) {
......@@ -220,11 +225,11 @@
newObj.ImgList = tripObj.hotelArray[0].ImgList;
newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
} else {
newObj.MainName = "默认酒店";
newObj.MainName = "行程酒店";
newObj.ImgList = [{
url: "https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
}];
newObj.MainDesc = "默认酒店描述信息";
newObj.MainDesc = "行程酒店描述信息";
}
} //餐
else if (pItem.pageType == 5) {
......@@ -234,11 +239,11 @@
newObj.ImgList = tripObj.dinnerArray[0].ImgList;
newObj.MainDesc = tripObj.dinnerArray[0].MainDesc;
} else {
newObj.MainName = "默认餐食";
newObj.MainName = "行程餐食";
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/Z4DbAPRPmBPkaJQyxwesEWAz3sbZadNj.jpg"
}];
newObj.MainDesc = "默认餐食描述";
newObj.MainDesc = "行程餐食描述";
}
}
//景点
......@@ -249,13 +254,18 @@
newObj.ImgList = tripObj.scenicArray[0].ImgList;
newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
} else {
newObj.MainName = "默认景点";
newObj.MainName = "行程景点";
newObj.ImgList = [{
url: "http://imgfile.oytour.com/Upload/DMC/20200201061804955.jpg"
}];
newObj.MainDesc = "默认景点描述信息";
newObj.MainDesc = "行程景点描述信息";
}
}
if(pItem.pageType == 4||pItem.pageType == 5||pItem.pageType == 6){
newObj.SubList = [
{url:''}, {url:''}
]
}
pItem.dataObj = newObj;
});
}
......@@ -307,23 +317,26 @@
}
if (dItem.HotelArray && dItem.HotelArray.length > 0) {
dItem.HotelArray.forEach(sItem => {
var tempImgList = [];
if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => {
tempImgList.push({
url: iItem.Url
});
})
}
var hObj = {
MainName: sItem.HotelName,
MainDesc: sItem.Description,
ImgList: tempImgList,
SourceType: 4
}
var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
if (!tempHotel) {
hotelArray.push(hObj);
//排除“温馨的家”和“机场附近酒店”
if (sItem.HotelId != 1568 && sItem.HotelId != 2353) {
var tempImgList = [];
if (sItem.ImaArray && sItem.ImaArray.length > 0) {
sItem.ImaArray.forEach(iItem => {
tempImgList.push({
url: iItem.Url
});
})
}
var hObj = {
MainName: sItem.HotelName,
MainDesc: sItem.Description,
ImgList: tempImgList,
SourceType: 4
}
var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
if (!tempHotel) {
hotelArray.push(hObj);
}
}
});
}
......@@ -379,7 +392,20 @@
scenicArray,
dinnerArray,
}
}
},
// 设置编辑状态
canEditChange: function (val) {
this.canEdit = val;
this.$forceUpdate();
},
// 返回数据对象
getFeatureData: function () {
this.canEditChange(false);
var obj = {
basicData: this.pageList,
};
return obj;
},
},
computed: {
......@@ -387,23 +413,14 @@
watch: {
FeatureData: {
handler(val, oldVal) {
console.log("UpgradedVersion_Feature", this.FeatureData);
},
deep: true,
immediate: true
},
},
mounted() {
//调用初始化信息提示
var that = this;
that.initFeature();
that.MsgBus.$on("comUpTravel", function () {
that.initFeature();
});
// that.MsgBus.$on("resetFresh", function () {
// that.Refresh = false;
// });
console.log("UpgradedVersion_Feature", this.FeatureData);
this.initFeature();
}
};
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ a7e44f10
......@@ -9,17 +9,20 @@
:isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_0'" @change="uploadpic">
<input type="file" style="display:none" :id="'introducefile_'+(index * 2 + 1) + '_0'" @change="uploadpic">
</div>
<div class="MasterMapList-box-two absolute z-index3">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
:isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false"
:isAddImg="FeatureItem.pageType==2?false:true" :isDeleteImg="false" @toUploadImg="UploadImg"
:isAddImg="FeatureItem.pageType==2?false:
FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
&&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
@toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
</div>
</div>
<MasterMapList :index="index" :FeatureData="FeatureItem" @toUploadImg="UploadImg" @toSelectImg="SelectImg"
<!-- 上传主图文件 -->
<input type="file" style="display:none" :id="'MasterMapfile_'+(index * 2 + 1)" @change="uploadpic">
<MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType" @toUploadImg="UploadImg" @toSelectImg="SelectImg"
@toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
<!-- 副标题 -->
......@@ -69,19 +72,26 @@
queryItem: {
queryName: '',
queryId: 0,
}
},
MasterMapIndex: null,//主图下标
StencilDrawing: false,//是否是模版图
};
},
methods: {
UploadImg() {
UploadImg(index,type) {
this.MasterMapIndex = index?index:0
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.FeatureItem.pageType==2){
document.querySelector(`#introducefile_${(this.FeatureItem * 2 + 1)}_0`).click();
document.querySelector(`#introducefile_${(this.index * 2 + 1)}_0`).click();
}else{
document.querySelector(`#MasterMapfile_${(this.index * 2 + 1)}`).click();
}
},
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);
......@@ -92,38 +102,60 @@
that.uploadSelfBlob(path, newArr, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
if(that.FeatureItem.pageType==2){
that.FeatureItem.dataObj.ImgList[0].url = allPath
if(that.StencilDrawing){
that.FeatureItem.dataObj.SubList[that.MasterMapIndex].url = allPath
}else{
that.FeatureItem.dataObj.ImgList[that.MasterMapIndex].url = allPath
}
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg() {
SelectImg(index,type) {
this.MasterMapIndex = index?index:0
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.FeatureItem.pageType==3) this.choseType = 2
else if(this.FeatureItem.pageType==4) this.choseType = 1
else if(this.FeatureItem.pageType==5) this.choseType = 2
else if(this.FeatureItem.pageType==6) this.choseType = 3
else this.choseType = 0
this.isShowScenicImg = true
},
AddImg() {
let obj = {
url:''
}
this.FeatureItem.dataObj.ImgList.push(obj)
},
DeleteImg() {
DeleteImg(index,type) {
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.StencilDrawing){
this.FeatureItem.dataObj.SubList.splice(index,1)
}else{
this.FeatureItem.dataObj.ImgList.splice(index,1)
}
},
toAddPages(index, FeatureData) {
this.$emit('toAddPages', index, FeatureData)
toAddPages() {
this.$emit('toAddPages', this.index, this.FeatureItem)
},
toDeletePages(index, FeatureData) {
this.$emit('toDeletePages', index, FeatureData)
toDeletePages() {
this.$emit('toDeletePages', this.index, this.FeatureItem)
},
setTemplate(index, TemplateType) {
this.$emit('setTemplate', index, TemplateType)
setTemplate(TemplateType) {
this.FeatureItem.pageTemplate = TemplateType
},
closeDMCchooseImg() {
this.isShowScenicImg = false
},
getDMCimg(selectImgArr) {
if(this.FeatureItem.pageType==2){
this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path
let Path = selectImgArr[0].Path
if(this.StencilDrawing){
this.FeatureItem.dataObj.SubList[this.MasterMapIndex].url = Path
}else{
this.FeatureItem.dataObj.ImgList[this.MasterMapIndex].url = Path
}
this.isShowScenicImg = false
}
......@@ -139,6 +171,13 @@
deep: true,
immediate: true
},
MasterMapIndex:{
handler(val,oldVal){
},
deep: true,
immediate: true
}
},
mounted() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/travelDays.vue 0 → 100644
View file @ a7e44f10
<template>
<div class="travelDays-form">
<div class="travelDays-box absolute z-index1">
<div class="travelDays-Title">===============</div>
</div>
<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>
</template>
<script>
import MasterMapList from "./components/MasterMapList";
import subheading from "./components/subheading";
import vEditDiv from "../TravelTemp/VEditDiv";
import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
export default {
components: {
MasterMapList,
subheading,
vEditDiv,
FeatureControls,
DMCchooseImg
},
props: [
'TripColor',
'index',
'FeatureItem'
],
data() {
return {
canEdit: true,
canEdit1: true,
isShowScenicImg: false,
choseType: 0,
queryItem: {
queryName: '',
queryId: 0,
},
MasterMapIndex: null,//主图下标
StencilDrawing: false,//是否是模版图
};
},
methods: {
UploadImg(index,type) {
this.MasterMapIndex = index?index:0
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.FeatureItem.pageType==2){
document.querySelector(`#introducefile_${(this.index * 2 + 1)}_0`).click();
}else{
document.querySelector(`#travelDays_${(this.index * 2 + 1)}`).click();
}
},
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];
if(that.StencilDrawing){
that.FeatureItem.dataObj.SubList[that.MasterMapIndex].url = allPath
}else{
that.FeatureItem.dataObj.ImgList[that.MasterMapIndex].url = allPath
}
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg(index,type) {
this.MasterMapIndex = index?index:0
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.FeatureData.pageType==3) this.choseType = 2
else if(this.FeatureData.pageType==4) this.choseType = 1
else if(this.FeatureData.pageType==5) this.choseType = 2
else if(this.FeatureData.pageType==6) this.choseType = 3
else this.choseType = 0
this.isShowScenicImg = true
},
AddImg() {
let obj = {
url:''
}
this.FeatureItem.dataObj.ImgList.push(obj)
},
DeleteImg(index,type) {
if(type) this.StencilDrawing = true
else this.StencilDrawing = false
if(this.StencilDrawing){
this.FeatureItem.dataObj.SubList.splice(index,1)
}else{
this.FeatureItem.dataObj.ImgList.splice(index,1)
}
},
toAddPages() {
this.$emit('toAddPages', this.index, this.FeatureItem)
},
toDeletePages() {
this.$emit('toDeletePages', this.index, this.FeatureItem)
},
setTemplate(TemplateType) {
this.FeatureItem.pageTemplate = TemplateType
},
closeDMCchooseImg() {
this.isShowScenicImg = false
},
getDMCimg(selectImgArr) {
let Path = selectImgArr[0].Path
if(this.StencilDrawing){
this.FeatureItem.dataObj.SubList[this.MasterMapIndex].url = Path
}else{
this.FeatureItem.dataObj.ImgList[this.MasterMapIndex].url = Path
}
this.isShowScenicImg = false
}
},
computed: {},
watch: {
FeatureData: {
handler(val, oldVal) {
},
deep: true,
immediate: true
},
},
mounted() {
}
};
</script>
<style>
.travelDays-box{
position: absolute;
left: 0;
top: 112px;
right: 0;
bottom: 115px;
border: 1px solid #ddd;
}
</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