Skip to content

A
Athena
Commit f0819fc7 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 90f41e6f
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 19 deletions
src/components/mall/newTrip.vue
View file @ f0819fc7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.pageViewTrip .sideBarBtns .btnPage { .pageViewTrip .sideBarBtns .btnPage {
cursor: pointer; cursor: pointer;
height:27px; height: 27px;
margin-bottom: 5px; margin-bottom: 5px;
} }
...@@ -532,7 +532,7 @@ ...@@ -532,7 +532,7 @@
height: 150px; height: 150px;
color: #fff; color: #fff;
position: relative; position: relative;
background-size: cover!important; background-size: cover !important;
} }
.tripViewAgendaList .agendaBox .txtCont { .tripViewAgendaList .agendaBox .txtCont {
...@@ -818,7 +818,8 @@ ...@@ -818,7 +818,8 @@
.slideHeader .cities i:last-child { .slideHeader .cities i:last-child {
display: none; display: none;
} }
.tripViewAgendaList .agendaBox .showMore{
.tripViewAgendaList .agendaBox .showMore {
color: #00B2B4; color: #00B2B4;
margin: 10px auto; margin: 10px auto;
padding: 4px 2px; padding: 4px 2px;
...@@ -829,13 +830,14 @@ ...@@ -829,13 +830,14 @@
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
} }
.tripViewAgendaList .agendaBox .hideAgendaDetails { .tripViewAgendaList .agendaBox .hideAgendaDetails {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
padding:20px 0 0 0; padding: 20px 0 0 0;
margin-bottom:20px; margin-bottom: 20px;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
</style> </style>
...@@ -1111,17 +1113,20 @@ ...@@ -1111,17 +1113,20 @@
disabled></el-rate> disabled></el-rate>
</span> </span>
</div> </div>
<div class="item" v-if="getService(subItem.childItem.facilityServices)!=''"> <div class="item"
v-if="getService(subItem.childItem.facilityServices)!=''">
<span class="label">设施服务</span> <span class="label">设施服务</span>
<span <span
class="text">{{getService(subItem.childItem.facilityServices)}}</span> class="text">{{getService(subItem.childItem.facilityServices)}}</span>
</div> </div>
</div> </div>
<div class="subSection" :class="{'hideAgendaDetails':!subItem.childItem.isShow}" <div class="subSection"
:class="{'hideAgendaDetails':!subItem.childItem.isShow}"
v-if="subItem.childItem.hotelNewDescriptionText" v-if="subItem.childItem.hotelNewDescriptionText"
v-html="subItem.childItem.hotelNewDescriptionText"> v-html="subItem.childItem.hotelNewDescriptionText">
</div> </div>
<div class="detailSection" style="margin-top:0;" v-if="subItem.childItem.isShow"> <div class="detailSection" style="margin-top:0;"
v-if="subItem.childItem.isShow">
<div class="item" <div class="item"
v-if="subItem.childItem.hotelAddress!=''"> v-if="subItem.childItem.hotelAddress!=''">
<span class="label">地址</span> <span class="label">地址</span>
...@@ -1133,7 +1138,8 @@ ...@@ -1133,7 +1138,8 @@
<span class="text">{{subItem.childItem.url}}</span> <span class="text">{{subItem.childItem.url}}</span>
</div> </div>
</div> </div>
<div class="showMore" @click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div> <div class="showMore"
@click="getShowMore(subItem.childItem)">{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}</div>
</div> </div>
<div class="Divtriangle"> <div class="Divtriangle">
<span></span> <span></span>
...@@ -1238,7 +1244,7 @@ ...@@ -1238,7 +1244,7 @@
if (y.childItem.imaArray.length > 0) { if (y.childItem.imaArray.length > 0) {
this.images.push(y.childItem.imaArray[0].url); this.images.push(y.childItem.imaArray[0].url);
} }
y.childItem.isShow=true y.childItem.isShow = true
} }
}) })
}) })
...@@ -1400,16 +1406,20 @@ ...@@ -1400,16 +1406,20 @@
}) })
} }
}); });
} } else {
else if (startTrafficArray && startTrafficArray.length > 0) {
{ Arr.push(...startTrafficArray);
}
} }
} }
//从酒店出发 //从酒店出发
else { else {
if (YesterdayHotelArray && YesterdayHotelArray.length > 0) {
Arr.push(...YesterdayHotelArray);
}
//最后一天 //最后一天
if (dayNum == this.dataList.dayList[this.dataList.dayList.length - 1].dayNum) { if (dayNum == this.dataList.dayList[this.dataList.dayList.length - 1].dayNum) {
if (this.FlightList && this.FlightList.length > 0) { if (this.FlightList && this.FlightList.length > 0) {
this.FlightList.forEach(subItem => { this.FlightList.forEach(subItem => {
if (subItem.startDate == newDate) { if (subItem.startDate == newDate) {
...@@ -1427,9 +1437,9 @@ ...@@ -1427,9 +1437,9 @@
}) })
} }
}); });
} else {
Arr.push(...startTrafficArray);
} }
} else {
} }
} }
...@@ -1511,9 +1521,9 @@ ...@@ -1511,9 +1521,9 @@
} }
} catch (error) {} } catch (error) {}
}, },
//隐藏显示 //隐藏显示
getShowMore(item){ getShowMore(item) {
item.isShow=!item.isShow; item.isShow = !item.isShow;
this.$forceUpdate(); this.$forceUpdate();
} }
} }
......
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