Skip to content

J
jz_Travel
Commit b6a456ea authored by 罗超's avatar 罗超
Browse files
Options

修改航班

parent 4cc35bc3
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 66 deletions
manifest.json
View file @ b6a456ea
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid": "wxcf0727a7c78b501e", "appid": "wx5564525562e92ddb",
"navigateToMiniProgramAppIdList" : [ "wxacd9f8cc3480d29e" ], "navigateToMiniProgramAppIdList" : [ "wxacd9f8cc3480d29e" ],
"setting" : { "setting" : {
"urlCheck" : true, "urlCheck" : true,
......
pages/jiuzhai/aiTravelDetail.vue
View file @ b6a456ea
...@@ -107,7 +107,9 @@ ...@@ -107,7 +107,9 @@
</view> </view>
</view> </view>
<view style="height: 40px;"></view> <view style="height: 40px;"></view>
<!-- <view class="traff"> <view v-for="(traffic, tIndex) in item.traffics" :key="tIndex"
v-if="traffic.type === '航班' && i < travel.days.length - 1">
<view class="traff">
<view class="icon-box"> <view class="icon-box">
<u-icon name='othertraffic' custom-prefix="tffont" color="#fff" size="40" <u-icon name='othertraffic' custom-prefix="tffont" color="#fff" size="40"
style="display: inline-block;"></u-icon> style="display: inline-block;"></u-icon>
...@@ -119,13 +121,13 @@ ...@@ -119,13 +121,13 @@
</view> </view>
<view class="col q-ml-md"> <view class="col q-ml-md">
<view class="text-gold"> <view class="text-gold">
成都 {{ traffic.departure }}
</view> </view>
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;"> <view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
成都天府国际机场 {{ traffic.departureAirport }}
</view> </view>
<view style="font-size: 12px;color: #12121266;"> <view style="font-size: 12px;color: #12121266;">
出发时间：08:23 出发时间：{{ traffic.departureTime }}
</view> </view>
</view> </view>
</view> </view>
...@@ -144,10 +146,10 @@ ...@@ -144,10 +146,10 @@
</view> </view>
<view class="col q-ml-md"> <view class="col q-ml-md">
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;"> <view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
CA2351 {{ traffic.flightNumber }}
</view> </view>
<view style="font-size: 12px;color: #12121266;"> <view style="font-size: 12px;color: #12121266;">
用时: 3小时58分 航空公司: {{ traffic.airline }}
</view> </view>
</view> </view>
</view> </view>
...@@ -158,18 +160,19 @@ ...@@ -158,18 +160,19 @@
</view> </view>
<view class="col q-ml-md"> <view class="col q-ml-md">
<view class="text-gold"> <view class="text-gold">
成都 {{ traffic.destination }}
</view> </view>
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;"> <view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
成都天府国际机场 {{ traffic.arrivalAirport }}
</view> </view>
<view style="font-size: 12px;color: #12121266;"> <view style="font-size: 12px;color: #12121266;">
出发时间：08:23 到达时间：{{ traffic.arrivalTime }}
</view> </view>
</view> </view>
</view> </view>
</view> --> </view>
<!-- <view class="split-line"></view> --> <view class="split-line"></view>
</view>
<template v-if="i > 0 && travel.days[i - 1].hotels && travel.days[i - 1].hotels.length > 0"> <template v-if="i > 0 && travel.days[i - 1].hotels && travel.days[i - 1].hotels.length > 0">
<view class="hotel"> <view class="hotel">
<view class="icon-box icon-box-sum"> <view class="icon-box icon-box-sum">
...@@ -202,7 +205,7 @@ ...@@ -202,7 +205,7 @@
<template v-for="(scenicspot, scenIndex) in item.attractions"> <template v-for="(scenicspot, scenIndex) in item.attractions">
<view class="scenicspot" :key="scenIndex"> <view class="scenicspot" :key="scenIndex">
<view class="icon-box">{{ scenIndex+1 }}</view> <view class="icon-box">{{ scenIndex + 1 }}</view>
<image :src="scenicspot.images" class="scenicspot-image" mode="aspectFill" <image :src="scenicspot.images" class="scenicspot-image" mode="aspectFill"
v-if="scenicspot.images"> v-if="scenicspot.images">
</image> </image>
...@@ -213,7 +216,7 @@ ...@@ -213,7 +216,7 @@
style="display: inline-block;"></u-icon> style="display: inline-block;"></u-icon>
<text class="q-ml-sm">{{ scenicspot.name }}</text> <text class="q-ml-sm">{{ scenicspot.name }}</text>
</view> </view>
<view class="scenicspot-desc" > <view class="scenicspot-desc">
{{ scenicspot.description }} {{ scenicspot.description }}
</view> </view>
<!-- <view class="text-center" style="margin-top: 20px;"> <!-- <view class="text-center" style="margin-top: 20px;">
...@@ -228,7 +231,8 @@ ...@@ -228,7 +231,8 @@
<template v-if="item.hotels && item.hotels.length > 0"> <template v-if="item.hotels && item.hotels.length > 0">
<view class="hotel"> <view class="hotel">
<view class="icon-box"> <view class="icon-box">
<u-icon name='moonbyueliang' custom-prefix="tffont" color="#fff" size="40" style="display: inline-block;"></u-icon> <u-icon name='moonbyueliang' custom-prefix="tffont" color="#fff" size="40"
style="display: inline-block;"></u-icon>
</view> </view>
<image :src="item.hotels[0].images" class="hotel-image" mode="aspectFill" <image :src="item.hotels[0].images" class="hotel-image" mode="aspectFill"
v-if="item.hotels[0].images"></image> v-if="item.hotels[0].images"></image>
...@@ -239,7 +243,7 @@ ...@@ -239,7 +243,7 @@
style="display: inline-block;"></u-icon> style="display: inline-block;"></u-icon>
<text class="q-ml-sm">{{ item.hotels[0].name }}</text> <text class="q-ml-sm">{{ item.hotels[0].name }}</text>
</view> </view>
<view class="hotel-desc" > <view class="hotel-desc">
{{ item.hotels[0].description }} {{ item.hotels[0].description }}
</view> </view>
<!-- <view class="text-center" style="margin-top: 20px;"> <!-- <view class="text-center" style="margin-top: 20px;">
...@@ -251,6 +255,73 @@ ...@@ -251,6 +255,73 @@
</view> </view>
</view> </view>
</template> </template>
<view v-for="(traffic, tIndex) in item.traffics" :key="tIndex"
v-if="traffic.type === '航班' && i === travel.days.length - 1">
<view class="split-line"></view>
<view class="traff">
<view class="icon-box">
<u-icon name='othertraffic' custom-prefix="tffont" color="#fff" size="40"
style="display: inline-block;"></u-icon>
</view>
<view class="row items-center">
<view style="width: 30px; text-align: center;">
<u-icon name='yuanquan' custom-prefix="tffont" color="#12121266" size="40"
style="display: inline-block;"></u-icon>
</view>
<view class="col q-ml-md">
<view class="text-gold">
{{ traffic.departure }}
</view>
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
{{ traffic.departureAirport }}
</view>
<view style="font-size: 12px;color: #12121266;">
出发时间：{{ traffic.departureTime }}
</view>
</view>
</view>
<view class="row items-center">
<view style="height: 86px;">
<view class="relative"
style="height: 100%; width: 30px;text-align: center;line-height: 86px;">
<u-icon name='qianwang' custom-prefix="tffont" color="#12121266" size="16"
style="transform: rotate(90deg) scaleY(-1);margin-left: -8px;"></u-icon>
<view
style="background:#FFF;width: 30px;height: 30px;border:3px solid #12121266;border-radius: 30px;position: absolute;top: 50%;left: 0;transform: translateY(-50%);line-height: 30px;text-align: center;">
<u-icon name='lvxing' custom-prefix="tffont" color="#12121266" size="32"
style="transform: scaleY(-1);display: inline-block;margin-top: -12px;"></u-icon>
</view>
</view>
</view>
<view class="col q-ml-md">
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
{{ traffic.flightNumber }}
</view>
<view style="font-size: 12px;color: #12121266;">
航空公司: {{ traffic.airline }}
</view>
</view>
</view>
<view class="row items-center">
<view style="width: 30px; text-align: center;">
<u-icon name='dingwei' custom-prefix="tffont" color="#12121266" size="40"
style="display: inline-block;"></u-icon>
</view>
<view class="col q-ml-md">
<view class="text-gold">
{{ traffic.destination }}
</view>
<view style="font-size: 18px;color: #121212;line-height: 1;padding: 10rpx 0;">
{{ traffic.arrivalAirport }}
</view>
<view style="font-size: 12px;color: #12121266;">
到达时间：{{ traffic.arrivalTime }}
</view>
</view>
</view>
</view>
</view>
<view class="split-line"></view> <view class="split-line"></view>
<view class="dinner"> <view class="dinner">
<view class="icon-box"> <view class="icon-box">
...@@ -261,21 +332,27 @@ ...@@ -261,21 +332,27 @@
<u-icon name='niunai' custom-prefix="tffont" color="#12121266" size="30"></u-icon> <u-icon name='niunai' custom-prefix="tffont" color="#12121266" size="30"></u-icon>
<text style="margin:0 10rpx;">早餐</text> <text style="margin:0 10rpx;">早餐</text>
<view class="dinner-name"> <view class="dinner-name">
{{ item.caterings.find(x=>x.type=='早餐')?item.caterings.find(x=>x.type=='早餐').name:'敬请自理' }} {{
item.caterings.find(x => x.type == '早餐') ? item.caterings.find(x => x.type == '早餐').name :'敬请自理'
}}
</view> </view>
</view> </view>
<view class="dinner-info row items-center"> <view class="dinner-info row items-center">
<u-icon name='roushi-c' custom-prefix="tffont" color="#12121266" size="30"></u-icon> <u-icon name='roushi-c' custom-prefix="tffont" color="#12121266" size="30"></u-icon>
<text style="margin:0 10rpx;">午餐</text> <text style="margin:0 10rpx;">午餐</text>
<view class="dinner-name"> <view class="dinner-name">
{{ item.caterings.find(x=>x.type=='午餐')?item.caterings.find(x=>x.type=='午餐').name:'敬请自理' }} {{
item.caterings.find(x => x.type == '午餐') ? item.caterings.find(x => x.type == '午餐').name :'敬请自理'
}}
</view> </view>
</view> </view>
<view class="dinner-info row items-center"> <view class="dinner-info row items-center">
<u-icon name='175' custom-prefix="tffont" color="#12121266" size="30"></u-icon> <u-icon name='175' custom-prefix="tffont" color="#12121266" size="30"></u-icon>
<text style="margin:0 10rpx;">晚餐</text> <text style="margin:0 10rpx;">晚餐</text>
<view class="dinner-name"> <view class="dinner-name">
{{ item.caterings.find(x=>x.type=='晚餐')?item.caterings.find(x=>x.type=='晚餐').name:'敬请自理' }} {{
item.caterings.find(x => x.type == '晚餐') ? item.caterings.find(x => x.type == '晚餐').name :'敬请自理'
}}
</view> </view>
</view> </view>
</view> </view>
...@@ -294,13 +371,13 @@ ...@@ -294,13 +371,13 @@
<view class="travel-ai-title">费用包含</view> <view class="travel-ai-title">费用包含</view>
<view class="include"> <view class="include">
<view class="include-content"> <view class="include-content">
<view v-for="(item,index) in travel.include.split('\n')" :key="index">{{ item }}</view> <view v-for="(item, index) in travel.include.split('\n')" :key="index">{{ item }}</view>
</view> </view>
</view> </view>
<view class="travel-ai-title">费用不含</view> <view class="travel-ai-title">费用不含</view>
<view class="include"> <view class="include">
<view class="include-content"> <view class="include-content">
<view v-for="(item,index) in travel.notInclude.split('\n')" :key="index">{{ item }}</view> <view v-for="(item, index) in travel.notInclude.split('\n')" :key="index">{{ item }}</view>
</view> </view>
</view> </view>
...@@ -381,10 +458,22 @@ export default { ...@@ -381,10 +458,22 @@ export default {
const systemInfo = uni.getSystemInfoSync() const systemInfo = uni.getSystemInfoSync()
this.topHeight = this.getTopSafeArea(systemInfo) this.topHeight = this.getTopSafeArea(systemInfo)
this.screenHeight = systemInfo.screenHeight this.screenHeight = systemInfo.screenHeight
if (options.scene) {
let t = decodeURIComponent(option.scene).split('&')
t.forEach(x => {
let item = x.split('=')
if (item.length === 2) {
if (item[0] === 'id') {
this.travelId = item[1]
}
}
})
}
if (options.id) { if (options.id) {
this.travelId = options.id this.travelId = options.id
this.getTravelDetail()
} }
this.getTravelDetail()
}, },
onReady() { onReady() {
......
plugin/rwRequest.js
View file @ b6a456ea
...@@ -27,7 +27,7 @@ const request = (method, url, data = {}, config = {}) => { ...@@ -27,7 +27,7 @@ const request = (method, url, data = {}, config = {}) => {
method: method.toUpperCase(), method: method.toUpperCase(),
data, data,
header, header,
timeout: config.timeout || 10000, timeout: config.timeout || 60*1000,
success: (res) => { success: (res) => {
if (res.statusCode >= 200 && res.statusCode < 300) { if (res.statusCode >= 200 && res.statusCode < 300) {
resolve(res.data); resolve(res.data);
......
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