Skip to content

A
Athena
Commit 65250f4f authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent 177306bc
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 55 deletions
src/components/Ticket/AirlineTicketOrder.vue
View file @ 65250f4f
......@@ -88,11 +88,18 @@
<el-table-column
label="状态">
<template slot-scope="scope">
<p style="cursor:pointer">
<span v-if="scope.row.status==2">取消</span>
<span style="color:#EE4454" v-if="scope.row.status==3">待付款</span>
<span v-if="scope.row.status==1">正常</span>
</p>
<div style="cursor:pointer">
<p v-if="scope.row.refundStatus!=1">
<span v-if="scope.row.refundStatus==2">退款中</span>
<span v-if="scope.row.refundStatus==3">已退款</span>
</p>
<p v-else>
<span v-if="scope.row.status==1">正常</span>
<span v-if="scope.row.status==2">取消</span>
<span v-if="scope.row.status==3">待付款</span>
</p>
</div>
<p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p>
</template>
</el-table-column>
......@@ -156,7 +163,7 @@ export default {
// 退款
TuiKuan(index,row){
this.$confirm('是否确认退款?', '提示', {
this.$confirm('是否申请退款?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
......@@ -165,6 +172,7 @@ export default {
// console.log(res);
if(res.data.resultCode==1){
this.$message.success("请求成功！")
this.List();
}
......@@ -214,7 +222,7 @@ export default {
this.form.endTime=this.form.time[1];
}
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
console.log(res);
// console.log(res);
this.loading=false;
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
......
src/components/Ticket/Choose.vue
View file @ 65250f4f
......@@ -42,15 +42,26 @@
</el-date-picker>
<!-- <span>{{startweek}}</span> -->
</div>
<div class="city">
<div class="city" style="display:inline-block;">
<span>舱位选择 | </span>
<el-select style="width:70%" v-model="choose_info.freightSpace" placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<!-- <div class="city">
<span>归期 | </span>
<el-date-picker @change="changeEnd"
v-model="choose_info.qFlightDateEnd"
type="date" style="width:80%"
placeholder="选择日期">
</el-date-picker>
<!-- <span>{{endweek}}</span> -->
</div>
</div> -->
</el-col>
<el-col :span="13">
<div style="margin-bottom:15px">
......@@ -73,18 +84,7 @@
</div>
<div>
<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"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</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="请选择">
......
src/components/Ticket/Pay.vue
View file @ 65250f4f
......@@ -365,7 +365,7 @@ export default {
position: absolute;
}
.payvue_content .pay_img {
width: 338px;
width: 340px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 6px 0px rgba(107, 107, 107, 0.2);
padding: 28px 10px;
......
src/components/Ticket/TicketHome.vue
View file @ 65250f4f
......@@ -3,9 +3,12 @@
<div class="banner" :height="bannerHeight" style="width:100%">
<img src="../../assets/img/ticket/banner.png" alt="">
<div class="choose">
<div class="choose_1">
<v-choose @ChooseInfo="ChooseInfo"></v-choose>
<div class="choose_w">
<div class="choose_1">
<v-choose @ChooseInfo="ChooseInfo"></v-choose>
</div>
</div>
</div>
</div>
<div class="banner_two">
......@@ -346,23 +349,29 @@ export default {
}
.choose{
position: absolute;
min-width: 1350px;
background: rgba(255, 255, 255, 0.24);
width: 100%;
height:175px;
padding:10px;
bottom: -10px;
left: 18%;
bottom: -10px;
}
.choose_w{
width: 1350px;
height: 100%;
margin:0 auto;
background: rgba(255, 255, 255, 0.24);
border-radius: 4px;
box-sizing: border-box;
padding:10px;
box-shadow:0px 2px 29px 0px rgba(107,107,107,0.27);
}
.choose_1{
width: 100%;
height: 100%;
margin:0 auto;
border-radius: 4px;
padding: 8px;
box-sizing: border-box;
background:rgba(255,255,255,1);
box-shadow:0px 2px 29px 0px rgba(107,107,107,0.27);
border-radius:0px 4px 4px 4px;
}
</style>
src/components/Ticket/TicketList.vue
View file @ 65250f4f
......@@ -2,7 +2,7 @@
<template>
<div v-loading="loading" element-loading-text="加载中">
<div class="ticket_1" style="background:rgba(255,255,255,1);box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);">
<div class="ticket_1" style="background:rgba(255,255,255,1);box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);padding-bottom:15px">
<el-row :gutter="20">
<el-col :span="20" :offset="2">
<el-row class="msg">
......@@ -45,14 +45,26 @@
placeholder="选择日期">
</el-date-picker>
</div>
<div class="city">
<div class="city" style="display:inline-block;">
<span>舱位选择 | </span>
<el-select style="width:80%" v-model="choose_info.freightSpace" placeholder="请选择">
<el-option :value="zero" label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<!-- <div class="city">
<span>归期 | </span>
<el-date-picker @change="changeEnd"
v-model="choose_info.qFlightDateEnd"
type="date"
placeholder="选择日期">
</el-date-picker>
</div>
</div> -->
</el-col>
<el-col :span="13">
<div style="margin-bottom:15px">
......@@ -75,18 +87,7 @@
</div>
<div>
<div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span>
<el-select style="width:65%" v-model="choose_info.freightSpace" placeholder="请选择">
<el-option :value="zero" label="不限"></el-option>
<el-option
v-for="item in cawei"
:key="item.id"
:label="item.title"
:value="item.id">
</el-option>
</el-select>
</div>
<div class="city" style="width:250px;display:inline-block;margin:0 10px">
<span>航空公司 | </span>
<el-select style="width:68%" filterable v-model="choose_info.airLineID" placeholder="请选择">
......@@ -142,8 +143,8 @@
<el-row :gutter="20">
<el-col :span="20" :offset="2">
<el-row class="px" style="margin-bottom:10px">
<el-col :span="16" style="color:rgba(51,51,51,1);font-size:16px;padding-left:6px">去程：成都-雅典</el-col>
<el-col :span="8" style="font-size:12px;color:rgba(102,102,102,1);">
<el-col :span="16" style="color:rgba(51,51,51,1);font-size:16px;padding-left:6px"> </el-col>
<el-col :span="8" style="font-size:12px;color:rgba(102,102,102,1);float:right">
<el-col :span="6">直飞优选</el-col>
<el-col :span="6">时间排序</el-col>
<el-col :span="6">总耗时</el-col>
......@@ -163,12 +164,16 @@
</el-col>
</el-row>
</el-col>
<el-col class="second" :span="10">
<el-col class="second" :span="12">
<div style="width:100%;overflow:auto;margin-bottom:10px">
<el-col v-if="item.ticketType==2" :span="2" style="text-align:right">
<span class="cilcle">往</span>
</el-col>
<el-col :span="7" style="text-align:right">
<el-col :span="4">
<p style="padding:6px;">{{item.goFlightTime}}</p>
</el-col>
<el-col :span="5" style="text-align:right">
<p class="time">{{item.goStartHouseTime}}</p>
<p class="adress">{{item.goStartAirPlace}}</p>
</el-col>
......@@ -177,7 +182,7 @@
<p class="fg"></p>
<p class="adress" v-if="item.goTransfer"><span class="green">{{item.goTransfer}}</span>转机</p>
</el-col>
<el-col :span="8" style="text-align:left">
<el-col :span="6" style="text-align:left">
<p class="time">{{item.goEndHouseTime}}</p>
<p class="adress">{{item.goEndAirPlace}}</p>
<span class="green num" v-if="item.goIsNextDay==1">+{{item.goIsNextDay}}</span>
......@@ -188,7 +193,10 @@
<el-col :span="2" style="text-align:right">
<span class="cilcle">返</span>
</el-col>
<el-col :span="7" style="text-align:right">
<el-col :span="4">
<p style="padding:6px;">{{item.backFlightTime}}</p>
</el-col>
<el-col :span="5" style="text-align:right">
<p class="time">{{item.backStartHouseTime}}</p>
<p class="adress">{{item.backStartAirPlace}}</p>
</el-col>
......@@ -197,7 +205,7 @@
<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">
<el-col :span="6" 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>
......@@ -207,7 +215,7 @@
</div>
</el-col>
<el-col class="third" :span="10" style="text-align:center">
<el-col class="third" :span="8" style="text-align:center">
<el-col :span="8">
<p class="orange font_12" style="margin-top:15px;position:relative">
<el-popover visible-arrow="false"
......@@ -267,7 +275,7 @@
<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 v-if="item.synum>0" @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
购买
</el-button>
</el-col>
......@@ -468,10 +476,12 @@ export default {
// moment("2018-10-29",'YYYY-MM-DD').format('E')
handleChange(){},
Search(){
// console.log("this.choose_info",this.choose_info)
this.loading=true;
this.getList();
this.Datelist();
sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info));
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
},
......@@ -513,6 +523,7 @@ export default {
},
Datelist(){
this.loading=true;
// console.log("this.datainfo",this.datainfo)
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketForMinPrice',this.datainfo,res=>{
// console.log(res);
this.loading=false;
......
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