Skip to content

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

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

parents ef1bd497 eb2d7e74
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2020 additions and 157 deletions
src/components/Ticket/AirlineTicketOrder.vue 0 → 100644
View file @ f84742f7
<template>
<div class="AirlineTicketOrder">
<el-row>
<el-col :span="20" :offset="2">
<el-form ref="form" :model="form" label-width="100px">
<el-form-item label="订单状态:">
<el-select v-model="form.status" filterable size="mini">
<el-option label="全部" :value=0></el-option>
<el-option label="正常" :value=1></el-option>
<el-option label="取消" :value=2></el-option>
<el-option label="代付款" :value=3></el-option>
</el-select>
</el-form-item>
<el-form-item label="下单开始时间:">
<el-date-picker size="mini" type="date" placeholder="下单开始时间" v-model="form.startTime"></el-date-picker>
</el-form-item>
<el-form-item label="下单结束时间:">
<el-date-picker size="mini" type="date" placeholder="下单开始时间" v-model="form.endTime"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini">查询</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="tableData"
stripe
style="width: 100%">
<el-table-column
prop="id"
label="订单id">
</el-table-column>
<el-table-column
prop="contactName"
label="联系人姓名">
</el-table-column>
<el-table-column
prop="contactMobile"
label="联系人电话">
</el-table-column>
<el-table-column
prop="status"
label="订单状态">
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handleEdit(scope.$index, scope.row)">修改订单</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align:right;margin:10px 0;">
<el-pagination
@current-change="Currentchange"
background
layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data () {
return {
form:{
status:0,
startTime:'',
endTime:'',
pageIndex:1,
pageSize:15,
},
tableData:[],
total:0,
loading:false,
}
},
mounted() {
},
created(){
this.List();
},
methods: {
Currentchange(val){
this.form.pageIndex=val;
this.List();
},
handleEdit(index,row){
// console.log("row",row)
this.$router.push({
path: `/EditTicketOrder/${row.id}`
})
},
List(){
this.loading=true;
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
// console.log(res);
this.loading=false;
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
this.total=res.data.data.count;
}
},null)
},
}
}
</script>
<style>
.AirlineTicketOrder .el-pager{
margin-top:6px;
}
.AirlineTicketOrder .el-form-item{
display: inline-block;
margin:10px 5px;
}
</style>
src/components/Ticket/Choose.vue
View file @ f84742f7
<template> <template>
<div> <div class="choose_back">
<el-row class="msg"> <el-row class="msg">
<div style="margin-bottom:10px"> <div style="margin-bottom:10px">
<el-radio v-model="choose_info.ticketType" :label=1>单程</el-radio> <el-radio v-model="choose_info.ticketType" :label=1>单程</el-radio>
...@@ -8,25 +8,25 @@ ...@@ -8,25 +8,25 @@
<el-col :span="5"> <el-col :span="5">
<div class="city" style="margin-bottom:15px"> <div class="city" style="margin-bottom:15px">
<span>出发地 | </span> <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 :value=0 label="不限"></el-option>
<el-option <el-option
v-for="item in cawei" v-for="item in cfd"
:key="item.id" :key="item.ID"
:label="item.title" :label="item.Name"
:value="item.id"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="city"> <div class="city">
<span>目的地 | </span> <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 :value=0 label="不限"></el-option>
<el-option <el-option
v-for="item in cawei" v-for="item in cfd"
:key="item.id" :key="item.ID"
:label="item.title" :label="item.Name"
:value="item.id"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
<span>{{startweek}}</span> <!-- <span>{{startweek}}</span> -->
</div> </div>
<div class="city"> <div class="city">
<span>归期 | </span> <span>归期 | </span>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
<span>{{endweek}}</span> <!-- <span>{{endweek}}</span> -->
</div> </div>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="13">
...@@ -65,10 +65,14 @@ ...@@ -65,10 +65,14 @@
<span>婴儿 | </span> <span>婴儿 | </span>
<el-input-number size="mini" v-model="choose_info.ye" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number> <el-input-number size="mini" v-model="choose_info.ye" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div> </div>
<el-button @click="Search" size="small">搜索</el-button> <div class="number">
<span>老人 | </span>
<el-input-number size="mini" v-model="choose_info.lr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div>
</div> </div>
<div> <div>
<div class="city" style="width:200px;display:inline-block;margin-right:10px"> <div class="city" style="width:220px;display:inline-block;">
<span>舱位选择 | </span> <span>舱位选择 | </span>
<el-select v-model="choose_info.freightSpace" placeholder="请选择"> <el-select v-model="choose_info.freightSpace" placeholder="请选择">
<el-option <el-option
...@@ -79,14 +83,15 @@ ...@@ -79,14 +83,15 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="city" style="width:250px;display:inline-block"> <div class="city" style="width:250px;display:inline-block;margin:0 10px">
<span>航空公司 | </span> <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 :value=0 label="不限"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" <el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option> :key="item.AirLineId"></el-option>
</el-select> </el-select>
</div> </div>
<el-button @click="Search" size="small">搜索</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -104,7 +109,7 @@ export default { ...@@ -104,7 +109,7 @@ export default {
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
id:0, id:0,
qFlightDateStart:"", qFlightDateStart:moment().format('YYYY-MM-DD'),
qFlightDateEnd:"", qFlightDateEnd:"",
flight_number:"", flight_number:"",
airLineID:0, airLineID:0,
...@@ -118,6 +123,7 @@ export default { ...@@ -118,6 +123,7 @@ export default {
cr:0, cr:0,
child:0, child:0,
ye:0, ye:0,
lr:0,
}, },
startweek:"", startweek:"",
...@@ -135,6 +141,7 @@ export default { ...@@ -135,6 +141,7 @@ export default {
input10:"", input10:"",
value:"", value:"",
airlineList:[], airlineList:[],
cfd:[],
} }
}, },
...@@ -143,9 +150,22 @@ export default { ...@@ -143,9 +150,22 @@ export default {
}, },
created(){ created(){
this.initAirlines(); this.initAirlines();
this.CFD();
this.$emit("ChooseInfo",this.choose_info) this.$emit("ChooseInfo",this.choose_info)
}, },
methods: { methods: {
CFD(){
this.apipost(
"dict_post_Destination_GetCityList", {},
res => {
if (res.data.resultCode == 1) {
this.cfd=res.data.data;
}
},
err => {
}
);
},
// 航空公司下拉框 // 航空公司下拉框
initAirlines() { initAirlines() {
this.apipost( this.apipost(
...@@ -199,25 +219,28 @@ export default { ...@@ -199,25 +219,28 @@ export default {
handleChange(){}, handleChange(){},
Search(){ Search(){
this.choose_info.airTicketScatterNum=this.choose_info.cr+this.choose_info.child+this.choose_info.ye; this.choose_info.airTicketScatterNum=this.choose_info.cr+this.choose_info.child+this.choose_info.ye;
console.log(this.choose_info,'choose_info');
this.$emit("ChooseInfo",this.choose_info) this.$emit("ChooseInfo",this.choose_info)
sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info));
this.$router.push({ this.$router.push({
path: 'TicketList', path: 'TicketList'
query:this.choose_info
}) })
} }
} }
} }
</script> </script>
<style> <style>
.choose_back .msg .el-input__icon{
line-height: 0;
}
.msg .el-select{ .choose_back .msg .el-select{
width: 130px; width: 130px;
height: 100%; height: 100%;
} }
.el-select>.el-input{ .choose_back .msg .el-select>.el-input{
width: 100%; width: 100%;
} }
.msg .el-button{ .msg .el-button{
...@@ -228,11 +251,11 @@ export default { ...@@ -228,11 +251,11 @@ export default {
color: #ffffff; color: #ffffff;
border: none; border: none;
} }
.el-input-number .el-input{ .msg .el-input-number .el-input{
width: 95px; width: 95px;
} }
.msg .number{ .choose_back .msg .number{
width:140px; width:150px;
height:34px; height:34px;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1); border:1px solid rgba(216,218,220,1);
...@@ -242,7 +265,7 @@ export default { ...@@ -242,7 +265,7 @@ export default {
display: inline-block; display: inline-block;
margin-right: 20px; margin-right: 20px;
} }
.el-input-number{ .msg .el-input-number{
width:95px; width:95px;
height: 100%; height: 100%;
} }
...@@ -253,24 +276,20 @@ export default { ...@@ -253,24 +276,20 @@ export default {
} }
.msg .city{ .msg .city{
width:80%; width:80%;
height:34px; height:36px;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1); border:1px solid rgba(216,218,220,1);
border-radius:4px; border-radius:4px;
padding-bottom: 2px;
padding-left: 6px; padding-left: 6px;
box-sizing: border-box box-sizing: border-box
} }
.el-input{
width: 145px; .msg .el-input.is-active .el-input__inner, .el-input__inner:focus{
height: 100%;
}
.el-input.is-active .el-input__inner, .el-input__inner:focus{
border-color: none; border-color: none;
} }
.el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 145px; .msg .el-input__inner{
}
.el-input__inner{
border: none; border: none;
height: 100%; height: 100%;
} }
......
src/components/Ticket/EditTicketOrder.vue 0 → 100644
View file @ f84742f7
This diff is collapsed.
src/components/Ticket/FillItinerary.vue 0 → 100644
View file @ f84742f7
This diff is collapsed.
src/components/Ticket/OrderPayOk.vue 0 → 100644
View file @ f84742f7
<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 @ f84742f7
This diff is collapsed.
src/components/Ticket/TicketHome.vue
View file @ f84742f7
...@@ -175,7 +175,7 @@ export default { ...@@ -175,7 +175,7 @@ export default {
methods: { methods: {
JXYH(){ JXYH(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.Youhui,res=>{ this.apiJavaPost('/api/dmc/airticket/getB2BAirticketList',this.Youhui,res=>{
console.log("Youhui",res) // console.log("Youhui",res)
this.yhList=res.data.data.pageData; this.yhList=res.data.data.pageData;
},null) },null)
}, },
...@@ -185,9 +185,11 @@ export default { ...@@ -185,9 +185,11 @@ export default {
},null) },null)
}, },
ChooseInfo(val){ ChooseInfo(val){
console.log("ChooseInfo",val) // console.log("ChooseInfo",val)
if(val){ if(val){
this.Choose_Info=val; this.Choose_Info=val;
this.Choose_Info.airTicketScatterNum=this.Choose_Info.cr+this.Choose_Info.lr+this.Choose_Info.child;
} }
}, },
loadSize(){ loadSize(){
...@@ -367,24 +369,22 @@ p{ ...@@ -367,24 +369,22 @@ p{
} }
.msg .city{ .msg .city{
width:95%; width:95%;
height:34px; height:36px;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(216,218,220,1); border:1px solid rgba(216,218,220,1);
border-radius:4px; border-radius:4px;
padding-left: 6px; padding-left: 6px;
padding-bottom: 2px;
box-sizing: border-box box-sizing: border-box
} }
.el-input{ .msg .el-input{
width: 145px;
height: 100%; 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; border-color: none;
} }
.el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 145px; .msg .el-input__inner{
}
.el-input__inner{
border: none; border: none;
height: 100%; height: 100%;
} }
...@@ -402,7 +402,7 @@ p{ ...@@ -402,7 +402,7 @@ p{
} }
.choose{ .choose{
position: absolute; position: absolute;
min-width: 1300px; min-width: 1350px;
background: rgba(255, 255, 255, 0.24); background: rgba(255, 255, 255, 0.24);
height:175px; height:175px;
padding:10px; padding:10px;
......
src/components/Ticket/TicketList.vue
View file @ f84742f7
This diff is collapsed.
src/components/global/head.vue
View file @ f84742f7
<style> <style>
@import "../../assets/global/header.css"; @import "../../assets/global/header.css";
.header .Info div{
float: left;
margin-top:10px;
}
.header .ckxx{
width:39px;
height:39px;
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> </style>
<template> <template>
...@@ -32,7 +71,7 @@ ...@@ -32,7 +71,7 @@
</el-row> </el-row>
</div> </div>
<div class="second-nav"> <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-col :span="20" :offset="2">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -48,9 +87,11 @@ ...@@ -48,9 +87,11 @@
<!-- <el-menu-item index="2-3">单团</el-menu-item> <!-- <el-menu-item index="2-3">单团</el-menu-item>
<el-menu-item index="2-4">私人订制</el-menu-item> --> <el-menu-item index="2-4">私人订制</el-menu-item> -->
</el-submenu> </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="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="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
<el-menu-item index="4"><a href="javascript:void(0);">餐厅</a></el-menu-item> <el-menu-item index="4"><a href="javascript:void(0);">餐厅</a></el-menu-item>
<el-menu-item index="3"><a href="javascript:void(0);">景区</a></el-menu-item> <el-menu-item index="3"><a href="javascript:void(0);">景区</a></el-menu-item>
<el-menu-item index="6"><a href="javascript:void(0);">签证</a></el-menu-item> --> <el-menu-item index="6"><a href="javascript:void(0);">签证</a></el-menu-item> -->
...@@ -68,7 +109,22 @@ ...@@ -68,7 +109,22 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </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-col :span="20" :offset="2" >
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -78,6 +134,7 @@ ...@@ -78,6 +134,7 @@
<el-menu default-active="" class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455"> <el-menu default-active="" class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455">
<el-menu-item index="1" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人主页</a></el-menu-item> <el-menu-item index="1" @click="goUrl('PsCenter',false)"><a href="javascript:void(0);">个人主页</a></el-menu-item>
<el-menu-item index="2" @click="goUrl('PsOrder',false)"><a href="javascript:void(0);">订单管理</a></el-menu-item> <el-menu-item index="2" @click="goUrl('PsOrder',false)"><a href="javascript:void(0);">订单管理</a></el-menu-item>
<el-menu-item index="6" @click="goUrl('AirlineTicketOrder',false)"><a href="javascript:void(0);">机票订单</a></el-menu-item>
<el-menu-item index="3"><a href="javascript:void(0);">经营管理</a></el-menu-item> <el-menu-item index="3"><a href="javascript:void(0);">经营管理</a></el-menu-item>
<el-menu-item index="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item> <el-menu-item index="4" @click="goUrl('PsSystem',false)"><a href="javascript:void(0);">系统管理</a></el-menu-item>
<el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item> <el-menu-item index="5" @click="goUrl('PsAccBalance',false)"><a href="javascript:void(0);">账户余额</a></el-menu-item>
...@@ -91,7 +148,7 @@ ...@@ -91,7 +148,7 @@
</template> </template>
<script> <script>
export default { export default {
name: 'header',
props: { props: {
msg: String msg: String
}, },
...@@ -99,21 +156,28 @@ export default { ...@@ -99,21 +156,28 @@ export default {
return { return {
city:0, city:0,
sites:[], sites:[],
defaultKey:'2-1', defaultKey:sessionStorage.getItem("defaultKey"),
isLogin:false, isLogin:false,
homePage:localStorage.homePage?localStorage.homePage:false, // homePage:localStorage.homePage?localStorage.homePage:false,
// homePage:this.$store.state.homePage,
groupInfo:{} groupInfo:{}
} }
}, },
created(){
console.log(this.defaultKey)
},
computed: { computed: {
user(){ user(){
return this.$store.state.user return this.$store.state.user
} },
homePage(){
return this.$store.state.homePage
}
}, },
watch:{ watch:{
homePage:{ homePage:{
handler: function(val, oldVal) { handler: function(val, oldVal) {
// console.log(val)
// console.log(oldVal) // console.log(oldVal)
}, },
deep: true deep: true
...@@ -140,8 +204,11 @@ export default { ...@@ -140,8 +204,11 @@ export default {
this.$emit('forword', this.defaultKey) this.$emit('forword', this.defaultKey)
}, },
methods: { methods: {
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
// console.log(key) console.log(key)
this.defaultKey=key;
sessionStorage.setItem("defaultKey",this.defaultKey);
this.$emit('forword', key) this.$emit('forword', key)
}, },
loadSites(){ loadSites(){
...@@ -164,13 +231,21 @@ export default { ...@@ -164,13 +231,21 @@ export default {
goLoginUrl(path,t){ goLoginUrl(path,t){
this.$store.commit('changeLogin',0); this.$store.commit('changeLogin',0);
this.$store.commit('updateUser',{}); this.$store.commit('updateUser',{});
this.$store.commit('HomePage','true')
localStorage.removeItem("userInfo"); 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}}) this.$router.push({name:path,query:{'type':t}})
}, },
goUrl(path,bl){ goUrl(path,bl){
localStorage.homePage = bl; // console.log("path",path)
this.homePage = localStorage.homePage; if(path=='heel'){
sessionStorage.setItem("defaultKey",'2-1');
this.$emit('forword', '2-1')
}
sessionStorage.setItem("Homepage",bl);
this.$store.commit('HomePage',bl)
this.$router.push({name:path}); this.$router.push({name:path});
} }
} }
......
src/components/mall/newcalendar.vue
View file @ f84742f7
...@@ -52,6 +52,14 @@ ...@@ -52,6 +52,14 @@
margin: 10px 0; margin: 10px 0;
color: #ff4646; color: #ff4646;
} }
.dayList:hover{
background: #FF680B;
color:#fff!important;
}
.dayList:hover .price{
color:#fff;
}
</style> </style>
<template> <template>
<div class="calendar-box" id='calendar'> <div class="calendar-box" id='calendar'>
...@@ -61,7 +69,7 @@ ...@@ -61,7 +69,7 @@
</thead> </thead>
</table> </table>
<div class="monthDayList"> <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>{{item.day}}</p>
<p v-if="item.price!='0.00' && item.price" class="price">￥{{item.price}}起</p> <p v-if="item.price!='0.00' && item.price" class="price">￥{{item.price}}起</p>
</div> </div>
...@@ -69,6 +77,7 @@ ...@@ -69,6 +77,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
import bus from '../../plugins/event-bus' import bus from '../../plugins/event-bus'
export default { export default {
props:{ props:{
...@@ -78,7 +87,8 @@ export default { ...@@ -78,7 +87,8 @@ export default {
data(){ data(){
return{ return{
week:['日','一','二','三','四','五','六'], week:['日','一','二','三','四','五','六'],
priceData:this.dateData, // priceData:this.dateData[0],
priceData:[],
currentDay: this.day, currentDay: this.day,
DaysInMonth:[], DaysInMonth:[],
daysData:[], daysData:[],
...@@ -88,31 +98,23 @@ export default { ...@@ -88,31 +98,23 @@ export default {
},mounted(){ },mounted(){
},created(){ },created(){
this.getYearMonthDay(); // this.getYearMonthDay();
},methods:{ },methods:{
selectDate(index){ selectDate(item){
if(this.$data.daysData[index].day == 0) { // console.log(item);
bus.$emit('chosen-tripdate', null) if(item.price=="0.00"){
return;
}
if(this.isSelect == index){
this.isSelect = -1;
bus.$emit('chosen-tripdate', null)
return; 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(){ getYearMonthDay(list){
// console.log("day",this.day); // console.log("dfsdgsg",list)
let currentYear = this.currentDay.substring(0,4); //当前年份 this.priceData=list[0];
let currentMonth = this.currentDay.substring(5,7); //当前月份 // 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("currentMonth",currentMonth) // console.log("currentMonth",currentMonth)
let date = new Date(); let date = new Date();
let strDate = date.getDate(); let strDate = date.getDate();
...@@ -127,20 +129,23 @@ export default { ...@@ -127,20 +129,23 @@ export default {
let monthDay = this.$data.DaysInMonth[Number(currentMonth)-1];//当前月的天数 let monthDay = this.$data.DaysInMonth[Number(currentMonth)-1];//当前月的天数
let daysData = []; let daysData = [];
//给数据源赋值 //给数据源赋值
for (var i = 0 ;i < Number(monthDay) ;i++) { for (let i = 0 ;i < Number(monthDay) ;i++) {
var priceDict = {'day':String(i+1),'price':0,'dis':false}; var priceDict = {'day':String(i+1),'price':0,'dis':false,date_str:''};
daysData.push(priceDict); daysData.push(priceDict);
} }
this.daysData = daysData; this.daysData = daysData;
var currentDay = `${currentYear}-${currentMonth}-01`; var currentDay = `${currentYear}-${currentMonth}-01`;
var dateObject = new Date(currentDay); var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay();//得到每个月1号是周几 var firstDay = dateObject.getDay();//得到每个月1号是周几
for (var i in this.priceData) { // for (let i in this.priceData) {
var price = this.priceData[i]; 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 dayIndex = price.dateStr.substring(price.dateStr.length-2,price.dateStr.length);
// console.log(dayIndex)
var dayDict = daysData[Number(dayIndex)-1]; var dayDict = daysData[Number(dayIndex)-1];
// console.log("dayIndex",dayIndex)
// console.log("dayDict",dayDict)
dayDict.price = price.price; dayDict.price = price.price;
dayDict.date_str=price.dateStr;
if(dayIndex<strDate&&strMonth==currentMonth){ if(dayIndex<strDate&&strMonth==currentMonth){
dayDict.price=''; dayDict.price='';
} }
......
src/components/mall/search.vue
View file @ f84742f7
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
<div class="daynum">{{item.dayNum}}天</div> <div class="daynum">{{item.dayNum}}天</div>
<el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'> <el-carousel :interval="3000" :autoplay='hoverIndex==index' arrow="never" height="148" :style="{'background':'#ddd'}" v-if='item.imgCover!=""'>
<el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'> <el-carousel-item v-for="(img,imgIndex) in JSON.parse(item.imgCover)" :key="imgIndex" v-if='img.Url!=""'>
<img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id)"> <img v-lazy='`${img.Url}?x-oss-process=image/resize,m_fill,h_148,w_200`' @click="goUrl('detail',item.id,item.tcid)">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
<img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' /> <img v-else style="height:100%;width:100%" src='../../assets/img/banner@3x.png' />
</div> </div>
<div class="contentbox"> <div class="contentbox">
<div class="title" @click="goUrl('detail',item.id)">{{item.title}}</div> <div class="title" @click="goUrl('detail',item.id,item.tcid)">{{item.title}}</div>
<div class="item-info"> <div class="item-info">
<span> <span>
<i class="iconfont icon-bb-chufadi"></i>出发地：{{item.startCityName?item.startCityName:'成都'}} <i class="iconfont icon-bb-chufadi"></i>出发地：{{item.startCityName?item.startCityName:'成都'}}
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<div class="price"> <div class="price">
￥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}<span>起</span> ￥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}<span>起</span>
</div> </div>
<el-button size='mini' @click="goUrl('detail',item.id)">立即预订</el-button> <el-button size='mini' @click="goUrl('detail',item.id,item.tcid)">立即预订</el-button>
</div> </div>
</div> </div>
<div class="item-pager" v-if='teamDatas.length>0'> <div class="item-pager" v-if='teamDatas.length>0'>
...@@ -216,10 +216,10 @@ export default { ...@@ -216,10 +216,10 @@ export default {
this.loadDayCount() this.loadDayCount()
}, },
methods: { methods: {
goUrl(path,id){ goUrl(path,id,tcid){
// detailTwo // detailTwo
path = 'detailTwo' path = 'detailTwo'
path=`${path}/${encodeURIComponent(id)}` path=`${path}/${encodeURIComponent(id)}/`+tcid
this.$router.push({ path }) this.$router.push({ path })
}, },
proving(){ proving(){
......
src/main.js
View file @ f84742f7
...@@ -29,6 +29,7 @@ Vue.http = Vue.prototype.$http = axios ...@@ -29,6 +29,7 @@ Vue.http = Vue.prototype.$http = axios
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.prototype.$echarts = echarts Vue.prototype.$echarts = echarts
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
if (to.meta.title) { if (to.meta.title) {
if(localStorage.g && localStorage.g!='undefined'){ if(localStorage.g && localStorage.g!='undefined'){
if(JSON.parse(localStorage.g).i!=2) if(JSON.parse(localStorage.g).i!=2)
......
src/plugins/index.js
View file @ f84742f7
...@@ -12,9 +12,9 @@ export default { ...@@ -12,9 +12,9 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // 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"//主域名 // var domainUrl = "http://192.168.2.214:8082"//主域名
// let domainUrl = "http://192.168.2.16:8083"; //刘东主域名 let domainUrl = "https://reborn.oytour.com"; //刘东主域名
if (this.isOnline()) { if (this.isOnline()) {
if(window.location.host.indexOf('viitto.com')!=-1) if(window.location.host.indexOf('viitto.com')!=-1)
domainUrl = "http://test.viitto.com" domainUrl = "http://test.viitto.com"
......
src/router.js
View file @ f84742f7
...@@ -138,7 +138,49 @@ export default new Router({ ...@@ -138,7 +138,49 @@ export default new Router({
meta: { meta: {
title: '机票列表' title: '机票列表'
} }
},
{
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: '支付'
}
},
{
path: '/AirlineTicketOrder',
name: 'AirlineTicketOrder',
component: resolve => require(['@/components/Ticket/AirlineTicketOrder'], resolve),
meta: {
title: '机票订单'
}
},
{
path: '/EditTicketOrder/:id',
name: 'EditTicketOrder',
component: resolve => require(['@/components/Ticket/EditTicketOrder'], resolve),
meta: {
title: '修改机票订单'
}
} }
] ]
} }
] ]
......
src/store.js
View file @ f84742f7
...@@ -8,8 +8,13 @@ export default new Vuex.Store({ ...@@ -8,8 +8,13 @@ export default new Vuex.Store({
user:{}, user:{},
site:0, site:0,
isLogin:0, isLogin:0,
homePage:sessionStorage.getItem("Homepage") ? sessionStorage.getItem("Homepage") :true,
}, },
mutations: { mutations: {
HomePage(state,data){
state.homePage=data;
},
updateSite(state, p) { updateSite(state, p) {
state.site = p state.site = p
}, },
......
src/views/index.vue
View file @ f84742f7
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
path='/heel' path='/heel'
} }
if(index=='3'){ if(index=='3'){
path='/TicketList' path='/TicketHome'
} }
if (path != "") { if (path != "") {
this.$router.push({ path }); this.$router.push({ path });
......
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