Skip to content

A
Athena
Commit f3ebff50 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 40708075 08778c75
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 57 deletions
src/App.vue
View file @ f3ebff50
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_s1n6yedme5h.css';
@import '//at.alicdn.com/t/font_863923_2ymixipq7o3.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/components/DependentTravel/IndependentTravel.vue
View file @ f3ebff50
......@@ -125,7 +125,7 @@
<img class="left1" src="../../assets/img/travel/left1.png" alt="">
<img class="right1" src="../../assets/img/travel/right1.png" alt="">
<el-col :span="18" :offset="3">
<div style="margin-top:15px;">
<div style="margin-top:45px;">
<p style="text-align:center;font-family:PingFang-SC-Regular;">Hot crash free rides</p>
<div class="djjx">
<span class="cont_top">热门速成自由行</span>
......@@ -227,21 +227,17 @@ export default {
},
mounted() {},
methods: {
Seasonenter(num){
let imgStr=`img`+num;
console.log(imgStr)
Seasonenter(num){
this.$nextTick(()=>{
console.log(this.$refs.imgStr)
// this.$refs.imgStr.style.height = 90+"px";
// this.SeasonBtn=num;
this.$refs[`img${num}`].style.height = 90+"px";
this.SeasonBtn=num;
})
},
Seasonleave(num){
let imgStr=`img${num}`
this.$nextTick(()=>{
// this.$refs.imgStr.style.height =130+"px";
// this.SeasonBtn=-1;
this.$refs[`img${num}`].style.height = 130+"px";
this.SeasonBtn=-1;
})
},
enter(num){
......
src/components/Ticket/Pay.vue
View file @ f3ebff50
......@@ -87,13 +87,13 @@
<router-link to="/TicketList" style="color:#ee4454;text-decoration:underline">返回重新下单>></router-link>
</div>
<div class="orderPay" v-show="order_exit=='3'">
<div class="div_1">
<img src="../../assets/img/ticket/gou.png" alt="">
<img src="../../assets/img/ticket/fail.png" alt="">
<!-- <img v-if="!payok" src="../../assets/img/ticket/fail.png" alt=""> -->
<div style="padding-left:80px;box-sizing: border-box;width:100%">
<p style="font-size:24px;color:#333;font-weight:700">订单支付成功！</p>
<!-- <p v-if="!payok" style="font-size:24px;color:#333;font-weight:700">订单支付失败！</p> -->
<p style="font-size:12px;color:#333">如有疑问 可致电028-565464646，点击
<router-link to="/AirlineTicketOrder" style="color:#ee4454;text-decoration:underline">查看订单>></router-link>
</p>
......@@ -151,6 +151,8 @@ export default {
Pay_timer:"",
CodeVialdTime:0,
payway:-1,
};
},
created() {
......@@ -183,11 +185,12 @@ export default {
);
},
Code(str) {
this.payway=str?this.payway=str:this.payway;
this.codeLoading=true;
this.code_ts="";
this.zfbpay_imgcode = false;
this.wxpay_imgcode = false;
this.code.payway = str;
this.code.payway = this.payway;
this.apipost(
"OnlinePay_post_GetCodeUrlForAirB2B",
this.code,
......@@ -206,10 +209,10 @@ export default {
this.Time5();
this.PayStatus();
if (str == "1") {
if (this.payway == "1") {
//微信
this.wxpay_imgcode = true;
} else if (str == "3") {
} else if (this.payway == "3") {
//支付宝
this.zfbpay_imgcode = true;
}
......@@ -255,7 +258,6 @@ export default {
// 验证是否支付成功
PayStatus(){
console.log("this.PayOrder",this.PayOrder)
this.Pay_timer = setInterval(() => {
this.apipost(
"ticket_get_GetAirPayMoneyIsSuccess",
......@@ -266,7 +268,8 @@ export default {
clearInterval(this.Pay_timer);
this.order_exit='3';
}else{
// this.$message.info(res.message)
// this.$message.error(res.message)
// this.payok=false;
}
},
err => {}
......@@ -300,8 +303,13 @@ export default {
this.code_timer = setInterval(() => {
numall--;
if (numall <= 0) {
if(this.CodeVialdTime>0){
this.Code();
}else{
this.code_ts="二维码有效时限过期，点击重新生成"
clearInterval(this.code_timer);
clearInterval(this.code_timer);
}
}
this.time_zfb_5 = this.s_to_hs(numall);
}, 1000);
......
src/components/Ticket/TicketHome.vue
View file @ f3ebff50
<template>
<div class="ticket_home">
<div class="banner" :height="bannerHeight" style="width:100%">
<img src="../../assets/img/ticket/banner.png" alt="">
<div class="banner" style="width:100%">
<el-carousel arrow="always" :height="banner_height" :interval="10000" trigger="click" :style="{'background':'#ddd'}">
<el-carousel-item>
<img src='../../assets/img/ticket/banner01.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/ticket/banner03.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/ticket/banner05.jpg'>
</el-carousel-item>
<el-carousel-item>
<img src='../../assets/img/ticket/banner07.jpg'>
</el-carousel-item>
</el-carousel>
<div class="choose">
<div class="choose_w">
<div class="choose_1">
......@@ -108,7 +121,7 @@
</div>
</div>
<div class="banner_img" style="margin:0 auto;margin-top:20px;">
<el-carousel ref="carousel" trigger="click" :height="carousel_height">
<el-carousel ref="carousel" arrow="never" :height="carousel_height">
<el-carousel-item>
<el-row :gutter="18" style="height:100%">
<el-col :span="18" :offset="3" style="height:100%">
......@@ -216,7 +229,7 @@
<p class="des">
<!-- -->
<span>{{item.flightList[0].departureName}} - {{item.flightList[item.flightList.length-1].arrivalCityName}} </span>
<span class="money">￥{{item.scatterB2BPrice}}</span>
<span class="money">￥{{item.scatterB2BPrice | priceFormat}}</span>
</p>
<p>
<img style="width:20px;height:20px" :src="item.airlineUrl" alt="">
......@@ -256,7 +269,7 @@ export default {
cityStatus: "",
carousel_height: "0px",
bannerHeight: "282px",
banner_height: "0px",
Youhui: {
isDiscounts: 1
},
......@@ -410,8 +423,10 @@ export default {
);
},
loadSize() {
let w = document.body.clientWidth * 0.75;
this.carousel_height = w * 0.269 + "px";
let w = document.body.clientWidth;
this.carousel_height = w * 0.269* 0.75 + "px";
this.banner_height=w*0.205+"px";
}
}
};
......@@ -599,6 +614,7 @@ export default {
width: 100%;
height: 175px;
bottom: -10px;
z-index:100;
}
.choose_w {
width: 1350px;
......
src/components/Ticket/TicketList.vue
View file @ f3ebff50
......@@ -466,12 +466,10 @@ export default {
this.getList();
},
SelectChild(item) {
this.datainfo.qFlightDateStart = moment(item.date_str).format(
"YYYY-MM-DD HH:mm:ss"
);
this.choose_info.qFlightDateStart = item.date_str;
this.other = false;
this.Datelist();
this.choose_info.qFlightDateStart = item.date_str;
//
},
Purchase(item) {
......@@ -531,18 +529,9 @@ export default {
this.choose_info.departure_city =this.choose_info.departure_cityname == ""? 0: this.choose_info.departure_city;
this.choose_info.arrival_city =this.choose_info.arrival_cityname == "" ? 0: this.choose_info.arrival_city;
this.choose_info.airTicketScatterNum =
this.choose_info.cr + this.choose_info.child + this.choose_info.ye;
this.choose_info.cr + this.choose_info.child + this.choose_info.ye;
console.log("this.choose_info", this.choose_info);
this.datainfo = this.choose_info;
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();
......@@ -608,24 +597,33 @@ export default {
},
// 获取点击时间
GetClickDate(item) {
this.datainfo.qFlightDateStart = moment(item.timeStr).format(
"YYYY-MM-DD HH:mm:ss"
);
this.datainfo.qFlightDateStart = moment(item.timeStr).format("YYYY-MM-DD HH:mm:ss");
this.Datelist();
this.choose_info.qFlightDateStart = item.timeStr;
},
Datelist() {
this.datainfo = this.choose_info;
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.datainfo.qFlightDateStart = moment(this.datainfo.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
this.other_date = this.datainfo;
this.other_date.flithtMonthDate = moment(
this.datainfo.qFlightDateStart
).format("YYYY-MM");
this.other_date.flithtMonthDate = moment(this.datainfo.qFlightDateStart).format("YYYY-MM");
this.OtherDate();
this.apiJavaPost(
"/api/dmc/airticket/getB2BAirticketForMinPrice",
this.datainfo,
res => {
this.getList();
this.dateList = res.data.data;
let time = moment(this.choose_info.qFlightDateStart).format(
"YYYY-MM-DD"
......
src/components/global/head.vue
View file @ f3ebff50
......@@ -88,7 +88,7 @@ color:rgba(51,51,51,1);
<!-- <el-menu-item index="2-3">单团</el-menu-item>
<el-menu-item index="2-4">私人订制</el-menu-item> -->
</el-submenu>
<!-- <el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item> -->
<el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item>
<!-- <el-menu-item index="4" @click="goUrl('VisaHomePage',true)"><a href="javascript:void(0);">签证</a></el-menu-item> -->
<!-- <el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item> -->
......
src/components/mall/newcalendar.vue
View file @ f3ebff50
......@@ -110,9 +110,7 @@ export default {
}
},
getYearMonthDay(list){
// console.log("dfsdgsg",list)
this.priceData=list[0];
// let day=moment(this.day).add(1, 'month').format('YYYY-MM-DD');
let day=this.day;
let currentYear = day.substring(0,4); //当前年份
let currentMonth =day.substring(5,7); //当前月份
......@@ -139,13 +137,18 @@ export default {
var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay();//得到每个月1号是周几
// for (let i in this.priceData) {
let today=moment().format("YYYY-MM-DD");
for (let i=0;i<this.priceData.length;i++) {
let price = this.priceData[i];
let dateStr=moment(price.dateStr).format("YYYY-MM-DD");
var dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
var dayDict = daysData[Number(dayIndex)-1];
// console.log("dayIndex",dayIndex)
// console.log("dayDict",dayDict)
dayDict.price = price.price;
if (moment(dateStr).isBefore(today)){
dayDict.price='';
}else{
dayDict.price = price.price;
}
// dayDict.price = price.price;
dayDict.date_str=price.dateStr;
if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price='';
......@@ -160,7 +163,7 @@ export default {
this.daysData = firstDayData.concat(daysData);
}else{
this.daysData = daysData;
}
}
},
isleapYears(year){
if (((year % 4)==0) && ((year % 100)!=0) || ((year % 400)==0)) {
......
src/components/visa/VisaHomePage.vue
View file @ f3ebff50
......@@ -27,13 +27,14 @@
<el-row :gutter="20">
<el-col :span="18" :offset="3">
<ul class="visa_process">
<li style="width:110px;background:#FDF5F7;padding:0 10px;box-shadow:3px 0px 6px 0px rgba(102,102,102,0.45);">
<li style="position:relative;width:110px;background:#FDF5F7;padding:0 10px;box-shadow:5px 0px 6px 0px #eee">
<div style="padding-top:10px">
<img src="../../assets/img/visa/visa.png" alt="">
</div>
<div style="position:absolute;top:18px;right:6px">
签证流程
</div>
<div class="visa_xz"></div>
</li>
<li>
<div>
......@@ -364,6 +365,16 @@ export default {
</script>
<style scoped>
@import url('../../assets/mall/swiper.css');
.visa_process .visa_xz{
position: absolute;
width: 0;
height: 0;
border-width: 8px;
border-style: solid;
border-color: transparent #eee transparent transparent;
right: 0px;
top:14px;
}
.coun_hover_visa div:hover{
background: #5079ED;
border: 1px solid #5079ED;
......
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