Skip to content

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

no message

parent 3bfb8125
Hide whitespace changes
Inline Side-by-side
Showing with 316 additions and 78 deletions
src/assets/css/UpgradedVersion.css
View file @ e3df5898
......@@ -74,5 +74,10 @@
.UpgradedVersion-otherBj{
background: #fff;
}
.UpgradedVersion-Hover{
cursor: pointer;
}
.UpgradedVersion-Hover:hover .featureControls{
opacity: 1;
}
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ e3df5898
......@@ -2,20 +2,20 @@
<div class="featureControls">
<div class="row-aic featureControls-bottom featureControls-bottomOne"
v-if="ControlsType=='row'">
<div @click="toAddPages">
<el-tooltip class="item" effect="dark" content="添加页面" placement="top">
<el-tooltip class="item" effect="dark" content="添加页面" placement="top">
<div @click="toAddPages">
<i class="el-icon-plus"></i>
</el-tooltip>
</div>
<div @click="toDeletePages" v-if="isDeletePage">
<el-tooltip class="item" effect="dark" content="删除页面" placement="top">
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i>
</el-tooltip>
</div>
</div>
</el-tooltip>
</div>
<div class="column featureControls-bottom featureControls-bottomTwo"
v-else>
<div v-if="!isTemplate">
<div v-if="isTemplate">
<el-popover trigger="hover" placement="right">
<div class="featureControls-Template">
<div class="Template-img relative" v-for="(item,index) in TemplateList"
......@@ -24,33 +24,33 @@
<div v-if="item.id==TemplateType" class="Template-imgSelect absolute row-ajc el-icon-success"></div>
</div>
</div>
<div slot="reference" style="padding: 0;">
<el-tooltip class="item" effect="dark" content="选模版" placement="top">
<el-tooltip class="item" effect="dark" content="选模版" placement="top">
<div slot="reference" style="padding: 0;">
<i class="el-icon-copy-document"></i>
</el-tooltip>
</div>
</div>
</el-tooltip>
</el-popover>
</div>
<div @click="toUploadImg">
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<el-tooltip class="item" effect="dark" content="上传图" placement="top">
<div @click="toUploadImg" v-if="isUploadImg">
<i class="el-icon-upload2"></i>
</el-tooltip>
</div>
<div @click="toSelectImg">
<el-tooltip class="item" effect="dark" content="选图" placement="top">
<i class="el-icon-search"></i>
</el-tooltip>
</div>
</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>
<el-tooltip class="item" effect="dark" content="添加图" placement="top">
<div @click="toAddImg" v-if="isAddImg">
<el-tooltip class="item" effect="dark" content="添加图" placement="top">
<i class="el-icon-plus"></i>
</el-tooltip>
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除图" placement="top">
<div @click="toDeleteImg" v-if="isDeleteImg">
<el-tooltip class="item" effect="dark" content="删除图" placement="top">
<i class="el-icon-delete"></i>
</el-tooltip>
<i class="el-icon-delete"></i>
</div>
</el-tooltip>
</div>
</div>
</template>
......@@ -60,8 +60,8 @@
components: {
},
props: ['ControlsType','pagesType','isDeletePage',
'isAddImg','isDeleteImg','isTemplate','Template'],
props: ['index','FeatureData','ControlsType','pagesType','isDeletePage',
'isUploadImg','isSelectImg','isAddImg','isDeleteImg','isTemplate','Template'],
data() {
return {
TemplateType: 1,
......@@ -101,10 +101,10 @@
},
toAddPages(){
// this.pagesType 1 首页 2 介绍 3餐食介绍 4宿 5食 6景
this.$emit('toAddPages')
this.$emit('toAddPages',this.index,this.FeatureData)
},
toDeletePages(){
this.$emit('toDeletePages')
this.$emit('toDeletePages',this.index,this.FeatureData)
},
},
computed: {},
......@@ -125,7 +125,12 @@
<style>
.featureControls{
opacity: 1;
transition: opacity 2s ease;
-webkit-transition: opacity 2s ease;
-moz-transition: opacity 2s ease;
-ms-transition: opacity 2s ease;
-o-transition: opacity 2s ease;
}
.featureControls-bottom{
font-size: 20px;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/headerTitle.vue
View file @ e3df5898
......@@ -21,7 +21,7 @@
},
props: [
'TripColor',
// FeatureData
'FeatureData'
],
data() {
return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/imgList/List1.vue
View file @ e3df5898
<template>
<div class="MasterMapList-1 relative">
<div class="MasterMapList1 absolute z-index3 UpgradedVersion-Hover">
<imgControls
v-if="FeatureData"
:index="index"
:FeatureData="FeatureData"
@toUploadImg="toUploadImg"
@toSelectedImg="toSelectedImg"
@toAddImg="toAddImg"
@toDeleteImg="toDeleteImg"/>
</div>
<img class="absolute" src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png"/>
</div>
</template>
<script>
import vEditDiv from "../../../TravelTemp/VEditDiv";
import imgControls from "../imgControls";
export default {
components: {
vEditDiv,
imgControls
},
props: {
// FeatureData
},
props: ['index','FeatureData'],
data() {
return {
};
},
methods: {
toUploadImg(){
this.$emit('toUploadImg')
},
toSelectedImg(selectImgArr){
this.$emit('toSelectedImg',selectImgArr)
},
toAddImg(){
this.$emit('toAddImg')
},
toDeleteImg(){
this.$emit('toDeleteImg')
},
},
computed: {},
watch: {
......@@ -40,5 +59,7 @@
</script>
<style>
.MasterMapList1{
}
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ e3df5898
......@@ -2,7 +2,7 @@
<div class="UpgradedVersion-subheading">
<div class="UpgradedVersion-subIde absolute z-index3">
<!-- UpgradedVersion-otherSubheading 宿、食、景 标记 -->
<div class="">
<div :class="[FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'?'UpgradedVersion-otherSubheading':'']">
<div class="UpgradedVersion-subIdeBj relative z-index2">
<div class="UpgradedVersion-subIdeBj1 absolute z-index2"
:style="{'background':TripColor}">&nbsp;</div>
......@@ -14,7 +14,7 @@
<img class="UpgradedVersion-titleIcon relative" src="http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png"/>
</div>
<!-- 宿、食、景 副标题 -->
<div class="UpgradedVersion-subIdeText-box" style="display: block;">
<div class="UpgradedVersion-subIdeText-box" v-if="FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'">
<div class="UpgradedVersion-subIdeText absolute z-index3">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
......@@ -37,6 +37,7 @@
</div>
</div>
<!-- subIdeImgBox 食景副标题图 -->
<template v-if="FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'">
<div class="subIdeImgBox">
<div class="UpgradedVersion-subIdeImgBox absolute row z-index1">
<div class="UpgradedVersion-subIdeImgBoxL"
......@@ -65,8 +66,9 @@
</div>
</div>
</div>
</template>
<!-- 介绍标题 -->
<div class="UpgradedVersion-intTitle" style="display: none;">
<div class="UpgradedVersion-intTitle" v-if="FeatureData.name=='介绍'">
<div class="UpgradedVersion-intTitle-one absolute">
<vEditDiv :canEdit='canEdit3' v-model="first3"></vEditDiv>
</div>
......@@ -84,8 +86,8 @@
vEditDiv
},
props: [
'TripColor'
// FeatureData
'TripColor',
'FeatureData'
],
data() {
return {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue
View file @ e3df5898
......@@ -15,20 +15,26 @@
<vEditDiv :canEdit='canEdit2' v-model="first2"></vEditDiv>
</div>
</div>
<div class="featureHome-left">
<div class="featureHome-vToolBar-one absolute z-index3" v-if="canEdit===true">
<div class="featureHome-left UpgradedVersion-Hover">
<div class="featureHome-vToolBar-one absolute z-index3">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'row'"
:isDeletePage="false"
:isDeletePage="FeatureData.isDeletePage"
:pagesType="1"
@toAddPages="AddPages"
@toDeletePages="DeletePages">
@toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" id='restaurantfile' @change="uploadpic">
</div>
<div class="featureHome-vToolBar-two absolute z-index3">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'column'"
:isUploadImg="true"
:isSelectImg="true"
:isAddImg="false"
:isDeleteImg="false"
@toUploadImg="UploadImg"
......@@ -109,7 +115,8 @@
},
props: [
'TripColor',
// FeatureData
'index',
'FeatureData',
],
data() {
return {
......@@ -202,11 +209,11 @@
DeleteImg(){
},
AddPages(){
toAddPages(index,FeatureData){
this.$emit('toAddPages',index,FeatureData)
},
DeletePages(){
toDeletePages(index,FeatureData){
this.$emit('toDeletePages',index,FeatureData)
},
closeDMCchooseImg(){
this.isShowScenicImg = false
......@@ -288,7 +295,7 @@
width: 784px;
}
.featureHome-vToolBar-one{
top: 339px;
top: 340px;
left: 0;
}
.featureHome-vToolBar-two{
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ e3df5898
......@@ -2,28 +2,47 @@
<div id="newFeatureBox3">
<!-- UpgradedVersion-homebj 首页、介绍、食、宿、景 UpgradedVersion-otherBj 餐介绍 -->
<div class="UpgradedVersion-box UpgradedVersion-homebj relative"
:class="{'UpgradedVersion-otherBj':index==2}"
v-for="(item,index) in 4">
:class="{'UpgradedVersion-otherBj':item.name=='食详情'}"
v-for="(item,index) in pageList">
<!-- logo -->
<Header :TripColor="TripColor"></Header>
<!-- 首页 -->
<featureHome :TripColor="TripColor" v-if="index==0"></featureHome>
<featureHome
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
v-if="item.name=='首页'"></featureHome>
<!-- 其余页 -->
<div v-if="index>0">
<headerTitle :TripColor="TripColor"></headerTitle>
<div v-else>
<headerTitle :FeatureData="item" :TripColor="TripColor"></headerTitle>
<!-- 介绍、宿食景页 -->
<otherJourney :TripColor="TripColor" v-if="index==1||index==3"></otherJourney>
<otherJourney
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
v-if="item.name=='介绍'||item.name=='宿'||item.name=='食'||item.name=='景'"></otherJourney>
<!-- 行程详情页 -->
<UpgradedVersionDetails :TripColor="TripColor" v-if="index==2"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景日本料理 -->
<div v-if="index!=0" :class="{'otherJourney-footer':index==3}">
<UpgradedVersionDetails
:index="index"
:FeatureData="item"
:TripColor="TripColor"
@toAddPages="AddPages"
@toDeletePages="DeletePages"
v-if="item.name=='食详情'"></UpgradedVersionDetails>
<!-- otherJourney-footer 食景 食详情 -->
<div v-if="item.name!='首页'" :class="{'otherJourney-footer':item.name=='食'||item.name=='景'||item.name=='食详情'}">
<div class="otherJourney-introduceFooter absolute z-index1 row-aic"
:style="{'background':index==3?TripColor:''}">
:style="{'background':item.name=='食'||item.name=='景'||item.name=='食详情'?TripColor:''}">
<template v-if="item.name!=='食'&&item.name!=='景'&&item.name!=='食详情'">
<div class="introduceFooterBJ introduceFooterOne"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertTwo"
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooter-text row-aic" v-if="index!=3">
<div class="introduceFooter-text row-aic">
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/footerLogo.png" />
<vEditDiv class="z-index2" :canEdit='canEdit' v-model="first"></vEditDiv>
</div>
......@@ -31,6 +50,7 @@
:style="{'background':TripColor}">&nbsp;</div>
<div class="introduceFooterBJ introduceFootertFour"
:style="{'background':TripColor}">&nbsp;</div>
</template>
</div>
</div>
</div>
......@@ -56,17 +76,69 @@
vEditDiv,
},
props: [
'TripColor'
'TripColor',
// FeatureData
],
data() {
return {
first: '欧洲线',
canEdit: true,
pageData:{
name:'首页',
id:0,
tyep:1,
isDeletePage: false
},
pageList:[
{
name: '首页',
id:1,
type:1,
isDeletePage: false
},
{
name: '介绍',
id:2,
type:2,
isDeletePage: false
},
{
name: '食详情',
id:3,
type:3,
isDeletePage: false
},
{
name: '宿',
id:4,
type:4,
isDeletePage: false
},
{
name: '食',
id:5,
type:5,
isDeletePage: false
},
{
name: '景',
id:6,
type:6,
isDeletePage: false
}
]
};
},
methods: {
AddPages(index,FeatureData){
this.pageData = JSON.parse(JSON.stringify(FeatureData))
this.pageData.id = 0
this.pageData.isDeletePage = true
this.pageList.splice(index+1,0,this.pageData)
},
DeletePages(index,FeatureData){
this.pageList.splice(1,index)
},
},
computed: {},
watch: {
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue
View file @ e3df5898
......@@ -2,19 +2,67 @@
<div class="otherJourney-form">
<!-- 主图 -->
<div class="MasterMapList-form absolute z-index1">
<div class="MasterMapList-box">
<List7></List7>
<div class="MasterMapList-box UpgradedVersion-Hover">
<div class="MasterMapList-box-one absolute z-index3">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'row'"
:isDeletePage="FeatureData.isDeletePage"
:pagesType="1"
@toAddPages="toAddPages"
@toDeletePages="toDeletePages">
</FeatureControls>
<input type="file" style="display:none" id='restaurantfile' @change="uploadpic">
</div>
<div class="MasterMapList-box-two absolute z-index3">
<FeatureControls
:index="index"
:FeatureData="FeatureData"
:ControlsType="'column'"
:isUploadImg="FeatureData.name=='介绍'?true:false"
:isSelectImg="FeatureData.name=='介绍'?true:false"
:isAddImg="FeatureData.name=='介绍'?false:true"
:isDeleteImg="false"
@toUploadImg="UploadImg"
@toSelectImg="SelectImg"
@toAddImg="AddImg"
@toDeleteImg="DeleteImg"
></FeatureControls>
</div>
<List1 v-if="FeatureData.name=='介绍'"></List1>
<template v-else>
<List1
:index="index"
:FeatureData="FeatureData"
></List1>
</template>
</div>
</div>
<!-- <MasterMapList></MasterMapList> -->
<!-- 副标题 -->
<subheading :TripColor="TripColor"></subheading>
<subheading :FeatureData="FeatureData" :TripColor="TripColor"></subheading>
<!-- otherJourney-otherDetails 宿、食 景详情 -->
<div class="otherJourney-otherDetails">
<div :class="[FeatureData.name=='宿'||FeatureData.name=='食'||FeatureData.name=='景'?'otherJourney-otherDetails':'']">
<div class="otherJourney-details absolute z-index1">
<vEditDiv :canEdit='canEdit' v-model="first"></vEditDiv>
</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>
......@@ -31,6 +79,8 @@
// 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,
......@@ -45,10 +95,13 @@
List7,
List8,
List9,
FeatureControls,
DMCchooseImg
},
props: [
'TripColor'
// FeatureData
'TripColor',
'index',
'FeatureData'
],
data() {
return {
......@@ -56,10 +109,60 @@
canEdit: true,
first1: '欧洲线',
canEdit1: true,
isShowScenicImg: false,
choseType: 0,
queryItem:{
queryName:'',
queryId:0,
}
};
},
methods: {
UploadImg(){
},
uploadpic(e) {
let that = this;
if (e.target.files.length > 0 && e.target.files[0].size > 0) {
// 压缩图片需要的一些元素和对象
var reader = new FileReader();
reader.onload = function (event) {
let blob = that.base64ToBlob(event.target.result);
let newArr = [];
newArr.push(blob);
var fileName = `${that.uuid(10, 10)}.png`;
var path = `/newFeature`;
that.uploadSelfBlob(path, newArr, x => {
let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
let i = e.target.id.split("_")[2];
that.imgUrlChange(allPath);
});
};
reader.readAsDataURL(e.target.files[0]);
}
},
SelectImg(){
this.isShowScenicImg = true
},
AddImg(){
},
DeleteImg(){
},
toAddPages(index,FeatureData){
this.$emit('toAddPages',index,FeatureData)
},
toDeletePages(index,FeatureData){
this.$emit('toDeletePages',index,FeatureData)
},
closeDMCchooseImg(){
this.isShowScenicImg = false
},
getDMCimg(selectImgArr){
console.log(selectImgArr,'已选图')
this.isShowScenicImg = false
}
},
......@@ -97,6 +200,14 @@
border-radius: 14px;
overflow: hidden;
}
.MasterMapList-box-one{
left: -33px;
top: 4px;
}
.MasterMapList-box-two{
left: -64px;
top: 118px;
}
.MasterMapList-1,.MasterMapList-2,
.MasterMapList-3,.MasterMapList-4,
.MasterMapList-4,.MasterMapList-8{
......
src/plug/index.js
View file @ e3df5898
......@@ -119,8 +119,8 @@ export default {
let lxymallUrl = ''; //国内游api
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
domainUrl = "http://192.168.10.226"; //春姐
// domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = "";
......@@ -1723,5 +1723,20 @@ export default {
return Money = Math.round(Money * 100) / 100
}
}
// 颜色转换rgb
Vue.prototype.hexToRgb = function (hexValue, opc) {
var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
var hex = hexValue.replace(rgx, function(m, r, g, b) {
return r + r + g + g + b + b;
});
var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
if(!rgb){
return hexValue;
}
var r = parseInt(rgb[1], 16);
var g = parseInt(rgb[2], 16);
var b = parseInt(rgb[3], 16);
return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
}
}
}
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