Skip to content

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

页面修改

parent fd873b66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 85 deletions
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ c2e06ca7
......@@ -122,8 +122,6 @@
</template>
<script>
import Travelslider from "../../../assets/img/Travelslider.png";
import TravelNinegrid from "../../../assets/img/TravelNinegrid.png";
import userDefined from "../../../assets/img/userDefined.png";
import MyEdit from "../../EditTemplate.vue";
import travelHotel1 from "./TravelTemp/TravelHotel1";
......
src/components/newTravelmanager/TravelGroupControl/TravelNotice.vue
View file @ c2e06ca7
......@@ -211,7 +211,6 @@
"subArray",
"NoticeData",
"PostConfig",
"CountryID" //国家编号
],
data() {
......@@ -311,9 +310,9 @@
//获取相似的行程特色列表
GetSameFeatureList() {
var msg = {
ID: this.subArray.ConfigId,
LineId: this.subArray.LineID,
LineteamId: this.subArray.LineteamId
ID: this.PostConfig.ID,
LineId: this.PostConfig.LineId,
LineteamId: this.PostConfig.LineteamId
};
this.apipost(
"travel_get_GetTopTenSameFeatureList",
......@@ -345,6 +344,9 @@
if (x.ShopRemark != null) {
this.ShopRemarkArr.push(x.ShopRemark);
}
if (x.VisaRemark && x.VisaRemark != '') {
this.VisaRemarkArr.push(x.VisaRemark);
}
});
}
},
......@@ -352,15 +354,15 @@
);
},
getVisaDescribe() {
this.apipost(
"dmc_get_visa_GetAllVisaDescribe", {},
res => {
if (res.data.resultCode == 1) {
this.VisaRemarkArr = res.data.data;
}
},
err => {}
);
// this.apipost(
// "dmc_get_visa_GetAllVisaDescribe", {},
// res => {
// if (res.data.resultCode == 1) {
// this.VisaRemarkArr = res.data.data;
// }
// },
// err => {}
// );
},
//获取购物店下拉框
getShopItemList() {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ c2e06ca7
......@@ -86,7 +86,8 @@
'index',
'TripColor',
'FeatureData',
'canEdit'
'canEdit',
'DataArray'
],
data() {
return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/MasterMapList.vue
View file @ c2e06ca7
......@@ -8,7 +8,7 @@
<FeatureControls v-if="FeatureData&&pageType!=2" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1"
:isUploadImg="pageType==2?false:true" :isSelectImg="pageType==2?false:true"
:isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" />
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="1019" :y="577" :isShowSelect="true" :DataArray="DataArray" />
</div>
<VueDraggableResizable v-if="FeatureData.ImgList.length==1"
:w="1019" :h="577"
......@@ -867,7 +867,8 @@
props: [
'index',
'FeatureData',
'pageType'
'pageType',
'DataArray'
],
data() {
return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ c2e06ca7
......@@ -27,40 +27,46 @@
<el-tooltip class="item" effect="dark" content="设置字体大小(默认34px)，最小值30，最大值40" placement="top" v-if="isFontSize">
<p class="row-aic">
<span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
<el-input-number :min="30" :max="40" v-model="FeatureData.dataObj.ShadowFontSize2" controls-position="right"></el-input-number>
<!-- <el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize2" style="width: 80px;height: 34px;"></el-input> -->
<el-input-number :min="30" :max="40" v-model="FeatureData.dataObj.ShadowFontSize2" controls-position="right">
</el-input-number>
<span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
<span class="relative" style="top: -3px;">px</span>
<span class="relative" style="top: -3px;">px</span>
</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="切换" placement="top" v-if="isShowSelect">
<p class="row-aic">
<el-select v-model="changeIndex" @change="changeData" filterable>
<el-option v-for="(item,index) in DataArray" :key="index" :label="item.MainName" :value="index"></el-option>
</el-select>
</p>
</el-tooltip>
</div>
<div class="column featureControls-bottom featureControls-bottomTwo" v-else>
<template v-if="!isImg&&!isTemplate">
<el-tooltip class="item" effect="dark" content="添加页面" placement="top">
<div @click="toAddPages">
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<div @click="toSelectImg" v-if="isSelectImg">
<i class="el-icon-search"></i>
</div>
</el-tooltip>
</template>
<el-tooltip class="item" effect="dark" content="添加页面" placement="top">
<div @click="toAddPages">
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<div @click="toSelectImg" v-if="isSelectImg">
<i class="el-icon-search"></i>
</div>
</el-tooltip>
</template>
<div v-if="isTemplate">
<el-tooltip class="item" effect="dark" content="选模版" placement="top">
<el-popover trigger="hover" placement="right">
......@@ -85,8 +91,9 @@
components: {
},
props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y','isFontSize'
props: ['index', 'FeatureData', 'ControlsType', 'isImg', 'pagesType', 'isDeletePage',
'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template', 'x', 'y', 'isFontSize',
'DataArray', 'isShowSelect'
],
data() {
return {
......@@ -103,10 +110,31 @@
url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateThree.png',
id: 3,
}
]
],
changeIndex: 0,
};
},
methods: {
changeData() {
if (this.DataArray && this.DataArray.length > 0 && this.changeIndex <= this.DataArray.length - 1) {
var dataObj = this.DataArray[this.changeIndex];
console.log(" this.FeatureData.dataObj", this.FeatureData);
if (dataObj) {
if (this.FeatureData) {
if (this.FeatureData.dataObj) {
this.FeatureData.dataObj.DetailsName = dataObj.MainName;
this.FeatureData.dataObj.MainDesc = dataObj.MainDesc;
this.FeatureData.dataObj.ImgList = dataObj.ImgList;
} else {
this.FeatureData.MainName = dataObj.MainName;
this.FeatureData.MainDesc = dataObj.MainDesc;
this.FeatureData.ImgList = dataObj.ImgList;
}
}
}
}
},
setTemplate(item) {
this.TemplateType = item.id
this.$emit('setTemplate', this.TemplateType)
......@@ -156,4 +184,5 @@
</script>
<style>
@import url("../../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ c2e06ca7
......@@ -7,17 +7,17 @@
<Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header>
<!-- 首页 -->
<featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
@UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
@UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages" :DataArray="DataArray"></featureHome>
<!-- 其余页 -->
<div v-else>
<headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :index="index" :FeatureItem="item" :canEdit="canEdit" :TripColor="TripColor"
@toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3">
@toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3" :DataArray="DataArray">
</otherJourney>
<!-- 食详情页 -->
<UpgradedVersionDetails :index="index" :canEdit="canEdit" :FeatureData="item" :TripColor="TripColor"
@toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
@toAddPages="AddPages" @toDeletePages="DeletePages" v-if="item.pageType==3" :DataArray="DataArray"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<div v-if="item.pageType!=1"
:class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
......@@ -119,6 +119,7 @@
dinner3: "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg",
dinner4: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg",
RenderingOk: false,
DataArray: [], //房、餐、景点数组
};
},
methods: {
......@@ -199,6 +200,11 @@
return detailsObj;
},
initFeature(isReload) {
var tripObj = this.getTripData();
if (tripObj && tripObj.allArray) {
this.DataArray = tripObj.allArray;
}
console.log("this.DataArray", this.DataArray);
if (this.FeatureData && this.FeatureData.FeatureHtmlJson && typeof (this.FeatureData.FeatureHtmlJson) ==
Array) {
this.FeatureData.FeatureHtmlJson.forEach(x => {
......@@ -221,7 +227,7 @@
this.RenderingOk = true;
} else {
var tripObj = this.getTripData();
this.pageList.forEach(pItem => {
var newObj = this.getDetailsObj();
newObj.LineName = this.FeatureData.LineName;
......@@ -601,6 +607,7 @@
var scenicArray = [];
var hotelArray = [];
var dinnerArray = [];
var allArray = [];
if (this.FeatureData && this.FeatureData.DayList && this.FeatureData.DayList.length > 0) {
this.FeatureData.DayList.forEach(dItem => {
//城市
......@@ -637,7 +644,8 @@
}
var temoScenic = scenicArray.find(x => x.MainName == sObj.MainName)
if (!temoScenic) {
scenicArray.push(sObj)
scenicArray.push(sObj);
allArray.push(sObj);
}
});
}
......@@ -665,6 +673,7 @@
var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
if (!tempHotel) {
hotelArray.push(hObj);
allArray.push(hObj);
}
}
});
......@@ -694,7 +703,8 @@
};
var tempDinner = dinnerArray.find(x => x.MainName == dObj.MainName)
if (!tempDinner) {
dinnerArray.push(dObj)
dinnerArray.push(dObj);
allArray.push(dObj);
}
}
});
......@@ -722,6 +732,7 @@
hotelArray,
scenicArray,
dinnerArray,
allArray,
}
},
//设置编辑状态
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ c2e06ca7
......@@ -23,7 +23,7 @@
<!-- 上传主图文件 -->
<input type="file" style="display:none" :id="'MasterMapfile_'+(FeatureItem * 2 + 1)+'_'+index" @change="uploadpic">
<MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType"
@toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
@toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :DataArray="DataArray" ></MasterMapList>
<!-- 副标题 -->
<subheading :Template="FeatureItem.pageTemplate" :index="index" :FeatureData="FeatureItem" :TripColor="TripColor"
......@@ -63,7 +63,8 @@
'TripColor',
'index',
'FeatureItem',
'canEdit'
'canEdit',
'DataArray'
],
data() {
return {
......
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