Skip to content

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

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

parents ba2014e7 71f2e2b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 289 deletions
src/assets/css/UpgradedVersion.css
View file @ 86861cd0
html, body{
background: #fff;
}
.UpgradedVersion-box .edit_div {
min-width: 30px;
height: 100%;
......@@ -36,6 +39,7 @@
.introduceFooter-text img {
width: 28px;
height: 28px;
object-fit: cover;
display: inline-block;
margin: 0 9px;
}
......@@ -45,7 +49,7 @@
text-align: center;
overflow: hidden;
font-size: 22px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
margin: 0 9px 0 0;
......@@ -172,7 +176,7 @@ img {
height: 80px;
overflow: hidden;
font-size: 66px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
padding: 0 280px 0 0;
......@@ -195,7 +199,7 @@ img {
.featureHome-text-box .edit_div {
font-size: 45px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: bold;
/* color: #CC0066; */
}
......@@ -235,6 +239,7 @@ img {
width: 100%;
height: 100%;
display: block;
object-fit: cover;
}
.featureHome-right {
......@@ -254,7 +259,7 @@ img {
height: 540px;
overflow: hidden;
font-size: 45px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #FFFFFF;
}
......@@ -454,6 +459,7 @@ img {
top: 0;
width: 100%;
height: 100%;
object-fit: cover;
}
.MasterMapList-4 .MasterMapList-2 {
......@@ -503,7 +509,7 @@ img {
top: 1137px;
left: 70px;
right: 70px;
height: 330px;
height: 300px;
overflow: hidden;
font-size: 23px;
font-family: Microsoft YaHei;
......@@ -559,6 +565,7 @@ img {
top: 0;
width: 100%;
height: 100%;
object-fit: cover;
}
.UpgradedVersionDetails-detailsTop {
......@@ -591,21 +598,21 @@ img {
.UpgradedVersionDetails-num {
height: 38px;
overflow: hidden;
margin-top: 5px;
}
.UpgradedVersionDetails-num span {
font-size: 76px;
font-weight: bold;
/* font-family: FZCuSong-B09S; */
/* font-family: FZCuSong-B09S !important; */
left: 0;
top: -23px;
top: -21px;
}
.UpgradedVersionDetails-Img-two {
width: 264px;
height: 21px;
margin-top: 77px;
margin-top: 38px;
margin-bottom: 20px;
}
......@@ -618,11 +625,10 @@ img {
}
.UpgradedVersionDetails-Img-two p {
left: 0;
right: 0;
top: -31px;
font-size: 24px;
font-weight: 500;
margin-top: 38px;
margin-bottom: 20px;
}
.UpgradedVersionDetails-T {
......@@ -630,7 +636,7 @@ img {
height: 44px;
overflow: hidden;
font-size: 38px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
left: -7px;
......@@ -763,7 +769,7 @@ img {
.UpgradedVersion-sTR {
font-size: 45px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
}
......@@ -804,7 +810,8 @@ img {
.UpgradedVersion-subIdeImgBoxL img {
width: 44px;
height: 1005;
height: 100%;
object-fit: cover;
}
.UpgradedVersion-subIdeImgBoxR {
......@@ -879,6 +886,7 @@ img {
top: 0;
width: 100%;
height: 100%;
object-fit: cover;
}
.subIdeImgForm1Box {
......@@ -932,7 +940,7 @@ img {
height: 70px;
overflow: hidden;
font-size: 60px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
}
......@@ -961,7 +969,7 @@ img {
right: 124px;
height: 53px;
font-size: 49px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
}
......@@ -986,6 +994,7 @@ img {
.UpgradedVersion-headerTitle-two .edit_div {
height: 40px;
text-overflow: ellipsis;
}
.UpgradedVersion-headerTitle-three {
......@@ -1040,7 +1049,7 @@ img {
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
color: #2A2A2A;
}
......@@ -1100,6 +1109,8 @@ img {
.Template-img img {
width: 100%;
height: 100%;
object-fit: cover;
padding: 10px;
display: block;
}
......
src/assets/css/tripIndexNew.css
View file @ 86861cd0
.LeaveGroupDownload-form div, .LeaveGroupDownload-form dl,
html, body{
background: #fff;
}
.LeaveGroupDownload-form dl,
.LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
.LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
.LeaveGroupDownload-form li, .LeaveGroupDownload-form h1,
......@@ -245,6 +248,7 @@
.travelDaysTitlle-left {
flex-shrink: 0;
margin-left: 22px;
}
.travelDaysTitlle-left-text {
......@@ -340,7 +344,8 @@
.travelDaysMasterMap-twoImg {
max-width: 335px;
max-height: 189px;
/* max-height: 189px; */
height: 44.5%;
overflow: hidden;
border: 2px solid #FFFFFF;
border-radius: 18px;
......@@ -354,7 +359,7 @@
}
.travelDaysContent {
min-height: 360px;
min-height: 360px;
max-height:600px;
overflow:hidden;
line-height: 38px;
......@@ -425,21 +430,31 @@
}
.LeaveGroupDownload-form .expense {
padding: 0 20px;
padding: 0 30px;
margin-bottom: 20px;
}
.LeaveGroupDownload-form .expense .right {
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%;
}
.LeaveGroupDownload-form .expense .right * {
color: #000000 !important;
font-size: 15px !important;
padding: 0 !important;
margin: 0 !important;
line-height: 160%;
}
.travelControlTrip .LeaveGroupDownload-form .Passenger-table{
width: 100% !important;
padding: 0 30px;
margin: 0;
}
.travelControlTrip .LeaveGroupDownload-form .footer-div {
text-align: center;
padding: 25px 0;
border-top: none;
}
.UpgradedVersion-header {
top: 0;
......@@ -484,13 +499,13 @@
.UpgradedVersion-header .edit_div {
font-size: 38px;
font-weight: 400;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
color: #2A2A2A;
}
.UpgradedVersion-box {
width: 1123px;
height: 1588px;
height: 1478px;
overflow: hidden;
}
......@@ -519,10 +534,9 @@
.otherJourney-introduceFooter {
left: 0;
right: 0;
bottom: 32px;
margin-bottom: 32px;
width: 100%;
height: 34px;
background-size: 100% 100%;
}
.introduceFooterBJ {
......@@ -559,7 +573,7 @@
text-align: center;
overflow: hidden;
font-size: 22px;
font-family: FZCuSong-B09S;
font-family: FZCuSong-B09S !important;
font-weight: 400;
color: #2A2A2A;
margin: 0 9px 0 0;
......
src/components/LeaveGroupDownload/index.vue
View file @ 86861cd0
This diff is collapsed.
src/components/LeaveGroupDownload/travelDays.vue
View file @ 86861cd0
......@@ -39,7 +39,6 @@
<div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2">
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgOne">
<div class="travelDaysMasterMap-twoImg relative bjF6"
:style="{'color':'#fff'}"
:id="'travelDaysImg_two'+index"
......@@ -59,8 +58,6 @@
</template>
</template>
</div>
</template>
<template v-if="item.imgMapId=='travelDaysMasterMap_'+index&&item.showImgTwo">
<div class="travelDaysMasterMap-twoImg relative bjF6" style="margin-top: 47px;"
:style="{'color':'#fff'}"
:id="'travelDaysImg_three'+index"
......@@ -81,15 +78,19 @@
</template>
</template>
</div>
</template>
</div>
</div>
<div class="travelDaysContent column">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details">
<span>【{{jindian.title}}】</span>
<div class="travelDaysContent-text" v-for="(jindian,j) in item.details"
v-if="item.details.length>0">
<span>{{jindian.title?'【'+jindian.title+'】':''}}</span>
{{jindian.content}}
</div>
<div class="travelDaysContent-text"
v-else>
<span>暂无描述</span>
</div>
</div>
<div class="travelDaysdetails">
......@@ -154,31 +155,6 @@
},
methods: {
getShow(Id,HeightNum,item){
item.imgMapId = Id
if(HeightNum>=243){
item.showImgOne = true
}else{
item.showImgOne = false
}
if(HeightNum>=478){
item.showImgTwo = true
}else{
item.showImgTwo = false
}
this.$forceUpdate()
},
getHeigthNum(Id,item){
let that = this
setTimeout(()=>{
var Height = document.getElementById(Id);
if(Height){
let HeightNum = Height.offsetHeight
that.getShow(Id,HeightNum,item)
}
},300)
},
getFontSize(title){
if(title.length>60){
return 929/60 +'px'
......@@ -285,9 +261,7 @@
},
tripList: {
handler(val, oldVal) {
this.tripList.forEach((x,index)=>{
this.getHeigthNum(`'travelDaysMasterMap_'+${this.index}`)
})
},
deep: true,
immediate: true
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 86861cd0
......@@ -41,25 +41,27 @@
<div class="travelControlTrip">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
<el-col :span="14">
<el-dropdown trigger="click">
<span class="el-dropdown-link">行程下载
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="travelControlDropDown">
<el-dropdown-item
@click.native="toPDF_2023(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')">
2023版PDF
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-checkbox v-model="isShowTime">显示行程日期</el-checkbox>
<el-col :span="14" class="row-aic">
<div class="el-dropdown-link" style=" height: 30px;
line-height: 30px;
background-color: #E95252;
color: #fff;
font-size: 12px;
width: 80px;
text-align: center;
border-radius: 4px;
cursor: pointer;
margin-left: 20px;"
@click="toPDF_2023(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')">
2023版PDF
</div>
<el-checkbox class="marginL11" v-model="isShowTime">显示行程日期</el-checkbox>
</el-col>
</el-row>
<div id="pdfNode" class="LeaveGroupDownload-form">
<div id="pdfDom" style="padding:0 20px;">
<div id="pdfDom">
<!-- 首页 -->
<LeaveGroupDownload :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
<LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId">
</LeaveGroupDownload>
......@@ -287,26 +289,30 @@
'Content-Type': 'application/json'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/DownLoadPdf2023',
url: urlObj.DomainUrl + '/api/file/DownLoadPdf2023Url',
data: {
"msg": msg
}
}).then(res => {
if (res.data.resultCode === 1) {
if (res.data.resultCode === 1&&res.data.data) {
let sign = title + "V2"
const a = document.createElement('a');
a.setAttribute('download', '');
a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
'.pdf&&fPath=' + res.data.data);
let path = res.data.data
a.setAttribute('href', 'https://microservice.oytour.com/task/create/pdf/'+encodeURIComponent(path));
a.click();
setTimeout(()=>{
this.pdfLoading = false
},25000)
} else {
this.pdfLoading = false
this.$message.error('PDF获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
},
},
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-")
......@@ -351,14 +357,6 @@
},
//初始化行程
initTrip(res, data) {
let arrlist = function (arr) {
arr.forEach(x => {
x.showImgOne = true
x.showImgTwo = true
x.imgMapId = null
})
}
arrlist(res.data.data.dayList)
this.tripList = res.data.data.dayList;
this.feature = res.data.data.feature
this.showType = this.feature.featureType;
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue
View file @ 86861cd0
......@@ -31,17 +31,17 @@
</div>
<!-- UpgradedVersionDetails-two 02 UpgradedVersionDetails-three 03-->
<div class="UpgradedVersionDetails-Title UpgradedVersionDetails-two">
<div class="UpgradedVersionDetails-Img-one relative">
<div class="UpgradedVersionDetails-Img-one">
<div class="UpgradedVersionDetails-num relative" :style="{'color':TripColor}">
<span class="absolute">{{'0'+(i+1)}}</span>
</div>
<div class="UpgradedVersionDetails-T absolute">
<div class="UpgradedVersionDetails-T">
<vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
</div>
</div>
<div class="UpgradedVersionDetails-Img-two relative">
<div class="UpgradedVersionDetails-Img-two">
<template v-for="(items,indexs) in subscriptText">
<p :key="indexs+10000" class="absolute row-sb" v-if="indexs==i" :style="{'color':TripColor}">
<p :key="indexs+10000" class="row-sb" v-if="indexs==i" :style="{'color':TripColor}">
<span v-for="(t,i) in items.Name" :key="i+100000">{{t}}</span>
</p>
</template>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue
View file @ 86861cd0
......@@ -30,6 +30,7 @@
<i class="el-icon-plus"></i>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除页面" placement="top">
<div @click="toDeletePages" v-if="isDeletePage">
<i class="el-icon-delete"></i>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue
View file @ 86861cd0
......@@ -36,7 +36,7 @@
</div>
</div>
<!-- subIdeImgBox 食景副标题图 -->
<template v-if="FeatureData.pageTitle=='宿'||FeatureData.pageTitle=='食'||FeatureData.pageTitle=='景'">
<template v-if="FeatureData.pageType==4||FeatureData.pageType==5||FeatureData.pageType==6">
<div :class="[Template==1?'':'subIdeImgBox']">
<div class="UpgradedVersion-subIdeImgBox absolute row z-index1">
<div class="UpgradedVersion-subIdeImgBoxL" :style="{'background':TripColor}">
......@@ -90,7 +90,7 @@
</div>
</template>
<!-- 介绍标题 -->
<div class="UpgradedVersion-intTitle" v-if="FeatureData.pageTitle=='介绍'">
<div class="UpgradedVersion-intTitle" v-if="FeatureData.pageType==2">
<div class="UpgradedVersion-intTitle-one absolute">
<vEditDiv :canEdit='canEdit' v-model="FeatureData.dataObj.MainName"></vEditDiv>
</div>
......
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @ 86861cd0
......@@ -7,7 +7,7 @@
<Header :TripColor="TripColor" :canEdit="canEdit" :FeatureItem="item"></Header>
<!-- 首页 -->
<featureHome v-if="item.pageType==1" :canEdit="canEdit" :index="index" :FeatureItem="item" :TripColor="TripColor"
@toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
@UploadImg="UploadImg" @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
<!-- 其余页 -->
<div v-else>
<headerTitle :FeatureItem="item" :TripColor="TripColor" :canEdit="canEdit"></headerTitle>
......@@ -118,6 +118,11 @@
};
},
methods: {
UploadImg(pageType,index,url){
if(pageType==1){
this.pageList[index].dataObj.ImgList[0].url = url
}
},
getPageObj() {
var pageObj = {
pageTitle: '首页', //页面名称
......
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