Skip to content

A
Athena
Commit 3edec8ce authored by zhengke's avatar zhengke
Browse files
Options

修改

parent c7ff5db1
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 10 deletions
src/App.vue
View file @ 3edec8ce
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
<style> <style>
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_jgikji5npg.css'; @import '//at.alicdn.com/t/font_863923_4bpjepv71zd.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
@import './assets/css/common.css'; @import './assets/css/common.css';
body,html{ body,html{
......
src/components/mall/newTrip.vue
View file @ 3edec8ce
...@@ -674,21 +674,17 @@ ...@@ -674,21 +674,17 @@
.tripAgendaTransitBox { .tripAgendaTransitBox {
overflow: hidden; overflow: hidden;
margin-bottom: 60px; margin: 60px 0;
} }
.tripAgendaTransitBox .transitIcon { .tripAgendaTransitBox .transitIcon {
float: left; float: left;
margin: 5px 0 0 60px; margin: 5px 0 0 60px;
font-size: 22px; font-size: 16px;
} }
.tripAgendaTransitBox .transitIcon i {
.tripAgendaTransitBox .transitIcon { font-size:20px;
float: left;
margin: 5px 0 0 60px;
font-size: 22px;
} }
.tripAgendaTransitBox .transitInfoTxt { .tripAgendaTransitBox .transitInfoTxt {
line-height: 34px; line-height: 34px;
position: relative; position: relative;
...@@ -842,6 +838,71 @@ ...@@ -842,6 +838,71 @@
margin-bottom: 20px; margin-bottom: 20px;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.tripAgendaTransitBox .btnTransit {
border: 2px #00A4A8 solid;
color: #00A4A8;
font-size: 16px;
cursor: pointer;
float: left;
border-radius: 40px;
padding: 6px 15px;
margin-left: 20px;
margin-right: 10px;
background: #fff;
}
.tripViewPop {
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0,0,0,.6);
z-index: 201;
position: fixed;
}
.tripViewPop .detailBox {
position: absolute;
top: 50%;
left: 50%;
width: 400px;
margin-left: -200px;
background: #fff;
border-radius: 5px;
padding: 70px 0 20px;
min-height: 140px;
-webkit-overflow-scrolling: touch;
-webkit-transform: translateY(-50%);
-ms-transform: translateY(-50%);
transform: translateY(-50%);
-moz-transform: translateY(-50%);
-webkit-box-shadow: 1px 1px 8px rgba(0,0,0,.16);
-moz-box-shadow: 1px 1px 8px rgba(0,0,0,.16);
box-shadow: 1px 1px 8px rgba(0,0,0,.16);
}
.tripViewPop .detailBox .btnClose {
position: absolute;
right: 20px;
top: 20px;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
cursor: pointer;
z-index: 2;
color: #fff;
border-radius: 40px;
-webkit-box-shadow: rgba(0,0,0,.2) 2px 2px 6px;
-moz-box-shadow: rgba(0,0,0,.2) 2px 2px 6px;
box-shadow: rgba(0,0,0,.2) 2px 2px 6px;
background: #00A4A8;
}
.tripViewPop .detailBox .tripViewPopCont {
width: 100%;
min-height: 140px;
max-height: calc(100vh - 120px);
overflow-y: auto;
box-sizing: border-box;
/* padding: 0 30px; */
}
</style> </style>
<template> <template>
<div class="pageViewTrip" v-if="isShow"> <div class="pageViewTrip" v-if="isShow">
...@@ -1086,6 +1147,39 @@ ...@@ -1086,6 +1147,39 @@
</div> </div>
</div> </div>
</div> </div>
<template v-if="subItem.childItem.trafficType==1">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-feiji2"></i>飞机
</div>
</div>
</template>
<template v-if="subItem.childItem.trafficType==2">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-icon-" style="font-size:25px;"></i>专车
</div>
</div>
</template>
<template v-if="subItem.childItem.trafficType==3">
<div class="tripAgendaTransitBox">
<div class="btnTransit" @click="getSubWay(subItem.childItem.trafficImage)">
<i class="iconfont icon-subway" style="margin-right:10px;font-size:18px;"></i>查看交通详情
</div>
<div class="transitIcon" style="margin-left:0;">
<span>地铁</span>
</div>
</div>
</template>
<template v-if="subItem.childItem.trafficType==4">
<div class="tripAgendaTransitBox">
<div class="transitIcon">
<i class="iconfont icon-walking"></i>
{{subItem.childItem.trafficContent}}
</div>
</div>
</template>
</template> </template>
<template v-if="subItem.type==3"> <template v-if="subItem.type==3">
<div class="agendaBox"> <div class="agendaBox">
...@@ -1160,6 +1254,16 @@ ...@@ -1160,6 +1254,16 @@
<div class="viewTripMap"> <div class="viewTripMap">
<tripMap :locationArray="travelLngLat" :type="1" ref="tripMap"></tripMap> <tripMap :locationArray="travelLngLat" :type="1" ref="tripMap"></tripMap>
</div> </div>
<div class="tripViewPop" v-if="showSubwayDiv">
<div class="detailBox">
<div class="btnClose icon-close" @click="showSubwayDiv=false">×</div>
<div class="tripViewPopCont">
<div class="detailHtml">
<img :src="subWaySrc" alt="">
</div>
</div>
</div>
</div>
</div> </div>
<viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer" <viewer style="display:none" :images="images" :options='imageOptions' @inited="inited" class="viewer"
ref="viewer"> ref="viewer">
...@@ -1191,7 +1295,9 @@ ...@@ -1191,7 +1295,9 @@
title: false title: false
}, },
FlightList: [], FlightList: [],
StartData: "" StartData: "",
showSubwayDiv:false,
subWaySrc:''
} }
}, },
mounted() { mounted() {
...@@ -1236,6 +1342,7 @@ ...@@ -1236,6 +1342,7 @@
this.FlightList = res.data.data.currentPriceInfo.priceFlight; this.FlightList = res.data.data.currentPriceInfo.priceFlight;
this.StartData = res.data.data.currentPriceInfo.startDate; this.StartData = res.data.data.currentPriceInfo.startDate;
this.isShow = true; this.isShow = true;
console.log(this.dataList,'dataList');
this.getAllPoint(); this.getAllPoint();
//装载景点酒店图片以供预览 //装载景点酒店图片以供预览
this.images = []; this.images = [];
...@@ -1538,6 +1645,11 @@ ...@@ -1538,6 +1645,11 @@
getShowMore(item) { getShowMore(item) {
item.isShow = !item.isShow; item.isShow = !item.isShow;
this.$forceUpdate(); this.$forceUpdate();
},
//查看
getSubWay(url){
this.showSubwayDiv=true;
this.subWaySrc=url;
} }
} }
} }
......
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