Skip to content

A
Athena
Commit 51fe91e9 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

修改

parent 8ab08c8f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 288 deletions
src/components/Ticket/AirlineTicketOrder.vue
View file @ 51fe91e9
......@@ -9,7 +9,7 @@
<el-option label="全部" :value=0></el-option>
<el-option label="正常" :value=1></el-option>
<el-option label="取消" :value=2></el-option>
<el-option label="代付款" :value=3></el-option>
<el-option label="待付款" :value=3></el-option>
</el-select>
</el-form-item>
<el-form-item label="下单开始时间:">
......@@ -31,7 +31,7 @@
style="width: 100%">
<el-table-column
prop="id"
label="订单id">
label="订单ID">
</el-table-column>
<el-table-column
prop="contactName"
......@@ -49,10 +49,14 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
<el-button v-show="scope.row.status==3"
size="mini"
type="danger"
type="primary"
@click="handleEdit(scope.$index, scope.row)">修改订单</el-button>
<el-button v-show="scope.row.status==3"
size="mini"
type="danger"
@click="handlePay(scope.$index, scope.row)">去付款</el-button>
</template>
</el-table-column>
</el-table>
......@@ -96,6 +100,12 @@ export default {
this.List();
},
methods: {
handlePay(index,row){
// console.log("row",row)
this.$router.push({
path: `/ticket/Pay/${row.id}`
})
},
Currentchange(val){
this.form.pageIndex=val;
this.List();
......@@ -124,9 +134,14 @@ export default {
</script>
<style>
.AirlineTicketOrder .el-pager{
margin-top:6px;
.AirlineTicketOrder .el-pagination .btn-next{
height:28px;
}
.AirlineTicketOrder .el-pagination .btn-prev{
height:28px;
}
.AirlineTicketOrder .el-form-item{
display: inline-block;
margin:10px 5px;
......
src/components/Ticket/Choose.vue
View file @ 51fe91e9
<template>
<div class="choose_back">
<el-row class="msg">
<div style="margin-bottom:10px">
<el-radio v-model="choose_info.ticketType" :label=1>单程</el-radio>
......@@ -36,7 +37,7 @@
<span>出发 | </span>
<el-date-picker @change="changeStart"
v-model="choose_info.qFlightDateStart"
type="date"
type="date" style="width:80%"
placeholder="选择日期">
</el-date-picker>
<!-- <span>{{startweek}}</span> -->
......@@ -45,7 +46,7 @@
<span>归期 | </span>
<el-date-picker @change="changeEnd"
v-model="choose_info.qFlightDateEnd"
type="date"
type="date" style="width:80%"
placeholder="选择日期">
</el-date-picker>
<!-- <span>{{endweek}}</span> -->
......@@ -75,6 +76,7 @@
<div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span>
<el-select v-model="choose_info.freightSpace" placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
......@@ -243,7 +245,7 @@ export default {
.choose_back .msg .el-select>.el-input{
width: 100%;
}
.msg .el-button{
.choose_back .msg .el-button{
width:77px;
height:32px;
background:rgba(238,68,84,1);
......@@ -251,7 +253,7 @@ export default {
color: #ffffff;
border: none;
}
.msg .el-input-number .el-input{
.choose_back .msg .el-input-number .el-input{
width: 95px;
}
.choose_back .msg .number{
......@@ -265,18 +267,20 @@ export default {
display: inline-block;
margin-right: 20px;
}
.msg .el-input-number{
.choose_back .msg .el-input-number{
width:95px;
height: 100%;
}
.msg{
.choose_back .msg{
color: #000000;
font-size: 12px;
margin-top: 15px;
}
.msg .city{
.choose_back .msg .city{
padding:4px 0;
width:80%;
height:36px;
line-height: 28px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
......@@ -285,11 +289,11 @@ export default {
box-sizing: border-box
}
.msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
.choose_back .msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
border-color: none;
}
.msg .el-input__inner{
.choose_back .msg .el-input__inner{
border: none;
height: 100%;
}
......
src/components/Ticket/FillItinerary.vue
View file @ 51fe91e9
......@@ -44,7 +44,7 @@
</div>
</div>
</el-col>
<el-col :span="9" style="border-right:1px dashed #AAAAAA;position:relative">
<el-col class="coupon_left" :span="9" style="position:relative">
<div class="bz">返程</div>
<div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backDate}}
......@@ -75,8 +75,9 @@
</div>
</div>
</el-col>
<el-col class="w31" :span="6">
<p>订单金额
<el-col class="w31 coupon_con" :span="6">
<div style="margin:15px 0;border-left:1px dashed #aaaaaa;padding:0 6px">
<p>订单金额
<span class="yu">余{{getlistSigel.synum}}</span>
</p>
<p style="font-size:12px;padding-top:20px">
......@@ -95,6 +96,8 @@
老人票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice }} x {{personNum.oldPeopleNum}}</span>
</P>
</div>
</el-col>
</div>
......@@ -152,7 +155,7 @@
</p>
</div>
</el-col>
<el-col :span="20">
<el-col class="formList" :span="20">
<el-form-item label="乘机人" :prop="'guestList.'+index+'.name'" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]">
<el-input size="mini" v-model="item.name"></el-input>
</el-form-item>
......@@ -162,19 +165,19 @@
<el-form-item label="出生日期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker size="mini" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.birthday" style="width: 100%;"></el-date-picker>
</el-form-item>
<el-form-item label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group v-model="item.sex">
<el-radio label="1" value="1">男</el-radio>
<el-radio label="2" value="2">女</el-radio>
</el-radio-group>
<el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]">
<el-input size="mini" v-model="item.mobilePhone"></el-input>
</el-form-item>
<el-form-item label="国籍">
<el-select size="mini" v-model="item.nationality" filterable placeholder="请选择国籍">
<el-select style="width:100%" size="mini" v-model="item.nationality" filterable placeholder="请选择国籍">
<el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]">
<el-input size="mini" v-model="item.mobilePhone"></el-input>
<el-form-item label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group v-model="item.sex">
<el-radio label="1" value="1">男</el-radio>
<el-radio label="2" value="2">女</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</div>
......@@ -185,7 +188,7 @@
<!-- 联系人 -->
<div v-show="!personnums" class="lxr_info" style="margin-top:20px;background:#fff;">
<p class="lxr">联系人信息</p>
<el-form style="width:90%" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<el-form style="width:90%;margin:5px auto" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input size="mini" v-model="personNum.contactName"></el-input>
</el-form-item>
......@@ -400,12 +403,54 @@ export default {
}
</script>
<style>
.formList{
display: flex;
justify-content: space-around;
flex-wrap: wrap;
}
.coupon_left::before{
content: '';
position: absolute;
top: 0;
left: 0;
right:0;
height:50%;
background:radial-gradient(circle at right top, #f5f5f5 15px, transparent 15px, transparent 15px)
}
.coupon_left::after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right:0;
height:50%;
background:radial-gradient(circle at right bottom, #f5f5f5 15px, transparent 15px, transparent 15px)
}
.coupon_con{
position: relative;
}
.coupon_con::before{
content: '';
position: absolute;
top: 0;
left: 0;
right:0;
height:50%;
background:radial-gradient(circle at left top, #f5f5f5 15px, #252525 15px, transparent 15px)
}
.coupon_con::after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right:0;
height:50%;
background:radial-gradient(circle at left bottom, #f5f5f5 15px, #252525 15px, transparent 15px)
}
.w31{
/* background: #58a; */
/* background: radial-gradient(circle at 0 25px, transparent 15px, #58a 16px) top left,
radial-gradient(circle at 100px 25px, transparent 15px, #58a 16px) right top;
background-size: 50% 100%;
background-repeat: no-repeat; */
padding:0!important;
}
.ticket_list .padd{
padding-left:25px;
......@@ -449,7 +494,7 @@ export default {
.lxr_info .el-form-item{
display: inline-block;
width:33%;
margin-bottom: 5px;
/* margin-bottom: 5px; */
}
.lxr{
height:36px;
......@@ -466,7 +511,7 @@ font-size: 14px;
line-height: 36px;
}
.el-form-item__error{
top:80%;
/* top:80%; */
}
.tx_list:nth-last-child(1){
......@@ -485,6 +530,7 @@ font-size: 14px;
margin-top:10px;
width:59px;
font-size: 12px;
margin-left: 30px;
text-align:center;
background:rgba(255,255,255,1);
border:1px solid rgba(73,192,161,1);
......@@ -492,7 +538,7 @@ font-size: 14px;
.tx_order .el-form-item{
display: inline-block;
width:30%;
margin-bottom: 5px;
/* margin-bottom: 5px; */
}
.tx_order .tx .number{
......
src/components/Ticket/Pay.vue
View file @ 51fe91e9
......@@ -155,7 +155,7 @@ export default {
"/api/dmc/airticket/GetB2BAirtickOrderPayInfo",
{ AirOrderId: this.AirOrderId },
res => {
// console.log("huoqu", res);
console.log("huoqu", res);
if (res.data.resultCode == 1) {
this.Commoditydetails = res.data.data;
this.code.OrderSource=this.Commoditydetails.orderResourceId;
......@@ -182,18 +182,20 @@ export default {
this.wxpay_imgcode = false;
this.code.payway = str;
this.apipost(
"OnlinePay_post_GetCodeUrl",
"OnlinePay_post_GetCodeUrlForAirB2B",
this.code,
res => {
this.codeLoading=false;
if (res.data.resultCode == 1) {
this.codeInfo=res.data.data;
console.log("codeInfo",this.codeInfo)
console.log("二维码过期时间",moment(this.codeInfo.ExpireDate).format('x'))
this.code_yxq=moment(this.codeInfo.ExpireDate).format('x')-moment(this.codeInfo.NowDate).format('x');
this.PayOrder=this.codeInfo.OrderID;
clearInterval(this.Pay_timer);
this.Time5();
this.PayStatus();
// this.PayStatus();
if (str == "1") {
//微信
this.wxpay_imgcode = true;
......
src/components/Ticket/TicketHome.vue
View file @ 51fe91e9
......@@ -119,7 +119,7 @@
<!-- <img src="../../assets/img/ticket/banner.png" alt=""> -->
</div>
<div class="yh" style="background:#fff">
<div v-for="(item,key) in yhList" :key="key">
<div @click="GoUrl(item)" v-for="(item,key) in yhList" :key="key" style="cursor:pointer">
<img :src="item.airlineUrl" alt="">
<div class="list_content">
<p class="des">
......@@ -173,6 +173,12 @@ export default {
this.JXYH();
},
methods: {
GoUrl(item){
// console.log(item)
this.$router.push({
path: `/ticket/FillItinerary/${item.id}`
})
},
JXYH(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.Youhui,res=>{
// console.log("Youhui",res)
......@@ -329,69 +335,6 @@ p{
}
.msg .el-select{
width: 130px;
height: 100%;
}
.el-select>.el-input{
width: 100%;
}
.msg .el-button{
width:77px;
height:32px;
background:rgba(238,68,84,1);
border-radius:4px;
color: #ffffff;
border: none;
}
.el-input-number .el-input{
width: 95px;
}
.msg .number{
width:140px;
height:34px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
padding-left: 6px;
box-sizing: border-box;
display: inline-block;
margin-right: 20px;
}
.el-input-number{
width:95px;
height: 100%;
}
.msg{
color: #000000;
font-size: 12px;
margin-top: 15px;
}
.msg .city{
width:95%;
height:36px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
padding-left: 6px;
padding-bottom: 2px;
box-sizing: border-box
}
.msg .el-input{
height: 100%;
}
.msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
border-color: none;
}
.msg .el-input__inner{
border: none;
height: 100%;
}
.banner{
position: relative;
}
......
src/components/Ticket/TicketList.vue
View file @ 51fe91e9
......@@ -44,7 +44,6 @@
type="date"
placeholder="选择日期">
</el-date-picker>
<span>{{startweek}}</span>
</div>
<div class="city">
<span>归期 | </span>
......@@ -53,7 +52,6 @@
type="date"
placeholder="选择日期">
</el-date-picker>
<span>{{endweek}}</span>
</div>
</el-col>
<el-col :span="13">
......@@ -79,7 +77,7 @@
<div>
<div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span>
<el-select v-model="choose_info.freightSpace" placeholder="请选择">
<el-select style="width:68%" v-model="choose_info.freightSpace" placeholder="请选择">
<el-option :value="zero" label="不限"></el-option>
<el-option
v-for="item in cawei"
......@@ -91,7 +89,7 @@
</div>
<div class="city" style="width:250px;display:inline-block;margin:0 10px">
<span>航空公司 | </span>
<el-select style="width:160px" filterable v-model="choose_info.airLineID" placeholder="请选择">
<el-select style="width:68%" filterable v-model="choose_info.airLineID" placeholder="请选择">
<el-option :value="zero" label="不限"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
......@@ -185,24 +183,27 @@
<span class="green num" v-if="item.goIsNextDay==1">+{{item.goIsNextDay}}</span>
</el-col>
</div>
<div v-if="item.ticketType==2">
<el-col :span="2" style="text-align:right">
<div v-if="item.ticketType==2" style="margin-top:15px">
<el-row>
<el-col :span="2" style="text-align:right">
<span class="cilcle">返</span>
</el-col>
<el-col :span="7" style="text-align:right">
<p class="time">{{item.backStartHouseTime}}</p>
<p class="adress">{{item.backStartAirPlace}}</p>
</el-col>
<el-col :span="7" style="text-align:right">
<p class="time">{{item.backStartHouseTime}}</p>
<p class="adress">{{item.backStartAirPlace}}</p>
</el-col>
<el-col :span="6" style="text-align:center">
<p style="font-size:12px;color:rgba(102,102,102,1);">{{item.backTotalTime}}</p>
<p class="fg"></p>
<p class="adress" v-if="item.backTransfer"><span class="green">{{item.backTransfer}}</span>转机</p>
</el-col>
<el-col :span="8" style="text-align:left">
<p class="time">{{item.backEndHouseTime}}</p>
<p class="adress">{{item.backEndAirPlace}}</p>
<span class="green num" v-if="item.backIsNextDay==1">+{{item.backIsNextDay}}</span>
</el-col>
<el-col :span="6" style="text-align:center">
<p style="font-size:12px;color:rgba(102,102,102,1);">{{item.backTotalTime}}</p>
<p class="fg"></p>
<p class="adress" v-if="item.backTransfer"><span class="green">{{item.backTransfer}}</span>转机</p>
</el-col>
<el-col :span="8" style="text-align:left">
<p class="time">{{item.backEndHouseTime}}</p>
<p class="adress">{{item.backEndAirPlace}}</p>
<span class="green num" v-if="item.backIsNextDay==1">+{{item.backIsNextDay}}</span>
</el-col>
</el-row>
</div>
</el-col>
......@@ -261,17 +262,23 @@
<span v-if="item.freightSpace==3">经济舱</span>
</p>
</el-col>
<el-col :span="4">
<p style="font-size:12px;margin:10px 0;">剩余机位</p>
<p>{{item.synum}}</p>
</el-col>
<el-col :span="4">
<el-col :span="6">
<p style="font-size:12px">余位
<span style="color:#49C0A1">{{item.synum}}</span>
</p>
<el-button @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
购买
</el-button>
</el-col>
</el-col>
</el-row>
<el-pagination class="pagination" style="text-align:right"
@current-change="CurrentChange"
background
layout="prev, pager, next"
:total="count">
</el-pagination>
</el-col>
</el-row>
</div>
......@@ -355,6 +362,7 @@ export default {
airlineList:[],
cfd:[],
loading:false,
count:0,
}
},
......@@ -515,10 +523,15 @@ export default {
},null)
},
CurrentChange(val){
this.choose_info.pageIndex=val;
this.getList();
},
getList(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.choose_info,res=>{
// console.log("机票列表",res)
this.datalist=res.data.data.pageData;
this.count=res.data.data.count;
if(this.datalist.length>0){
this.datalist.forEach(item=>{
item.synum=item.airTicketScatterNum-item.useScatterNum;
......@@ -593,9 +606,37 @@ export default {
<style>
@import '../../assets/global/font.css';
@import '../../assets/css/reset.css';
.ticketlist_content .pagination{
margin:10px 0;
}
.ticketlist_content .el-pagination .btn-next{
height:28px;
}
.ticketlist_content .el-pagination .btn-prev{
height:28px;
}
.ticket_1 .msg .el-input__icon{
line-height: 0;
}
.ticket_1 .msg .el-select{
width: 130px;
height: 100%;
}
.ticket_1 .msg .el-select>.el-input{
width: 100%;
}
.ticket_1 .msg .el-button{
width:77px;
height:32px;
background:rgba(238,68,84,1);
border-radius:4px;
color: #ffffff;
border: none;
}
.ticket_1 .msg .el-input-number .el-input{
width: 95px;
}
.ticket_1 .msg .number{
width:150px;
height:34px;
......@@ -606,8 +647,45 @@ export default {
box-sizing: border-box;
display: inline-block;
margin-right: 20px;
padding-bottom:2px;
}
.ticket_1 .msg .el-input-number{
width:95px;
height: 100%;
}
.ticket_1 .msg{
color: #000000;
font-size: 12px;
margin-top: 15px;
}
.ticket_1 .msg .city{
padding:4px 0;
width:80%;
height:36px;
line-height: 28px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
padding-bottom: 2px;
padding-left: 6px;
box-sizing: border-box
}
.ticket_1 .msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
border-color: none;
}
.ticket_1 .msg .el-input__inner{
border: none;
height: 100%;
}
.ticketlist_content .first{
height: 100%;
overflow: auto;
}
.el-popover{
padding:0;
}
......@@ -794,4 +872,6 @@ p{
background:rgba(221,221,221,1);
line-height: 36px;
}
</style>
\ No newline at end of file
src/router.js
View file @ 51fe91e9
This diff is collapsed.
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