Skip to content

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

修改

parent 4cf9f7ea
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 79 deletions
src/App.vue
View file @ e5dbff32
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_5a8yeisxuxj.css';
@import '//at.alicdn.com/t/font_863923_74m8au7e9xx.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/components/Ticket/ChooseCity.vue
View file @ e5dbff32
......@@ -121,7 +121,7 @@ export default {
}
#ChooseCity .ChooseCity .flex_box li{
list-style: none;
width:16.67%;
width:16.6%;
padding:4px 0 4px 6px;
box-sizing: border-box;
margin:4px 0;
......@@ -135,7 +135,7 @@ export default {
justify-content: flex-start;
margin:0;
padding:0;
color: #333333;
color: #000000;
}
#ChooseCity .ChooseCity .el-tabs__item:hover{
......@@ -148,14 +148,13 @@ export default {
color: #EE4454;
}
#ChooseCity .ChooseCity{
width: 600px;
/* height: 300px; */
width: 507px;
background: #ffffff;
box-shadow:0px 1px 8px 0px rgba(153,153,153,0.6);
z-index:2000;
padding:10px 15px;
padding:10px;
box-sizing: border-box;
position: relative;
/* overflow-y: scroll; */
font-size: 12px;
font-family: "MicrosoftYaHei"
}
</style>
src/components/Ticket/ChooseCity1.vue
View file @ e5dbff32
......@@ -102,7 +102,7 @@ export default {
</script>
<style>
#ChooseCity .ChooseCity .icon-cha:hover{
/* #ChooseCity .ChooseCity .icon-cha:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .icon-cha{
......@@ -121,7 +121,7 @@ export default {
}
#ChooseCity .ChooseCity .flex_box li{
list-style: none;
width:16.67%;
width:16.6%;
padding:4px 0 4px 6px;
box-sizing: border-box;
margin:4px 0;
......@@ -150,12 +150,12 @@ export default {
#ChooseCity .ChooseCity{
width: 600px;
/* height: 300px; */
background: #ffffff;
box-shadow:0px 1px 8px 0px rgba(153,153,153,0.6);
z-index:2000;
padding:10px 15px;
/* background: #ffffff; */
/* box-shadow:0px 1px 8px 0px rgba(153,153,153,0.6); */
/* z-index:2000; */
/* padding:10px 15px;
box-sizing: border-box;
position: relative;
position: relative; */
/* overflow-y: scroll; */
}
/* } */
</style>
src/components/Ticket/FillItinerary.vue
View file @ e5dbff32
......@@ -132,9 +132,9 @@
</div>
<div style="position:absolute;right:5px">
<div style="position:absolute;right:5px;top:8px">
<span>专员：</span>
<el-select size="small" v-model="personNum.enterID" filterable placeholder="请选择专员">
<el-select size="mini" style="width:100px" v-model="personNum.enterID" filterable placeholder="请选择专员">
<el-option v-for="item in SellInfoList" :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId"></el-option>
</el-select>
</div>
......@@ -276,7 +276,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;
......@@ -378,7 +378,9 @@ export default {
this.personnums=false;
},
submitForm(addMsg) {
this.$refs[addMsg].validate((valid) => {
console.log("valid",valid)
if(valid) {
this.personNum.customerId=this.userInfo.accountId;
......
src/components/Ticket/OrderDetails.vue
View file @ e5dbff32
......@@ -107,10 +107,10 @@
</div>
<div style="position:absolute;right:5px;top:3px">
<div style="position:absolute;right:5px;top:2px">
<el-button @click="disabled=false" style="margin-right:10px" v-if="personNum.status==3" class="status_3" size="mini" >修改信息</el-button>
<span>服务专员：</span>
<el-select :disabled="disabled" size="small" v-model="personNum.enterID" filterable placeholder="请选择专员">
<el-select style="width:100px" :disabled="disabled" size="mini" 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>
......
src/components/Ticket/Pay.vue
View file @ e5dbff32
......@@ -4,15 +4,22 @@
<el-col :span="18" :offset="3">
<!-- 头部 -->
<div class="head">
<p style="font-size:14px">订单提交成功！剩余支付时间
<i class="iconfont icon-jinggao"></i>
<div style="padding-left:40px;box-sizing:border-box">
<p style="font-size:14px;font-weight:600">
订单提交成功！剩余支付时间
<span style="color:#FF680B;font-size:18px">{{time_15}}</span>
<span style="text-align:center;float:right">应付金额
<span style="text-align:center;float:right;">
<span style="font-weight:200">应付金额</span>
<span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
</span>
</p>
<p style="font-size:12px">请您在
<span style="color:#FF680B;">15分钟</span>
内完成支付，否则订单会自动取消</p>
</div>
</div>
<div class="payvue_content">
......@@ -21,8 +28,8 @@
订单号 : {{Commoditydetails.airOrderId}}
<div class="triangle_border_left"></div>
</div>
<p style="text-align:center;font-size:24px">支付金额
<span style="color:#FF680B;font-size:30px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
<p style="text-align:center;font-size:18px">支付金额
<span style="color:#FF680B;font-size:20px;font-weight:700">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
</p>
<el-row style="margin-top:15px" v-loading="codeLoading">
<el-col class="position" style="padding-right:50px" :span="12">
......@@ -176,9 +183,7 @@ export default {
);
},
Code(str) {
this.codeLoading=true;
console.log("this.codeLoading",this.codeLoading)
this.code_ts="";
this.zfbpay_imgcode = false;
this.wxpay_imgcode = false;
......@@ -187,6 +192,7 @@ export default {
"OnlinePay_post_GetCodeUrlForAirB2B",
this.code,
res => {
console.log(res)
this.codeLoading=false;
if (res.data.resultCode == 1) {
this.codeInfo=res.data.data;
......@@ -195,7 +201,7 @@ export default {
if((this.code_yxq/1000)>this.CodeVialdTime){
this.CodeVialdTime=(this.code_yxq/1000);
}
this.PayOrder=this.codeInfo.OrderID;
this.PayOrder=this.codeInfo.Pay_Order;
clearInterval(this.Pay_timer);
this.Time5();
......@@ -210,19 +216,21 @@ export default {
if(res.data.data.IsUpdateAirOrderPayStatus==1){
// 获取支付状态
this.apiJavaPost(
"/api/dmc/airticket/SetB2BAirtickOrderPayStatus",
{ AirOrderId: this.AirOrderId },
res => {
if (res.data.resultCode == 1) {
// this.apiJavaPost(
// "/api/dmc/airticket/SetB2BAirtickOrderPayStatus",
// { AirOrderId: this.AirOrderId },
// res => {
// if (res.data.resultCode == 1) {
}else{
this.$message.error(res.data.message)
}
},
null);
// }else{
// this.$message.error(res.data.message)
// }
// },
// null);
}
}else{
this.$message.error(res.data.message)
}
},
err => {}
......@@ -247,6 +255,7 @@ export default {
// 验证是否支付成功
PayStatus(){
console.log("this.PayOrder",this.PayOrder)
this.Pay_timer = setInterval(() => {
this.apipost(
"ticket_get_GetAirPayMoneyIsSuccess",
......@@ -256,6 +265,8 @@ export default {
if (res.data.resultCode == 1) {
clearInterval(this.Pay_timer);
this.order_exit='3';
}else{
// this.$message.info(res.message)
}
},
err => {}
......@@ -300,7 +311,15 @@ export default {
</script>
<style>
.pay_vue{
font-family: "PingFang"
}
.pay_vue .icon-jinggao{
color: #49C0A1;
font-size: 38px;
position: absolute;
top:8px;
}
.orderPay .div_2 p span:nth-child(2){
float: right;
}
......@@ -417,6 +436,7 @@ export default {
}
.pay_vue .head {
padding: 4px 0;
position: relative;
}
.payvue_content {
min-height:479px;
......
src/components/Ticket/TicketHome.vue
View file @ e5dbff32
......@@ -36,7 +36,7 @@
<v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
</div>
<span slot="reference">
<el-input clearable @focus="CityCompStatus('end')" class="ChooseCity" style="width:65%" v-model="choose_info.arrival_cityname" placeholder="城市">
<el-input size="mini" clearable @focus="CityCompStatus('end')" class="ChooseCity" style="width:65%" v-model="choose_info.arrival_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
......@@ -50,6 +50,7 @@
value-format="yyyy-MM-dd"
v-model="choose_info.qFlightDateStart"
type="date" style="width:75%"
:picker-options="pickerOptions0"
placeholder="选择日期">
</el-date-picker>
<!-- <span>{{startweek}}</span> -->
......@@ -313,7 +314,12 @@ export default {
input10: "",
value: "",
airlineList: [],
cfd: []
cfd: [],
pickerOptions0: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
};
},
mounted() {
......@@ -403,7 +409,6 @@ export default {
"/api/dmc/airticket/getB2BAirticketList",
this.Youhui,
res => {
console.log("Youhui",res)
this.yhList = res.data.data.pageData;
},
null
......@@ -422,6 +427,10 @@ export default {
@import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css";
@import "../../assets/global/global.css";
@import "../../assets/css/reset.css";
.el-popover{
padding:0;
border: none;
}
.list_content .goumai{
position: absolute;
right:10px;
......@@ -439,7 +448,7 @@ export default {
}
.choose_back .msg .el-input-number--mini{
line-height: 32px;
line-height: 30px;
}
.choose_back .msg .el-input__icon{
line-height: 0;
......@@ -465,7 +474,8 @@ export default {
}
.choose_back .msg .number{
width:170px;
height:36px;
height:34px;
/* line-height: 34px; */
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
......@@ -489,10 +499,10 @@ export default {
} */
.choose_back .msg .city{
position: relative;
padding:4px 0;
/* padding:4px 0; */
width:80%;
height:36px;
line-height: 28px;
height:34px;
line-height: 34px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
......
src/components/Ticket/TicketList.vue
View file @ e5dbff32
......@@ -33,10 +33,11 @@
<el-col :span="5">
<div class="city" style="margin-bottom:15px">
<span>出发 <i class="iconfont icon-vertical_line"></i> </span>
<el-date-picker @change="changeStart"
<el-date-picker
value-format="yyyy-MM-dd"
v-model="choose_info.qFlightDateStart"
type="date" style="width:80%"
:picker-options="pickerOptions0"
style="width:80%"
placeholder="选择日期">
</el-date-picker>
<!-- <span>{{startweek}}</span> -->
......@@ -138,7 +139,7 @@
<div @click="BeforeDate" style="color:#dddddd;font-size:20px" class="margin common">
<i class="iconfont icon-xiangzuo"></i>
</div>
<div @click="GetClickDate(item)" class="li" :class="{'active_data':index==4}" v-for="(item,index) in dateList" :key="index">
<div @click="GetClickDate(item)" class="li" :class="{'active_data':item.active=='yes'}" v-for="(item,index) in dateList" :key="index">
<div>
<p class="font_12" style="color:#FF680B">￥{{parseFloat(item.price) | priceFormat}}</p>
<p class="font_12">{{item.monthTime}} {{item.week}}</p>
......@@ -153,7 +154,7 @@
placement="bottom"
trigger="click">
<div ref="otherdate" class="otherdate">
<div style="font-size:16px;padding:10px">
<div style="font-size:16px;padding:10px;text-align:center">
<el-col :span="8"><span @click="ChangeMonth(1)" class="month_circle">&lt;</span> </el-col>
<el-col :span="8">{{tomonth}}</el-col>
<el-col :span="8"><span @click="ChangeMonth(2)" class="month_circle">&gt;</span></el-col>
......@@ -317,7 +318,7 @@
<p style="font-size:12px">余位
<span style="color:#49C0A1">{{item.synum}}</span>
</p>
<el-button v-if="item.synum>0" @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
<el-button v-if="item.synum>0 && item.isPayOrder==1" @click="Purchase(item)" style="color:#FF6633;border:1px solid #FF6633;margin-top:10px" size="small">
购买
</el-button>
</el-col>
......@@ -368,7 +369,7 @@ export default {
qFlightDateStart:""
},
dateList:[],
changeday:moment().format("YYYY-MM-DD HH:mm:ss"),
changeday:"",
other:false,
other_date:{
flithtMonthDate:moment().format("YYYY-MM")
......@@ -385,7 +386,7 @@ export default {
pageIndex:1,
pageSize:10,
id:0,
qFlightDateStart:"",
qFlightDateStart:null,
qFlightDateEnd:"",
flight_number:"",
airLineID:0,
......@@ -422,6 +423,11 @@ export default {
cfd:[],
loading:false,
count:0,
pickerOptions0: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
}
},
......@@ -439,7 +445,12 @@ export default {
this.choose_info=JSON.parse(sessionStorage.getItem("ChooseInfo"));
this.choose_info.priceSort=0;
this.choose_info.timeSort=0;
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss")
if(!this.choose_info.qFlightDateStart || this.choose_info.qFlightDateStart=="Invalid date"){
this.datainfo.qFlightDateStart=moment().format("YYYY-MM-DD HH:mm:ss");
}
else{
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
}
},
......@@ -561,11 +572,6 @@ export default {
}
},
changeStart(val){
let num=moment(val,'YYYY-MM-DD').format('E');
this.startweek=this.Weekday(num);
this.choose_info.qFlightDateStart=moment(val).format('YYYY-MM-DD');
},
changeEnd(val){
let num=moment(val,'YYYY-MM-DD').format('E');
this.endweek=this.Weekday(num);
......@@ -575,12 +581,16 @@ export default {
// moment("2018-10-29",'YYYY-MM-DD').format('E')
handleChange(){},
Search(){
// console.log("this.choose_info",this.choose_info)
// this.choose_info.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
this.loading=true;
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");
if(this.choose_info.qFlightDateStart==null){
this.choose_info.qFlightDateStart=moment().format("YYYY-MM-DD");
this.datainfo.qFlightDateStart=moment().format("YYYY-MM-DD HH:mm:ss");
}
else{
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
}
this.loading=true;
this.Datelist();
sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info));
},
......@@ -616,6 +626,12 @@ export default {
},
// 获取当前日期的前一天
BeforeDate(){
let today = moment().format('YYYY-MM-DD')
let changeday=moment(this.changeday).format('YYYY-MM-DD');
if(today==changeday){
this.$message.error('不能选择过去的日期！');
return;
}
this.changeday=moment(this.changeday).subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss');
this.datainfo.qFlightDateStart=this.changeday;
this.choose_info.qFlightDateStart=moment(this.changeday).format('YYYY-MM-DD');
......@@ -633,6 +649,13 @@ export default {
// console.log(res);
this.getList();
this.dateList=res.data.data;
let time=moment(this.choose_info.qFlightDateStart).format('YYYY-MM-DD');
this.dateList.forEach(item=>{
if(item.timeStr==time){
item.active="yes";
this.changeday=item.timeStr;
}
})
},null)
},
......@@ -643,7 +666,9 @@ export default {
},
getList(){
this.loading=true;
this.choose_info.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD");
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.choose_info,res=>{
// console.log(res);
this.loading=false;
if(res.data.resultCode==1){
......@@ -837,10 +862,9 @@ export default {
font-size: 12px;
}
.ticket_1 .msg .city{
padding:4px 0;
width:270px;
height:36px;
line-height: 28px;
height:34px;
line-height: 34px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
border-radius:4px;
......@@ -946,7 +970,7 @@ li{
border: none;
}
.otherdate{
width: 520px;
width: 500px;
position: absolute;
right: 0;
z-index: 5;
......
src/components/global/head.vue
View file @ e5dbff32
......@@ -13,7 +13,6 @@
color:#fff;
font-size: 12px;
text-align: center;
padding:6px;
}
.header .zf{
width:38px;
......@@ -24,15 +23,15 @@
font-size: 12px;
text-align: center;
line-height: 38px;
padding:7px;
/* padding:4px; */
/* margin-top:8px */
}
.header .fg{
margin: 0 6px;
margin-top:30px!important;
width:86px;
height:1px;
background:rgba(170,170,170,1);
height:1px;
background:rgba(170,170,170,1);
}
.header .head_title{
padding-top:15px;
......
src/components/mall/newcalendar.vue
View file @ e5dbff32
......@@ -14,11 +14,11 @@
font-size: 14px;
font-family: 'PingFangR';
}
.dayList{
.newcalendar-box .dayList{
position: relative;
float: left;
width: 13.88%;
height: 65px;
height: 57px;
cursor: pointer;
border: 1px solid transparent;
background-color: #F5F5F5;
......@@ -42,16 +42,17 @@
width: 100%;
text-align: center;
padding:0;
margin: 10px 0;
margin: 6px 0;
}
.dayList p.price{
float: initial;
width: 100%;
text-align: center;
padding:0;
margin: 10px 0;
margin: 6px 0;
color: #EE4454;
}
font-size: 12px;
}
.dayList.yesPrice:hover{
background: #FF680B;
color:#fff!important;
......
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