Skip to content

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

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

parents bd49f96a e915d9eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3310 additions and 2193 deletions
src/assets/css/UpgradedVersion.css
View file @ 31335d64
This diff is collapsed.
src/assets/css/tripIndexNew.css 0 → 100644
View file @ 31335d64
.LeaveGroupDownload-form div, .LeaveGroupDownload-form dl,
.LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
.LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
.LeaveGroupDownload-form li, .LeaveGroupDownload-form h1,
.LeaveGroupDownload-form h2, .LeaveGroupDownload-form h3,
.LeaveGroupDownload-form h4, .LeaveGroupDownload-form h5,
.LeaveGroupDownload-form h6, .LeaveGroupDownload-form pre,
.LeaveGroupDownload-form form, .LeaveGroupDownload-form fieldset,
.LeaveGroupDownload-form input,
.LeaveGroupDownload-form p, .LeaveGroupDownload-form blockquote,
.LeaveGroupDownload-form table, .LeaveGroupDownload-form th,
.LeaveGroupDownload-form td, .LeaveGroupDownload-form iframe {
font-family: Microsoft JhengHei, sans-serif !important;
}
.bjE6{
background: #e6e6e6;
}
.bjF6{
background: #f6f6f6;
}
.relative{
position: relative;
}
.absolute{
position: absolute;
}
.z-index1{
z-index: 1;
}
.z-index2{
z-index: 2;
}
.z-index3{
z-index: 3;
}
.row{
display: flex;
}
.row-aic{
display: flex;
align-items: center;
}
.row-ajc{
display: flex;
align-items: center;
justify-content: center;
}
.row-sb{
display:flex;
justify-content: space-between;
}
.row-sb-nowrap{
display:flex;
justify-content: space-between;
flex-wrap: nowrap;
}
.column{
display:flex;
flex-direction: column;
}
.column-ajc{
display:flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.marginL20{
margin-left: 20px;
}
.marginL11{
margin-left: 11px;
}
.marginL15{
margin-left: 15px;
}
.marginT20{
margin-top: 20px;
}
.marginT10{
margin-top: 10px;
}
.marginT13{
margin-top: 13px;
}
.marginT14{
margin-top: 14px;
}
.pkey {
color: grey !important;
}
.pvalue {
color: #000;
font-weight: 700;
}
.detail-box .hangban-info {
width: 100%;
background: unset;
paddong: 0px;
}
.detail-box .hangban-info {
background-color: #f7f7f7;
padding: 20px 0px 15px 0px;
width: 960px;
margin: 0 auto;
box-sizing: border-box;
}
.hangban-info {
background: #FFF !important;
}
.trip-v3-base {
margin-top: 20px !important;
width: 100% !important;
border-collapse: collapse !important;
}
.travelControlTrip * {
page-break-inside: avoid;
}
.baseTable .essential-item.jianju {
border-right: 5px solid #FFF;
border-bottom: 5px solid #FFF;
}
.baseTable .essential-item {
background: #eee;
}
.travelControlTrip .essential-item {
width: 320px;
height: 100px;
box-sizing: border-box;
padding-left: 20px;
}
.baseTable .essential-item.jianju_b {
border-bottom: 5px solid #FFF;
}
.travelControlTrip .essential-item p.pvalue {
font-size: 18px;
color: #000;
margin-top: 5px;
}
.trip-v3-title.small-margin {
margin-bottom: 20px;
}
.trip-v3-title {
font-size: 36px !important;
font-weight: bolder !important;
margin-top: 40px !important;
text-align: center;
}
.LeaveGroupDownload-form .flight_header th {
font-size: 20px !important;
font-weight: 700 !important;
color: #000000 !important;
padding-bottom: 8px;
border-bottom: 1px solid #929292;
text-align: left;
}
.LeaveGroupDownload-form .flight_header th span {
font-size: 12px;
font-weight: 400;
vertical-align: 3px;
margin-left: 1px;
color: #CCC;
}
.LeaveGroupDownload-form .flight_list tbody tr:first-child td {
padding-top: 12px !important;
}
.LeaveGroupDownload-form .flight_list td {
font-size: 15px;
height: 34px;
vertical-align: middle;
background: #ffffff;
}
.travelDays-form{
top: 112px;
left: 0;
right: 0;
bottom: 0;
}
.travelDaysTitlle-left{
flex-shrink: 0;
}
.travelDaysTitlle-left-text{
width: 173px;
height: 173px;
background: url('https://imgfile.oytour.com/Static/NewTripFeature/Shape.png')no-repeat center;
background-size: 100% 100%;
}
.travelDaysTitlle-left-textOne{
font-size: 79px;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
line-height: 55px;
margin-top: 15px;
}
.travelDaysTitlle-left-textTwo{
font-size: 47px;
font-family: PingFang SC !important;
font-weight: 800;
color: #2A2A2A;
line-height: 55px;
margin-top: 10px;
}
.travelDaysTitlle-right{
flex-grow: 1;
margin-left: 21px;
}
.travelDaysTitlle-right-text{
min-height: 124px;
/* padding: 25px 25px 25px 36px; */
padding: 0 25px 0 36px;
border-radius: 100px 0px 0px 100px;
-webkit-border-radius: 100px 0px 0px 100px;
-moz-border-radius: 100px 0px 0px 100px;
-ms-border-radius: 100px 0px 0px 100px;
-o-border-radius: 100px 0px 0px 100px;
}
.travelDaysMasterMap{
height: 632px;
margin-top: 14px;
overflow: hidden;
}
.travelDaysMasterMap img{
left: 0;
top: 0;
right: 0;
width: 100%;
height: 100%;
}
.travelDaysMasterMap-one{
}
.travelDaysMasterMap-oneImg{
width: 100%;
}
.travelDaysMasterMap-text{
left: 15px;
right: 15px;
bottom: 19px;
overflow: hidden;
font-size: 26px;
font-family: PingFang SC;
font-weight: 500;
/* color: #FEFEFE; */
line-height: 34px;
text-align: center;
}
.travelDaysMasterMap-two{
top: 54px;
right: 50px;
}
.travelDaysMasterMap-twoImg{
width: 335px;
height: 189px;
overflow: hidden;
border: 2px solid #FFFFFF;
border-radius: 18px;
}
.travelDaysMasterMap-text.textTwo{
font-size: 26px;
font-family: PingFang SC;
font-weight: 500;
line-height: 34px;
}
.travelDaysContent{
max-height: 468px;
line-height: 38px;
padding: 0 44px 0 44px;
margin: 41px 0 47px 0;
overflow: hidden;
}
.travelDaysContent-text{
font-size: 21px;
font-weight: 10;
color: #2A2A2A;
}
.travelDaysContent-text span{
font-size: 21px;
line-height: 38px;
font-weight: bold;
}
.travelDaysdetails{
padding: 0 36px 115px 36px;
}
.travelDaysdetailsBJ{
border-radius: 100px;
flex-wrap: wrap;
padding: 20px 35px;
-webkit-border-radius: 100px;
-moz-border-radius: 100px;
-ms-border-radius: 100px;
-o-border-radius: 100px;
}
.travelDaysdetails-text{
flex-wrap: nowrap;
margin-right: 46px;
}
.travelDaysdetails-text span{
font-size: 21px;
font-family: PingFang SC;
font-weight: 800;
color: #2A2A2A;
line-height: 34px;
}
.travelDaysdetails-text div p{
font-size: 21px;
font-weight: 100;
color: #2A2A2A;
line-height: 34px;
white-space: wrap;
padding: 0;
margin: 0;
}
.LeaveGroupDownload-form .travelControlTrip .module-title {
text-align: center;
font-size: 18px;
color: #333;
padding-top: 30px;
padding-bottom: 30px;
}
.LeaveGroupDownload-form .expense{
padding: 0 20px;
margin-bottom: 20px;
}
.LeaveGroupDownload-form .expense .right{
margin-bottom: 20px;
}
.LeaveGroupDownload-form .expense .right *{
color: #000000 !important;
font-size: 15px !important;
padding: 0 !important;
margin: 0 !important;
line-height: 160%;
}
.UpgradedVersion-box{
width: 1123px;
height: 1588px;
overflow: hidden;
}
.UpgradedVersion-homebj{
background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
}
.UpgradedVersion-introduceBj{
background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
}
.UpgradedVersion-otherBj{
background: #fff;
}
.UpgradedVersion-Hover{
cursor: pointer;
}
.UpgradedVersion-Hover:hover .featureControls{
opacity: 1;
}
.otherJourney-introduceFooter {
left: 0;
right: 0;
bottom: 32px;
width: 100%;
height: 34px;
background-size: 100% 100%;
}
.introduceFooterBJ {
height: 100%;
}
.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;
overflow: hidden;
font-size: 22px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
margin: 0 9px 0 0;
}
.otherJourney-footer .edit_div {
display: none;
}
src/components/Details.vue
View file @ 31335d64
......@@ -869,21 +869,23 @@
this.parentName = tempparentName;
this.currentName = tempcurrentName;
}
return tempcurrentName
},
getTitleByRouter(name) {
let obj = {}
routerConfig.routes[11].children[0].children.forEach(x => {
if (x.name == name) {
obj.comp = x.component
if (x.meta && x.meta.title)
obj.title = x.meta.title
else
obj.title = ''
return false
}
})
let obj = {title:""};
// console.log("routerConfig.routes[11]",routerConfig.routes[12]);
if (routerConfig.routes[12] && routerConfig.routes[12].children && routerConfig.routes[12].children.length>0) {
routerConfig.routes[12].children[0].children.forEach(x => {
if (x.name == name) {
obj.comp = x.component
if (x.meta && x.meta.title)
obj.title = x.meta.title
else
obj.title = ''
return false
}
})
}
return obj
},
filterRouter() {
......@@ -966,13 +968,13 @@
// dom.href = `http://${window.location.host}/#${to.fullPath}`
// dom.click()
var el = document.createElement("a");
document.body.appendChild(el);
el.href = `http://${window.location.host}/#${to.fullPath}`;
el.target = '_blank';
el.click();
} else {
next()
}
document.body.appendChild(el);
el.href = `http://${window.location.host}/#${to.fullPath}`;
el.target = '_blank';
el.click();
} else {
next()
}
});
this.$nextTick(function () {
document.title = this.$route.meta.title ? this.$route.meta.title : ''
......
src/components/FinancialModule/invoicesManager.vue
View file @ 31335d64
......@@ -138,6 +138,9 @@
<el-option :value="1" label="跟团游"></el-option>
<el-option :value="2" label="签证"></el-option>
<el-option :value="4" label="单机票"></el-option>
<el-option :value="5" label="车"></el-option>
<el-option :value="6" label="酒店"></el-option>
<el-option :value="7" label="门票"></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/LeaveGroupDownload/ItineraryFeatures.vue 0 → 100644
View file @ 31335d64
<template>
<div id="pdf_2">
<div class="template-box">
<div id="gernalCanvas" style="margin:auto;width:100%" v-html="feature.featureHtml">
</div>
</div>
</div>
</template>
<script>
export default {
components: {
},
props: [
'feature',
],
data() {
return {
};
},
methods: {
},
computed: {},
watch: {
feature: {
handler(val, oldVal) {
},
deep: true,
immediate: true
},
},
mounted() {
}
};
</script>
<style>
@import url("../../assets/css/UpgradedVersion.css");
</style>
src/components/LeaveGroupDownload/OrderNotice.vue 0 → 100644
View file @ 31335d64
<template>
<div id="pdf_5">
<div class="module-title" v-if="vshowG">
<div
style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
订单须知
</div>
</div>
<div class="expense" v-if="feature.importantTip!=''&&vshowG">
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
重要提示
</div>
</div>
<div class="right">
<div v-html="feature.importantTip"></div>
</div>
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
温馨提示
</div>
</div>
<div class="right" >
<div v-html="feature.warmTip"></div>
</div>
</div>
<div style="width: 100%;height:2px;"></div>
</div>
</template>
<script>
import Header from "./components/header";
export default {
components: {
Header
},
props: ["vshowG","feature",],
data() {
return {
};
},
methods: {},
computed: {},
watch: {
feature: {
handler(val, oldVal) {
},
deep: true,
immediate: true
}
},
mounted() {}
};
</script>
<style></style>
src/components/LeaveGroupDownload/TourFareDescription.vue 0 → 100644
View file @ 31335d64
<template>
<div id="pdf_5">
<div class="module-title">
<div
style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
团费说明
</div>
</div>
<div class="expense" v-if='vshowE'>
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
费用包含
</div>
</div>
<div class="right" v-html="feature.feeInclude"></div>
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
费用不含
</div>
</div>
<div class="right" v-html="feature.feeNonInclude"></div>
</div>
<div class="expense" v-if='dataList.selfpayingList && dataList.selfpayingList.length>0&&vshowE'>
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
自理费用
</div>
</div>
<div class="right">
<table class="expense-table" cellspacing=0 cellpadding=0>
<thead>
<th>城市</th>
<th>活动</th>
<th>参考价格</th>
<th>说明</th>
</thead>
<tbody>
<tr v-for="(item,i) in dataList.selfpayingList" :key="i">
<td>{{item.cityName}}</td>
<td>{{item.itemName}}</td>
<td>约{{item.estimatedCost}}</td>
<td>{{item.explain}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<template v-if='vshowF&&(feature.shopRemark||(dataList.shopList && dataList.shopList.length>0&&vshowF))'>
<div class="module-title">
<div
style="font-size:36px;margin-top:40px;text-align:center;margin-bottom:20px;"
>
购物说明
</div>
</div>
<div class="expense">
<div class="left"></div>
<div class="right">
<div v-html="feature.shopRemark"></div>
</div>
</div>
</template>
<div class="expense" v-if="dataList.shopList && dataList.shopList.length>0&&vshowF">
<div class="left">购物安排</div>
<div class="right">
<table class="expense-table autowidth" cellspacing=0 cellpadding=0>
<thead>
<th>城市</th>
<th>购物店名称</th>
<th>预计停留时间</th>
</thead>
<tbody>
<tr v-for="(item,i) in dataList.shopList" :key="i">
<td>{{item.cityName}}</td>
<td>{{item.shopName}}</td>
<td>{{item.visitTime}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div style="width: 100%;height:2px;"></div>
</div>
</template>
<script>
export default {
components: {
},
props: ["vshowE","dataList","feature","vshowF"],
data() {
return {
};
},
methods: {},
computed: {},
watch: {
feature: {
handler(val, oldVal) {
},
deep: true,
immediate: true
}
},
mounted() {}
};
</script>
<style></style>
src/components/LeaveGroupDownload/VisaInformation.vue 0 → 100644
View file @ 31335d64
<template>
<div id="pdf_6">
<div class="module-title" v-if="vshowG">
<div
style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
签证
</div>
</div>
<div class="expense" v-if="feature.importantTip != '' && vshowG">
<div class="left">
<div style="font-size:28px;margin-bottom:20px;">
签字须知
</div>
</div>
<div class="right">
<div v-html="feature.visaRemark"></div>
</div>
</div>
<div class="module-title" v-if="vshowM">
<div
style="font-size:36px;font-weight:bolder;margin-top:40px;text-align:center;margin-bottom:20px;"
>
旅客信息
</div>
</div>
<table v-if='vshowM' class="Passenger-table" border="0" cellspacing="2" cellpadding="2">
<tbody>
<tr>
<td width="16.6%" class="thClass">姓名</td>
<td width="16.6%" class="thClass">英文姓名</td>
<td width="16.6%" class="thClass">性别</td>
<td width="16.6%" class="thClass">护照号</td>
<td width="16.6%" class="thClass">有效期</td>
<td width="16.6%" class="thClass">联系电话</td>
</tr>
<tr v-for="(item, i) in orderMsg.guestList" :key="i">
<td>{{item.name}}</td>
<td>{{item.eName}}</td>
<td>{{item.sex}}</td>
<td>{{item.passportNo}}</td>
<td>{{item.passportExpiry}}</td>
<td>{{item.mobilePhone}}</td>
</tr>
</tbody>
</table>
<div v-if='vshowJ' class="footer-div">
<img :src="domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/TravelControlTripIcon20.png'" />
</div>
<div style="width: 100%;height:2px;"></div>
</div>
</template>
<script>
import Header from "./components/header";
export default {
components: {
Header
},
props: ["vshowG", "vshowM","vshowJ", "feature","orderMsg"],
data() {
return {};
},
methods: {},
computed: {},
watch: {
feature: {
handler(val, oldVal) {},
deep: true,
immediate: true
}
},
mounted() {}
};
</script>
<style></style>
src/components/LeaveGroupDownload/components/header.vue 0 → 100644
View file @ 31335d64
<template>
<div class="UpgradedVersion-header absolute row-sb z-index1">
<div class="UpgradedVersion-header-left relative row-aic" :style="{'background':TripColor}">
<img class="header-leftBj absolute z-index2" :src="backgroundImgBj2" />
<img class="header-leftImg" src="https://imgfile.oytour.com/Static/NewTripFeature/headerLogoTwo.png" />
</div>
<div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title">
<span class="edit_div">{{orderMsg.lineName}}</span>
</div>
</div>
</div>
</template>
<script>
export default {
components: {
},
props: [
'TripColor',
'orderMsg'
],
data() {
return {
canEdit: true,
LineShortName: '欧洲线',
backgroundImg: '',
backgroundImgBj1: 'https://imgfile.oytour.com/Static/NewTripFeature/logoBjOne.png', //花纹背景
backgroundImgBj2: 'https://imgfile.oytour.com/Static/NewTripFeature/logoBjTwo.png', //白色背景
};
},
methods: {
},
computed: {},
watch: {
TripColor: {
handler(val, oldVal) {
// this.backgroundImg = `url('https://imgfile.oytour.com/Static/NewTripFeature/logoBj.png') no-repeat right ${val}`
},
deep: false,
immediate: true
},
orderMsg: {
handler(val,oldVal) {
},
deep: true,
immediate: true
}
},
mounted() {
}
};
</script>
<style>
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
</style>
src/components/LeaveGroupDownload/index.vue 0 → 100644
View file @ 31335d64
<template>
<div id="pdf_1" v-if="orderMsg">
<div class="trip-adviser">
<h1 class="trip-nav-title">
<span>{{ vshowL ? "出团通知书：" : "" }}</span>
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
</h1>
<p>
尊敬的旅客：<br />感谢您选择我们的旅游服务。为了确保各位旅客有更好的旅游体验，请详细阅读《出团通知书》的各项内容。如有任何问题，请拨打通知书内的本团领队电话或机场服务人员电话。
在此，预祝您旅途愉快！希望您在本次旅程中留下此生中最美好的回忆！
</p>
</div>
<table class="baseTable trip-v3-base">
<tbody>
<tr>
<td class="essential-item jianju">
<p class="pkey">线路</p>
<p class="pvalue">{{ orderMsg.lineName }}</p>
</td>
<td class="essential-item jianju">
<p class="pkey">出发日期</p>
<p class="pvalue">{{ orderMsg.startDate }}</p>
</td>
<td class="essential-item jianju">
<p class="pkey">返回日期</p>
<p class="pvalue">{{ orderMsg.endDate }}</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">行程天数</p>
<p class="pvalue">{{ orderMsg.dayNum }}</p>
</td>
<td rowspan="2">
<div style="width: 160px; height:160px;margin-left:20px;">
<img style="width: 160px; height:160px;" :src="'data:image/png;base64,' + WeiXinShareImgSrc"
alt="获取微信小程序分享链接" />
</div>
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<p class="pkey">系列</p>
<p class="pvalue">{{ orderMsg.lineteamName }}</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">团队编号</p>
<p class="pvalue">{{ orderMsg.tcnum }}</p>
</td>
</tr>
</tbody>
</table>
<div class="trip-v3-title small-margin">
<h2>集合地点&amp;联系人</h2>
</div>
<table class="baseTable trip-v3-base">
<tbody>
<tr>
<td class="essential-item jianju">
<p class="pkey">本团领队</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.leaderInfo
: orderMsg.leaderName +
(orderMsg.leaderMobile != null
? "/" + orderMsg.leaderMobile
: "")
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">集合时间</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringTime
: orderMsg.gatheringTime
}}
</p>
</td>
<td class="essential-item jianju">
<p class="pkey">机场服务</p>
<p class="pvalue">
<template v-if="
orderMsg &&
orderMsg.airportServicePerson &&
orderMsg.airportServicePerson != ''
">
{{ orderMsg.airportServicePerson }}
</template>
</p>
</td>
<td class="essential-item jianju_b">
<p class="pkey">集合标识</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatherIdent
: orderMsg.bName
}}
</p>
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
<template v-if="orderMsg.emergencyContact != ''">
{{ orderMsg.emergencyContact }}
</template>
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{
orderTripdiff != null
? orderTripdiff.gatheringAddress
: orderMsg.gatheringAddress
}}
</p>
</td>
</tr>
</tbody>
</table>
<template v-if='vshowB'>
<div class="trip-v3-title small-margin">
参考航班
</div>
<div class="hangban-info">
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"
:class="{'guoneiLine':lineId==90}">
<thead class="flight_header">
<tr>
<th width="140">出发时间<span>(当地)</span></th>
<th width="160">抵达时间<span>(当地)</span></th>
<th width="160">
<template v-if="lineId==90">起飞机场/出发城市</template>
<template v-else>起飞机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="160">
<template v-if="lineId==90">抵达机场/到达城市</template>
<template v-else>抵达机场</template>
</th>
<th width="18" class="gap">&nbsp;</th>
<th width="140">航空公司</th>
<th width="90">航班编号</th>
<th width="18" class="gap">&nbsp;</th>
<th width="100">经停城市</th>
</tr>
</thead>
<tbody style="padding-top:12px;"
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="140">{{flight.alName}}</td>
<td width="110">{{flight.flightNumber}}
<span style="color:green;">{{(flight.flightState==1)?"OK":"暂定"}}</span></td>
<td width="18" class="gap">&nbsp;</td>
<td width="100">{{flight.stopoverAirPortName}}</td>
</tr>
</tbody>
<tbody>
<tr>
<td colspan="10" align="center" style="color:#333;font-size:14px;">
1.本航班表僅提供參考，正確航班請點選您的出發日期。 2.
不同航班，餐食及行程安排皆有所不同，正確行程，請點選您的出發日期。
</td>
</tr>
</tbody>
</table>
</div>
</template>
<div style="width: 100%;height:40px;"></div>
</div>
</template>
<script>
export default {
components: {},
props: [
"vshowJ",
"vshowL",
"orderMsg",
"WeiXinShareImgSrc",
"orderTripdiff",
"vshowLLR",
"vshowB",
"lineId"
],
data() {
return {};
},
methods: {},
computed: {},
watch: {
orderMsg: {
handler(val, oldVal) {},
deep: true,
immediate: true
},
},
mounted() {}
};
</script>
<style>
</style>
src/components/LeaveGroupDownload/travelDays.vue 0 → 100644
View file @ 31335d64
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 31335d64
......@@ -224,11 +224,11 @@
</div>
</div>
</div>
<!-- <div class="_VideoStr_box">
<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> -->
</div>
</el-form>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 31335d64
......@@ -8,13 +8,15 @@
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<div class="TrfList clearfix">
<!--&&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)">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
<template v-for="item in TypeArray">
<div class="TFslide"
: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">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
</template>
</div>
<div style="display:none">
<p style="padding:5px 0;">{{$t('sm.qxzxzwtheme')}}</p>
......@@ -358,7 +360,12 @@
this.$refs.newFeature.setReadOnly(false)
} catch (ex) {}
try {
this.$refs.newFeature2.canEditChange(true)
if (this.$refs.newFeature2) {
this.$refs.newFeature2.canEditChange(true);
}
if (this.$refs.UpgradedVersion) {
this.$refs.UpgradedVersion.canEditChange(true);
}
} catch (ex) {}
//解锁表单重复提交
this.$emit("unlockFormCommit", true);
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 31335d64
......@@ -164,6 +164,7 @@
WCountryId: 0, //国家编号
WLocationId: 0, //位置编号
WCityId: 0, //城市编号
TripColor:"",//行程特色主色
},
//行程
FeatureData: {
......@@ -372,7 +373,6 @@
basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.OfferId = this.PostConfig.OfferId;
basicData.TeamType = this.PostConfig.TeamType;
basicData.StartCityId = 0;
basicData.ReturnArriveCityId = 0;
......@@ -390,7 +390,7 @@
basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
}
}
basicData.TripColor=this.PostConfig.TripColor;
basicData.SelfpayingList = this.PostConfig.SelfpayingList;
basicData.ShopList = this.PostConfig.ShopList;
basicData.DinnerList = this.PostDaysTrip.DinnerList;
......@@ -813,8 +813,10 @@
}
//如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
if (tempData.TripColor && tempData.TripColor != '') {
this.PostConfig.TripColor=tempData.TripColor;
this.FeatureData.TripColor = tempData.TripColor;
} else if (tempData.LineTripColor && tempData.LineTripColor != '') {
this.PostConfig.TripColor=tempData.LineTripColor;
this.FeatureData.TripColor = tempData.LineTripColor;
}
this.FeatureData.LtName = tempData.LtName;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue
View file @ 31335d64
<template>
<div class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true" @blur="isLocked = false"
@input="changeText">
<div :data-name="isLocked" class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true"
@blur="isLocked = false" @input="changeText">
</div>
</template>
<script>
......@@ -23,7 +23,7 @@
changeText: function () {
let sel = window.getSelection();
let offset = sel.anchorOffset;
if (this.textLength&&this.$el.innerText.length > this.textLength) {
if (this.textLength && this.$el.innerText.length > this.textLength) {
this.$el.innerText = this.$el.innerText.slice(0, this.textLength);
}
this.$emit("input", this.$el.innerText);
......@@ -34,7 +34,8 @@
sel.removeAllRanges();
sel.addRange(range);
}, 0);
}
},
}
};
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 31335d64
......@@ -23,7 +23,7 @@
<img :src="item.ImgList[0].url" />
</template>
<template v-else>
<img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
<img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png" />
</template>
</div>
<div class="UpgradedVersionDetails-detailsTop absolute"></div>
......@@ -36,18 +36,18 @@
<span class="absolute">{{'0'+(i+1)}}</span>
</div>
<div class="UpgradedVersionDetails-T absolute">
<vEditDiv :canEdit='canEdit1' v-model="item.MainDesc"></vEditDiv>
<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}">
<p :key="indexs+10000" class="absolute row-sb" v-if="indexs==i" :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>
<vEditDiv :canEdit='canEdit' v-model="item.MainDesc"></vEditDiv>
</div>
</div>
</div>
......@@ -78,12 +78,11 @@
props: [
'index',
'TripColor',
'FeatureData'
'FeatureData',
'canEdit'
],
data() {
return {
canEdit: true,
canEdit1: true,
backgroundColor: null,
subscriptText: [{
Name: 'FOODING',
......@@ -104,7 +103,7 @@
queryId: 0,
},
isShowScenicImg: false,
MasterMapIndex: null,//主图下标
MasterMapIndex: null, //主图下标
};
},
methods: {
......@@ -133,11 +132,11 @@
}
},
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
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
},
......@@ -187,147 +186,5 @@
</script>
<style>
.UpgradedVersionDetails-form {
left: 0;
top: 301px;
right: 0;
padding: 43px 35px 0 35px;
}
.UpgradedVersionDetails-form-Box {
width: 100%;
height: 438px;
left: 0;
top: -40px;
}
.UpgradedVersionDetails-formBox1 {
top: 12px;
}
.UpgradedVersionDetails-imgbox {}
.UpgradedVersionDetails-img {
width: 332px;
height: 332px;
background: #fff;
border-radius: 50%;
padding: 10px;
}
.UpgradedVersionDetails-imgOne {
left: 0;
top: 0;
width: 312px;
height: 312px;
border-radius: 50%;
overflow: hidden;
}
.UpgradedVersionDetails-imgOne img {
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.UpgradedVersionDetails-detailsTop {
width: 40px;
height: 56px;
background: url("http://192.168.10.214:8130/Upload/NewTripFeature/detailsTop.png") no-repeat center;
background-size: 100% 100%;
left: 136px;
bottom: -84px;
}
.UpgradedVersionDetails-Title {
width: 276px;
margin: 111px auto 44px;
padding: 0 26px;
}
.UpgradedVersionDetails-Img-one {
/* width: 72px;
height: 32px;
background: url("http://192.168.10.214:8130/Upload/NewTripFeature/one.png") no-repeat center;
background-size: 100% 100%; */
}
.UpgradedVersionDetails-two .UpgradedVersionDetails-Img-one {
/* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/two.png") no-repeat center;
background-size: 100% 100%; */
}
.UpgradedVersionDetails-three .UpgradedVersionDetails-Img-one {
/* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/three.png") no-repeat center;
background-size: 100% 100%; */
}
.UpgradedVersionDetails-num {
height: 32px;
overflow: hidden;
}
.UpgradedVersionDetails-num span {
font-size: 76px;
font-weight: bold;
/* font-family: FZCuSong-B09S; */
left: 0;
top: -28px;
}
.UpgradedVersionDetails-Img-two {
width: 264px;
height: 21px;
/* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/fooding.png") no-repeat center;
background-size: 100% 100%; */
margin-top: 77px;
margin-bottom: 20px;
}
.UpgradedVersionDetails-two .UpgradedVersionDetails-Img-two {
/* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/experience.png") no-repeat center;
background-size: 100% 100%; */
}
.UpgradedVersionDetails-three .UpgradedVersionDetails-Img-two {
/* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/delicious.png") no-repeat center;
background-size: 100% 100%; */
}
.UpgradedVersionDetails-Img-two p {
left: 0;
right: 0;
font-size: 24px;
font-weight: 500;
}
.UpgradedVersionDetails-T {
width: 276px;
height: 44px;
overflow: hidden;
font-size: 38px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
left: -7px;
bottom: -53px;
}
.UpgradedVersionDetails-T-two {
width: 276px;
height: 499px;
overflow: hidden;
font-size: 23px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #444444;
line-height: 42px;
}
.UpgradedVersionDetails1 {
left: 16px;
top: 122px;
}
@import url("../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 31335d64
......@@ -64,15 +64,15 @@
return {
TemplateType: 1,
TemplateList: [{
url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateOne.png',
id: 1,
},
{
url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateTwo.png',
url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateTwo.png',
id: 2,
},
{
url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateThree.png',
url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateThree.png',
id: 3,
}
]
......@@ -126,74 +126,6 @@
};
</script>
<style>
.featureControls {
opacity: 0;
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;
color: #fff;
cursor: pointer;
background: rgba(0, 0, 0, 0.7);
border-radius: 2px;
}
.featureControls-bottomOne {
padding: 1px 10px;
}
.featureControls-bottomTwo {
padding: 5px 0;
}
.featureControls-bottomOne div {
padding: 0 5px;
}
.featureControls-bottomTwo div {
padding: 5px;
}
.featureControls-Template {
width: 150px;
top: -5px;
left: 85px;
background: #fff;
border: 4px;
}
.featureControls-Template div {
padding: 0;
}
.Template-img {
background: #e6e6e6;
margin: 5px 8px;
border-radius: 4px;
overflow: hidden;
cursor: pointer;
}
.Template-img img {
width: 100%;
padding: 10px;
display: block;
}
.Template-imgSelect {
background: rgba(0, 0, 0, 0.7);
left: 0;
top: 0;
right: 0;
bottom: 0;
color: #e95252;
}
@import url("../../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/header.vue
View file @ 31335d64
......@@ -2,9 +2,8 @@
<div class="UpgradedVersion-header absolute row-sb z-index1">
<div class="UpgradedVersion-header-left relative row-aic" :style="{'background':TripColor}">
<img class="header-leftBj absolute z-index2" :src="backgroundImgBj2" />
<img class="header-leftImg" src="http://192.168.10.214:8130/Upload/NewTripFeature/headerLogoTwo.png" />
<img class="header-leftImg" src="http://imgfile.oytour.com/Static/NewTripFeature/headerLogoTwo.png" />
</div>
<div class="UpgradedVersion-header-right">
<div class="UpgradedVersion-header-title">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.LineShortName"></vEditDiv>
......@@ -20,35 +19,18 @@
},
props: [
'TripColor',
'FeatureItem'
'FeatureItem',
'canEdit'
],
data() {
return {
canEdit: true,
backgroundImg: '',
backgroundImgBj1: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjOne.png', //花纹背景
backgroundImgBj2: 'http://192.168.10.214:8130/Upload/NewTripFeature/logoBjTwo.png', //白色背景
return {
backgroundImgBj2: 'http://imgfile.oytour.com/Static/NewTripFeature/logoBjTwo.png', //白色背景
};
},
methods: {
},
methods: {},
computed: {},
watch: {
TripColor: {
handler(val, oldVal) {
// this.backgroundImg = `url('http://192.168.10.214:8130/Upload/NewTripFeature/logoBj.png') no-repeat right ${val}`
},
deep: false,
immediate: true
},
FeatureItem: {
handler(val,oldVal) {
},
deep: true,
immediate: true
}
},
mounted() {
......@@ -56,53 +38,6 @@
};
</script>
<style>
.UpgradedVersion-header {
top: 0;
left: 0;
right: 0;
}
.UpgradedVersion-header-left {
width: 341px;
height: 65px;
border-radius: 0px 0px 18px 0px;
position: relative;
}
.header-leftImg {
width: 292px;
height: auto;
display: block;
margin-left: 19px;
}
.header-leftBj {
left: 314px;
top: 0;
width: 27px;
height: 100%;
background-size: 100% 100%;
}
.UpgradedVersion-header-title {
padding: 12px 19px 10px 19px;
margin-right: 53px;
margin-top: 20px;
border: 2px dashed #000;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
color: #2A2A2A;
}
@import url("../../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/headerTitle.vue
View file @ 31335d64
......@@ -4,12 +4,10 @@
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.LtName"></vEditDiv>
</div>
<div class="UpgradedVersion-headerTitle-two absolute z-index2">
<vEditDiv :canEdit='canEdit1' v-model="FeatureItem.dataObj.Title"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Title"></vEditDiv>
</div>
<div class="UpgradedVersion-headerTitle-three absolute z-index1" :style="{'background':backgroundColor}">&nbsp;
</div>
<!-- <img class="UpgradedVersion-headerTitle-three absolute z-index1"
src="http://192.168.10.214:8130/Upload/NewTripFeature/textBj.png" /> -->
</div>
</template>
......@@ -21,13 +19,11 @@
},
props: [
'TripColor',
'FeatureItem'
'FeatureItem',
'canEdit'
],
data() {
return {
canEdit: true,
canEdit1: true,
backgroundColor: null
};
},
......@@ -52,47 +48,6 @@
</script>
<style>
.UpgradedVersion-headerTitle {
text-align: center;
}
.UpgradedVersion-headerTitle-one {
top: 139px;
left: 124px;
right: 124px;
height: 53px;
font-size: 49px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-headerTitle-two {
top: 205px;
left: 144px;
right: 144px;
font-size: 34px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-headerTitle-one .edit_div,
.UpgradedVersion-headerTitle-two .edit_div {
white-space: nowrap;
overflow: hidden;
}
.UpgradedVersion-headerTitle-two .edit_div {
height: 40px;
}
.UpgradedVersion-headerTitle-three {
top: 237px;
left: 370px;
width: 379px;
height: 14px;
border-radius: 7px;
}
@import url("../../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 31335d64
......@@ -6,13 +6,13 @@
:class="[FeatureData.pageType==4||FeatureData.pageType==5||FeatureData.pageType==6?'UpgradedVersion-otherSubheading':'']">
<div class="UpgradedVersion-subIdeBj relative z-index2">
<div class="UpgradedVersion-subIdeBj1 absolute z-index2" :style="{'background':TripColor}">&nbsp;</div>
<!-- <div class="UpgradedVersion-subIdeBj2 absolute z-index1">&nbsp;</div> -->
<div class="UpgradedVersion-subIdeBj-h absolute z-index3">
<vEditDiv :canEdit='canEdit2' :textLength="FeatureData.pageType==2?2:1" v-model="FeatureData.pageTitle"></vEditDiv>
<vEditDiv :canEdit='canEdit' :textLength="FeatureData.pageType==2?2:1" v-model="FeatureData.pageTitle">
</vEditDiv>
</div>
</div>
<img class="UpgradedVersion-titleIcon relative"
src="http://192.168.10.214:8130/Upload/NewTripFeature/titleIcon.png" />
src="http://imgfile.oytour.com/Static/NewTripFeature/titleIcon.png" />
</div>
<!-- 宿、食、景 副标题 -->
<div class="UpgradedVersion-subIdeText-box"
......@@ -28,7 +28,7 @@
</div>
<div class="UpgradedVersion-sTR marginL20">
<div class="UpgradedVersion-sTR-h">
<vEditDiv :canEdit='canEdit1' v-model="FeatureData.dataObj.MainName"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.MainName"></vEditDiv>
</div>
</div>
</div>
......@@ -65,7 +65,9 @@
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
</div>
<img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[0].url" />
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0">
<img :src="FeatureData.dataObj.SubList[0].url" />
</template>
</div>
</div>
</div>
......@@ -79,7 +81,9 @@
:isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
@toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
</div>
<img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[1].url" />
<template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 ">
<img :src="FeatureData.dataObj.SubList[1].url" />
</template>
</div>
</div>
</div>
......@@ -88,10 +92,10 @@
<!-- 介绍标题 -->
<div class="UpgradedVersion-intTitle" v-if="FeatureData.pageTitle=='介绍'">
<div class="UpgradedVersion-intTitle-one absolute">
<vEditDiv :canEdit='canEdit3' v-model="FeatureData.dataObj.MainName"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.MainName"></vEditDiv>
</div>
<div class="UpgradedVersion-intTitle-two absolute">
<vEditDiv :canEdit='canEdit4' v-model="FeatureData.dataObj.SubName"></vEditDiv>
<vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.SubName"></vEditDiv>
</div>
</div>
</div>
......@@ -114,27 +118,24 @@
data() {
return {
canEdit: true,
canEdit1: true,
canEdit2: true,
canEdit3: true,
canEdit4: true,
};
},
methods: {
toUploadImg(index) {
this.$emit('toUploadImg',index,'模版图')
this.$emit('toUploadImg', index, '模版图')
},
toSelectImg(index) {
this.$emit('toSelectImg',index,'模版图')
this.$emit('toSelectImg', index, '模版图')
},
toAddImg() {
this.$emit('toAddImg')
},
toDeleteImg(index) {
this.$emit('toDeleteImg',index,'模版图')
this.$emit('toDeleteImg', index, '模版图')
},
setTemplate(TemplateType) {
this.$emit('setTemplate',TemplateType)
this.$emit('setTemplate', TemplateType)
}
},
computed: {},
......@@ -162,309 +163,5 @@
</script>
<style>
.UpgradedVersion-subIde {}
.UpgradedVersion-subIdeBj {
left: 72px;
top: 827px;
width: 154px;
height: 155px;
/* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/titleBj.png')no-repeat center;
background-size: 100% 100%; */
/* overflow: hidden; */
}
.UpgradedVersion-subIdeBj1 {
right: 7px;
left: 0;
top: 0;
width: 100%;
height: 100%;
border-radius: 100%;
}
/* .UpgradedVersion-subIdeBj2{
right: 0;
left: 7px;
top: 10px;
width: 100%;
height: 100%;
border-radius: 50%;
background: black;
} */
.UpgradedVersion-subIdeBj-h {
width: 109px;
height: 71px;
overflow: hidden;
left: 22px;
top: 41px;
text-align: center;
}
.UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj-h {
width: 54px;
height: 71px;
left: 34px;
top: 20px;
}
.UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj {
left: 85px;
top: 840px;
width: 120px;
height: 120px;
}
.UpgradedVersion-subIdeBj .edit_div {
font-size: 53px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #FFFFFF;
}
.UpgradedVersion-titleIcon {
width: 64px;
height: 28px;
left: 242px;
top: 748px;
}
.UpgradedVersion-otherSubheading .UpgradedVersion-titleIcon {
left: 236px;
top: 784px;
}
.UpgradedVersion-subIdeText-box {}
.UpgradedVersion-subIdeText {
width: 240px;
left: 237px;
top: 944px;
right: 350px;
height: 38px;
overflow: hidden;
font-size: 30px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-subIdeTitle {
left: 67px;
top: 1001px;
right: 683px;
}
.UpgradedVersion-subIdeTitleBj {
width: 233px;
height: 234px;
/* background: #D23181; */
opacity: 0.2;
border-radius: 50%;
left: -24px;
top: -92px;
}
.UpgradedVersion-sT {
width: 354px;
left: 18px;
top: -230px;
}
.UpgradedVersion-sTL {
width: 17px;
height: 100%;
line-height: 62px;
/* background: #CC0066; */
border-radius: 9px;
}
.UpgradedVersion-sTR {
font-size: 45px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-sTR-h {
min-height: 60px;
max-height: 115px;
overflow: hidden;
}
.UpgradedVersion-sTR .edit_div {
padding: 8px 0;
}
.UpgradedVersion-subIdeImgBox {
top: 1008px;
right: 0;
width: 476px;
height: 39px;
overflow: hidden;
border-top-left-radius: 19px;
border-bottom-left-radius: 19px;
}
.subIdeImgBox .UpgradedVersion-subIdeImgBox {
top: 1062px;
width: 598px;
}
.UpgradedVersion-subIdeImgBox div {
height: 39px;
}
.UpgradedVersion-subIdeImgBoxL {
width: 44px;
flex-shrink: 0;
}
.UpgradedVersion-subIdeImgBoxL img {
width: 44px;
height: 1005;
}
.UpgradedVersion-subIdeImgBoxR {
margin-left: 12px;
flex-grow: 1;
/* background: #CC0066; */
}
.UpgradedVersion-subIdeImgForm1 {
top: 919px;
right: 81px;
width: 351px;
height: 207px;
overflow: hidden;
border-radius: 25px;
background: #ECF6FB;
padding: 10px;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm2 {
left: 569px;
top: 933px;
right: 74px;
width: 270px;
height: 207px;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm2-two {
left: 770px;
top: 843px;
right: 84px;
width: 270px;
height: 207px;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm3 {
left: 569px;
top: 933px;
right: 74px;
width: 198px;
height: 207px;
}
.UpgradedVersion-subIdeImgForm1.subIdeImgForm3-two {
left: 787px;
top: 933px;
right: 84px;
width: 270px;
height: 207px;
}
.subIdeImgBox1 {
left: 0;
top: 0;
}
.subIdeImg1 {
height: 187px;
border-radius: 14px;
overflow: hidden;
}
.subIdeImg1relative {
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.subIdeImg1relative img {
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.subIdeImgForm1Box {
left: 0;
top: 0;
}
.subIdeImgFormRelative {
width: 478px;
height: 214px;
left: 647px;
top: 911px;
}
.subIdeImgFormRelative2 {
width: 478px;
height: 295px;
left: 526px;
top: 843px;
}
.subIdeImgFormRelative3 {
height: 198px;
left: 526px;
top: 944px;
}
.subIdeImgForm2Box {
left: 0px;
top: 20px;
}
.subIdeImgForm2Box2 {
left: 0px;
top: 99px;
}
.subIdeImgForm2Box3 {
left: 0px;
top: 0;
}
.UpgradedVersion-intTitle {
text-align: center;
}
.UpgradedVersion-intTitle-one {
top: 944px;
left: 300px;
right: 300px;
height: 70px;
overflow: hidden;
font-size: 60px;
font-family: FZCuSong-B09S;
font-weight: 400;
color: #2A2A2A;
}
.UpgradedVersion-intTitle-two {
top: 1046px;
left: 200px;
right: 200px;
height: 50px;
overflow: hidden;
font-size: 42px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #2A2A2A;
}
@import url("../../../../../assets/css/UpgradedVersion.css");
</style>
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/travelDays.vue deleted 100644 → 0
View file @ bd49f96a
<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>
src/plug/index.js
View file @ 31335d64
......@@ -1739,6 +1739,10 @@ export default {
var b = parseInt(rgb[3], 16);
return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
}
// 颜色深浅
Vue.prototype.getRgbLevel = function (arr) {
return arr[0] * 0.299 + arr[1] * 0.587 + arr[2] * 0.114;
}
Vue.prototype.base64ToBlob = function (code) {
let parts = code.split(";base64,");
let contentType = parts[0].split(":")[1];
......
src/router/config.js
View file @ 31335d64
This diff is collapsed.
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