Skip to content

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

update

parent 335f6169
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 641 additions and 161 deletions
src/components/Ticket/Choose.vue
View file @ 89b4e8b0
<template>
<div>
<div class="choose_back">
<el-row class="msg">
<div style="margin-bottom:10px">
<el-radio v-model="choose_info.ticketType" :label=1>单程</el-radio>
......@@ -8,7 +8,7 @@
<el-col :span="5">
<div class="city" style="margin-bottom:15px">
<span>出发地 | </span>
<el-select style="width:80%" v-model="choose_info.departure_city" filterable placeholder="请选择">
<el-select style="width:75%" v-model="choose_info.departure_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cfd"
......@@ -20,7 +20,7 @@
</div>
<div class="city">
<span>目的地 | </span>
<el-select style="width:80%" v-model="choose_info.arrival_city" filterable placeholder="请选择">
<el-select style="width:75%" v-model="choose_info.arrival_city" filterable placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option
v-for="item in cfd"
......@@ -39,7 +39,7 @@
type="date"
placeholder="选择日期">
</el-date-picker>
<span>{{startweek}}</span>
<!-- <span>{{startweek}}</span> -->
</div>
<div class="city">
<span>归期 | </span>
......@@ -48,7 +48,7 @@
type="date"
placeholder="选择日期">
</el-date-picker>
<span>{{endweek}}</span>
<!-- <span>{{endweek}}</span> -->
</div>
</el-col>
<el-col :span="13">
......@@ -72,7 +72,7 @@
</div>
<div>
<div class="city" style="width:200px;display:inline-block;">
<div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span>
<el-select v-model="choose_info.freightSpace" placeholder="请选择">
<el-option
......@@ -85,7 +85,7 @@
</div>
<div class="city" style="width:250px;display:inline-block;margin:0 10px">
<span>航空公司 | </span>
<el-select style="width:180px" filterable v-model="choose_info.airLineID" placeholder="请选择">
<el-select style="width:160px" filterable v-model="choose_info.airLineID" placeholder="请选择">
<el-option :value=0 label="不限"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
......@@ -109,7 +109,7 @@ export default {
pageIndex:1,
pageSize:10,
id:0,
qFlightDateStart:"",
qFlightDateStart:moment().format('YYYY-MM-DD'),
qFlightDateEnd:"",
flight_number:"",
airLineID:0,
......@@ -237,7 +237,7 @@ export default {
width: 130px;
height: 100%;
}
.el-select>.el-input{
.msg .el-select>.el-input{
width: 100%;
}
.msg .el-button{
......@@ -248,11 +248,11 @@ export default {
color: #ffffff;
border: none;
}
.el-input-number .el-input{
.msg .el-input-number .el-input{
width: 95px;
}
.msg .number{
width:140px;
.choose_back .msg .number{
width:150px;
height:34px;
background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1);
......@@ -262,7 +262,7 @@ export default {
display: inline-block;
margin-right: 20px;
}
.el-input-number{
.msg .el-input-number{
width:95px;
height: 100%;
}
......@@ -273,24 +273,25 @@ export default {
}
.msg .city{
width:80%;
height:34px;
height:36px;
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
}
.el-input{
.msg .el-input{
width: 145px;
height: 100%;
}
.el-input.is-active .el-input__inner, .el-input__inner:focus{
.msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
border-color: none;
}
.el-date-editor.el-input, .el-date-editor.el-input__inner{
.msg .el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 145px;
}
.el-input__inner{
.msg .el-input__inner{
border: none;
height: 100%;
}
......
src/components/Ticket/FillItinerary.vue
View file @ 89b4e8b0
This diff is collapsed.
src/components/Ticket/OrderPayOk.vue 0 → 100644
View file @ 89b4e8b0
<template>
<div>
<div class="orderPay">
<div class="div_1">
<img src="../../assets/img/ticket/gou.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 style="font-size:12px;color:#333">如有疑问 可致电028-565464646，点击
<a style="color:#ee4454;text-decoration:underline">查看订单>></a></p>
</div>
</div>
<div class="div_2">
<p>
<span>支付金额：￥12545</span>
<span>支付平台：支付宝</span>
</p>
<p>
<span>订单编号：584569846568</span>
<span>下单时间：2019-02-02</span>
</p>
</div>
<el-button size="mini" style="background:rgba(238,68,84,1);border-radius:4px;color:#fff">返回首页</el-button>
<img class="back" src="../../assets/img/ticket/back.png" alt="">
</div>
</div>
</template>
<script>
export default {
}
</script>
<style>
.orderPay .div_2 p span:nth-child(2){
float: right;
}
.orderPay .div_2 {
margin-top: 20px;
width: 320px;
}
.orderPay .div_2 p{
padding:6px 0;
margin:20px 0;
font-size: 12px;
color:#333;
border-bottom:1px solid rgba(221,221,221,1);
}
.orderPay .div_1 img{
width: 54px;
height:54px;
position: absolute;
}
.orderPay .div_1{
position: relative;
box-sizing: border-box;
}
.orderPay{
padding-top:130px;
padding-left:150px;
margin:30px auto;
width:1039px;
height:553px;
position: relative;
box-shadow:0px 4px 38px 0px rgba(107,107,107,0.2);
box-sizing: border-box;
}
.back{
position: absolute;
width: 384px;
height: 289px;
right:10px;
top:110px;
}
</style>
src/components/Ticket/Pay.vue 0 → 100644
View file @ 89b4e8b0
<template>
<div class="pay_vue">
<el-row :gutter="18">
<el-col :span="18" :offset="3">
<!-- 头部 -->
<div class="head">
<p style="font-size:14px">订单提交成功！剩余支付时间
<span style="color:#FF680B;font-size:18px">{{time_15}}</span>
<span style="text-align:center;float:right">应付金额
<span style="color:#FF680B;font-size:18px">￥1259</span>
</span>
</p>
<p style="font-size:12px">请您在
<span style="color:#FF680B;">15分钟</span>
内完成支付，否则订单会自动取消</p>
</div>
<div class="payvue_content">
<p class="ordernum">订单号</p>
<p style="text-align:center">支付金额
<span style="color:#FF680B;font-size:18px">￥1259</span>
</p>
<el-row style="margin-top:15px">
<el-col class="position" style="padding-right:50px" :span="12">
<div style="float:right" class="pay_img">
<div class="w21">
<img class="title_img" src="../../assets/img/ticket/zfb.png" alt="">
<div class="title_content">
<p>支付宝</p>
<p>
<span @click="Code('3')" style="cursor:pointer;color:#FF680B;font-size:14px">点击生成二维码</span>
打开支付宝扫码支付
</p>
</div>
</div>
<div v-show="pay_imgcode" style="text-align:center">
<img class="pay_imgcode" src="../../assets/img/ticket/weixin.png" alt="">
<p>二维码有效时限
<span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
</p>
</div>
</div>
</el-col>
<!-- <el-col class="position" style="padding-left:50px" :span="12">
<div class="pay_img">
<div class="w21">
<img class="title_img" src="../../assets/img/ticket/weixin.png" alt="">
<div class="title_content">
<p>微信</p>
<p>
<span @click="Code('1')" style="cursor:pointer;color:#FF680B;font-size:14px">点击生成二维码</span>
打开支付宝扫码支付
</p>
</div>
</div>
<div v-show="pay_imgcode" style="text-align:center">
<img class="pay_imgcode" src="../../assets/img/ticket/weixin.png" alt="">
<p>二维码有效时限
<span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
</p>
</div>
</div>
</el-col> -->
</el-row>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data() {
return {
pay_imgcode:false,
time_15:0,
time_zfb_5:0,
code:{
OrderSource:"",
body:"",
attach:'',
total_fee:'',
payway:'',
},
// AirOrderId:this.$route.params.id,
};
},
created() {
this.Time15();
},
methods: {
Code(str){
console.log(str)
this.code.payway=str;
this.pay_imgcode=true;
this.apipost(
"OnlinePay_post_GetCodeUrl",this.code,
res => {
console.log(res)
if (res.data.resultCode == 1) {
}
},
err => {
}
);
// this.Time5();
},
Time15(){
clearInterval(timer);
let timer;
let numall=15*60*1000;
timer=setInterval(()=>{
numall--;
if(numall<=0){
clearInterval(timer);
}
this.time_15=this.s_to_hs(numall)
},1000)
},
Time5(){
clearInterval(timer);
let timer;
let numall=5*60*1000;
timer=setInterval(()=>{
numall--;
if(numall<=0){
clearInterval(timer);
}
this.time_zfb_5=this.s_to_hs(numall)
},1000)
},
s_to_hs(s){
//计算分钟
//算法：将秒数除以60，然后下舍入，既得到分钟数
var h;
h = Math.floor(s/60/1000);
//计算秒
//算法：取得秒%60的余数，既得到秒数
s = s%60;
//将变量转换为字符串
h += '';
s += '';
//如果只有一位数，前面增加一个0
h = (h.length==1)?'0'+h:h;
s = (s.length==1)?'0'+s:s;
return h+'分'+s+"秒";
}
}
};
</script>
<style>
.position{
box-sizing: border-box;
}
.payvue_content .pay_img .pay_imgcode{
display: block;
margin:15px auto;
width:216px;
height:216px;
border:1px solid rgba(221,221,221,1);
}
.payvue_content .pay_img .w21 .title_content{
padding-left: 70px;
box-sizing: border-box;
overflow: auto;
}
.payvue_content .pay_img .w21{
position: relative;
}
.payvue_content .pay_img .title_img{
width: 47px;
height: 47px;
border-radius: 50%;
position: absolute;
}
.payvue_content .pay_img{
width:338px;
background:rgba(255,255,255,1);
box-shadow:0px 0px 6px 0px rgba(107,107,107,0.2);
padding:28px;
box-sizing: border-box;
}
.payvue_content .ordernum{
width:203px;
height:35px;
line-height:35px;
background: #49C0A1;
font-size:14px;
font-weight:400;
color:rgba(255,255,255,1);
padding-left:16px;
box-sizing: border-box;
}
.pay_vue p{
margin:0;
}
.pay_vue .head{
padding:4px 0;
}
.payvue_content{
margin-top:15px;
padding-bottom: 25px;
padding-top:16px;
background:rgba(255,255,255,1);
box-shadow:0px 4px 38px 0px rgba(107,107,107,0.2);
}
</style>
src/components/Ticket/TicketHome.vue
View file @ 89b4e8b0
......@@ -185,7 +185,7 @@ export default {
},null)
},
ChooseInfo(val){
console.log("ChooseInfo",val)
// console.log("ChooseInfo",val)
if(val){
this.Choose_Info=val;
this.Choose_Info.airTicketScatterNum=this.Choose_Info.cr+this.Choose_Info.lr+this.Choose_Info.child;
......@@ -369,11 +369,12 @@ p{
}
.msg .city{
width:95%;
height:34px;
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
}
.el-input{
......@@ -386,7 +387,7 @@ p{
.el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 145px;
}
.el-input__inner{
.msg .el-input__inner{
border: none;
height: 100%;
}
......@@ -404,7 +405,7 @@ p{
}
.choose{
position: absolute;
min-width: 1300px;
min-width: 1350px;
background: rgba(255, 255, 255, 0.24);
height:175px;
padding:10px;
......
src/components/Ticket/TicketList.vue
View file @ 89b4e8b0
This diff is collapsed.
src/components/global/head.vue
View file @ 89b4e8b0
<style>
@import "../../assets/global/header.css";
.header .Info div{
float: left;
margin-top:10px;
}
.header .ckxx{
width:38px;
height:38px;
background:rgba(73,192,161,1);
border-radius:50%;
color:#fff;
font-size: 10px;
text-align: center;
}
.header .zf{
width:38px;
height:38px;
background:rgba(170,170,170,1);
border-radius:50%;
color: #fff;
font-size: 12px;
text-align: center;
line-height: 38px;
/* margin-top:8px */
}
.header .fg{
margin: 0 6px;
margin-top:30px!important;
width:86px;
height:1px;
background:rgba(170,170,170,1);
}
.header .head_title{
padding-top:15px;
font-size:14px;
font-family:MicrosoftYaHei-Bold;
font-weight:bold;
color:rgba(51,51,51,1);
}
</style>
<template>
......@@ -32,7 +71,7 @@
</el-row>
</div>
<div class="second-nav">
<el-row v-if="homePage=='true'||!homePage">
<el-row v-if="homePage=='true'|| homePage==true">
<el-col :span="20" :offset="2">
<el-row>
<el-col :span="6">
......@@ -48,9 +87,9 @@
<!-- <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"><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="5"><a href="javascript:void(0);">机票</a></el-menu-item>
<el-menu-item index="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
<el-menu-item index="4"><a href="javascript:void(0);">餐厅</a></el-menu-item>
......@@ -70,7 +109,22 @@
</el-row>
</el-col>
</el-row>
<el-row v-if="homePage=='false'">
<el-row v-if="homePage=='ticket'">
<el-col :span="20" :offset="2" >
<el-row>
<el-col :span="6">
<img src='../../assets/img/logo.png' class="logo" />
</el-col>
<el-col :span="4" :offset="14" class="Info">
<div class="ckxx">乘客信息</div>
<div class="fg"></div>
<div class="zf">支付</div>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row v-if="homePage=='false' || homePage==false">
<el-col :span="20" :offset="2" >
<el-row>
<el-col :span="6">
......@@ -93,7 +147,7 @@
</template>
<script>
export default {
name: 'header',
props: {
msg: String
},
......@@ -101,21 +155,28 @@ export default {
return {
city:0,
sites:[],
defaultKey:'2-1',
defaultKey:sessionStorage.getItem("defaultKey"),
isLogin:false,
homePage:localStorage.homePage?localStorage.homePage:false,
// homePage:localStorage.homePage?localStorage.homePage:false,
// homePage:this.$store.state.homePage,
groupInfo:{}
}
},
created(){
console.log(this.defaultKey)
},
computed: {
user(){
return this.$store.state.user
}
},
homePage(){
return this.$store.state.homePage
}
},
watch:{
homePage:{
handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal)
},
deep: true
......@@ -142,8 +203,11 @@ export default {
this.$emit('forword', this.defaultKey)
},
methods: {
handleSelect(key, keyPath) {
// console.log(key)
console.log(key)
this.defaultKey=key;
sessionStorage.setItem("defaultKey",this.defaultKey);
this.$emit('forword', key)
},
loadSites(){
......@@ -166,13 +230,19 @@ export default {
goLoginUrl(path,t){
this.$store.commit('changeLogin',0);
this.$store.commit('updateUser',{});
this.$store.commit('HomePage','true')
localStorage.removeItem("userInfo");
localStorage.homePage = 'true';
sessionStorage.setItem("Homepage",'true');
// localStorage.homePage = 'true';
// console.log(" this.homePage.", this.homePage)
this.$router.push({name:path,query:{'type':t}})
},
goUrl(path,bl){
// console.log("path",path)
// console.log("bl",bl)
localStorage.homePage = bl;
this.homePage = localStorage.homePage;
this.$store.commit('HomePage',bl)
// console.log(" this.homePage.", this.homePage)
this.$router.push({name:path});
}
}
......
src/components/mall/newcalendar.vue
View file @ 89b4e8b0
......@@ -52,6 +52,14 @@
margin: 10px 0;
color: #ff4646;
}
.dayList:hover{
background: #FF680B;
color:#fff!important;
}
.dayList:hover .price{
color:#fff;
}
</style>
<template>
<div class="calendar-box" id='calendar'>
......@@ -61,7 +69,7 @@
</thead>
</table>
<div class="monthDayList">
<div v-for="(item,index) in daysData" class="dayList" :key="index" @click="item.price?selectDate(index):''" :class="{selectDay:isSelect == index,noPrice:!item.price,yesPrice:item.price}">
<div v-for="(item,index) in daysData" class="dayList" :key="index" @click="item.price?selectDate(item):''" :class="{selectDay:isSelect == index,noPrice:!item.price,yesPrice:item.price}">
<p>{{item.day}}</p>
<p v-if="item.price!='0.00' && item.price" class="price">￥{{item.price}}起</p>
</div>
......@@ -79,7 +87,8 @@ export default {
data(){
return{
week:['日','一','二','三','四','五','六'],
priceData:this.dateData,
// priceData:this.dateData[0],
priceData:[],
currentDay: this.day,
DaysInMonth:[],
daysData:[],
......@@ -91,31 +100,21 @@ export default {
},created(){
// this.getYearMonthDay();
},methods:{
selectDate(index){
if(this.$data.daysData[index].day == 0) {
bus.$emit('chosen-tripdate', null)
return;
}
if(this.isSelect == index){
this.isSelect = -1;
bus.$emit('chosen-tripdate', null)
selectDate(item){
// console.log(item);
if(item.price=="0.00"){
return;
}else{
this.$emit('SelectChild',item);
}
this.isSelect = index;
let currentDay = this.currentDay.split('-')
let clickDay = parseInt(this.$data.daysData[index].day)
clickDay = clickDay < 10 ? ('0' + clickDay) : clickDay
let clickDate = currentDay[0] + '-' + currentDay[1] + '-' + clickDay
this.$emit('ChildrenSelect', clickDate)
bus.$emit('chosen-tripdate', this.currentDay.substring(0,7) + '-' + clickDay)
},
getYearMonthDay(){
let day=moment(this.day).add(1, 'month').format('YYYY-MM-DD');
// let day=this.day;
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); //当前月份
// console.log("currentYear",currentYear)
let currentMonth =day.substring(5,7); //当前月份
// console.log("currentMonth",currentMonth)
let date = new Date();
let strDate = date.getDate();
......@@ -130,19 +129,23 @@ export default {
let monthDay = this.$data.DaysInMonth[Number(currentMonth)-1];//当前月的天数
let daysData = [];
//给数据源赋值
for (var i = 0 ;i < Number(monthDay) ;i++) {
var priceDict = {'day':String(i+1),'price':0,'dis':false};
for (let i = 0 ;i < Number(monthDay) ;i++) {
var priceDict = {'day':String(i+1),'price':0,'dis':false,date_str:''};
daysData.push(priceDict);
}
this.daysData = daysData;
var currentDay = `${currentYear}-${currentMonth}-01`;
var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay();//得到每个月1号是周几
for (var i in this.priceData) {
// for (let i in this.priceData) {
for (let i=0;i<this.priceData.length;i++) {
let price = this.priceData[i];
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;
dayDict.date_str=price.dateStr;
if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price='';
}
......
src/main.js
View file @ 89b4e8b0
......@@ -29,6 +29,16 @@ Vue.http = Vue.prototype.$http = axios
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.prototype.$echarts = echarts
router.beforeEach((to, from, next) => {
let ticket=to.path.substring(1, 7);
if(ticket=="ticket"){
sessionStorage.setItem("Homepage",'ticket');
store.commit('HomePage','ticket')
}else{
sessionStorage.setItem("Homepage",'true');
store.commit('HomePage','true')
}
if (to.meta.title) {
if(localStorage.g && localStorage.g!='undefined'){
if(JSON.parse(localStorage.g).i!=2)
......
src/plugins/index.js
View file @ 89b4e8b0
......@@ -12,9 +12,9 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function() {
// var domainUrl = "http://test_reborn.oytour.com";//主域名
var domainUrl = "http://reborn.oytour.com"; //主域名
//var domainUrl = "http://reborn.oytour.com"; //主域名
// var domainUrl = "http://192.168.2.214:8082"//主域名
// let domainUrl = "http://192.168.2.16:8083"; //刘东主域名
let domainUrl = "http://192.168.2.16:8083"; //刘东主域名
if (this.isOnline()) {
if(window.location.host.indexOf('viitto.com')!=-1)
domainUrl = "http://test.viitto.com"
......
src/router.js
View file @ 89b4e8b0
......@@ -140,12 +140,28 @@ export default new Router({
}
},
{
path: '/FillItinerary/:id',
path: '/ticket/FillItinerary/:id',
name: 'FillItinerary',
component: resolve => require(['@/components/Ticket/FillItinerary'], resolve),
meta: {
title: '行程填写'
}
},
{
path: '/ticket/OrderPayOk',
name: 'OrderPayOk',
component: resolve => require(['@/components/Ticket/OrderPayOk'], resolve),
meta: {
title: '确认订单'
}
},
{
path: '/ticket/Pay/:id',
name: 'Pay',
component: resolve => require(['@/components/Ticket/Pay'], resolve),
meta: {
title: '支付'
}
}
]
}
......
src/store.js
View file @ 89b4e8b0
......@@ -8,8 +8,13 @@ export default new Vuex.Store({
user:{},
site:0,
isLogin:0,
homePage:sessionStorage.getItem("Homepage") ? sessionStorage.getItem("Homepage") :true,
},
mutations: {
HomePage(state,data){
state.homePage=data;
},
updateSite(state, p) {
state.site = p
},
......
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