Skip to content

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

机票订单

parent 86abd42d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2104 additions and 1273 deletions
package-lock.json
View file @ 41149810
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 41149810
......@@ -22,7 +22,7 @@
"vuex": "^3.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.0.4",
"@vue/cli-plugin-babel": "^3.4.1",
"@vue/cli-plugin-pwa": "^3.0.4",
"@vue/cli-service": "^3.0.4",
"stylus": "^0.54.5",
......
src/components/Ticket/Choose.vue
View file @ 41149810
......@@ -9,7 +9,7 @@
<el-col :span="5">
<div class="city" style="margin-bottom:15px">
<span>出发地 | </span>
<el-select style="width:75%" v-model="choose_info.departure_city" filterable placeholder="请选择">
<el-select style="width:70%" v-model="choose_info.departure_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cfd"
......@@ -21,7 +21,7 @@
</div>
<div class="city">
<span>目的地 | </span>
<el-select style="width:75%" v-model="choose_info.arrival_city" filterable placeholder="请选择">
<el-select style="width:70%" v-model="choose_info.arrival_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cfd"
......
src/components/Ticket/FillItinerary.vue
View file @ 41149810
......@@ -139,6 +139,13 @@
<el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button>
<el-button size="mini" style="background:#EE4454;color:#fff">取消</el-button>
</div>
<div style="position:absolute;right:5px">
<span>专员：</span>
<el-select size="small" v-model="personNum.enterID" filterable placeholder="请选择专员">
<el-option v-for="(item,key) in SellInfoList" :key="key" :label="item.EmName" :value="item.EmployeeId"></el-option>
</el-select>
</div>
</div>
<el-form :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
......@@ -249,11 +256,13 @@ export default {
userInfo:this.getLocalStorage(),
customer:{},
countroylist:[],
SellInfoList:[],
}
},
mounted () {
this.GetDes();
this.GetCountroy()
this.SellInfo();
},
methods: {
// 国籍
......@@ -273,7 +282,7 @@ export default {
//获取订单详情
GetDes(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{
console.log("订单",res)
// console.log("订单",res)
this.getlistSigel=res.data.data;
this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
......@@ -398,6 +407,22 @@ export default {
});
},
// 服务专员
SellInfo(){
this.apipost(
"sell_get_GetCustomerToSellInfo", {},
res => {
console.log(res)
if (res.data.resultCode == 1) {
this.SellInfoList = res.data.data;
this.personNum.enterID=this.SellInfoList[0].EmployeeId;
}
},
err => {
}
);
},
}
}
......@@ -561,6 +586,7 @@ font-size: 14px;
display: flex;
justify-content: flex-start;
font-size: 14px;
position: relative;
}
.ticket_list .time{
color: #333333;
......
src/components/Ticket/OrderDetails.vue 0 → 100644
View file @ 41149810
This diff is collapsed.
src/components/Ticket/Pay.vue
View file @ 41149810
......@@ -226,11 +226,9 @@ export default {
clearInterval(this.timer);
let numall =parseInt(this.Commoditydetails.timeMillisecond / 1000);
// let numall =10;
this.timer = setInterval(() => {
numall--;
if (numall <= 0) {
console.log(111);
clearInterval(this.timer);
this.order_exit='2';
this.order_exit_info="订单支付超时，请重新下单！"
......
src/components/Ticket/TicketHome.vue
View file @ 41149810
......@@ -226,7 +226,7 @@ export default {
.list_content p{
padding:4px 0;
}
p{
.list_content p{
margin:0;
}
.list_content .time{
......@@ -350,7 +350,7 @@ p{
height:175px;
padding:10px;
bottom: -10px;
left: 16%;
left: 18%;
border-radius: 4px;
box-sizing: border-box;
}
......
src/components/Ticket/TicketList.vue
View file @ 41149810
......@@ -77,7 +77,7 @@
<div>
<div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span>
<el-select style="width:68%" v-model="choose_info.freightSpace" placeholder="请选择">
<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"
......@@ -802,9 +802,14 @@ li{
border-right:1px solid #dddddd;
}
.li p{
padding: 6px 0;
margin:0;
padding:0;
}
.second p{
margin:0;
padding:0;
}
.date_list>div{
text-align: center;
......@@ -846,10 +851,6 @@ li{
font-weight:400;
color:rgba(51,51,51,1);
}
p{
margin: 0;
padding: 0;
}
.list{
padding:10px 6px;
box-sizing: border-box;
......
src/plugins/index.js
View file @ 41149810
......@@ -13,8 +13,9 @@ export default {
Vue.prototype.domainManager = function() {
// var domainUrl = "http://test_reborn.oytour.com";//主域名
//var domainUrl = "http://reborn.oytour.com"; //主域名
// var domainUrl = "http://192.168.2.214:8082"//主域名
let domainUrl = "https://reborn.oytour.com"; //刘东主域名
var domainUrl = "http://192.168.2.16:8083"//主域名
// let domainUrl = "https://reborn.oytour.com"; //刘东主域名
// let domainUrl = "https://reborn.oytour.com";
if (this.isOnline()) {
if(window.location.host.indexOf('viitto.com')!=-1)
domainUrl = "http://test.viitto.com"
......
src/router.js
View file @ 41149810
......@@ -133,7 +133,16 @@ export default new Router({
meta: {
title: "发票信息"
}
}
},
{
path: "/AirlineTicketOrder",
name: "AirlineTicketOrder",
component: resolve =>
require(["@/components/Ticket/AirlineTicketOrder"], resolve),
meta: {
title: "机票订单"
}
},
]
},
......@@ -173,24 +182,26 @@ export default new Router({
title: "支付"
}
},
{
path: "/AirlineTicketOrder",
name: "AirlineTicketOrder",
path: "/EditTicketOrder/:id",
name: "EditTicketOrder",
component: resolve =>
require(["@/components/Ticket/AirlineTicketOrder"], resolve),
require(["@/components/Ticket/EditTicketOrder"], resolve),
meta: {
title: "机票订单"
title: "修改机票订单"
}
},
{
path: "/EditTicketOrder/:id",
name: "EditTicketOrder",
path: "/OrderDetails/:id",
name: "OrderDetails",
component: resolve =>
require(["@/components/Ticket/EditTicketOrder"], resolve),
require(["@/components/Ticket/OrderDetails"], resolve),
meta: {
title: "修改机票订单"
title: "机票订单详情"
}
}
},
]
}
]
......
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