Skip to content

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

no message

parent 5122bad9
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 39 deletions
src/assets/css/tripIndexNew2.css
View file @ ba8ead7f
......@@ -159,7 +159,7 @@ html, body{
height: 0px;
border-bottom: 2px dashed red;
left: 0;
top: 1538px;
top: 1378px;
right: 0;
}
.UpgradedVersion2Line span{
......@@ -438,7 +438,7 @@ html, body{
}
.travelDaysdetails-tsText{
width: 100%;
padding: 25px 38px;
padding: 15px;
border-radius: 18px;
-webkit-border-radius: 18px;
-moz-border-radius: 18px;
......@@ -494,6 +494,9 @@ html, body{
}
.travelDaysdetails-text.right0{
margin-right: 0;
}
.travelDaysdetails-text0-r>p:first-child{
text-indent: 101px;
}
.travelDaysdetails-text1{
/* font-size: 16px !important; */
......@@ -712,6 +715,9 @@ html, body{
.lineHeight38{
line-height: 38px;
}
.MT15{
margin-top: 15px;
}
.MT19{
margin-top: 19px;
}
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ ba8ead7f
......@@ -4,7 +4,8 @@
>
<div class=" z-index1" style="left: 0;right: 0; top: 0;bottom: 0;">
<div :id="'LineOfTravel'+(item*4)+'_0'+index">
<Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header>
<!-- <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header> -->
<div style="padding: 10px 0;"></div>
<div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
<div class="travelDaysTitlle-left">
<div class="relative">
......@@ -27,17 +28,18 @@
</div>
<!-- 一张图 1-单张图，2-多张图-->
<div v-if="item.TitleObj.ShowTripType==1||(item.TitleObj.ShowTripType==2&&item.ScenicArray.length==1)||item.ScenicArray.length==0">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap relative borderRadius18 hidden">
<div class="column travelDaysMasterMap2-box" style="padding: 45px 32px 41px 32px;">
<div :id="'viewSpotBox_'+(item*4)+'_0'+index" class="travelDaysMasterMap2 relative borderRadius18 hidden">
<div class="travelDaysMasterMap-one" :style="{'color':'#fff'}">
<div class="travelDaysMasterMap-oneImg bjF6 relative UpgradedVersion-Hover">
<div class="featureDay-vToolBar absolute z-index3" style="zoom:2">
<FeatureControls :index="index" :FeatureData="item" :ControlsType="'row'" :isTemplate="false"
:isUploadImg="true" :isSelectImg="true" @toUploadImg="UploadImg(0)" @toSelectImg="SelectImg(0)"
:x="1123" :y="632"></FeatureControls>
:x="1059" :y="632"></FeatureControls>
<input type="file" style="display:none" :id="'dayfile_'+(item * 2 + 1) + '_'+index" @change="uploadpic">
</div>
<VueDraggableResizable v-if="item.ScenicArray.length>0||item.TrafficObj.trafficIntroduce.IntroduceImage"
:w="1123" :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:w="1059" :h="632" :ref="'viewSpotVds_' + item * 4 + '_0'+index" tabindex="0" :resizable="false"
:active="false" :parent="false" axis="y" @activated="onActivated(0)"
:x="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.x:item.TrafficObj.trafficIntroduce.x"
:y="ScenicArrayList&&ScenicArrayList.length>0?ScenicArrayList[0].ScenicJson.y:item.TrafficObj.trafficIntroduce.y"
......@@ -57,6 +59,7 @@
</div>
</div>
</div>
</div>
<div class="travelDaysContent" :style="{'min-height': item.WarmTipObj.Description?'210px':'310px'}">
<template v-if="item.ScenicArray.length>0">
<div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" :key="j">
......@@ -115,8 +118,8 @@
</div>
</div>
<div class="MT28" v-if="item.ScenicArray.length>0">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz18 MT15 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div>
</div>
......@@ -154,8 +157,8 @@
</div>
<div class="ML26 flexG">
<template v-if="item.ScenicArray.length>1">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div>
</template>
......@@ -199,8 +202,8 @@
</div>
<div class="ML26 flexG">
<template v-if="item.ScenicArray.length>0">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div>
</template>
......@@ -209,8 +212,8 @@
<div class="row MB32">
<div class="flexG">
<template v-if="item.ScenicArray.length>1">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div>
</template>
......@@ -279,8 +282,8 @@
</div>
<div class="ML26 flexG">
<template v-if="item.ScenicArray.length>2">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
</div>
</template>
......@@ -323,8 +326,8 @@
</div>
<div class="ML37 flexG">
<template v-if="item.ScenicArray.length>0">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div>
</template>
......@@ -364,8 +367,8 @@
</div>
<div class="MT28 width331">
<template v-if="item.ScenicArray.length>1">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div>
</template>
......@@ -404,8 +407,8 @@
</div>
<div class="MT28">
<template v-if="item.ScenicArray.length>2">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
</div>
</template>
......@@ -444,8 +447,8 @@
</div>
<div class="MT28">
<template v-if="item.ScenicArray.length>3">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[3].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[3].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].Description"></vEditSpan>
</div>
</template>
......@@ -487,8 +490,8 @@
</div>
</div>
<div class="MT28" v-if="item.ScenicArray.length>0">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[0].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[0].Description"></vEditSpan>
</div>
</div>
......@@ -523,8 +526,8 @@
</div>
</div>
<div class="MT28" v-if="item.ScenicArray.length>1">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[1].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[1].Description"></vEditSpan>
</div>
</div>
......@@ -564,8 +567,8 @@
</div>
<div class="MT28">
<template v-if="item.ScenicArray.length>2">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[2].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[2].Description"></vEditSpan>
</div>
</template>
......@@ -604,8 +607,8 @@
</div>
<div class="MT28">
<template v-if="item.ScenicArray.length>3">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[3].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[3].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[3].Description"></vEditSpan>
</div>
</template>
......@@ -644,8 +647,8 @@
</div>
<div class="MT28 width331">
<template v-if="item.ScenicArray.length>4">
<div class="fz26 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[4].CouponsName}}</div>
<div class="fz21 MT19 lineHeight25 color444 fontFamilyUI">
<div class="fz21 fontBold fontFamilyLigh color2A2A2A">{{item.ScenicArray[4].CouponsName}}</div>
<div class="fz18 MT19 lineHeight25 color444 fontFamilyUI">
<vEditSpan :canEdit='canEdit' v-model="item.ScenicArray[4].Description"></vEditSpan>
</div>
</template>
......@@ -660,9 +663,9 @@
<div class="travelDaysdetails-tsTextBox"
v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
<div class="travelDaysdetails-tsText row" :style="{'background':'#EFECEC'}">
<span class="travelDaysdetails-text0" style="margin-top: -7px;">温馨提示：</span>
<span v-html="item.WarmTipObj.Description"></span>
<div :id="'WarmTip_'+index" class="travelDaysdetails-tsText row relative" :style="{'background':'#EFECEC'}">
<span class='travelDaysdetails-text0 absolute' style='line-height:25px;top: 8px;'>温馨提示：</span>
<div v-html="item.WarmTipObj.Description" class="travelDaysdetails-text0-r"></div>
</div>
</div>
<div class="travelDaysdetails">
......@@ -724,10 +727,10 @@
</div>
</div>
<div class="UpgradedVersion2Line absolute z-index3 row-ajc">
<span>{{pageHeight>1538?'超出内容分割到下一页':'底线'}}</span>
<span>{{pageHeight>1378?'超出内容分割到下一页':'底线'}}</span>
</div>
<div class="UpgradedVersion2Line absolute z-index3 row-ajc"
:style="{'top': pageHeight>1538&&pageHeight<3076?pageHeight+'px':'3076px'}">
:style="{'top': pageHeight>1378&&pageHeight<2756?pageHeight+'px':'2756px'}">
<span>底线</span>
</div>
</div>
......
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