Skip to content

S
SuperMan
Commit 6de27762 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 2749a8d2 c63878f2
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 80 deletions
src/assets/css/tripIndexNew.css
View file @ 6de27762
html, body{
background: #fff;
}
.travelControlTrip .Passenger-table{width:960px; margin: 0 20px; color: #666; background: #fff;}
.travelControlTrip .Passenger-table td.thClass {height: 50px; background: #e2e2e2; font-size: 16px; font-weight: normal; padding: 0!important;}
.travelControlTrip .Passenger-table td.thClass img{margin-right:5px; margin-top: 2px;}
.travelControlTrip .Passenger-table tr td{background: #f7f7f7; text-align: center; font-size: 14px; padding: 15px 10px; }
.LeaveGroupDownload-form dl,
.LeaveGroupDownload-form dt, .LeaveGroupDownload-form dd,
.LeaveGroupDownload-form ul, .LeaveGroupDownload-form ol,
......@@ -145,11 +149,28 @@ html, body{
color: #000;
font-weight: 700;
}
.UpgradedVersion2Line{
height: 0px;
border-bottom: 2px dashed red;
left: 0;
top: 1450px;
right: 0;
}
.UpgradedVersion2Line span{
background: #fff;
font-size: 20px;
padding: 5px 20px;
border: 2px dashed red;
border-radius: 15px;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
-ms-border-radius: 15px;
-o-border-radius: 15px;
}
.detail-box .hangban-info {
width: 100%;
background: unset;
paddong: 0px;
padding: 0px;
}
.detail-box .hangban-info {
......@@ -170,8 +191,9 @@ html, body{
border-collapse: collapse !important;
}
.travelControlTrip * {
page-break-inside: avoid;
.travelControlTrip{
/* page-break-inside: avoid; */
}
.baseTable .essential-item.jianju {
......@@ -301,8 +323,8 @@ html, body{
.travelDaysMasterMap {
margin-top: 14px;
margin-bottom: 41px;
/*height: 632px;*/
flex:1;
height: 632px;
/* flex:1; */
overflow: hidden;
}
......@@ -343,9 +365,9 @@ html, body{
}
.travelDaysMasterMap-twoImg {
max-width: 335px;
/* max-height: 189px; */
height: 44.5%;
width: 335px;
height: 189px;
/* height: 44.5%; */
overflow: hidden;
border: 2px solid #FFFFFF;
border-radius: 18px;
......@@ -356,11 +378,14 @@ html, body{
font-family: PingFang SC;
font-weight: 500;
line-height: 34px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.travelDaysContent {
min-height: 360px;
max-height:600px;
/* min-height: 360px;
max-height:600px; */
overflow:hidden;
line-height: 38px;
padding: 0 36px;
......@@ -373,7 +398,7 @@ html, body{
color: #2A2A2A;
}
.travelDaysContent-text span {
.textBold {
font-size: 21px;
line-height: 38px;
font-weight: bold;
......@@ -384,11 +409,23 @@ html, body{
right: 0;
bottom: 115px;
margin: 44px 36px;
padding: 0 0 115px 0;
}
.travelDaysdetails-tsTextBox{
padding: 0 36px;
margin-top: 20px;
}
.travelDaysdetails-tsText{
width: 100%;
padding: 15px;
border-radius: 14px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
.travelDaysdetailsBJ {
border-radius: 100px;
flex-wrap: nowrap;
padding: 20px 35px;
-webkit-border-radius: 100px;
-moz-border-radius: 100px;
......@@ -396,20 +433,12 @@ html, body{
-o-border-radius: 100px;
}
.travelDaysdetails-textBox{
flex: 1;
}
.travelDaysdetails-textBox:last-child .travelDaysdetails-text{
height: 105px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
overflow: hidden;
flex-wrap: wrap;
}
.travelDaysdetails-text {
flex-wrap: wrap;
margin-right: 46px;
margin-right: 10px;
flex: 1;
}
.travelDaysdetails-text0 {
......@@ -419,19 +448,26 @@ html, body{
line-height: 34px;
flex-shrink: 0;
}
.travelDaysdetails-text div span{
width: 100%;
white-space: wrap;
overflow: hidden;
}
.travelDaysdetails-text {
font-size: 16px;
.travelDaysdetails-tsText,.travelDaysdetails-text {
font-size: 21px;
font-weight: 100;
color: #2A2A2A;
line-height: 34px;
white-space: wrap;
display: inline-block;
padding: 0;
margin: 0;
}
.travelDaysdetails-text {
padding: 0;
margin: 0;
}
.travelDaysdetails-text1{
font-size: 16px !important;
/* font-size: 16px !important; */
font-weight: 100 !important;
color: #2A2A2A;
}
......@@ -527,21 +563,23 @@ html, body{
font-family: FZCuSong-B09S !important;
color: #2A2A2A;
}
.UpgradedVersion-box {
.UpgradedVersion-box{
width: 1123px;
min-height: 1450px;
margin: auto;
}
.UpgradedVersion-box2 {
width: 1123px;
height: 1478px;
overflow: hidden;
min-height: 1478px;
height: 100%;
}
.UpgradedVersion-homebj {
background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
background: url('../img/trip/otherBjThree.jpg') repeat;
}
.UpgradedVersion-introduceBj {
background: url('https://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
background-size: 100% 100%;
}
.UpgradedVersion-otherBj {
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 6de27762
......@@ -1117,6 +1117,9 @@
<!-- 成本月结关联单号 -->
<CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail">
</CostmonthDetails>
<!-- 相同对象付款单据 -->
<SamePayment :GetDetail="GetDetail">
</SamePayment>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<RollCall v-if="GetDetail.OrderSource==10&&
......@@ -2002,6 +2005,7 @@
import czBillModule from "./FinancialSubmodule/czBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
import CostmonthDetails from './components/CostmonthDetails';
import SamePayment from './components/SamePayment';
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall'
export default {
......@@ -2197,6 +2201,7 @@
'huijiBill': huijiBill,
'czBillModule': czBillModule,
CostmonthDetails,
SamePayment,
UserCredit,
RollCall
},
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 6de27762
......@@ -1142,6 +1142,9 @@
<!-- 成本月结关联单号 -->
<CostmonthDetails v-if="GetDetail.OtherType==75||getTemplate(GetDetail)" :GetDetail="GetDetail">
</CostmonthDetails>
<!-- 相同对象付款单据 -->
<SamePayment :GetDetail="GetDetail">
</SamePayment>
<!-- 团成员已制单名单 -->
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<RollCall v-if="GetDetail.OrderSource==10&&
......@@ -1492,6 +1495,7 @@
import dmcTravelBill from './FinancialSubmodule/DmcTravelBillModule'; //线路
import CostmonthDetails from './components/CostmonthDetails';
import SamePayment from './components/SamePayment';
import UserCredit from './components/UserCredit';
import RollCall from './components/RollCall'
export default {
......@@ -1598,6 +1602,7 @@
"czBillModule": czBillModule,
"dmcTravelBill": dmcTravelBill,
CostmonthDetails,
SamePayment,
UserCredit,
RollCall
},
......
src/components/LeaveGroupDownload/index.vue
View file @ 6de27762
......@@ -167,6 +167,23 @@
<td width="100">{{flight.stopoverAirPortName}}</td>
</tr>
</tbody>
<tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0"
style="padding-top:12px;">
<tr v-for="(flight,ftIndex) in priceList[0].priceFlight" :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}}({{(flight.flightState==1)?"OK":"暂定"}})</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;">
......@@ -202,7 +219,8 @@
"orderTripdiff",
"vshowLLR",
"vshowB",
"lineId"
"lineId",
"priceList"
],
data() {
return {
......
src/components/LeaveGroupDownload/travelDays.vue
View file @ 6de27762
......@@ -40,7 +40,7 @@
</div>
<div class="travelDaysMasterMap-text absolute z-index2">{{item.details[0].title}}</div>
</div>
<div class="travelDaysMasterMap-two absolute z-index2">
<div class="travelDaysMasterMap-two absolute z-index2" style="display: none;">
<div class="travelDaysMasterMap-twoImg relative bjF6" :style="{'color':'#fff'}"
:id="'travelDaysImg_two'+index"
v-if="(item.details&&item.details.length>1&&item.details[1].img)||(item.jiu2&&item.jiu2.length>0&&item.jiu2[0].url)">
......@@ -90,42 +90,41 @@
<span>暂无描述</span>
</div>
</div>
<template v-for="(t,i) in item.tips">
<div class="travelDaysdetails-tsTextBox">
<div class="travelDaysdetails-tsText row"
:style="{'background':backgroundColor2}">
<span class="travelDaysdetails-text0">温馨提示：</span>
<template v-if="t.content&&getHtmlPlainText(t.content).length>0">
{{getHtmlPlainText(t.content)}}
</template>
<template v-else>暂无提示</template>
</div>
</div>
</template>
<div class="travelDaysdetails">
<div class="travelDaysdetailsBJ row" :style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox column">
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">早餐：</span>
{{item.can.breakfirst}}
</div>
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">午餐：</span>
{{item.can.lanuch}}
</div>
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">晚餐：</span>
{{item.can.dinner}}
</div>
<div class="travelDaysdetailsBJ column"
:style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row-sb">
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">早餐：</span>
{{item.can.breakfirst?item.can.breakfirst:'无'}}
</div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
</div>
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">午餐：</span>
{{item.can.lanuch?item.can.lanuch:'无'}}
</div>
<template v-for="(t,i) in item.tips">
<div class="travelDaysdetails-textBox"
:style="{'flex-grow':t.content&&getHtmlPlainText(t.content).length>20?'2':''}">
<div class="travelDaysdetails-text" style="margin-right: 0;">
<span class="travelDaysdetails-text0">温馨提示：</span>
<template v-if="getHtmlPlainText(t.content).length>0">
{{getHtmlPlainText(t.content)}}
</template>
<!-- <div class="travelDaysdetails-text1" v-if="t.content!=''" v-html="t.content"></div> -->
<p v-else>暂无提示</p>
</div>
</div>
</template>
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">晚餐：</span>
{{item.can.dinner?item.can.dinner:'无'}}
</div>
</div>
<div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text">
<span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
</div>
</div>
</div>
</div>
<!-- otherJourney-footer -->
......@@ -160,6 +159,7 @@
title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
day: 'DAY',
backgroundColor: '',
backgroundColor2: '',
textColor: '',
textColorOne: '',
};
......@@ -261,6 +261,7 @@
if (val && val.tripColor) {
this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
this.backgroundColor2 = this.hexToRgb(val.tripColor, 0.1)
let rgba = this.hexToRgb(val.tripColor, 1)
rgba = rgba.split(',')
let rgba0 = rgba[0].split('(')
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 6de27762
......@@ -64,7 +64,7 @@
<div id="pdfDom">
<!-- 首页 -->
<LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId">
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId" :priceList="priceList">
</LeaveGroupDownload>
<!-- 行程特色 -->
......@@ -503,7 +503,10 @@
var fileName = title + "_2023.pdf";
this.pdfLoading = true;
let urlObj = this.domainManager();
var ocrUrl = urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
var ocrUrl ="";
//urlObj.ocrUrl + "/Home/DownloadFileForPdf?url=" + encodeURIComponent(path);
ocrUrl= urlObj.ocrUrl + "/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
//ocrUrl="http://192.168.10.128:8300"+"/api/Home/DownloadFileForPdf?configId="+msg.configId+"&url=" + encodeURIComponent(path);
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -913,8 +916,6 @@
@import url('../assets/css/tripIndex.css');
@import url("../assets/css/tripIndexNew.css");
@import url('../assets/css/detail.css');
@import url('../assets/css/UpgradedVersion.css');
.edit_form_box {
......
src/components/newTravelmanager/TravelTripPreview/noScenic.vue
View file @ 6de27762
......@@ -95,6 +95,8 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
this.trafficObj.trafficIntroduce.IntroduceImage =
this.domainManager().ViittoFileUrl + x.data.FilePath;
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
});
},
//关闭添加弹窗
......@@ -107,16 +109,21 @@ export default {
imgArr.forEach(imgItem => {
this.trafficObj.trafficIntroduce.IntroduceImage =
imgItem.Path ;
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
});
}
},
mounted() {
},
watch: {
"trafficObj.trafficIntroduce":{
handler: function(newValue, oldValue) {
this.trafficObj.Introduce = JSON.stringify(this.trafficObj.trafficIntroduce);
this.trafficObj.trafficIntroduce.x = 0
this.trafficObj.trafficIntroduce.y = 0
this.trafficObj.Introduce = JSON.stringify(this.trafficObj.trafficIntroduce);
},
deep: true
}
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 6de27762
......@@ -626,7 +626,7 @@
scenicDescribeObj.Describe = s.About;
//this.WarmTripDescribe.ScenicDescribeArr.push(scenicDescribeObj);
if (scenicDescribeObj.Describe != null && scenicDescribeObj.Describe != "") {
this.dayObj.WarmTipObj.Description += "<p>" + scenicDescribeObj.Describe + "</p>";
// this.dayObj.WarmTipObj.Description += "<p>" + scenicDescribeObj.Describe + "</p>";
}
}
});
......
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