Skip to content

S
SuperMan
Commit 37b91e15 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 2755dbb9 4975f684
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
src/assets/css/tripIndexNew.css
View file @ 37b91e15
...@@ -461,6 +461,9 @@ html, body{ ...@@ -461,6 +461,9 @@ html, body{
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-right: 46px; margin-right: 46px;
}
.travelDaysdetails-text.right0{
margin-right: 0;
} }
.travelDaysdetails-text1{ .travelDaysdetails-text1{
/* font-size: 16px !important; */ /* font-size: 16px !important; */
......
src/components/LeaveGroupDownload/travelDays.vue
View file @ 37b91e15
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</div> </div>
</div> </div>
<div class="travelDaysdetails-textBox"> <div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text"> <div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span> <span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级 <template v-for="(j,i) in item.jiu2">{{j.name}} </template> 或同级
</div> </div>
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 37b91e15
...@@ -155,22 +155,22 @@ ...@@ -155,22 +155,22 @@
<div class="travelDaysdetails"> <div class="travelDaysdetails">
<div class="travelDaysdetailsBJ column" <div class="travelDaysdetailsBJ column"
:style="{'background':backgroundColor}"> :style="{'background':backgroundColor}">
<div class="travelDaysdetails-textBox row-sb"> <div class="travelDaysdetails-textBox row">
<div class="travelDaysdetails-text"> <div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">早餐：</span> <span class="travelDaysdetails-text0">早餐：</span>
{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}} <div>{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}</div>
</div> </div>
<div class="travelDaysdetails-text"> <div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">午餐：</span> <span class="travelDaysdetails-text0">午餐：</span>
{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}} <div>{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}</div>
</div> </div>
<div class="travelDaysdetails-text"> <div class="travelDaysdetails-text row">
<span class="travelDaysdetails-text0">晚餐：</span> <span class="travelDaysdetails-text0">晚餐：</span>
{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}} <div>{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}</div>
</div> </div>
</div> </div>
<div class="travelDaysdetails-textBox"> <div class="travelDaysdetails-textBox">
<div class="travelDaysdetails-text"> <div class="travelDaysdetails-text right0 row">
<span class="travelDaysdetails-text0">住宿：</span> <span class="travelDaysdetails-text0">住宿：</span>
<template v-for="(j,i) in item.HotelArray">{{j.HotelName?j.HotelName:'无'}}</template> <template v-for="(j,i) in item.HotelArray">{{j.HotelName?j.HotelName:'无'}}</template>
</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