Skip to content

J
jz_Travel
Commit f7e63682 authored by 18224442217's avatar 18224442217
Browse files
Options

no message

parent 95655fc5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 39 deletions
asset/css/flex.css
View file @ f7e63682
...@@ -371,8 +371,11 @@ ...@@ -371,8 +371,11 @@
.PB300{ .PB300{
padding-bottom: 300rpx; padding-bottom: 300rpx;
} }
.PY20{
padding: 20rpx 0;
}
.PY53{ .PY53{
padding: 0 53rpx; padding: 53rpx 0;
} }
.PX4{ .PX4{
padding: 0 4rpx; padding: 0 4rpx;
......
pages/airTicket/TicketOrderDetails.vue
View file @ f7e63682
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<NavigationHeader :title="title" :titleStyle="titleStyle"></NavigationHeader> <NavigationHeader :title="title" :titleStyle="titleStyle"></NavigationHeader>
<!-- :style="{top:topheight+'px'}" --> <!-- :style="{top:topheight+'px'}" -->
<view class="TicketOrderDetailsC overflow PT123 PB260" v-if="orderData&&orderData.model"> <view class="TicketOrderDetailsC overflow PT123 PB260" v-if="orderData&&orderData.model">
<view class="PY53"> <view class="PX53">
<view class="row-sb-n MT20"> <view class="row-sb-n MT20">
<view class="flexS row-aic-n"> <view class="flexS row-aic-n">
<img class="inlineblock MR20" mode="widthFix" style="width: 44rpx;height: 44rpx;" <img class="inlineblock MR20" mode="widthFix" style="width: 44rpx;height: 44rpx;"
...@@ -38,8 +38,9 @@ ...@@ -38,8 +38,9 @@
<text>{{index+1>=10?index:'0'+(index+1)}}</text> <text>{{index+1>=10?index:'0'+(index+1)}}</text>
<text class="ML15">乘机人</text> <text class="ML15">乘机人</text>
</view> </view>
<view class="fz26 fontBold color1D1D20 flexG"> <view class="flexG row-sb-n">
<text class="width100One ellipsis1">{{item.SurName}}</text> <text class="fz26 fontBold color1D1D20">{{item.SurName}}</text>
<text class="fz22 color9999A5">{{item.MobilePhone}}</text>
</view> </view>
<view class="fz22 color9999A5 flexS"> <view class="fz22 color9999A5 flexS">
<!-- ¥{{item.Unit_Price}} --> <!-- ¥{{item.Unit_Price}} -->
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
<view class="row-sb-n MT25"> <view class="row-sb-n MT25">
<view class="TicketOrderDetails-Name MR40 fz26 color9999A5 textRight flexS"> <view class="TicketOrderDetails-Name MR40 fz26 color9999A5 textRight flexS">
<text></text> <text></text>
<text class="ML15">证件号</text> <text class="ML15">护照号</text>
</view> </view>
<view class="fz26 fontBold color1D1D20 flexG"> <view class="fz26 fontBold color1D1D20 flexG">
{{item.IdCard?item.IdCard:item.PassportNo}} {{item.IdCard?item.IdCard:item.PassportNo}}
...@@ -101,7 +102,10 @@ ...@@ -101,7 +102,10 @@
<view class="MT75 TicketOrderDetailsGetC"> <view class="MT75 TicketOrderDetailsGetC">
<view class="TicketOrderDetailsGet-Num MB52" v-for="(item,index ) in NewGuestList"> <view class="TicketOrderDetailsGet-Num MB52" v-for="(item,index ) in NewGuestList">
<view class="row-sb-n"> <view class="row-sb-n">
<text class="flexS">{{item.text}}</text> <text class="flexS">
人数
<!-- {{item.text}} -->
</text>
<view class="TicketOrderDetailsGet-NumA flexS ML30"> <view class="TicketOrderDetailsGet-NumA flexS ML30">
<view class="height-line1 lineC8C8CF"></view> <view class="height-line1 lineC8C8CF"></view>
</view> </view>
...@@ -114,11 +118,12 @@ ...@@ -114,11 +118,12 @@
</view> </view>
</view> </view>
</view> </view>
<!--
<view class="fz24 color9999A5 MT25" v-if="index!=2"> <view class="fz24 color9999A5 MT25" v-if="index!=2">
<template v-if="index==0">(14岁及以上的顾客)</template> <template v-if="index==0">(14岁及以上的顾客)</template>
<template v-if="index==1">(2岁及14岁以下的顾客)</template> <template v-if="index==1">(2岁及14岁以下的顾客)</template>
<template v-if="index==2">(2岁以下的顾客)</template> <template v-if="index==2">(2岁以下的顾客)</template>
</view> </view> -->
</view> </view>
</view> </view>
<view class="absolute TicketOrderDetailsGet-Footer bgFFF row-sb-n"> <view class="absolute TicketOrderDetailsGet-Footer bgFFF row-sb-n">
......
pages/airTicket/airTicketDetails.vue
View file @ f7e63682
...@@ -42,9 +42,14 @@ ...@@ -42,9 +42,14 @@
@click="bindClick" @click="bindClick"
@open="open"> @open="open">
<view> <view>
<view class="fz30 fontBold">{{item.SurName}}</view> <view class="row-sb-n">
<text class="fz30 fontBold">{{item.SurName}} </text>
<text class="ML20 fz24 color9999A5">
{{item.MobilePhone}}
</text>
</view>
<view class="fz26 color9999A5 MT25"> <view class="fz26 color9999A5 MT25">
<text>证件号</text> <text>护照号</text>
<text class="ML10">{{item.IdCard?item.IdCard:item.PassportNo}}</text> <text class="ML10">{{item.IdCard?item.IdCard:item.PassportNo}}</text>
</view> </view>
</view> </view>
...@@ -53,12 +58,13 @@ ...@@ -53,12 +58,13 @@
</template> </template>
<view class="height-line1 MT40 MB35"></view> <view class="height-line1 MT40 MB35"></view>
<!--
<view class="row-ajc-n MB70"> <view class="row-ajc-n MB70">
<text class="flexS fz30">联系电话</text> <text class="flexS fz30">联系电话</text>
<view class="airTicketDetailsAddMobile flexG ML30"> <view class="airTicketDetailsAddMobile flexG ML30">
<input class="fz30" type="number" v-model="orderMsg.ContactMobile" placeholder="用于接收通知" /> <input class="fz30" type="number" v-model="orderMsg.ContactMobile" placeholder="用于接收通知" />
</view> </view>
</view> </view> -->
</view> </view>
<view v-if="B2BSellNum>=orderMsg.YSeatNum" class="airTicketDetailsAdd bgDEBF7B fz32 fontBold textCenter" <view v-if="B2BSellNum>=orderMsg.YSeatNum" class="airTicketDetailsAdd bgDEBF7B fz32 fontBold textCenter"
@click="AddPassengers"> @click="AddPassengers">
...@@ -89,11 +95,7 @@ ...@@ -89,11 +95,7 @@
<view class="row-acje"> <view class="row-acje">
<view class="airTicketDetailsFooter-order row-ajc-w fontBold" @click="SubmitOrder" <view class="airTicketDetailsFooter-order row-ajc-w fontBold" @click="SubmitOrder"
:class="[ :class="[
loading loading||!orderMsg.ManNum?'bgF5':'bgDEBF7B']">
||!orderMsg.ManNum
||!orderMsg.ContactMobile
||orderMsg.ContactMobile.length>11
||11>orderMsg.ContactMobile.length?'bgF5':'bgDEBF7B']">
<text class="fz32">立即下单</text> <text class="fz32">立即下单</text>
</view> </view>
</view> </view>
...@@ -132,7 +134,7 @@ ...@@ -132,7 +134,7 @@
GuestList:[ GuestList:[
// {SurName:'',PassportNo:'',IdCard:'',MobilePhone:''} // {SurName:'',PassportNo:'',IdCard:'',MobilePhone:''}
], ],
ContactMobile: '', // ContactMobile: '',
PlaceOrderFrom: 2, PlaceOrderFrom: 2,
CreateBy: 0,//销售id CreateBy: 0,//销售id
}, },
...@@ -205,7 +207,11 @@ ...@@ -205,7 +207,11 @@
let obj = { let obj = {
SurName: x.SurName, SurName: x.SurName,
PassportNo: x.PassportNo, PassportNo: x.PassportNo,
PassportExpiry: x.PassportExpiry,
PassportAddress: x.PassportAddress,
Nationality: x.Nationality,
IdCard: x.IdCard, IdCard: x.IdCard,
Sex: x.Sex,
MobilePhone: x.MobilePhone MobilePhone: x.MobilePhone
} }
this.orderMsg.GuestList.push(obj) this.orderMsg.GuestList.push(obj)
...@@ -314,14 +320,14 @@ ...@@ -314,14 +320,14 @@
}); });
return return
} }
if(!this.orderMsg.ContactMobile||(this.orderMsg.ContactMobile.length>0&&this.orderMsg.ContactMobile.length!=11)){ // if(!this.orderMsg.ContactMobile||(this.orderMsg.ContactMobile.length>0&&this.orderMsg.ContactMobile.length!=11)){
uni.showToast({ // uni.showToast({
title: '请输入正确联系电话', // title: '请输入正确联系电话',
icon: 'none', // icon: 'none',
mask: true // mask: true
}); // });
return // return
} // }
uni.showLoading({ uni.showLoading({
title: "请稍等片刻...", title: "请稍等片刻...",
}) })
......
pages/airTicket/components/address/indexGroup.vue
View file @ f7e63682
<template> <template>
<view class="addressIndex-box"> <view class="addressIndex-box">
<view class="fz30 fontBold textCenter MB30 PX53 relative" style="text-align: left;">选择出发地/目的地 <view class="fz30 fontBold MB30 PX53 relative">选择出发地/目的地
<text v-if="SelectObj.DepartCityId||SelectObj.ArriveCityId" class="fz24 color9999A5 absolute PX10" <text v-if="SelectObj.DepartCityId||SelectObj.ArriveCityId" class="fz24 color9999A5 absolute PX10"
style="right: 53rpx;top: 0;bottom: 0;" @click="Clear">清空</text> style="right: 53rpx;top: 0;bottom: 0;" @click="Clear">清空</text>
</view> </view>
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
</view> </view>
</view> </view>
<view class="air-arrcity-box"> <view class="air-arrcity-box">
<div class="air-arrcity-item" @click="getAddress(i)" <view class="air-arrcity-item" @click="getAddress(i)"
:class="{'currentCity':SelectObj.ArriveCityId==x.ID && SelectObj.DepartCityId==dataList[active].ID}" :class="{'currentCity':SelectObj.ArriveCityId==x.ID && SelectObj.DepartCityId==dataList[active].ID}"
v-for="(x,i) in dataList[active].CityList">{{x.Name}}</div> v-for="(x,i) in dataList[active].CityList">{{x.Name}}</view>
</view> </view>
<!-- <template v-for="(item,index) in dataList"> <!-- <template v-for="(item,index) in dataList">
<view class="addressIndex-toponym row-aic-n" :key="item.ID"> <view class="addressIndex-toponym row-aic-n" :key="item.ID">
......
pages/jiuzhai/jz_LineDetail.vue
View file @ f7e63682
...@@ -1540,7 +1540,7 @@ export default { ...@@ -1540,7 +1540,7 @@ export default {
}, },
fail(err) { fail(err) {
console.log(err) console.log(err)
that.downloadFailed('下载失败，请重试。如果仍然失败，请联系销售索要PDF行程') that.downloadFailed('下载失败，请重试。如果仍然失败，请联系销售索要PDF行程'+err)
}, },
}); });
}, },
...@@ -1549,7 +1549,7 @@ export default { ...@@ -1549,7 +1549,7 @@ export default {
icon:'none', icon:'none',
title:msg title:msg
}) })
uni.hideLoading() //uni.hideLoading()
this.isDownloading=false this.isDownloading=false
}, },
previewTravelPicHandler(url,urls){ previewTravelPicHandler(url,urls){
......
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