Skip to content

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

no message

parent 95655fc5
Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 39 deletions
asset/css/flex.css
View file @ f7e63682
......@@ -371,8 +371,11 @@
.PB300{
padding-bottom: 300rpx;
}
.PY20{
padding: 20rpx 0;
}
.PY53{
padding: 0 53rpx;
padding: 53rpx 0;
}
.PX4{
padding: 0 4rpx;
......
pages/airTicket/AirplanePassengerAddEditing.vue
View file @ f7e63682
......@@ -11,7 +11,7 @@
</view>
<view class="height-line1"></view>
</view>
<view class="column">
<view class="column" v-if="false">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">证件</text>
<view class="flexG row-aic-n">
......@@ -26,7 +26,7 @@
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">证件号</text>
<text class="flexS AirplanePassengerAddEditingC-textL">护照号</text>
<input v-if="addMsg.GuestType==1" class="flexG" type="text" placeholder="请输入身份证号码"
:class="[addMsg.IdCard?'fontBold':'']"
:placeholder-style="placeholderStyle"
......@@ -39,6 +39,70 @@
<view class="height-line1"></view>
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">过期时间</text>
<view class="flexG" @click="showCalendarPreviwe=true">
<input type="text" placeholder="请选择护照过期时间"
:class="[addMsg.PassportExpiry?'fontBold':'']"
:placeholder-style="placeholderStyle"
:disabled="true"
v-model="addMsg.PassportExpiry"/>
</view>
</view>
<view class="height-line1"></view>
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">签发地</text>
<view class="flexG">
<input type="text" placeholder="请输入护照签发地"
:class="[addMsg.PassportAddress?'fontBold':'']"
:placeholder-style="placeholderStyle"
v-model="addMsg.PassportAddress"/>
</view>
</view>
<view class="height-line1"></view>
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">国籍</text>
<view class="flexG" @click="showNationalityPreviwe=true">
<input type="text" placeholder="请选择国籍"
:class="[addMsg.Nationality?'fontBold':'']"
:placeholder-style="placeholderStyle"
:disabled="true"
v-model="addMsg.NationalityName"/>
</view>
</view>
<view class="height-line1"></view>
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">性别</text>
<view class="flexG row-aic-n">
<view v-for="(item,index) in typeList" class="AirplanePassengerAddEditingC-choose MR30"
@click="addMsg.Sex=item.Id">
<uni-icons color="#DEBF7B" :type="addMsg.Sex==item.Id?'checkbox-filled':'circle'" size="18"></uni-icons>
<text class="ML20 fz30 fontBold">{{item.Name}}</text>
</view>
</view>
</view>
<view class="height-line1"></view>
</view>
<view class="column">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">联系电话</text>
<view class="flexG">
<input type="number" placeholder="请输入联系电话"
:class="[addMsg.MobilePhone?'fontBold':'']"
:placeholder-style="placeholderStyle"
v-model="addMsg.MobilePhone"/>
</view>
</view>
<view class="height-line1"></view>
</view>
<view class="column" v-if="false">
<view class="AirplanePassengerAddEditingC-text row-sb-n fz30">
<text class="flexS AirplanePassengerAddEditingC-textL">成人/婴儿</text>
<view class="flexG row-aic-n">
......@@ -53,7 +117,9 @@
</view>
</view>
<view class="AirplanePassengerList-footer fixedFooter bgFFF fixed z-index2">
<view v-if="addMsg.SurName&&(addMsg.PassportNo||addMsg.IdCard)"
<view v-if="addMsg.SurName&&addMsg.PassportNo&&addMsg.PassportExpiry
&&addMsg.PassportAddress&&addMsg.Nationality
&&addMsg.MobilePhone&&addMsg.MobilePhone.length==11"
class="AirplanePassengerList-buttom bgDEBF7B fz32 fontBold textCenter"
@click="showAddEditingPreviwe=true">
确认{{editorIndex||editorIndex==0?'编辑':'添加'}}
......@@ -80,13 +146,13 @@
<text class="fz30 fontBold colorFF5858 flexG">{{addMsg.SurName}}</text>
</view>
<view class="row-aic-n">
<text class="fz26 flexS">证件号</text>
<text class="fz26 flexS">护照号</text>
<text class="fz30 fontBold colorFF5858 flexG">{{addMsg.GuestType==1?addMsg.IdCard:addMsg.PassportNo}}</text>
</view>
<view class="row-aic-n" v-if="addMsg.result">
<!-- <view class="row-aic-n" v-if="addMsg.result">
<text class="fz26 flexS">出生日期</text>
<text class="fz30 fontBold flexG">{{addMsg.result.birthday}}</text>
</view>
</view> -->
</view>
<view class="showAddEditing-buttom fz32 fontBold textCenter row-sb-n">
<view class="border1 colorDEBF7B borderDEBF7B" @click="showAddEditingPreviwe=false">返回修改</view>
......@@ -95,17 +161,75 @@
</view>
</view>
</u-popup>
<u-popup
v-model="showCalendarPreviwe"
mode="bottom"
border-radius="20"
:safe-area-inset-bottom="true">
<uniCalendar ref="uniCalendar"
:insert="true"
:date="addMsg.PassportExpiry"
@confirm="confirm"></uniCalendar>
</u-popup>
<u-popup
v-model="showNationalityPreviwe"
mode="bottom"
border-radius="20"
:safe-area-inset-bottom="true">
<view class="addressIndex-box">
<view class="fz30 fontBold textCenter MB30 PX53 relative">
选择国籍
</view>
<scroll-view :scroll-y="true" :enable-back-to-top="true"
:enable-flex="true"
style="width: 100%; height: calc(100vh - 50vh);">
<view class="column">
<template v-for="(x,i) in countryList">
<view class="PX53">
<view class="PY20 row-sb-n" @click="getNationality(x)"
:class="[addMsg.Nationality==x.ID?'colorDEBF7B':'']">
<text>
{{x.Name}}
</text>
<view>
<!-- checkbox-filled':'circle' -->
<uni-icons v-if="addMsg.Nationality==x.ID" color="#DEBF7B" type="checkbox-filled" size="18"></uni-icons>
</view>
</view>
</view>
<view class="height-line1"></view>
</template>
</view>
</scroll-view>
<view class="AirplanePassengerList-footer fixedFooter bgFFF fixed z-index2">
<view
class="AirplanePassengerList-buttom bgDEBF7B fz32 fontBold textCenter"
@click="showNationalityPreviwe=false">
确认
</view>
</view>
</view>
</u-popup>
</view>
</template>
<script>
import { parseIDCard } from "./dates.js";
import uniCalendar from "./components/uni-calendar/uni-calendar.vue";
export default {
components: {
uniCalendar
},
data() {
return {
showNationalityPreviwe: false,
countryList:[],
showCalendarPreviwe: false,
loading: false,
typeList:[
{Name:'男',Id:1},
{Name:'女',Id:2},
],
certificateList:[
{Name:'身份证',Id:1},
{Name:'护照',Id:2},
......@@ -117,8 +241,16 @@
text:'',
showAddEditingPreviwe: false,
addMsg: {
SurName:'',PassportNo:'',IdCard:'',MobilePhone:'',
result:null,show: false,GuestType:1,GuestNum: 1,Id:0
SurName:'',
PassportNo:'',//护照号
PassportExpiry:'',//过期时间
PassportAddress:'',//签发地址
Nationality: null,//国籍
NationalityName: '',
Sex:1,
MobilePhone:'',
IdCard:'',
result:null,show: false,GuestType:2,GuestNum: 1,Id:0
},
GuestList: [],
editorIndex: null,
......@@ -133,10 +265,17 @@
},
created() {},
mounted() {
this.getCountryList()
let GuestList = uni.getStorageSync("GuestList")
this.GuestList = GuestList?GuestList:[]
if(this.editorIndex||this.editorIndex==0){
this.addMsg = this.GuestList[this.editorIndex]
this.calendar = []
let obj = {
date: this.addMsg.PassportExpiry,
info: "",
}
this.calendar.push(obj)
}
},
watch: {
......@@ -147,6 +286,21 @@
}
},
methods: {
getNationality(item){
this.addMsg.Nationality = item.ID
this.addMsg.NationalityName = item.Name
},
getCountryList() { //获取国家
let msg = {};
this.apipost('dict_post_Destination_GetCountry', msg, res => {
this.countryList = []
this.countryList = res.data
}, err => {})
},
confirm(e) {
this.showCalendarPreviwe = false
this.addMsg.PassportExpiry = e.fulldate
},
submit(){
this.addMsg.Id = Math.floor(Math.random()*(100-1)+1)
if(!this.editorIndex){
......@@ -181,6 +335,9 @@
<style scoped>
@import url("@/asset/css/flex.css");
@import url("./style.css");
.addressIndex-box{
padding: 46rpx 0 139rpx 0;
}
.AirplanePassengerAddEditingC{
padding: 0 54rpx;
}
......@@ -206,7 +363,7 @@
padding: 60rpx 47rpx;
}
.showAddEditing-Details>view:nth-child(2){
padding: 68rpx 0;
padding: 68rpx 0 0 0;
}
.showAddEditing-Details>view>text:first-child{
width: 150rpx;
......
pages/airTicket/TicketOrderDetails.vue
View file @ f7e63682
......@@ -8,7 +8,7 @@
<NavigationHeader :title="title" :titleStyle="titleStyle"></NavigationHeader>
<!-- :style="{top:topheight+'px'}" -->
<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="flexS row-aic-n">
<img class="inlineblock MR20" mode="widthFix" style="width: 44rpx;height: 44rpx;"
......@@ -38,8 +38,9 @@
<text>{{index+1>=10?index:'0'+(index+1)}}</text>
<text class="ML15">乘机人</text>
</view>
<view class="fz26 fontBold color1D1D20 flexG">
<text class="width100One ellipsis1">{{item.SurName}}</text>
<view class="flexG row-sb-n">
<text class="fz26 fontBold color1D1D20">{{item.SurName}}</text>
<text class="fz22 color9999A5">{{item.MobilePhone}}</text>
</view>
<view class="fz22 color9999A5 flexS">
<!-- ¥{{item.Unit_Price}} -->
......@@ -48,7 +49,7 @@
<view class="row-sb-n MT25">
<view class="TicketOrderDetails-Name MR40 fz26 color9999A5 textRight flexS">
<text></text>
<text class="ML15">证件号</text>
<text class="ML15">护照号</text>
</view>
<view class="fz26 fontBold color1D1D20 flexG">
{{item.IdCard?item.IdCard:item.PassportNo}}
......@@ -101,7 +102,10 @@
<view class="MT75 TicketOrderDetailsGetC">
<view class="TicketOrderDetailsGet-Num MB52" v-for="(item,index ) in NewGuestList">
<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="height-line1 lineC8C8CF"></view>
</view>
......@@ -114,11 +118,12 @@
</view>
</view>
</view>
<!--
<view class="fz24 color9999A5 MT25" v-if="index!=2">
<template v-if="index==0">(14岁及以上的顾客)</template>
<template v-if="index==1">(2岁及14岁以下的顾客)</template>
<template v-if="index==2">(2岁以下的顾客)</template>
</view>
</view> -->
</view>
</view>
<view class="absolute TicketOrderDetailsGet-Footer bgFFF row-sb-n">
......
pages/airTicket/airTicketDetails.vue
View file @ f7e63682
......@@ -42,9 +42,14 @@
@click="bindClick"
@open="open">
<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">
<text>证件号</text>
<text>护照号</text>
<text class="ML10">{{item.IdCard?item.IdCard:item.PassportNo}}</text>
</view>
</view>
......@@ -53,12 +58,13 @@
</template>
<view class="height-line1 MT40 MB35"></view>
<!--
<view class="row-ajc-n MB70">
<text class="flexS fz30">联系电话</text>
<view class="airTicketDetailsAddMobile flexG ML30">
<input class="fz30" type="number" v-model="orderMsg.ContactMobile" placeholder="用于接收通知" />
</view>
</view>
</view> -->
</view>
<view v-if="B2BSellNum>=orderMsg.YSeatNum" class="airTicketDetailsAdd bgDEBF7B fz32 fontBold textCenter"
@click="AddPassengers">
......@@ -89,11 +95,7 @@
<view class="row-acje">
<view class="airTicketDetailsFooter-order row-ajc-w fontBold" @click="SubmitOrder"
:class="[
loading
||!orderMsg.ManNum
||!orderMsg.ContactMobile
||orderMsg.ContactMobile.length>11
||11>orderMsg.ContactMobile.length?'bgF5':'bgDEBF7B']">
loading||!orderMsg.ManNum?'bgF5':'bgDEBF7B']">
<text class="fz32">立即下单</text>
</view>
</view>
......@@ -132,7 +134,7 @@
GuestList:[
// {SurName:'',PassportNo:'',IdCard:'',MobilePhone:''}
],
ContactMobile: '',
// ContactMobile: '',
PlaceOrderFrom: 2,
CreateBy: 0,//销售id
},
......@@ -205,7 +207,11 @@
let obj = {
SurName: x.SurName,
PassportNo: x.PassportNo,
PassportExpiry: x.PassportExpiry,
PassportAddress: x.PassportAddress,
Nationality: x.Nationality,
IdCard: x.IdCard,
Sex: x.Sex,
MobilePhone: x.MobilePhone
}
this.orderMsg.GuestList.push(obj)
......@@ -314,14 +320,14 @@
});
return
}
if(!this.orderMsg.ContactMobile||(this.orderMsg.ContactMobile.length>0&&this.orderMsg.ContactMobile.length!=11)){
uni.showToast({
title: '请输入正确联系电话',
icon: 'none',
mask: true
});
return
}
// if(!this.orderMsg.ContactMobile||(this.orderMsg.ContactMobile.length>0&&this.orderMsg.ContactMobile.length!=11)){
// uni.showToast({
// title: '请输入正确联系电话',
// icon: 'none',
// mask: true
// });
// return
// }
uni.showLoading({
title: "请稍等片刻...",
})
......
pages/airTicket/components/address/indexGroup.vue
View file @ f7e63682
<template>
<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"
style="right: 53rpx;top: 0;bottom: 0;" @click="Clear">清空</text>
</view>
......@@ -53,9 +53,9 @@
</view>
</view>
<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}"
v-for="(x,i) in dataList[active].CityList">{{x.Name}}</div>
v-for="(x,i) in dataList[active].CityList">{{x.Name}}</view>
</view>
<!-- <template v-for="(item,index) in dataList">
<view class="addressIndex-toponym row-aic-n" :key="item.ID">
......
pages/jiuzhai/jz_LineDetail.vue
View file @ f7e63682
......@@ -1540,7 +1540,7 @@ export default {
},
fail(err) {
console.log(err)
that.downloadFailed('下载失败，请重试。如果仍然失败，请联系销售索要PDF行程')
that.downloadFailed('下载失败，请重试。如果仍然失败，请联系销售索要PDF行程'+err)
},
});
},
......@@ -1549,7 +1549,7 @@ export default {
icon:'none',
title:msg
})
uni.hideLoading()
//uni.hideLoading()
this.isDownloading=false
},
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