Skip to content

A
Athena
Commit 15f87ec7 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

修改交通和标题

parent 613c6810
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 46 deletions
src/App.vue
View file @ 15f87ec7
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
<style> <style>
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_luoxdzztue.css'; @import '//at.alicdn.com/t/font_863923_9v70nlynbdt.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
body,html{ body,html{
padding: 0px; padding: 0px;
......
src/components/DependentTravel/CustomizedTourism.vue
View file @ 15f87ec7
...@@ -159,9 +159,36 @@ ...@@ -159,9 +159,36 @@
<div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100"> <div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100">
<div style="padding-left:36px;margin-bottom:30px;"> <div style="padding-left:36px;margin-bottom:30px;">
<span class="dayindex">D{{item.dayNum}}</span> <span class="dayindex">D{{item.dayNum}}</span>
<!-- <span class="daytitle">出发东京迪士尼，探寻梦幻王国（专车送去迪士尼）</span> --> <span v-if="item.title.childItem.title" class="daytitle">{{item.title.childItem.title}}</span>
</div> </div>
<div class="common_left"> <div class="common_left">
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
</span>
<p style="font-size:16px;"><span style="padding-right:10px">交通</span>
<span v-for="(tra,index) in traff.childItem.subTraffic" :key="tra.arrivalCityName">
<span v-if="index==0">{{tra.startCityName}}</span>
<span style="margin:0 5px">
<span v-if="tra.arrivalType==1" class="iconfont icon-Shape1"></span>
<span v-if="tra.arrivalType==2" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
<span v-if="tra.arrivalType==3" class="iconfont icon--lunchuan"></span>
<span v-if="tra.arrivalType==4" class="iconfont icon-huoche"></span>
</span>
<span>{{tra.arrivalCityName}}</span>
</span>
<div style="font-size:14px;margin-top:20px">
<span style="color:#5F95E8;margin-left:5px">{{traff.childItem.descriptionText}}</span>
</div>
</div>
</div>
</div>
<!-- 酒店 --> <!-- 酒店 -->
<div v-if="item.HotelList.length>0" class="commonday"> <div v-if="item.HotelList.length>0" class="commonday">
<div class="commonday_item"> <div class="commonday_item">
...@@ -171,7 +198,7 @@ ...@@ -171,7 +198,7 @@
</span> </span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p> <p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px"> <div style="font-size:14px;margin-top:20px;width: 942px;">
<div> <div>
<span v-html="hotel.childItem.description"></span> <span v-html="hotel.childItem.description"></span>
</div> </div>
...@@ -217,36 +244,21 @@ ...@@ -217,36 +244,21 @@
</div> </div>
</div> --> </div> -->
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
</span>
<p style="font-size:16px;"><span>交通</span></p>
<div style="font-size:14px;margin-top:20px">
<span v-if="traff.childItem.trafficIntroduce">{{traff.childItem.trafficIntroduce.introduceDetail}}</span>
</div>
</div>
</div>
</div>
<!-- 景点 --> <!-- 景点 -->
<div v-if="item.ScenicList.length>0" class="commonday"> <div v-if="item.ScenicList.length>0" class="commonday">
<div class="commonday_item"> <div class="commonday_item">
<div v-for="(Scen,index) in item.ScenicList" :key="index+100"> <div style="" v-for="(Scen,index) in item.ScenicList" :key="index+100">
<span class="icon_span" style="background:#fff;"> <span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-Shape4"></span> <span v-if="index==0" class="iconfont icon-Shape4"></span>
</span> </span>
<p style="font-size:16px;"><span>景点</span></p> <p v-if="index==0" style="font-size:16px;"><span>景点</span></p>
<div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div v-if="Scen.childItem.description" style="float:left;margin-left:20px;width:719px"> <div style="float:left;margin-left:20px;width:719px">
<p v-html="Scen.childItem.description"></p> <p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
<p v-if="Scen.childItem.description" v-html="Scen.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -360,6 +372,7 @@ export default { ...@@ -360,6 +372,7 @@ export default {
methods: { methods: {
GetDes(){ GetDes(){
this.desshow=!this.desshow; this.desshow=!this.desshow;
if(this.desshow==false){ if(this.desshow==false){
return; return;
...@@ -378,6 +391,7 @@ export default { ...@@ -378,6 +391,7 @@ export default {
dayitem.HotelList=[]; dayitem.HotelList=[];
dayitem.RestaList=[]; dayitem.RestaList=[];
dayitem.tipList=[]; dayitem.tipList=[];
dayitem.title={};
dayitem.dayArray.forEach(typeitem=>{ dayitem.dayArray.forEach(typeitem=>{
if(typeitem.type==1){ if(typeitem.type==1){
dayitem.trafficList.push(typeitem); dayitem.trafficList.push(typeitem);
...@@ -394,9 +408,11 @@ export default { ...@@ -394,9 +408,11 @@ export default {
if(typeitem.type==6){ if(typeitem.type==6){
dayitem.tipList.push(typeitem); dayitem.tipList.push(typeitem);
} }
if(typeitem.type==6){
dayitem.title=typeitem;
}
}) })
}); });
}else{} }else{}
},err=>{}) },err=>{})
}, },
......
src/components/DependentTravel/DesignScheme.vue
View file @ 15f87ec7
...@@ -49,9 +49,36 @@ ...@@ -49,9 +49,36 @@
<div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100"> <div class="daylist" v-for="(item,index) in datades.dayList" :key="index+100">
<div style="padding-left:36px;margin-bottom:30px;"> <div style="padding-left:36px;margin-bottom:30px;">
<span class="dayindex">D{{item.dayNum}}</span> <span class="dayindex">D{{item.dayNum}}</span>
<!-- <span class="daytitle">出发东京迪士尼，探寻梦幻王国（专车送去迪士尼）</span> --> <span class="daytitle">{{item.title.childItem.title}}</span>
</div> </div>
<div class="common_left"> <div class="common_left">
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
</span>
<p style="font-size:16px;"><span style="padding-right:10px">交通</span>
<span v-for="(tra,index) in traff.childItem.subTraffic" :key="tra.arrivalCityName">
<span v-if="index==0">{{tra.startCityName}}</span>
<span style="margin:0 5px">
<span v-if="tra.arrivalType==1" class="iconfont icon-Shape1"></span>
<span v-if="tra.arrivalType==2" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
<span v-if="tra.arrivalType==3" class="iconfont icon--lunchuan"></span>
<span v-if="tra.arrivalType==4" class="iconfont icon-huoche"></span>
</span>
<span>{{tra.arrivalCityName}}</span>
</span>
<div style="font-size:14px;margin-top:20px">
<span style="color:#5F95E8;margin-left:5px">{{traff.childItem.descriptionText}}</span>
</div>
</div>
</div>
</div>
<!-- 酒店 --> <!-- 酒店 -->
<div v-if="item.HotelList.length>0" class="commonday"> <div v-if="item.HotelList.length>0" class="commonday">
<div class="commonday_item"> <div class="commonday_item">
...@@ -61,7 +88,7 @@ ...@@ -61,7 +88,7 @@
</span> </span>
<p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p> <p style="font-size:16px;"><span>酒店</span><span style="color:#5F95E8;margin-left:5px">{{hotel.childItem.hotelName}}</span></p>
<div style="font-size:14px;margin-top:20px"> <div style="font-size:14px;margin-top:20px;width: 942px;">
<div> <div>
<span v-html="hotel.childItem.description"></span> <span v-html="hotel.childItem.description"></span>
</div> </div>
...@@ -107,36 +134,22 @@ ...@@ -107,36 +134,22 @@
</div> </div>
</div> --> </div> -->
<!-- 交通 -->
<div v-if="item.trafficList.length>0" class="commonday">
<div class="commonday_item">
<div v-for="(traff,index) in item.trafficList" :key="index+70">
<span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-jiaotonggongjiaochekanfangtuandabamianxing"></span>
</span>
<p style="font-size:16px;"><span>交通</span></p>
<div style="font-size:14px;margin-top:20px">
<span v-if="traff.childItem.trafficIntroduce">{{traff.childItem.trafficIntroduce.introduceDetail}}</span>
</div>
</div>
</div>
</div>
<!-- 景点 --> <!-- 景点 -->
<div v-if="item.ScenicList.length>0" class="commonday"> <div v-if="item.ScenicList.length>0" class="commonday">
<div class="commonday_item"> <div class="commonday_item">
<div v-for="(Scen,index) in item.ScenicList" :key="index+100"> <div style="" v-for="(Scen,index) in item.ScenicList" :key="index+100">
<span class="icon_span" style="background:#fff;"> <span class="icon_span" style="background:#fff;">
<span v-if="index==0" class="iconfont icon-Shape4"></span> <span v-if="index==0" class="iconfont icon-Shape4"></span>
</span> </span>
<p style="font-size:16px;"><span>景点</span></p> <p v-if="index==0" style="font-size:16px;"><span>景点</span></p>
<div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto"> <div v-if="im==0" v-for="(img,im) in Scen.childItem.imaArray" :key="img.url" style="font-size:14px;margin-top:20px;overflow:auto">
<img :src="img.url" style="width:200px;height:133px;float:left;" alt=""> <img :src="img.url" style="width:200px;height:133px;float:left;" alt="">
<div v-if="Scen.childItem.description" style="float:left;margin-left:20px;width:719px"> <div style="float:left;margin-left:20px;width:719px">
<p v-html="Scen.childItem.description"></p> <p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
<p v-if="Scen.childItem.description" v-html="Scen.childItem.description"></p>
</div> </div>
</div> </div>
...@@ -284,6 +297,7 @@ export default { ...@@ -284,6 +297,7 @@ export default {
dayitem.HotelList=[]; dayitem.HotelList=[];
dayitem.RestaList=[]; dayitem.RestaList=[];
dayitem.tipList=[]; dayitem.tipList=[];
dayitem.title={};
dayitem.dayArray.forEach(typeitem=>{ dayitem.dayArray.forEach(typeitem=>{
if(typeitem.type==1){ if(typeitem.type==1){
dayitem.trafficList.push(typeitem); dayitem.trafficList.push(typeitem);
...@@ -300,8 +314,12 @@ export default { ...@@ -300,8 +314,12 @@ export default {
if(typeitem.type==6){ if(typeitem.type==6){
dayitem.tipList.push(typeitem); dayitem.tipList.push(typeitem);
} }
if(typeitem.type==7){
dayitem.title=typeitem;
}
}) })
}); });
console.log("this.datades",this.datades);
}else{} }else{}
},err=>{}) },err=>{})
}, },
......
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