Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents 9097095a 1085099b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2379 additions and 358 deletions
asset/css/flex.css
View file @ 77a7a75e
......@@ -39,6 +39,12 @@
justify-content: space-between;
flex-wrap: nowrap;
}
.row-sbs-n{
display: flex;
align-items: center;
justify-content: space-around;
flex-wrap: nowrap;
}
.row-sbas-n{
display: flex;
justify-content: space-between;
......@@ -137,6 +143,9 @@
.width100{
width: 100rpx;
}
.width436{
width: 436rpx;
}
.width100One{
width: 100%;
}
......@@ -245,6 +254,9 @@
.MR20{
margin-right: 20rpx;
}
.MR25{
margin-right: 25rpx;
}
.MR30{
margin-right: 30rpx;
}
......@@ -347,6 +359,9 @@
.PT123{
padding-top: 123rpx;
}
.PB20{
padding-bottom: 20rpx;
}
.PB200{
padding-bottom: 200rpx;
}
......@@ -362,9 +377,18 @@
.PX4{
padding: 0 4rpx;
}
.PX10{
padding: 0 10rpx;
}
.PX20{
padding: 0 20rpx;
}
.PX50{
padding: 0 50rpx;
}
.PX53{
padding: 0 53rpx;
}
.relativeFT5{
top: -5rpx;
}
......
pages/airTicket/AirplanePassengerAddEditing.vue
View file @ 77a7a75e
......@@ -4,7 +4,9 @@
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">姓名(英文)</text>
<input class="flexG fontBold" type="text" placeholder="英文姓名，请于乘机证件相同"
<input class="flexG"
:class="[addMsg.SurName?'fontBold':'']" type="text" placeholder="请输入英文姓名，请于乘机证件相同"
:placeholder-style="placeholderStyle"
v-model="addMsg.SurName"/>
</view>
<view class="height-line1"></view>
......@@ -25,9 +27,13 @@
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">证件号</text>
<input v-if="addMsg.GuestType==1" class="flexG fontBold" type="text" placeholder="请输入身份证号码"
<input v-if="addMsg.GuestType==1" class="flexG" type="text" placeholder="请输入身份证号码"
:class="[addMsg.IdCard?'fontBold':'']"
:placeholder-style="placeholderStyle"
v-model="addMsg.IdCard" @blur="setBirthday"/>
<input v-if="addMsg.GuestType==2" class="flexG fontBold" type="text" placeholder="请输入护照号码"
<input v-if="addMsg.GuestType==2" class="flexG" type="text" placeholder="请输入护照号码"
:class="[addMsg.PassportNo?'fontBold':'']"
:placeholder-style="placeholderStyle"
v-model="addMsg.PassportNo" @blur="setBirthday"/>
</view>
<view class="height-line1"></view>
......@@ -115,7 +121,8 @@
result:null,show: false,GuestType:1,GuestNum: 1,Id:0
},
GuestList: [],
editorIndex: null
editorIndex: null,
placeholderStyle: "color:#B8B8C0",
}
},
onLoad(options){
......@@ -147,12 +154,10 @@
}
if(this.GuestList.length>0){
uni.setStorageSync("GuestList",this.GuestList)
}
setTimeout(()=>{
uni.navigateBack({
delta: -1
})
},200)
}
},
setBirthday(){
if(this.addMsg.GuestType==1){
......
pages/airTicket/TicketOrderDetails.vue
View file @ 77a7a75e
This diff is collapsed.
pages/airTicket/TicketOrderList.vue
View file @ 77a7a75e
......@@ -4,8 +4,8 @@
<view class="TicketOrderList-header bgFFF fixed row-sb-n z-index3">
<view v-for="(item,index) in TicketOrderTyle"
class="border1 hidden fz24 bgF5 textCenter"
:class="[OrderTyle==item.Id?'borderDEBF7B':'borderF5']"
@click="research(item)">
:class="[msg.orderState==item.Id?'borderDEBF7B':'borderF5']"
@click="research(item.Id)">
{{item.Name}}
</view>
</view>
......@@ -15,9 +15,7 @@
@scrolltolower="lower" :style="{ 'height': `calc(100% - ${scrollHeight})`}">
<view class="TicketOrderListC">
<view class="TicketOrderList-box">
<template v-for="(item,index) in dataList">
<TicketOrderList></TicketOrderList>
</template>
<TicketOrderList :dataList="dataList" :msg="msg" @research="research"></TicketOrderList>
</view>
<view style="padding:10px 0;">
<u-loadmore :status="status" :load-text="loadText"
......@@ -30,6 +28,7 @@
</template>
<script>
import TicketOrderList from "./components/TicketOrderList.vue";
import { getDateWeek } from "./dates.js";
export default {
components: {
TicketOrderList
......@@ -39,23 +38,21 @@
scrollTop: 0,
status: 'loadmore',
msg:{
ageIndex:1,
pageSize:5,
OrderStaus:0,
TeacherId:0,
CourseId:0,
ID:0,
StartTime:'',
EndTime:''
pageIndex: 1,
pageSize: 15,
//MiniAppUserId: 0,
orderType:-1,
orderState: 0,
GroupType:5,//线路订单
queryDays:0,
OutBranchId:-1
},
pageCount: 0,
OrderTyle: 1,
dataList: [],
loading: false,
TicketOrderTyle:[
{Name:'全部订单',Id:1},
{Name:'已付款',Id:2},
{Name:'待付款',Id:3},
{Name:'全部订单',Id:0},
{Name:'已付款',Id:3},
{Name:'待付款',Id:1},
{Name:'已取消',Id:4},
],
loadText: {
......@@ -63,20 +60,25 @@
loading: "努力加载中",
nomore: "没有更多了",
},
scrollHeight: 0,
scrollHeight: '30px',
}
},
onLoad(options){
this.msg.orderState = options.orderState?options.orderState:0
},
created() {},
onShow() {
},
mounted() {
this.getList()
setTimeout(() => {
this.getHeadHeight();
}, 1000);
},
methods: {
getHeadHeight() {
return
let that = this;
const query = uni.createSelectorQuery().in(this);
query
......@@ -87,7 +89,7 @@
.exec();
},
research(item) {
this.OrderTyle = item.Id
this.msg.orderState = item
this.msg.pageIndex = 1;
this.getList(1);
},
......@@ -96,14 +98,58 @@
if (type == 1) {
this.dataList = [];
}
return
uni.showLoading()
this.request2({
url: "/api/Hotel/AppGetHotelPage",
data: this.msg,
},
this.apipost(
"sellorder_post_GetTravelOrderAppletList",
this.msg,
(res) => {
if (res.resultCode == 1) {
let arr = function(list){
list.forEach(x=>{
x.time = ''
x.week = ''
x.duration = ''
x.frequency = 0
x.frequencyA = 0
x.different = 0 //是否异地
x.NewFlightList = []
x.loading = false
})
}
arr(res.data.pageData)
res.data.pageData.forEach(x=>{
arr(x.flightList)
})
res.data.pageData.forEach(x=>{
if(x.flightList.length>2){
x.different = 1
}
x.frequency = 0
x.frequencyA = 0
x.flightList.forEach((y,index)=>{
if(y.flightSubType!=3&&x.flightList.length>2){
x.frequency+=1
}
if(y.flightSubType==3){
x.frequencyA+=1
}
let date = y.flightDate.split('-')
y.time = `${date[1]}-${date[2]}`
y.week = getDateWeek(y.flightDate)
if(index==0){
y.frequency = x.frequency
y.duration = `${x.departureTime.days>0?x.departureTime.days+'d ':''}${x.departureTime.hours>0?x.departureTime.hours+'h ':''}${x.departureTime.minutes>0?x.departureTime.minutes+'m ':''}`
x.NewFlightList.push(y)
}
if(x.flightList.length-1==index){
y.frequency = x.frequencyA-1
y.duration = `${x.arrivalTime.days>0?x.arrivalTime.days+'d ':''}${x.arrivalTime.hours>0?x.arrivalTime.hours+'h ':''}${x.arrivalTime.minutes>0?x.arrivalTime.minutes+'m ':''}`
x.NewFlightList.push(y)
}
// x.NewFlightList[0].frequency = y.frequency
})
})
if (this.msg.pageIndex === 1) {
this.dataList = res.data.pageData;
} else {
......
pages/airTicket/airTicketDetails.vue
View file @ 77a7a75e
This diff is collapsed.
pages/airTicket/airTicketList.vue
View file @ 77a7a75e
This diff is collapsed.
pages/airTicket/components/TicketOrderDetails.vue 0 → 100644
View file @ 77a7a75e
<template>
<view class="airTicketDetailsList column">
<view v-for="(items,i) in dataList">
<view class="airTicketDetailsCard bgFFF"
:class="[dataList.length-1>i?'MB40':'']">
<view class="row-sb-n"
:class="[items.FlightList.length>1?'MR50':'']">
<view class="row-aic-n">
<view>
<view class="airTicketDetailsCard-qfc bgE1C278 fz30 color111 fontBold">
<template v-if="items.FlightSubType==1">去程</template>
<template v-if="items.FlightSubType==3">返程</template>
</view>
</view>
<view class="fz28 color111 ML20">
<text>{{items.time}}</text> <text class="ML10">周{{items.week}}</text>
</view>
<view class="fz28 color111 ML31">
总时长 {{items.duration}}
</view>
</view>
<view v-if="items.FlightList.length>1" class="fz28 colorE1C278 row-aic-n" @click="TicketDetails(items)">
<!-- <text>详情</text> -->
<uni-icons class="ML10" color="#DEBF7B" :type="items.show?'arrowdown':'arrowright'" size="14"></uni-icons>
<!-- <uni-icons class="ML10" color="#DEBF7B" type="arrowright" size="14"></uni-icons> -->
</view>
</view>
<view class="MT60 PX50" v-if="!items.show">
<view class="row relative" v-for="(item,index) in items.NewFlightList"
:class="[index==0?'MB50':'']">
<text v-if="index==1" class="fz18 fontWeight400 colorFF5858 absolute airTicketDetailsCard-timeT">
{{item.time}} 周{{item.week}}
</text>
<view class="airTicketDetailsCard-timeL column flexS MR20 textRight">
<view v-if="index==0" class="fz28 fontBold relative relativeFT10">{{item.Departure_time}} </view>
<view v-if="items.NewFlightList.length-1==index" class="MT25 fz28 fontBold">
{{item.Arrival_time}}
</view>
</view>
<view class="flexS MR30">
<view class="width-lineH49 bgE1C278 relative">
<view class="bgE1C278 absolute WH12R50 airTicketDetailsCard-LinT"></view>
<template v-if="index">
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinT2"></view>
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinT3"></view>
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinT4"></view>
</template>
<view class="bgE1C278 absolute WH12R50 airTicketDetailsCard-LinB"></view>
<template v-if="index!=1">
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinB2"></view>
</template>
</view>
</view>
<view class="flexG relative">
<view v-if="index!=0" class="airTicketDetailsCard-ZhuanNum bgE1C278 fz18 colorFFF absolute">
转
<template v-if="items.FlightList.length-1>1">+{{items.FlightList.length-1}}</template>
</view>
<view class="airTicketDetailsCard-title row-aic-n absolute" v-if="index==0">
<img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;"
:src="item.AlImage"/>
<view class="flexG">
<text class="block width100One hidden ellipsis1 fz20 ML5 color9999A5 fontWeight400">{{item.AlName}} {{item.Flight_number}} </text>
</view>
</view>
<view class="width436 hidden">
<view class="fz28 fontBold relative relativeFT8 hidden" v-if="index==0">
<text class="block width100One hidden ellipsis1">{{item.DepartureName?item.DepartureName:''}} {{item.dName}}</text>
</view>
<view class="fz28 fontBold MT25 hidden" v-if="index==1">
<text class="block width100One hidden ellipsis1">{{item.ArrivalCityName?item.ArrivalCityName:''}} {{item.aName}}</text>
</view>
</view>
</view>
</view>
</view>
<template v-if="items.show">
<view class="MT60 PX50" v-for="(item,index) in items.FlightList"
:class="[items.FlightList.length-1!=index?'MB50':'']">
<view class="row-aic-n relative"
:class="[items.FlightList.length-1!=index?'MB70':'']">
<text v-if="items.FlightList.length-1==index" class="fz18 fontWeight400 colorFF5858 absolute airTicketDetailsCard-timeT">
{{item.time}} 周{{item.week}}
</text>
<view class="airTicketDetailsCard-timeL column flexS MR20 textRight">
<view :class="[index?'fz24':'fz28 fontBold']">{{item.Departure_time}} </view>
<view class="MT35" :class="[items.FlightList.length-1!=index?'fz24':'fz28 fontBold']">
{{item.Arrival_time}}
</view>
</view>
<view class="flexS MR30">
<view class="width-lineH83 bgE1C278 relative">
<view class="bgE1C278 absolute WH12R50 airTicketDetailsCard-LinT"></view>
<template v-if="index">
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinT2"></view>
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinT3"></view>
</template>
<view class="bgE1C278 absolute WH12R50 airTicketDetailsCard-LinB"></view>
<template v-if="items.FlightList.length-1>index">
<view class="bgE1C278 absolute WH6R50 airTicketDetailsCard-LinB2"></view>
<view class="bgE1C278 fz18 colorFFF absolute airTicketDetailsCard-LinText">
中转
</view>
</template>
</view>
</view>
<view class="column flexG relative">
<view class="airTicketDetailsCard-title row-aic-n absolute">
<img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;"
:src="item.AlImage"/>
<view class="flexG">
<text class="block width100One overflow fz20 ML5 color9999A5 fontWeight400">{{item.AlName}} {{item.Flight_number}}</text>
</view>
</view>
<view class="width436 hidden">
<view class="fz28 fontBold relative relativeFT8">
<text class="block width100One hidden ellipsis1">{{item.DepartureName?item.DepartureName:''}} {{item.dName}} </text>
</view>
<view class="fz28 fontBold MT25">
<text class="block width100One hidden ellipsis1">{{item.ArrivalCityName?item.ArrivalCityName:''}} {{item.aName}} </text>
</view>
</view>
</view>
</view>
</view>
</template>
</view>
</view>
</view>
</template>
<script>
export default {
props:['DetailsList'],
components: {
},
data() {
return {
dataList:[
{
show:true
},
{
show:false
},
],
}
},
onLoad(options){
},
watch: {
DetailsList:{
handler(newVal, oldval) {
this.dataList = JSON.parse(JSON.stringify(this.DetailsList))
},
deep: true,
immediate: true
}
},
created() {},
methods: {
TicketDetails(items){
items.show=!items.show
this.$forceUpdate();
},
}
}
</script>
<style scoped>
@import url("@/asset/css/flex.css");
@import url("../style.css");
.airTicketDetailsList{
/* margin: 0 54rpx; */
}
.airTicketDetailsCard{
/* border-radius: 50rpx;
padding: 45rpx 0; */
}
</style>
\ No newline at end of file
pages/airTicket/components/address/index.vue
View file @ 77a7a75e
<template>
<view class="addressIndex-box">
<view class="fz30 fontBold textCenter MB30">选择{{AddressType==1?'出发地':'目的地'}}</view>
<view class="fz30 fontBold MB30">当前{{AddressType==1?'出发地':'目的地'}}</view>
<view class="MT30">
<view class="fz30 fontBold textCenter MB30 PX53 relative">选择{{AddressType==1?'出发地':'目的地'}}
<text v-if="SelectObj.ID" class="fz24 color9999A5 absolute PX10" style="right: 53rpx;top: 0;bottom: 0;" @click="Clear">清空</text>
</view>
<view class="fz30 fontBold MB30 PX53">当前{{AddressType==1?'出发地':'目的地'}}</view>
<view class="MT30 PX53">
<view class="addressIndex-Orientation inlineblock bgF5 row-ajc-n textCenter">
<img class="inlineblock MR10" mode="widthFix" style="width: 18rpx;height: 22rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1696743247000_254.png"/>
<text class="fz30">{{SelectObj.Name?SelectObj.Name:'--'}}</text>
</view>
</view>
<view class="fz30 fontBold MT45">地址</view>
<view class="fz30 fontBold MT45 PX53">地址</view>
<view class="hidden" style="height: calc(100vh - 60vh);">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
<view class="addressIndex-toponym row-sb-w">
<template v-for="(item,index) in dataList">
<view class="addressIndex-toponym row-aic-w">
<view class="addressIndex-toponym-box row-ajc-n" v-for="(item,index) in dataList">
<view class="addressIndex-Orientation inlineblock textCenter MT30 fz30"
:class="[SelectObj.ID==item.ID?'bgDEBF7B':'bgF5']"
@click="getAddress(item)">{{item.Name}}</view>
</template>
</view>
</view>
</scroll-view>
</view>
......@@ -30,7 +32,7 @@
return {
SelectObj: {
Name: '',
ID: ''
ID: 0
},
}
},
......@@ -70,6 +72,13 @@
},
methods: {
Clear(){
this.SelectObj = {
Name: '',
ID: 0,
}
this.$emit('RenewalAddres',this.SelectObj ,this.AddressType)
},
getAddress(item){
if(item.ID==this.SelectObj.ID){
this.SelectObj = {
......@@ -93,7 +102,7 @@
@import url("@/asset/css/flex.css");
@import url("../../style.css");
.addressIndex-box{
padding: 46rpx 53rpx 139rpx 53rpx;
padding: 46rpx 0 139rpx 0;
}
.addressIndex-Orientation{
width: 190rpx;
......@@ -101,5 +110,9 @@
border-radius: 30rpx;
}
.addressIndex-toponym{
padding: 0 22rpx;
}
.addressIndex-toponym-box{
flex: 0 0 33.33%;
}
</style>
\ No newline at end of file
pages/airTicket/components/address/indexGroup.vue 0 → 100644
View file @ 77a7a75e
<template>
<view class="addressIndex-box">
<view class="fz30 fontBold textCenter MB30 PX53 relative">选择出发地/目的地
<text v-if="SelectObj.DepartCityId||SelectObj.ArriveCityId" class="fz24 color9999A5 absolute PX10"
style="right: 53rpx;top: 0;bottom: 0;" @click="Clear">清空</text>
</view>
<view class="fz30 fontBold MB30 PX53 row-aic-n">
<text style="width: 50%;">当前出发地</text>
<text>当前目的地</text>
</view>
<view class="MT30 PX53 row-aic-n">
<view style="width: 50%;">
<view class="addressIndex-Orientation inlineblock bgF5 row-ajc-n textCenter" style="width: auto; padding: 15rpx 50rpx;">
<img class="inlineblock MR10" mode="widthFix" style="width: 18rpx;height: 22rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1696743247000_254.png"/>
<text class="fz30">
<template v-if="SelectObj.DepartCityName">
{{SelectObj.DepartCityName}}
</template>
<template v-else>
--
</template>
</text>
</view>
</view>
<view>
<view class="addressIndex-Orientation inlineblock bgF5 row-ajc-n textCenter" style="width: auto; padding: 15rpx 50rpx;">
<img class="inlineblock MR10" mode="widthFix" style="width: 18rpx;height: 22rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1696743247000_254.png"/>
<text class="fz30">
<template v-if="SelectObj.ArriveCityName">
{{SelectObj.ArriveCityName}}
</template>
<template v-else>
--
</template>
</text>
</view>
</view>
</view>
<view class="height-line1 MT25" ></view>
<view class="fz30 fontBold MT20 PX53 MB20 row-aic-n">
<view style="width: 150rpx;">出发地</view>
<view class="flexG">目的地</view>
</view>
<view class="hidden" style="height: calc(100vh - 60vh);">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
<template v-for="(item,index) in dataList">
<view class="addressIndex-toponym row-aic-n" :key="item.ID">
<view style="width: 150rpx;"
:class="[SelectObj.DepartCityId==item.ID?'colorDEBF7B':'']"
@click="getAddress(item)">
{{item.Name}}
</view>
<view class="flexG row-aic-w">
<view class="addressIndex-toponym-box" v-for="(items,index) in item.CityList" :key="items.ID">
<view class="addressIndex-Orientation inlineblock textCenter MT10 fz30"
:class="[SelectObj.ArriveCityId==items.ID?'bgDEBF7B':'bgF5']"
@click="getAddress(item,items)">{{items.Name}}</view>
</view>
</view>
</view>
<view class="height-line1 MT10" ></view>
</template>
</scroll-view>
</view>
<view class="AirplanePassengerList-footer fixedFooter bgFFF fixed z-index2">
<view
class="AirplanePassengerList-buttom bgDEBF7B fz32 fontBold textCenter"
@click="RenewalAddres">
确认
</view>
</view>
</view>
</template>
<script>
export default {
props:['OriginAddressObj','dataList'],
data() {
return {
SelectObj: {},
}
},
onLoad(options){
},
watch: {
OriginAddressObj: {
handler(newVal, oldval) {
this.SelectObj = JSON.parse(JSON.stringify(this.OriginAddressObj))
},
deep: true
},
},
created() {},
mounted() {
},
methods: {
RenewalAddres(){
this.$emit('RenewalAddres',this.SelectObj)
},
Clear(){
this.ClearData(null,null,1)
},
ClearData(item,items,type){
if(item||type){
this.SelectObj.DepartCityName = ''
this.SelectObj.DepartCityId = 0
}
if(items||type){
this.SelectObj.ArriveCityName = ''
this.SelectObj.ArriveCityId = 0
}
},
getAddress(item,items){
if(item&&items){
this.ClearData(item,items)
}
if(!items){
this.ClearData(item,items,1)
}
this.ClearData(item,items)
this.SelectObj.DepartCityName = item.Name
this.SelectObj.DepartCityId = item.ID
if(items){
this.SelectObj.ArriveCityName = items.Name
this.SelectObj.ArriveCityId = items.ID
}
// this.$forceUpdate()
},
}
}
</script>
<style scoped>
@import url("@/asset/css/flex.css");
@import url("../../style.css");
.addressIndex-box{
padding: 46rpx 0 139rpx 0;
}
.addressIndex-Orientation{
width: 160rpx;
padding: 15rpx 0;
border-radius: 30rpx;
}
.addressIndex-toponym{
padding: 0 0 0 53rpx;
}
.addressIndex-toponym-box{
flex: 0 0 33.33%;
}
</style>
\ No newline at end of file
pages/airTicket/components/airTicketDetails.vue
View file @ 77a7a75e
......@@ -18,7 +18,7 @@
</view>
</view>
<view v-if="items.FlightList.length>1" class="fz28 colorE1C278 row-aic-n" @click="TicketDetails(items)">
<text>详情</text>
<!-- <text>详情</text> -->
<uni-icons class="ML10" color="#DEBF7B" :type="items.show?'arrowdown':'arrowright'" size="14"></uni-icons>
<!-- <uni-icons class="ML10" color="#DEBF7B" type="arrowright" size="14"></uni-icons> -->
</view>
......@@ -61,12 +61,15 @@
<text class="block width100One overflow fz20 ML5 color9999A5 fontWeight400">{{item.AlName}} {{item.Flight_number}} </text>
</view>
</view>
<view class="fz28 fontBold relative relativeFT8" v-if="index==0">
<text class="block width100One hidden">{{item.DepartureName}} {{item.dName}}</text>
</view>
<view class="fz28 fontBold MT25" v-if="index==1">
<text class="block width100One hidden">{{item.ArrivalCityName}} {{item.aName}}</text>
<view class="width436 hidden">
<view class="fz28 fontBold relative relativeFT8" v-if="index==0">
<text class="block width100One hidden ellipsis1">{{item.DepartureName?item.DepartureName:''}} {{item.dName}}</text>
</view>
<view class="fz28 fontBold MT25" v-if="index==1">
<text class="block width100One hidden ellipsis1">{{item.ArrivalCityName?item.ArrivalCityName:''}} {{item.aName}}</text>
</view>
</view>
</view>
</view>
</view>
......@@ -108,11 +111,13 @@
<text class="block width100One overflow fz20 ML5 color9999A5 fontWeight400">{{item.AlName}} {{item.Flight_number}}</text>
</view>
</view>
<view class="fz28 fontBold relative relativeFT8">
<text class="block width100One hidden">{{item.DepartureName}} {{item.dName}} </text>
</view>
<view class="fz28 fontBold MT25">
<text class="block width100One hidden">{{item.ArrivalCityName}} {{item.aName}} </text>
<view class="width436 hidden">
<view class="fz28 fontBold relative relativeFT8">
<text class="block width100One hidden ellipsis1">{{item.DepartureName?item.DepartureName:''}} {{item.dName}} </text>
</view>
<view class="fz28 fontBold MT25">
<text class="block width100One hidden ellipsis1">{{item.ArrivalCityName?item.ArrivalCityName:''}} {{item.aName}} </text>
</view>
</view>
</view>
</view>
......
pages/airTicket/components/airTicketList.vue
View file @ 77a7a75e
......@@ -6,7 +6,7 @@
<view v-if="item.FlightList.length>2" class="aviationCard-wf absolute bg111 colorFFF fz20 z-index2">异地往返</view>
<view class="column flexG">
<view
:class="[item.FlightList.length-1!=indexs?'MB30':'']"
:class="[indexs?'':'MB10']"
v-for="(childs,indexs) in item.NewFlightList">
<view class="row-sb-n MT25">
<view class="flexS MR20">
......@@ -27,12 +27,7 @@
<view class="FlightDirection-zhuan z-index2 ML10" v-if="childs.frequency">
<!-- childs.FlightType==2 -->
<text class="block bgECF1F4 fz21 nowrap">
<template v-if="childs.frequency&&childs.frequency>1">
转+{{childs.frequency}}
</template>
<template v-if="childs.frequency&&childs.frequency==1">
经停
</template>
转<template v-if="childs.frequency>1">+{{childs.frequency}}</template>
</text>
</view>
</view>
......@@ -55,18 +50,20 @@
<text class="fz36 fontBold">{{childs.Arrival_time}} </text>
<text class="fz22 MT5 width100 ellipsis1">{{childs.aName}}</text>
</view>
<!-- <view class="FlightDirection-time absolute colorFF5858 fz20 nowrap">
<view class="FlightDirection-time absolute colorFF5858 fz20 nowrap">
<text>+</text>
<text class="ML5">1</text>
<text class="ML5">{{childs.Days}}</text>
<text class="ML5">天</text>
</view> -->
</view>
</view>
</view>
<view class="row-w MT15">
<view class="aviationTitle row-aic-n">
<img class="inlineblock" mode="widthFix" style="width: 36rpx;height: 30rpx;"
<view>
<img class="inlineblock flexS" mode="widthFix" style="width: 36rpx;height: 30rpx;"
:src="item.AirlineUrl"/>
</view>
<text class="fz22 ML10 color9999A5">{{item.AirLineName}}</text>
</view>
</view>
......
pages/airTicket/components/sign/day.js 0 → 100644
View file @ 77a7a75e
//节假日信息
const day=[
{
year:2022,
month:1,
festival:[
{name:'元旦',day:1},
{name:'除夕',day:31},
]
},
{
year:2022,
month:2,
festival:[
{name:'春节',day:1},
{name:'元宵',day:15},
{name:'情人节',day:14}
]
},
{
year:2022,
month:3,
festival:[
{name:'妇女节',day:8},
]
},
{
year:2022,
month:4,
festival:[
{name:'清明',day:4},
]
},
{
year:2022,
month:5,
festival:[
{name:'劳动节',day:1},
{name:'青年节',day:4},
{name:'母亲节',day:10},
]
},
{
year:2021,
month:6,
festival:[
{name:'儿童节',day:1},
{name:'父亲节',day:21},
{name:'端午',day:14},
]
},
{
year:2021,
month:7,
festival:[
{name:'建党节',day:1}
]
},
{
year:2021,
month:8,
festival:[
{name:'建军节',day:1},
{name:'七夕',day:14},
{name:'中元节',day:22},
]
},
{
year:2021,
month:9,
festival:[
{name:'教师节',day:10},
{name:'中秋',day:21}
]
},
{
year:2021,
month:10,
festival:[
{name:'国庆',day:1},
{name:'重阳',day:14}
]
},
{
year:2021,
month:11,
festival:[
{name:'感恩节',day:26}
]
},
{
year:2021,
month:12,
festival:[
{name:'平安夜',day:24},
{name:'圣诞节',day:25}
]
}
]
export default day
\ No newline at end of file
pages/airTicket/components/sign/index.vue 0 → 100644
View file @ 77a7a75e
This diff is collapsed.
pages/airTicket/components/time/index.vue
View file @ 77a7a75e
......@@ -153,6 +153,10 @@
lastNot: [0, 10] //前置的无房操作
};
},
onShow(){
this.start = this.setDefaultDate(this.StartDate);
this.end = this.setDefaultDate(this.EndDate);
},
mounted () {
console.log("进入了....")
uni.getSystemInfo({
......@@ -473,17 +477,6 @@
submit() {
var obj = {
/* startYMD: this.date[this.start[0]].year + this.type + this.date[this.start[0]].month + this.type + this.isFestival(
this.start[0], this.start[1]),
startMD: this.date[this.start[0]].month + this.type + this.isFestival(this.start[0], this.start[1]),
startDay: this.startDay,
startWeek: this.startWeek,
endYMD: this.date[this.end[0]].year + this.type + this.date[this.end[0]].month + this.type + this.isFestival(this
.end[0], this.end[1]),
emdMD: this.date[this.end[0]].month + this.type + this.type + this.isFestival(this.end[0], this.end[1]),
endDay: this.endDay,
endWeek: this.endWeek,
day: this.day */
startWeek: this.startWeek,
endWeek: this.endWeek,
start: this.date[this.start[0]].year + this.type + this.date[this.start[0]].month + this.type +
......@@ -505,72 +498,6 @@
})
this.$emit("finish",obj)
//价格清单,应该存入vuex获取缓存中
// if (this.priceStauts.length > 0) {
// var price = []
// if (this.end[0] - this.start[0] == 0) {
// for (var i = this.start[1]; i < this.end[1]; i++) {
// var day = this.date[this.start[0]].year + this.type + this.setPull(this.date[this.start[0]]
// .month) + this.type + this.isFestival(
// this.start[0], i)
// price.push({
// day_str: day,
// price: this.priceStauts[this.start[0]][i]
// })
// }
// } else {
// for (var i = this.start[0]; i <= this.end[0]; i++) {
// console.log(i)
// if (i == this.start[0]) {
// for (var j = this.start[1]; j < this.date[i].day.length; j++) {
// var day = this.date[i].year + this.type + this.setPull(this.date[i].month) + this
// .type + this.isFestival(
// i, j)
// price.push({
// day_str: day,
// price: this.priceStauts[i][j]
// })
// }
// } else if (i == this.end[0]) {
// for (var j = 0; j < this.end[1]; j++) {
// var day = this.date[i].year + this.type + this.setPull(this.date[i].month) + this
// .type + this.isFestival(
// i, j)
// price.push({
// day_str: day,
// price: this.priceStauts[i][j]
// })
// }
// } else {
// for (var j = 0; j < this.date[i].day.length; j++) {
// var day = this.date[i].year + this.type + this.setPull(this.date[i].month) + this
// .type + this.isFestival(
// i, j)
// price.push({
// day_str: day,
// price: this.priceStauts[i][j]
// })
// }
// }
// }
// }
// //加入缓存
// uni.setStorage({
// key: 'Price',
// data: JSON.stringify(price)
// })
// }
//跳转到上一页
// uni.navigateBack({
// delta: 1
// })
},
}
};
......
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