Commit fdbcfc81 authored by zhengke's avatar zhengke

修改

parent 7973f272
...@@ -514,6 +514,7 @@ ...@@ -514,6 +514,7 @@
"天数日期", "天数日期",
"出发城市" "出发城市"
], ],
CityId:0
}; };
}, },
created() { created() {
...@@ -534,8 +535,9 @@ ...@@ -534,8 +535,9 @@
this.branchList = res.data.SiteList; this.branchList = res.data.SiteList;
this.startCitys = res.data.CityList; this.startCitys = res.data.CityList;
this.lineList = res.data.linePlaceList; this.lineList = res.data.linePlaceList;
this.msg.companyId = this.branchList[0].BId this.msg.companyId = this.branchList[0].BId;
this.currentBrachName = this.branchList[0].BName this.currentBrachName = this.branchList[0].BName;
this.CityId = this.branchList[0].CityId;
} }
}, },
null null
...@@ -544,6 +546,7 @@ ...@@ -544,6 +546,7 @@
changeBranch(val) { changeBranch(val) {
this.msg.companyId = this.branchList[val].BId this.msg.companyId = this.branchList[val].BId
this.currentBrachName = this.branchList[val].BName this.currentBrachName = this.branchList[val].BName
this.CityId = this.branchList[val].CityId;
this.research(); this.research();
}, },
setDays(day) { setDays(day) {
...@@ -707,7 +710,7 @@ ...@@ -707,7 +710,7 @@
//跳转至详情 //跳转至详情
goJzDetail(tcid, configId) { goJzDetail(tcid, configId) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId + '&cityId=' + this.CityId
}); });
}, },
//获取第一张图 //获取第一张图
......
...@@ -138,6 +138,41 @@ ...@@ -138,6 +138,41 @@
</view> </view>
<view class="jz_Zhankai" style="display:none;">展开全部</view> <view class="jz_Zhankai" style="display:none;">展开全部</view>
</view> </view>
<view class="jz_TripDays">
<span style="display: inline-block;position: relative;margin-bottom:40rpx;">
<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">往返交通</text>
<span style="width:40px;background-color: #DFBE6E;height: 6px;bottom: 2px;left: 0;right: 0;position: absolute;z-index: 1;"></span>
</span>
<view class="jz_TripMain">
<view>
<view class="jz_Flight" v-for="(fItem,fIndex) in dataList.currentPriceInfo.priceFlight" :key="fIndex">
<view class="jz_FlightItem">
<view style="width:150rpx;">
<view class="jz_FlightTitle">{{fItem.departureAirPortName}}</view>
<view class="jz_FlightBottom">{{fItem.departureTime}}</view>
</view>
<view class="jz_FlightIcon">
<view style="display: flex;align-items: center;font-size:24rpx;">
<img v-if="fItem.trafficType==1" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/airfly.png" alt="" />
<img v-if="fItem.trafficType==2" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/train.png" alt="" />
<view style="margin-left:10rpx;">{{fItem.flightNumber}}</view>
</view>
<view class="jz_Arrow">
<img style="width:110rpx;height:8rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/b_arrow.png" />
</view>
<view class="jz_StartDate">
{{getFlightDay(fItem.startDate)}}
</view>
</view>
<view style="width:150rpx;">
<view class="jz_FlightTitle">{{fItem.arrivalAirPortName}}</view>
<view class="jz_FlightBottom">{{fItem.arrivalTime}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="jz_TripDays"> <view class="jz_TripDays">
<span style="display: inline-block;position: relative;margin-bottom:40rpx;"> <span style="display: inline-block;position: relative;margin-bottom:40rpx;">
<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">行程特色</text> <text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">行程特色</text>
...@@ -336,7 +371,8 @@ ...@@ -336,7 +371,8 @@
delMsg: { delMsg: {
tcid: 0, tcid: 0,
configId: 0, configId: 0,
tcnum:'' tcnum:'',
cityId:0
}, },
scenicNum: 0, // 景点数量 scenicNum: 0, // 景点数量
breakfastNum: 0, //早餐数 breakfastNum: 0, //早餐数
...@@ -354,9 +390,10 @@ ...@@ -354,9 +390,10 @@
}, },
onLoad(option) { onLoad(option) {
if (option.tcid && option.configId) { if (option.tcid && option.configId && option.cityId) {
this.delMsg.tcid = option.tcid; this.delMsg.tcid = option.tcid;
this.delMsg.configId = option.configId; this.delMsg.configId = option.configId;
this.delMsg.cityId = option.cityId;
this.getDetails(); this.getDetails();
} }
let that = this let that = this
...@@ -466,6 +503,12 @@ ...@@ -466,6 +503,12 @@
return Myday[1] + '-' + Myday[2] return Myday[1] + '-' + Myday[2]
} }
}, },
getFlightDay(day){
if (day) {
let Myday = day.split('-');
return Myday[1] + '月' + Myday[2] + '日'
}
},
//点击切换 //点击切换
getDayInfo(item){ getDayInfo(item){
if(this.crCount+this.etCount>this.currentPrice.totalSeat){ if(this.crCount+this.etCount>this.currentPrice.totalSeat){
...@@ -508,6 +551,40 @@ ...@@ -508,6 +551,40 @@
}; };
</script> </script>
<style> <style>
.jz_FlightItem{
display: flex;
justify-content: space-between;
width:90%;
margin:auto;
margin-bottom:45rpx;
}
.jz_FlightTitle{
color:#999999;
font-size:24rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
.jz_Arrow{
position: absolute;
top: 17rpx;
}
.jz_StartDate{
color:#999999;
font-size:24rpx;
margin-top:25rpx;
}
.jz_FlightBottom{
color:#111111;
font-size:26rpx;
margin-top:10rpx;
}
.jz_FlightIcon{
text-align: center;
position: relative;
flex-shrink: 0;
}
.jz_LineDetail { .jz_LineDetail {
background-color: #ECF1F4; background-color: #ECF1F4;
padding-bottom:70px; padding-bottom:70px;
...@@ -957,4 +1034,8 @@ ...@@ -957,4 +1034,8 @@
border: none!important; border: none!important;
height:auto!important; height:auto!important;
} }
.jz_Flight{
display: flex;
justify-content: space-between;
}
</style> </style>
\ No newline at end of file
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