Skip to content

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

行程主题色

parent 930e94cf
Show whitespace changes
Inline Side-by-side
Showing with 224 additions and 422 deletions
src/assets/css/UpgradedVersion.css
View file @ 67f2e961
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.row-ajc{
display: flex;
align-items: center;
justify-content: center;
}
.row-sb{ .row-sb{
display:flex; display:flex;
justify-content: space-between; justify-content: space-between;
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 67f2e961
...@@ -224,6 +224,11 @@ ...@@ -224,6 +224,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="_VideoStr_box">
<el-form-item label="行程主题色">
<el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker>
</el-form-item>
</div> -->
</el-form> </el-form>
</div> </div>
</div> </div>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 67f2e961
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2> <newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div> </div>
<!--行程特色第三版 --> <!--行程特色第三版 -->
<UpgradedVersion v-if="FeatureData.FeatureType==8"></UpgradedVersion> <UpgradedVersion :TripColor="TripColor" v-if="FeatureData.FeatureType==8"></UpgradedVersion>
</div> </div>
</div> </div>
</div> </div>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
// newFeature3, // newFeature3,
UpgradedVersion UpgradedVersion
}, },
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"], props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType","TripColor"],
inject: ['loadConfigInfo'], inject: ['loadConfigInfo'],
data() { data() {
return { return {
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 67f2e961
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
@change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect> @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
<TravelFeature :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor" <TravelFeature :TripColor="PostConfig.TripColor" :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor"
@featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
@unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"></TravelFeature> @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"></TravelFeature>
<TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
...@@ -270,6 +270,7 @@ ...@@ -270,6 +270,7 @@
/*获取组件配置信息【回调方法】*/ /*获取组件配置信息【回调方法】*/
getConfig(configObj) { getConfig(configObj) {
this.PostConfig = configObj; this.PostConfig = configObj;
this.PostConfig.TripColor = configObj.TripColor?configObj.TripColor:'#CC6900'//#CC0066
//没有报价单根据线路设置直采和非直采方式生成线路行程 //没有报价单根据线路设置直采和非直采方式生成线路行程
if (this.IsHaveOffer == 0) { if (this.IsHaveOffer == 0) {
this.NoticeParameters.ConfigId = this.PostConfig.ConfigId; this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 67f2e961
...@@ -16,10 +16,12 @@ ...@@ -16,10 +16,12 @@
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div> </div>
<div class="UpgradedVersion-subIdeTitle absolute"> <div class="UpgradedVersion-subIdeTitle absolute">
<div class="UpgradedVersion-subIdeTitleBj relative z-index1"></div> <div class="UpgradedVersion-subIdeTitleBj relative z-index1"
:style="{'background':TripColor}"></div>
<div class="UpgradedVersion-sT relative row z-index2"> <div class="UpgradedVersion-sT relative row z-index2">
<div> <div>
<div class="UpgradedVersion-sTL">&nbsp;</div> <div class="UpgradedVersion-sTL"
:style="{'background':TripColor}">&nbsp;</div>
</div> </div>
<div class="UpgradedVersion-sTR marginL20"> <div class="UpgradedVersion-sTR marginL20">
<div class="UpgradedVersion-sTR-h"> <div class="UpgradedVersion-sTR-h">
...@@ -37,7 +39,8 @@ ...@@ -37,7 +39,8 @@
<div class="UpgradedVersion-subIdeImgBoxL"> <div class="UpgradedVersion-subIdeImgBoxL">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/subheadingBj.png"/> <img src="http://192.168.10.214:8130/Upload/NewTripFeature/subheadingBj.png"/>
</div> </div>
<div class="UpgradedVersion-subIdeImgBoxR">&nbsp;</div> <div class="UpgradedVersion-subIdeImgBoxR"
:style="{'background':TripColor}">&nbsp;</div>
</div> </div>
</div> </div>
<div class="UpgradedVersion-subIdeImgForm"> <div class="UpgradedVersion-subIdeImgForm">
...@@ -75,9 +78,10 @@ ...@@ -75,9 +78,10 @@
components: { components: {
vEditDiv vEditDiv
}, },
props: { props: [
'TripColor'
// FeatureData // FeatureData
}, ],
data() { data() {
return { return {
first: '五星级风景美术馆', first: '五星级风景美术馆',
...@@ -97,12 +101,13 @@ ...@@ -97,12 +101,13 @@
}, },
computed: {}, computed: {},
watch: { watch: {
// FeatureData: { TripColor: {
// handler(val, oldVal) { handler(val, oldVal) {
// }, },
// deep: true deep: true,
// }, immediate: true
},
}, },
mounted() { mounted() {
...@@ -183,7 +188,7 @@ ...@@ -183,7 +188,7 @@
.UpgradedVersion-subIdeTitleBj{ .UpgradedVersion-subIdeTitleBj{
width: 233px; width: 233px;
height: 234px; height: 234px;
background: #D23181; /* background: #D23181; */
opacity: 0.2; opacity: 0.2;
border-radius: 50%; border-radius: 50%;
left: -24px; left: -24px;
...@@ -198,7 +203,7 @@ ...@@ -198,7 +203,7 @@
width: 17px; width: 17px;
height: 100%; height: 100%;
line-height: 62px; line-height: 62px;
background: #CC0066; /* background: #CC0066; */
border-radius: 9px; border-radius: 9px;
} }
.UpgradedVersion-sTR{ .UpgradedVersion-sTR{
...@@ -242,7 +247,7 @@ ...@@ -242,7 +247,7 @@
.UpgradedVersion-subIdeImgBoxR{ .UpgradedVersion-subIdeImgBoxR{
margin-left: 12px; margin-left: 12px;
flex-grow: 1; flex-grow: 1;
background: #CC0066; /* background: #CC0066; */
} }
.UpgradedVersion-subIdeImgForm1{ .UpgradedVersion-subIdeImgForm1{
top: 919px; top: 919px;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ 67f2e961
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<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}">
<vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv> <vEditDiv :canEdit='canEdit1' v-model="first1"></vEditDiv>
</div> </div>
</div> </div>
...@@ -15,49 +17,35 @@ ...@@ -15,49 +17,35 @@
</div> </div>
<div class="featureHome-left"> <div class="featureHome-left">
<div class="featureHome-vToolBar-one absolute z-index3" v-if="canEdit===true"> <div class="featureHome-vToolBar-one absolute z-index3" v-if="canEdit===true">
<vToolBar <FeatureControls
:isHorizontal="true" :ControlsType="'row'"
name="restaurant" :isDeletePage="false"
:type="2" :pagesType="1"
:index1="2" @toAddPages="AddPages"
:index2="2" @toDeletePages="DeletePages">
:length1="2" </FeatureControls>
:length2="2" <input type="file" style="display:none" id='restaurantfile' @change="uploadpic">
@toPreY="imgToPreY"
@toNextY="imgToNextY"
@toPreZ="imgToPreZ"
@toNextZ="imgToNextZ"
@toHuan="imgToHuan"
@toXuan="imgToXuan"
@toDelete="imgToDelete">
</vToolBar>
<input type="file" style="display:none" :id='"restaurantfile_"+2+"_0"' @change="uploadpic">
</div> </div>
<div class="featureHome-vToolBar-two absolute z-index3"> <div class="featureHome-vToolBar-two absolute z-index3">
<vToolBar <FeatureControls
:isHorizontal="false" :ControlsType="'column'"
:isHuan="false" :isAddImg="false"
:isXuan="false" :isDeleteImg="false"
name="hotel" @toUploadImg="UploadImg"
:type="1" @toSelectImg="SelectImg"
:index1="4" @toAddImg="AddImg"
:index2="0" @toDeleteImg="DeleteImg"
:length1="1" ></FeatureControls>
:length2="1"
@toPreY="bolckToPreY"
@toNextY="bolckToNextY"
@toPreZ="bolckToPreZ"
@toNextZ="bolckToNextZ"
@toDelete="bolckToDelete">
</vToolBar>
</div> </div>
<div class="featureHome-left-one absolute z-index2"> <div class="featureHome-left-one 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"
:style="{'background':TripColor}">
<vEditDiv :canEdit='canEdit3' v-model="first3"></vEditDiv> <vEditDiv :canEdit='canEdit3' v-model="first3"></vEditDiv>
</div> </div>
<div class="featureHome-Markers Markers absolute z-index1"></div> <div class="featureHome-Markers Markers absolute z-index1"
:style="{'background':TripColor}"></div>
<div class="featureHome-left-three absolute z-index2"> <div class="featureHome-left-three absolute z-index2">
<vEditDiv :canEdit='canEdit4' v-model="first4"></vEditDiv> <vEditDiv :canEdit='canEdit4' v-model="first4"></vEditDiv>
</div> </div>
...@@ -70,12 +58,24 @@ ...@@ -70,12 +58,24 @@
<vEditDiv :canEdit='canEdit6' v-model="first6"></vEditDiv> <vEditDiv :canEdit='canEdit6' v-model="first6"></vEditDiv>
</div> </div>
<div class="featureHome-right-three absolute z-index1"> <div class="featureHome-right-three absolute z-index1">
<div>
<div class="featureHomeBjH1 featureHomeBj1" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj2 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH1 featureHomeBj3 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW1 featureHomeBj4 relative" :style="{'background':TripColor}">&nbsp;</div>
</div>
<div class="featureHome-three-text featureHome-three-textOne absolute"> <div class="featureHome-three-text featureHome-three-textOne absolute">
<vEditDiv :canEdit='canEdit7' v-model="first7"></vEditDiv> <vEditDiv :canEdit='canEdit7' v-model="first7"></vEditDiv>
</div> </div>
<div class="featureHome-three-text featureHome-three-textTwo absolute"> <div class="featureHome-three-text featureHome-three-textTwo absolute">
<vEditDiv :canEdit='canEdit8' v-model="first8"></vEditDiv> <vEditDiv :canEdit='canEdit8' v-model="first8"></vEditDiv>
</div> </div>
<div>
<div class="featureHomeBjH2 featureHomeBj5 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj6 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjH2 featureHomeBj7 relative" :style="{'background':TripColor}">&nbsp;</div>
<div class="featureHomeBjW2 featureHomeBj8 relative" :style="{'background':TripColor}">&nbsp;</div>
</div>
</div> </div>
</div> </div>
<el-dialog custom-class="resourceImgAdd" <el-dialog custom-class="resourceImgAdd"
...@@ -99,17 +99,18 @@ ...@@ -99,17 +99,18 @@
<script> <script>
import vEditDiv from "../TravelTemp/VEditDiv"; import vEditDiv from "../TravelTemp/VEditDiv";
import vToolBar from "../TravelTemp/VToolBar"; import FeatureControls from "./components/featureControls";
import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue"; import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
export default { export default {
components: { components: {
vEditDiv, vEditDiv,
vToolBar, FeatureControls,
DMCchooseImg DMCchooseImg
}, },
props: { props: [
'TripColor',
// FeatureData // FeatureData
}, ],
data() { data() {
return { return {
first: '森之京都~椿山庄.', first: '森之京都~椿山庄.',
...@@ -164,361 +165,67 @@ ...@@ -164,361 +165,67 @@
queryItem:{ queryItem:{
queryName:'', queryName:'',
queryId:0, queryId:0,
}
};
}, },
methods: { borderBox: ''
// 返回数据对象
getFeatureData() {
this.canEditChange(false);
let travelFeature2 = {
hotelObj: this.hotelObj,
viewSpotObj: this.viewSpotObj,
restaurantObj: this.restaurantObj
};
var obj = {
basicData: travelFeature2,
deleteArray: this.deleteArray
}; };
return obj;
},
// 设置编辑状态
canEditChange(val) {
this.canEdit = val;
this.$forceUpdate();
}, },
//关闭添加弹窗 methods: {
closeDMCchooseImg() { UploadImg(){
this.isShowScenicImg = false;
this.queryItem.queryName = "";
}, },
//获取选择的图片 uploadpic(e) {
getDMCimg(imgArr) { let that = this;
if (imgArr.length > 0) { if (e.target.files.length > 0 && e.target.files[0].size > 0) {
if (this.name === "hotel") { // 压缩图片需要的一些元素和对象
if (this.hotelObj.list[this.currentIndex].images[this.imgIndex]) { var reader = new FileReader();
this.$refs[ reader.onload = function (event) {
"hotelVds_" + this.currentIndex + "_" + this.imgIndex let blob = that.base64ToBlob(event.target.result);
][0]._data.top = 0; let newArr = [];
this.hotelObj.list[this.currentIndex].images[this.imgIndex].Url = newArr.push(blob);
imgArr[0].Path; var fileName = `${that.uuid(10, 10)}.png`;
} else { var path = `/newFeature`;
this.hotelObj.list[this.currentIndex].images[this.imgIndex] = { that.uploadSelfBlob(path, newArr, x => {
x: 0, let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
y: 0, let i = e.target.id.split("_")[2];
Url: imgArr[0].Path that.imgUrlChange(allPath);
}; });
}
} else if (this.name === "viewSpot") {
if (this.viewSpotObj.list[this.currentIndex].images[this.imgIndex]) {
this.$refs[
"viewSpotVds_" + this.currentIndex + "_" + this.imgIndex
][0]._data.top = 0;
this.viewSpotObj.list[this.currentIndex].images[this.imgIndex].Url =
imgArr[0].Path;
} else {
this.viewSpotObj.list[this.currentIndex].images[this.imgIndex] = {
x: 0,
y: 0,
Url: imgArr[0].Path
};
}
} else if (this.name === "restaurant") {
if (
this.restaurantObj.list[this.currentIndex].images[this.imgIndex]
) {
this.$refs[
"restaurantVds_" + this.currentIndex + "_" + this.imgIndex
][0]._data.top = 0;
this.restaurantObj.list[this.currentIndex].images[
this.imgIndex
].Url = imgArr[0].Path;
} else {
this.restaurantObj.list[this.currentIndex].images[this.imgIndex] = {
x: 0,
y: 0,
Url: imgArr[0].Path
}; };
reader.readAsDataURL(e.target.files[0]);
} }
}
}
this.$forceUpdate();
}, },
// 图片高度重置 SelectImg(){
imgTopReset(name, index1, index2) { this.isShowScenicImg = true
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0;
if (this.$refs["hotelVds_"+index1+"_"+i]) {
this.$refs["hotelVds_"+index1+"_"+i][0]._data.top=0
}
}
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0;
if (this.$refs["viewSpotVds_"+index1+"_"+i]) {
this.$refs["viewSpotVds_"+index1+"_"+i][0]._data.top=0
}
}
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images;
for (let i = 0; i < imgList.length; i ++) {
imgList[i].y = 0;
if (this.$refs["restaurantVds_"+index1+"_"+i]) {
this.$refs["restaurantVds_"+index1+"_"+i][0]._data.top=0
}
}
}
},
// 图片顺序上移
imgToPreY(name, index1, index2) {
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images
}
this.imgTopReset(name, index1, index2);
let preImg = JSON.stringify(imgList[index2-1]);
let nowImg = JSON.stringify(imgList[index2]);
this.$set(imgList, index2-1, JSON.parse(nowImg));
this.$set(imgList, index2, JSON.parse(preImg))
},
// 图片顺序下移
imgToNextY(name, index1, index2) {
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images
}
this.imgTopReset(name, index1, index2);
let nextImg = JSON.stringify(imgList[index2+1]);
let nowImg = JSON.stringify(imgList[index2]);
this.$set(imgList, index2, JSON.parse(nextImg));
this.$set(imgList, index2+1, JSON.parse(nowImg))
}, },
// 图片顺序置顶 AddImg(){
imgToPreZ(name, index1, index2) {
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images
}
this.imgTopReset(name, index1, index2);
let nowImg = JSON.stringify(imgList[index2]);
imgList.splice(index2,1);
imgList.splice(0,0,JSON.parse(nowImg))
},
// 图片顺序置底
imgToNextZ(name, index1, index2) {
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images
}
this.imgTopReset(name, index1, index2);
let nowImg = JSON.stringify(imgList[index2]);
imgList.splice(index2,1);
imgList.push(JSON.parse(nowImg))
},
// 图片替换
imgToHuan(name, index1, index2) {
if (name === 'hotel') {
document.querySelector("#hotelfile_"+index1+"_"+index2).click()
} else if (name === 'viewSpot') {
document.querySelector("#viewSpotfile_"+index1+"_"+index2).click()
} else if (name === 'restaurant') {
document.querySelector("#restaurantfile_"+index1+"_"+index2).click()
}
this.name = name;
this.currentIndex = index1;
this.imgIndex = index2
},
// 图片选择
imgToXuan(name, index1, index2) {
if (name === 'hotel') {
this.choseType = 1;
this.queryItem.queryName = this.hotelObj.list[index1].name;
} else if (name === 'viewSpot') {
this.choseType = 3;
this.queryItem.queryName = this.viewSpotObj.list[index1].name;
} else if (name === 'restaurant') {
this.choseType = 2;
if(this.restaurantObj.list[index1].name==='酒店内享用早餐'){
this.queryItem.queryName=''
}else{
this.queryItem.queryName = this.restaurantObj.list[index1].name;
}
}
this.isShowScenicImg = true;
this.name = name;
this.currentIndex = index1;
this.imgIndex = index2
},
// 图片删除
imgToDelete(name, index1, index2) {
let imgList = [];
if (name === 'hotel') {
imgList = this.hotelObj.list[index1].images
} else if (name === 'viewSpot') {
imgList = this.viewSpotObj.list[index1].images
} else if (name === 'restaurant') {
imgList = this.restaurantObj.list[index1].images
}
this.imgTopReset(name, index1, index2);
imgList.splice(index2,1)
},
// 版块顺序上移
bolckToPreY(name, index1, index2) {
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
} else if (name === 'viewSpot') {
blockList = this.viewSpotObj.list
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
this.imgTopReset(name, index1, index2);
let preBlock = JSON.stringify(blockList[index1-1]);
let nowBlock = JSON.stringify(blockList[index1]);
this.$set(blockList, index1-1, JSON.parse(nowBlock));
this.$set(blockList, index1, JSON.parse(preBlock))
}, },
// 版块顺序下移 DeleteImg(){
bolckToNextY(name, index1, index2) {
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
} else if (name === 'viewSpot') {
blockList = this.viewSpotObj.list
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
this.imgTopReset(name, index1, index2);
let nextBlock = JSON.stringify(blockList[index1+1]);
let nowBlock = JSON.stringify(blockList[index1]);
this.$set(blockList, index1, JSON.parse(nextBlock));
this.$set(blockList, index1+1, JSON.parse(nowBlock))
}, },
// 版块顺序置顶 AddPages(){
bolckToPreZ(name, index1, index2) {
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
} else if (name === 'viewSpot') {
blockList = this.viewSpotObj.list
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
this.imgTopReset(name, index1, index2);
let nowBlock = JSON.stringify(blockList[index1]);
blockList.splice(index1,1);
blockList.splice(0,0,JSON.parse(nowBlock))
}, },
// 版块顺序置底 DeletePages(){
bolckToNextZ(name, index1, index2) {
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
} else if (name === 'viewSpot') {
blockList = this.viewSpotObj.list
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
this.imgTopReset(name, index1, index2);
let nowBlock = JSON.stringify(blockList[index1]);
blockList.splice(index1,1);
blockList.push(JSON.parse(nowBlock))
}, },
// 版块删除 closeDMCchooseImg(){
bolckToDelete(name, index1, index2) { this.isShowScenicImg = false
let blockList = [];
if (name === 'hotel') {
blockList = this.hotelObj.list
} else if (name === 'viewSpot') {
blockList = this.viewSpotObj.list
} else if (name === 'restaurant') {
blockList = this.restaurantObj.list
}
this.imgTopReset(name, index1, index2);
blockList.splice(index1,1);
this.pageCount(name)
}, },
pageCount(type) { getDMCimg(selectImgArr){
if (type === 'hotel') { console.log(selectImgArr,'已选图')
if (this.hotelObj.list.length!==0) { this.isShowScenicImg = false
this.hotelObj.pageList = [];
let num = Math.ceil(this.hotelObj.list.length/2);
for (let i = 0; i < num; i++) {
this.hotelObj.pageList.push(i)
}
}
} else if (type === 'viewSpot') {
if (this.viewSpotObj.list.length!==0) {
this.viewSpotObj.pageList = [];
this.viewSpotObj.pageList.push(0);
if (this.viewSpotObj.list.length > 2) {
let num = Math.ceil((this.viewSpotObj.list.length-2)/4);
for (let i = 0; i < num; i++) {
this.viewSpotObj.pageList.push(i+1)
}
}
}
} else if (type === 'restaurant') {
if (this.restaurantObj.list.length!==0) {
this.restaurantObj.pageList = [];
let num = Math.ceil(this.restaurantObj.list.length/2);
for (let i = 0; i < num; i++) {
this.restaurantObj.pageList.push(i)
}
}
}
},
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 = `/feature/${that.cid}/${fileName}`;
that.uploadBlob(path, newArr, x => {
let allPath=this.domainManager().ViittoFileUrl+x.name;
let i=e.target.id.split('_')[2];
that.imgUrlChange(allPath)
})
};
reader.readAsDataURL(e.target.files[0])
} }
},
}, },
computed: {}, computed: {},
watch: { watch: {
// FeatureData: { TripColor: {
// handler(val, oldVal) { handler(val, oldVal) {
this.borderBox = '2px solid '+val
// }, },
// deep: true deep: true,
// }, immediate: true
},
}, },
mounted() { mounted() {
...@@ -557,7 +264,7 @@ ...@@ -557,7 +264,7 @@
width: auto; width: auto;
max-width: 100%; max-width: 100%;
height: 70px; height: 70px;
border: 2px solid #CC0066; /* border: 2px solid #CC0066; */
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
padding: 8px 14px; padding: 8px 14px;
...@@ -566,7 +273,7 @@ ...@@ -566,7 +273,7 @@
font-size: 45px; font-size: 45px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S;
font-weight: bold; font-weight: bold;
color: #CC0066; /* color: #CC0066; */
} }
.featureHome-text-titleTwo{ .featureHome-text-titleTwo{
height: 46px; height: 46px;
...@@ -581,7 +288,7 @@ ...@@ -581,7 +288,7 @@
width: 784px; width: 784px;
} }
.featureHome-vToolBar-one{ .featureHome-vToolBar-one{
top: 325px; top: 339px;
left: 0; left: 0;
} }
.featureHome-vToolBar-two{ .featureHome-vToolBar-two{
...@@ -604,7 +311,7 @@ ...@@ -604,7 +311,7 @@
} }
.featureHome-left-two{ .featureHome-left-two{
width: 126px; width: 126px;
background: #CC0066; /* background: #CC0066; */
bottom: 267px; bottom: 267px;
right: 339px; right: 339px;
padding: 47px 0 47px 58px; padding: 47px 0 47px 58px;
...@@ -637,7 +344,7 @@ ...@@ -637,7 +344,7 @@
.Markers{ .Markers{
width: 23px; width: 23px;
height: 23px; height: 23px;
background: #CC0066; /* background: #CC0066; */
border-radius: 50%; border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
-moz-border-radius: 50%; -moz-border-radius: 50%;
...@@ -667,11 +374,55 @@ ...@@ -667,11 +374,55 @@
.featureHome-right-three{ .featureHome-right-three{
width: 143px; width: 143px;
height: 747px; height: 747px;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/featureHomeTextBox.png')no-repeat center; /* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/featureHomeTextBox.png')no-repeat center;
background-size: 100% 100%; background-size: 100% 100%; */
top: 240px; top: 240px;
right: 42px; right: 42px;
} }
.featureHomeBjH1{
width: 7px;
height: 18px;
}
.featureHomeBjW1{
width: 25px;
height: 7px;
}
.featureHomeBjH2{
width: 7px;
height: 27px;
}
.featureHomeBjW2{
width: 25px;
height: 7px;
}
.featureHomeBj2{
left: 7px;
top: -18px;
}
.featureHomeBj3{
left: 134px;
top: -25px;
}
.featureHomeBj4{
left: 109px;
top: -43px;
}
.featureHomeBj5{
left: 0;
top: 668px;
}
.featureHomeBj6{
left: 7px;
top: 661px;
}
.featureHomeBj7{
left: 134px;
top: 634px;
}
.featureHomeBj8{
left: 109px;
top: 627px;
}
.featureHome-three-text .edit_div{ .featureHome-three-text .edit_div{
width: 34px; width: 34px;
line-height: 50px; line-height: 50px;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 67f2e961
...@@ -7,18 +7,30 @@ ...@@ -7,18 +7,30 @@
<!-- logo --> <!-- logo -->
<Header></Header> <Header></Header>
<!-- 首页 --> <!-- 首页 -->
<featureHome v-if="index==0"></featureHome> <featureHome :TripColor="TripColor" v-if="index==0"></featureHome>
<!-- 其余页 --> <!-- 其余页 -->
<div v-if="index>0"> <div v-if="index>0">
<headerTitle></headerTitle> <headerTitle></headerTitle>
<!-- 介绍、宿食景页 --> <!-- 介绍、宿食景页 -->
<otherJourney v-if="index==1||index==3"></otherJourney> <otherJourney :TripColor="TripColor" v-if="index==1||index==3"></otherJourney>
<!-- 行程详情页 --> <!-- 行程详情页 -->
<UpgradedVersionDetails v-if="index==2"></UpgradedVersionDetails> <UpgradedVersionDetails :TripColor="TripColor" v-if="index==2"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景日本料理 --> <!-- otherJourney-footer 食景日本料理 -->
<div v-if="index!=0" :class="{'otherJourney-footer':index==3}"> <div v-if="index!=0" :class="{'otherJourney-footer':index==3}">
<div class="otherJourney-introduceFooter absolute z-index1"> <div class="otherJourney-introduceFooter absolute z-index1 row-aic"
<vEditDiv class="absolute z-index2" :canEdit='canEdit' v-model="first"></vEditDiv> :style="{'background':index==3?TripColor:''}">
<div class="introduceFooterBJ introduceFooterOne"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic" v-if="index!=3">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/footerLogo.png" />
<vEditDiv class="z-index2" :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
<div class="introduceFooterBJ introduceFootertThree"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour"
:style="{'background':TripColor}">&nbsp;</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -43,9 +55,10 @@ ...@@ -43,9 +55,10 @@
UpgradedVersionDetails, UpgradedVersionDetails,
vEditDiv, vEditDiv,
}, },
props: { props: [
'TripColor'
// FeatureData // FeatureData
}, ],
data() { data() {
return { return {
first: '欧洲线', first: '欧洲线',
...@@ -83,23 +96,44 @@ ...@@ -83,23 +96,44 @@
bottom: 32px; bottom: 32px;
width: 100%; width: 100%;
height: 34px; height: 34px;
background: url('http://192.168.10.214:8130/Upload/NewTripFeature/introduceButtom.png')no-repeat center; /* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/introduceButtom.png')no-repeat center; */
background-size: 100% 100%; background-size: 100% 100%;
} }
.otherJourney-introduceFooter .edit_div{ .introduceFooterBJ{
width: 70px; height: 100%;
height: 27px; }
.introduceFooterOne{
flex-grow: 1;
margin-right: 5px;
}
.introduceFootertTwo,.introduceFootertThree{
width: 7px;
}
.introduceFootertFour{
width: 120px;
margin-left: 5px;
}
.introduceFooter-text{
}
.introduceFooter-text img{
width: 28px;
height: 28px;
display: inline-block;
margin: 0 9px;
}
.introduceFooter-text .edit_div{
line-height: 34px;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
right: 145px;
bottom: 0;
font-size: 22px; font-size: 22px;
font-family: FZCuSong-B09S; font-family: FZCuSong-B09S;
font-weight: 400; font-weight: 400;
color: #2A2A2A; color: #2A2A2A;
margin: 0 9px 0 0;
} }
.otherJourney-footer .otherJourney-introduceFooter{ .otherJourney-footer .otherJourney-introduceFooter{
background: #CC0066; /* background: #CC0066; */
} }
.otherJourney-footer .edit_div{ .otherJourney-footer .edit_div{
display: none; display: none;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ 67f2e961
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</div> </div>
<!-- <MasterMapList></MasterMapList> --> <!-- <MasterMapList></MasterMapList> -->
<!-- 副标题 --> <!-- 副标题 -->
<subheading></subheading> <subheading :TripColor="TripColor"></subheading>
<!-- otherJourney-otherDetails 宿、食 景详情 --> <!-- otherJourney-otherDetails 宿、食 景详情 -->
<div class="otherJourney-otherDetails"> <div class="otherJourney-otherDetails">
<div class="otherJourney-details absolute z-index1"> <div class="otherJourney-details absolute z-index1">
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
List8, List8,
List9, List9,
}, },
props: { props: [
'TripColor'
// FeatureData // FeatureData
}, ],
data() { data() {
return { return {
first: '印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺！ 房型 多样 设 计， 京都千饭店外观为京町家的格子风格，非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造，意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道，便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看，眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下，一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华，但连小细节都做得非常精致，散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻，同時享受頂級的休閒時光。 ', first: '印象日本独家使用京 都 车 站旁 的 京都 千 饭店 ~酒店房间 37 平 方公 尺！ 房型 多样 设 计， 京都千饭店外观为京町家的格子风格，非常引人注目。饭店以「Personal Comfort Hotel」为概念所打造，意思就是追求每个人入住时的舒适感。从有着庭院的大厅穿过以京町家的内庭长廊为主题所建的信道，便可看见用玻璃纱创作的艺术装置随风轻柔地飘动着。再往旁边一看，眼前只见充满开放感的挑高空间。有如通往神社寺庙大门般的大型阶梯充满了存在感。在柔和的光线包围下，一瞬间忘了自己是身处在建筑物之中。让人联想到京都传统建筑的内部装潢没有刻意的高调奢华，但连小细节都做得非常精致，散发出古都特有的风情。低調沉穩的寬敞客房。讓入住者可以從陽台或窗邊觀賞庭園的綠色景緻，同時享受頂級的休閒時光。 ',
......
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