Skip to content

S
SuperMan
Commit 3dd9290f authored by 吴春's avatar 吴春
Browse files
Options

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

parents 697e0d44 50fb0c32
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 34 deletions
src/assets/css/tripIndexNewHV.css
View file @ 3dd9290f
.LeaveGroupDownload-form.LeaveGroupDownload-formHV .flight_list td{
background: none !important;
}
.pdfDomHV{
background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat #efebe1;
background-size: 1754px 1240px;
}
.LeaveGroupDownload-form.LeaveGroupDownload-formHV{
background: url('http://imgfile.oytour.com/Static/bjHV2.png') repeat;
}
.hangban-info.hangban-infoHV{
.travelControlTrip .trip-adviser.trip-adviserHV,.hangban-info.hangban-infoHV,.baseTableHV .essential-item.essential-itemHV{
background: none !important;
}
.travelControlTrip .trip-adviser.trip-adviserHV{
background: none;
}
.baseTable.baseTableHV .essential-item.jianju {
border: 5px solid #FFF;
/* border: 5px solid #FFF;*/
border: none;
}
.baseTable.baseTableHV .essential-item.jianju_b {
border: 5px solid #FFF;
/* border: 5px solid #FFF;*/
border: none;
}
.travelDaysHVMasterMap3{
height: 388px;
......@@ -22,7 +31,7 @@
font-size: 24px;
line-height: 34px;
color: #484647;
font-family: DengXian;
font-family: "Microsoft JhengHei UI";
font-weight: 400;
word-break: break-all;
text-overflow: ellipsis;
......@@ -56,7 +65,7 @@
overflow: hidden;
font-size: 30px;
text-align: center;
font-family: Microsoft YaHei;
font-family: "Microsoft JhengHei UI";
white-space: nowrap;
}
.travelDaysHVMasterMap-one{
......@@ -90,13 +99,13 @@
}
.trtravelDaysHVdetails-textC{
font-size: 26px;
font-family: DengXian;
font-family: "Microsoft JhengHei UI";
font-weight: 400;
color: #484647;
}
.travelDaysHVdetails-text0{
font-size: 26px;
font-family: Microsoft YaHei;
font-family: "Microsoft JhengHei UI";
font-weight: bold;
color: #484647;
line-height: 28px;
......@@ -128,7 +137,7 @@
}
.travelDaysHVContent-text{
font-size: 26px;
font-family: DengXian;
font-family: "Microsoft JhengHei UI";
font-weight: 400;
color: #FFFFFF;
line-height: 40px;
......@@ -151,7 +160,8 @@
right: 57px;
background: rgba(23,23,23,0.4);
padding: 40px 50px;
z-index: 1
z-index: 1;
overflow: hidden;
/* max-height: 695px;
padding: 42px 55px;
background: rgba(23,23,23,0.4);
......@@ -181,7 +191,7 @@
.HVTitlle-header1{
width: 1342px;
font-size: 26px;
font-family: DengXian;
font-family: "Microsoft JhengHei UI";
font-weight: bold;
color: #242424;
margin-top: 22px;
......@@ -203,7 +213,7 @@ top: 7px;
.HVTitlle-header0 span{
width: 1342px;
font-size: 32px;
font-family: Microsoft YaHei;
font-family: "Microsoft JhengHei UI";
font-weight: bold;
color: #242424;
white-space: nowrap;
......@@ -239,7 +249,7 @@ height: 36px;
margin-top: 6px;
}
.travelDaysHVTitlle-left-textTwo{
font-family: Microsoft YaHei;
font-family: "Microsoft JhengHei UI";
font-size: 52px;
font-weight: bold;
color: #242424;
......
src/components/LeaveGroupDownload/index.vue
View file @ 3dd9290f
......@@ -74,7 +74,8 @@
</div> -->
<div :class="[dataAll.featurePageType==1?'travelDaysHVMasterMap2-box':'']">
<div style="margin: 0 30px;">
<div class="trip-adviser" style="margin-top: 20px;">
<div class="trip-adviser" style="margin-top: 20px;"
:class="[dataAll.featurePageType==1?'trip-adviserHV':'']">
<!-- <h1 class="trip-nav-title">
<span>{{ vshowL ? "出团通知书：" : "" }}</span>
{{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
......@@ -88,19 +89,23 @@
:class="[dataAll.featurePageType==1?'baseTableHV':'']">
<tbody>
<tr>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">线路</p>
<p class="pvalue">{{ orderMsg.lineName }}</p>
</td>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">出发日期</p>
<p class="pvalue">{{ orderMsg.startDate }}</p>
</td>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">返回日期</p>
<p class="pvalue">{{ orderMsg.endDate }}</p>
</td>
<td class="essential-item jianju_b">
<td class="essential-item jianju_b"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">行程天数</p>
<p class="pvalue">{{ orderMsg.dayNum }}</p>
</td>
......@@ -112,11 +117,13 @@
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<td class="essential-item jianju" colspan="2"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">系列</p>
<p class="pvalue">{{ orderMsg.lineteamName }}</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<td class="essential-item jianju_b" colspan="2"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">团队编号</p>
<p class="pvalue">{{ orderMsg.tcnum }}</p>
</td>
......@@ -129,25 +136,29 @@
<table class="baseTable trip-v3-base" v-if="vshowL">
<tbody>
<tr>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">本团领队</p>
<p class="pvalue">
{{orderMsg.leaderInfo}}
</p>
</td>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">集合时间</p>
<p class="pvalue">
{{ orderMsg.gatheringTimeInfo }}
</p>
</td>
<td class="essential-item jianju">
<td class="essential-item jianju"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">机场服务</p>
<p class="pvalue">
{{orderMsg.airportServiceInfo}}
</p>
</td>
<td class="essential-item jianju_b">
<td class="essential-item jianju_b"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">集合标识</p>
<p class="pvalue">
{{
......@@ -157,7 +168,8 @@
</td>
</tr>
<tr>
<td class="essential-item jianju" colspan="2">
<td class="essential-item jianju" colspan="2"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">紧急联系人</p>
<p class="pvalue">
<span v-if="vshowLLR">
......@@ -165,7 +177,8 @@
</span>
</p>
</td>
<td class="essential-item jianju_b" colspan="2">
<td class="essential-item jianju_b" colspan="2"
:class="[dataAll.featurePageType==1?'essential-itemHV':'']">
<p class="pkey">集合地点</p>
<p class="pvalue">
{{ orderMsg.gatheringAddressInfo}}
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 3dd9290f
......@@ -74,7 +74,7 @@
</el-col>
</el-row>
<div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
<div id="pdfDom">
<div id="pdfDom" :class="[dataAll.featurePageType==1?'pdfDomHV':'']">
<!-- 首页 -->
<LeaveGroupDownload :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
:orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 3dd9290f
......@@ -224,9 +224,10 @@
</div>
</div>
</div>
<div class="_VideoStr_box" v-if="false">
<div class="_VideoStr_box" v-if="true">
<el-form-item label="行程主题色">
<el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker>
<span style="color: red;margin-left: 15px;">注意，如果你使用行程模板，系统将会强制修改主色</span>
</el-form-item>
</div>
</el-form>
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ 3dd9290f
......@@ -179,7 +179,7 @@
</el-select>
</el-form-item>
</span>
<template v-if="false">
<template v-if="true">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">版型</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="FeaturePageType">
......@@ -206,10 +206,12 @@
<span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span>
</el-tooltip>
<template v-if="!item.IsBlowUp">
<travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
<travelDays v-if="dataAll.FeaturePageType==2" :index="index" :dataAll="dataAll" :item="item">
</travelDays>
</template>
<div v-if="item.IsBlowUp" class="BlowUpTravelDaysBox">
<travelDaysHV v-if="dataAll.FeaturePageType==1" :index="index" :dataAll="dataAll" :item="item">
</travelDaysHV>
......@@ -283,7 +285,10 @@
},
clickBlowUpTravelDays(item){
item.IsBlowUp=!item.IsBlowUp
if(item.IsBlowUp) item.zoom = 1
if(item.IsBlowUp) {
if(this.dataAll.FeaturePageType==1) item.zoom = 0.68
if(this.dataAll.FeaturePageType==2) item.zoom = 1
}
else{
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==2) item.zoom = 0.44
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ 3dd9290f
......@@ -107,6 +107,7 @@
<!-- 2张 -->
<div v-if="item.ScenicArray.length==2" class="travelDaysHV2 row">
<div class="travelDaysHV2-imgBox">
<div style="display: none;"></div>
<div :id="'viewSpotBox_'+(item*4)+'_0'+index"
class="travelDaysHVMasterMap2 hidden relative borderRadius18">
<div class="travelDaysHVMasterMap-one" :style="{'color':'#fff'}">
......@@ -155,6 +156,7 @@
</div>
</div>
<div class="travelDaysHV2-imgBox" v-if="ScenicArrayList.length>1" style="margin-left: 74px;">
<div style="display: none;"></div>
<div class="flexS">
<div :id="'viewSpotBox_'+(item*4)+'_1'+index"
class="travelDaysHVMasterMap2 hidden relative borderRadius18">
......
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