Skip to content

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

update

parent 1d6e0420
Hide whitespace changes
Inline Side-by-side
Showing with 760 additions and 227 deletions
src/App.vue
View file @ 4cf9f7ea
...@@ -59,12 +59,12 @@ export default { ...@@ -59,12 +59,12 @@ export default {
<style> <style>
@import './assets/global/font.css'; @import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_v9ubqse9sl.css'; @import '//at.alicdn.com/t/font_863923_5a8yeisxuxj.css';
@import './assets/global/global.css'; @import './assets/global/global.css';
body,html{ body,html{
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
font-family:'微软雅黑',' Microsoft YaHei'; font-family:'微软雅黑',' Microsoft YaHei','PingFang','PingFangR';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
height: 100%; height: 100%;
} }
......
src/assets/img/ticket/banner.png
View replaced file @ 1d6e0420 View file @ 4cf9f7ea
src/assets/img/ticket/banner.png

711 KB | W: | H:

src/assets/img/ticket/banner.png

705 KB | W: | H:

src/assets/img/ticket/banner.png
src/assets/img/ticket/banner.png
src/assets/img/ticket/banner.png
src/assets/img/ticket/banner.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/img/ticket/banner@2x.png
View replaced file @ 1d6e0420 View file @ 4cf9f7ea
src/assets/img/ticket/banner@2x.png

2.32 MB | W: | H:

src/assets/img/ticket/banner@2x.png

2.31 MB | W: | H:

src/assets/img/ticket/banner@2x.png
src/assets/img/ticket/banner@2x.png
src/assets/img/ticket/banner@2x.png
src/assets/img/ticket/banner@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/utils/commonUtils.js
View file @ 4cf9f7ea
...@@ -259,5 +259,7 @@ var commonUtils = { ...@@ -259,5 +259,7 @@ var commonUtils = {
} }
return dateStr; return dateStr;
}, },
} }
export default commonUtils export default commonUtils
src/components/Ticket/AirlineTicketOrder.vue
View file @ 4cf9f7ea
...@@ -78,12 +78,16 @@ ...@@ -78,12 +78,16 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="preferPrice"
label="实付金额"> label="实付金额">
<template slot-scope="scope">
￥{{scope.row.preferPrice | priceFormat}}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="refund"
label="退款金额"> label="退款金额">
<template slot-scope="scope">
￥{{scope.row.refund | priceFormat}}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
...@@ -112,10 +116,6 @@ ...@@ -112,10 +116,6 @@
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button v-show="scope.row.status==3"
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row)">修改订单</el-button> -->
<el-button v-show="scope.row.status==3" <el-button v-show="scope.row.status==3"
size="mini" style="border:1px solid #EE4454;color:#EE4454" size="mini" style="border:1px solid #EE4454;color:#EE4454"
@click="handlePay(scope.$index, scope.row)">去付款</el-button> @click="handlePay(scope.$index, scope.row)">去付款</el-button>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align:right;margin:10px 0;"> <div v-show="tableData.length>0" style="text-align:right;margin:10px 0;">
<el-pagination <el-pagination
@current-change="Currentchange" @current-change="Currentchange"
background background
...@@ -178,6 +178,18 @@ export default { ...@@ -178,6 +178,18 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.$message.success("请求成功！") this.$message.success("请求成功！")
this.List(); this.List();
let msg={
AirOrderId:row.id,
MsgType:Refund
}
// 推送接口
this.apipost("airline_get_GetB2BAirLineList",msg,
res => {
// console.log(res)
},
err => {
}
);
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -230,7 +242,7 @@ export default { ...@@ -230,7 +242,7 @@ export default {
this.form.endTime=this.form.time[1]; this.form.endTime=this.form.time[1];
} }
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{ this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
// console.log(res); console.log(res);
this.loading=false; this.loading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.tableData=res.data.data.pageData; this.tableData=res.data.data.pageData;
...@@ -247,6 +259,9 @@ export default { ...@@ -247,6 +259,9 @@ export default {
</script> </script>
<style> <style>
.AirlineTicketOrder .el-input__inner{
border-radius: 0;
}
.AirlineTicketOrder .el-table__header{ .AirlineTicketOrder .el-table__header{
background: #DDDDDD; background: #DDDDDD;
} }
......
src/components/Ticket/ChooseCity.vue 0 → 100644
View file @ 4cf9f7ea
<template>
<div id="ChooseCity">
<div class="ChooseCity">
<i @click="CloseCityComp" class="iconfont icon-cha"></i>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="国家" name="first">
<ul class="flex_box">
<li @click="getProvince(country)" v-for="country in countryList" :key="country.Name">{{country.Name}}</li>
</ul>
</el-tab-pane>
<el-tab-pane label="省份" name="second" :disabled="provincetab">
<ul class="flex_box">
<li @click="getCity(province)" v-for="province in provinceList" :key="province.Name">{{province.Name}}</li>
</ul>
</el-tab-pane>
<el-tab-pane label="市区" name="third" :disabled="citytab">
<ul class="flex_box">
<li @click="GetCity(city)" v-for="city in cityList" :key="city.Name">{{city.Name}}</li>
</ul>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
export default {
data () {
return {
activeName:"first",
countryList:[],
msg:{},
provinceList:[],
cityList:[],
provincetab:true,
citytab:true,
msg:{},
cityInfo:{},
}
},
created() {
this.getCountryList()
},
methods: {
GetCity(city){
this.$emit("CityInfo",city);
this.$emit("CityCompClose",'close');
},
CloseCityComp(){
this.$emit("CityCompClose",'close');
},
handleClick(){
},
getCountryList() { //获取国家
let msg = {};
this.apipost('dict_post_Destination_GetCountry', msg, res => {
// console.log(res);
this.countryList = res.data.data;
}, err => {})
},
getProvince(country){
this.msg = {
Id: country.ID
};
// this.cityInfo=country;
this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
// console.log(res);
if(res.data.data.length==0){
this.$emit("CityInfo",country);
this.$emit("CityCompClose",'close');
}
this.activeName="second";
this.provincetab=false;
this.provinceList = res.data.data;
}, err => {})
},
getCity(province){
this.msg = {
Id: province.ID
};
this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
if(res.data.data.length==0){
this.$emit("CityInfo",province);
this.$emit("CityCompClose",'close');
}
this.activeName="third";
this.citytab=false;
this.cityList = res.data.data;
}, err => {})
},
}
}
</script>
<style>
#ChooseCity .ChooseCity .icon-cha:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .icon-cha{
position: absolute;
right:10px;
font-size: 20px;
cursor: pointer;
z-index:2001;
}
#ChooseCity .ChooseCity .flex_box li:hover{
background-color: #EE4454;
color: #fff;
cursor: pointer;
}
#ChooseCity .ChooseCity .flex_box li{
list-style: none;
width:16.67%;
padding:4px 0 4px 6px;
box-sizing: border-box;
margin:4px 0;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
#ChooseCity .ChooseCity .flex_box{
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
margin:0;
padding:0;
color: #333333;
}
#ChooseCity .ChooseCity .el-tabs__item:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .el-tabs__active-bar{
background-color: #EE4454;
}
#ChooseCity .ChooseCity .el-tabs__item.is-active{
color: #EE4454;
}
#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;
box-sizing: border-box;
position: relative;
/* overflow-y: scroll; */
}
</style>
src/components/Ticket/ChooseCity1.vue 0 → 100644
View file @ 4cf9f7ea
<template>
<div id="ChooseCity">
<div class="ChooseCity">
<i @click="CloseCityComp" class="iconfont icon-cha"></i>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="国家" name="first">
<ul class="flex_box">
<li @click="getProvince(country)" v-for="country in countryList" :key="country.Name">{{country.Name}}</li>
</ul>
</el-tab-pane>
<el-tab-pane label="省份" name="second" :disabled="provincetab">
<ul class="flex_box">
<li @click="getCity(province)" v-for="province in provinceList" :key="province.Name">{{province.Name}}</li>
</ul>
</el-tab-pane>
<el-tab-pane label="市区" name="third" :disabled="citytab">
<ul class="flex_box">
<li @click="GetCity(city)" v-for="city in cityList" :key="city.Name">{{city.Name}}</li>
</ul>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
export default {
data () {
return {
activeName:"first",
countryList:[],
msg:{},
provinceList:[],
cityList:[],
provincetab:true,
citytab:true,
msg:{},
cityInfo:{},
}
},
created() {
this.getCountryList()
},
methods: {
GetCity(city){
this.$emit("CityInfo1",city);
this.$emit("CityCompClose1",'close');
},
CloseCityComp(){
this.$emit("CityCompClose1",'close');
},
handleClick(){
},
getCountryList() { //获取国家
let msg = {};
this.apipost('dict_post_Destination_GetCountry', msg, res => {
// console.log(res);
this.countryList = res.data.data;
}, err => {})
},
getProvince(country){
this.msg = {
Id: country.ID
};
// this.cityInfo=country;
this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
// console.log(res);
if(res.data.data.length==0){
this.$emit("CityInfo1",country);
this.$emit("CityCompClose1",'close');
}
this.activeName="second";
this.provincetab=false;
this.provinceList = res.data.data;
}, err => {})
},
getCity(province){
this.msg = {
Id: province.ID
};
this.apipost('dict_post_Destination_GetChildList', this.msg, res => {
if(res.data.data.length==0){
this.$emit("CityInfo1",province);
this.$emit("CityCompClose1",'close');
}
this.activeName="third";
this.citytab=false;
this.cityList = res.data.data;
}, err => {})
},
}
}
</script>
<style>
#ChooseCity .ChooseCity .icon-cha:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .icon-cha{
position: absolute;
right:10px;
font-size: 20px;
cursor: pointer;
z-index:2001;
}
#ChooseCity .ChooseCity .flex_box li:hover{
background-color: #EE4454;
color: #fff;
cursor: pointer;
}
#ChooseCity .ChooseCity .flex_box li{
list-style: none;
width:16.67%;
padding:4px 0 4px 6px;
box-sizing: border-box;
margin:4px 0;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
#ChooseCity .ChooseCity .flex_box{
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
margin:0;
padding:0;
color: #333333;
}
#ChooseCity .ChooseCity .el-tabs__item:hover{
color: #EE4454;
}
#ChooseCity .ChooseCity .el-tabs__active-bar{
background-color: #EE4454;
}
#ChooseCity .ChooseCity .el-tabs__item.is-active{
color: #EE4454;
}
#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;
box-sizing: border-box;
position: relative;
/* overflow-y: scroll; */
}
</style>
src/components/Ticket/FillItinerary.vue
View file @ 4cf9f7ea
<template> <template>
<div> <div class="FillItinerary">
<!-- <div class="baner_top">
<el-row :gutter="20">
<el-col :span="24" :offset="2">
</el-col>
</el-row>
</div> -->
<el-row :gutter="20" style="background:#f5f5f5"> <el-row :gutter="20" style="background:#f5f5f5">
<el-col :span="18" :offset="3"> <el-col :span="18" :offset="3">
<!-- 订单详情 --> <!-- 订单详情 -->
...@@ -16,7 +9,7 @@ ...@@ -16,7 +9,7 @@
<div class="bz">去程</div> <div class="bz">去程</div>
<div class="padd"> <div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.flightDate}} <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.goFlightTime}}
{{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}} {{getlistSigel.goStartCityName}} - {{getlistSigel.goEndCityName}}
</p> </p>
<p style="font-size:12px;color:#666666"> <p style="font-size:12px;color:#666666">
...@@ -47,7 +40,7 @@ ...@@ -47,7 +40,7 @@
<el-col class="coupon_left" :span="9" style="position:relative"> <el-col class="coupon_left" :span="9" style="position:relative">
<div class="bz">返程</div> <div class="bz">返程</div>
<div class="padd"> <div class="padd">
<p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backDate}} <p style="font-size:16px;color:#333333;padding-top:10px">{{getlistSigel.backFlightTime}}
{{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}} {{getlistSigel.backStartCityName}} - {{getlistSigel.backEndCityName}}
</p> </p>
<p style="font-size:12px;color:#666666"> <p style="font-size:12px;color:#666666">
...@@ -82,19 +75,19 @@ ...@@ -82,19 +75,19 @@
</p> </p>
<p style="font-size:12px;padding-top:20px"> <p style="font-size:12px;padding-top:20px">
<span>票价</span> <span>票价</span>
<span style="float:right;color:#FF680B;font-size:20px">￥{{personNum.preferPrice}}</span> <span style="float:right;color:#FF680B;font-size:20px">￥{{personNum.preferPrice | priceFormat }}</span>
</p> </p>
<P style="font-size:12px;margin-top:12px"> <P style="font-size:12px;margin-top:12px">
成人票： 成人票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice }} x {{personNum.manNum}}</span> <span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.manNum}}</span>
</P> </P>
<P style="font-size:12px;"> <P style="font-size:12px;">
儿童票： 儿童票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice }} x {{personNum.chirdNum}}</span> <span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.chirdNum}}</span>
</P> </P>
<P style="font-size:12px;"> <P style="font-size:12px;">
老人票： 老人票：
<span style="float:right;">{{getlistSigel.scatterB2BPrice }} x {{personNum.oldPeopleNum}}</span> <span style="float:right;">{{getlistSigel.scatterB2BPrice | priceFormat }} x {{personNum.oldPeopleNum}}</span>
</P> </P>
</div> </div>
...@@ -105,39 +98,39 @@ ...@@ -105,39 +98,39 @@
<!-- 填写订单 --> <!-- 填写订单 -->
<div class="tx_order" style="margin-top:20px"> <div class="tx_order" style="margin-top:20px">
<div class="tx"> <div class="tx">
<div style="margin-top:8px"> <div style="margin-top:10px;margin-left:15px;">
乘机人信息 乘机人信息
</div> </div>
<div v-show="!personnums" class="person_num"> <div v-show="!personnums" class="person_num">
<span>成人</span> <span style="margin-left:25px">成人：{{personNum.manNum}}人</span>
<span>{{personNum.manNum}}人</span> <span>儿童：{{personNum.chirdNum}}人</span>
<span>儿童</span> <span>婴儿：{{personNum.babyNum}}人</span>
<span>{{personNum.chirdNum}}人</span> <span>老人：{{personNum.oldPeopleNum}}人</span>
<span>婴儿</span>
<span>{{personNum.babyNum}}人</span>
<span>老人</span>
<span>{{personNum.oldPeopleNum}}人</span>
<el-button @click="personnums=true" size="mini" style="background:#EE4454;color:#fff;">修改人数</el-button> <el-button @click="personnums=true" size="mini" style="background:#EE4454;color:#fff;">修改人数</el-button>
</div> </div>
<div v-show="personnums"> <div class="personnum" v-show="personnums">
<div class="number" style="margin-left:15px">
<span>成人 | </span> <el-form class="personnum_form" :model="personNum" label-width="60px">
<el-input-number size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number> <el-form-item label="成人：">
</div> <el-input-number size="mini" v-model="personNum.manNum" :min="0" :max="10" label="描述文字"></el-input-number>
<div class="number"> </el-form-item>
<span>儿童 | </span> <el-form-item label="儿童：">
<el-input-number size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number> <el-input-number size="mini" v-model="personNum.chirdNum" :min="0" :max="10" label="描述文字"></el-input-number>
</div> </el-form-item>
<div class="number"> <el-form-item label="婴儿：">
<span>婴儿 | </span> <el-input-number size="mini" v-model="personNum.babyNum" :min="0" :max="10" label="描述文字"></el-input-number>
<el-input-number size="mini" v-model="personNum.babyNum" :min="0" :max="10" label="描述文字"></el-input-number> </el-form-item>
</div> <el-form-item label="老人：">
<div class="number"> <el-input-number size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number>
<span>老人 | </span> </el-form-item>
<el-input-number size="mini" v-model="personNum.oldPeopleNum" :min="0" :max="10" label="描述文字"></el-input-number> <el-form-item>
</div> <el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button>
<el-button @click="ConfirmedPersonNum" size="mini" style="background:#EE4454;color:#fff">确认</el-button> <el-button size="mini" style="background:#EE4454;color:#fff">取消</el-button>
<el-button size="mini" style="background:#EE4454;color:#fff">取消</el-button> </el-form-item>
</el-form>
</div> </div>
<div style="position:absolute;right:5px"> <div style="position:absolute;right:5px">
<span>专员：</span> <span>专员：</span>
...@@ -152,7 +145,7 @@ ...@@ -152,7 +145,7 @@
<div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index"> <div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index">
<el-col :span="4"> <el-col :span="4">
<div class="index"> <div class="index">
<p>第<span style="font-weight:700">{{index+1}}</span>位</p> <p>第<span style="font-weight:700;font-size:18px">{{index+1}}</span>位</p>
<!-- //1 成年 2小孩 3婴儿 4老人 --> <!-- //1 成年 2小孩 3婴儿 4老人 -->
<p style="background:#49C0A1;color:#fff"> <p style="background:#49C0A1;color:#fff">
<span v-if="item.ageType=='1'">成年</span> <span v-if="item.ageType=='1'">成年</span>
...@@ -164,19 +157,19 @@ ...@@ -164,19 +157,19 @@
</el-col> </el-col>
<el-col class="formList" :span="20"> <el-col class="formList" :span="20">
<el-form-item label="乘机人" :prop="'guestList.'+index+'.name'" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]"> <el-form-item label="乘机人" :prop="'guestList.'+index+'.name'" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]">
<el-input size="mini" v-model="item.name"></el-input> <el-input size="small" v-model="item.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="护照信息" :prop="'guestList.'+index+'.passportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]"> <el-form-item label="护照信息" :prop="'guestList.'+index+'.passportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]">
<el-input size="mini" v-model="item.passportNo"></el-input> <el-input size="small" v-model="item.passportNo"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出生日期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]"> <el-form-item label="出生日期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker size="mini" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.birthday" style="width: 100%;"></el-date-picker> <el-date-picker size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.birthday" style="width: 100%;"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]"> <el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]">
<el-input size="mini" v-model="item.mobilePhone"></el-input> <el-input size="small" v-model="item.mobilePhone"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国籍"> <el-form-item label="国籍">
<el-select style="width:100%" size="mini" v-model="item.nationality" filterable placeholder="请选择国籍"> <el-select style="width:100%" size="small" v-model="item.nationality" filterable placeholder="请选择国籍">
<el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -197,16 +190,16 @@ ...@@ -197,16 +190,16 @@
<p class="lxr">联系人信息</p> <p class="lxr">联系人信息</p>
<el-form style="width:90%;margin:5px auto" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm"> <el-form style="width:90%;margin:5px auto" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }"> <el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input size="mini" v-model="personNum.contactName"></el-input> <el-input size="small" v-model="personNum.contactName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="contactMobile" :rules="{ required: true, message: '请输入联系电话', trigger: 'blur' }"> <el-form-item label="手机号" prop="contactMobile" :rules="{ required: true, message: '请输入联系电话', trigger: 'blur' }">
<el-input size="mini" v-model="personNum.contactMobile"></el-input> <el-input size="small" v-model="personNum.contactMobile"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮箱" prop="contactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]"> <el-form-item label="邮箱" prop="contactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input size="mini" v-model="personNum.contactEmail"></el-input> <el-input size="small" v-model="personNum.contactEmail"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="width:99%" label="备注"> <el-form-item style="width:99%" label="备注">
<el-input size="mini" v-model="personNum.remarks"></el-input> <el-input size="small" v-model="personNum.remarks"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -219,7 +212,7 @@ ...@@ -219,7 +212,7 @@
<p class="total" style="margin-top:12px"> <p class="total" style="margin-top:12px">
<span>总价</span> <span>总价</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.preferPrice}}</span> <span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.preferPrice| priceFormat}}</span>
<span @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">同意以上协议条款，提交订单</span> <span @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">同意以上协议条款，提交订单</span>
</p> </p>
</div> </div>
...@@ -265,11 +258,7 @@ export default { ...@@ -265,11 +258,7 @@ export default {
this.SellInfo(); this.SellInfo();
}, },
methods: { methods: {
// selectenterID(val){
// console.log("val",val)
// // this.personNum.enterID=val;
// this.$set(this.personNum,val,this.personNum.enterID);
// },
// 国籍 // 国籍
GetCountroy(){ GetCountroy(){
this.apipost( this.apipost(
...@@ -287,7 +276,7 @@ export default { ...@@ -287,7 +276,7 @@ export default {
//获取订单详情 //获取订单详情
GetDes(){ GetDes(){
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{ this.apiJavaPost('/api/dmc/airticket/getB2BAirticketInfo',{AirTicketId:this.AirTicketId},res=>{
// console.log("订单",res) console.log("订单",res)
this.getlistSigel=res.data.data; this.getlistSigel=res.data.data;
this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum; this.getlistSigel.synum=this.getlistSigel.airTicketScatterNum-this.getlistSigel.useScatterNum;
...@@ -435,6 +424,17 @@ export default { ...@@ -435,6 +424,17 @@ export default {
} }
</script> </script>
<style> <style>
.FillItinerary .el-input__inner{
border-radius: 0px;
}
.personnum_form{
margin-left: 20px;
}
.personnum_form .el-form-item{
width:200px;
display: inline-block;
margin:0;
}
.formList{ .formList{
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
...@@ -567,7 +567,7 @@ font-size: 14px; ...@@ -567,7 +567,7 @@ font-size: 14px;
background:rgba(255,255,255,1); background:rgba(255,255,255,1);
border:1px solid rgba(73,192,161,1); border:1px solid rgba(73,192,161,1);
} }
.tx_order .el-form-item{ .tx_order .demo-ruleForm .el-form-item{
display: inline-block; display: inline-block;
width:30%; width:30%;
/* margin-bottom: 5px; */ /* margin-bottom: 5px; */
......
src/components/Ticket/OrderDetails.vue
View file @ 4cf9f7ea
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div style="position:absolute;right:5px;top:3px"> <div style="position:absolute;right:5px;top:3px">
<el-button @click="disabled=false" style="margin-right:10px" v-if="personNum.status==3" class="status_3" size="mini" >修改信息</el-button> <el-button @click="disabled=false" style="margin-right:10px" v-if="personNum.status==3" class="status_3" size="mini" >修改信息</el-button>
<span>服务专员：</span> <span>服务专员：</span>
<el-select :disabled="disabled" size="mini" v-model="personNum.enterID" filterable placeholder="请选择专员"> <el-select :disabled="disabled" 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-option v-for="(item,key) in SellInfoList" :key="key" :label="item.EmName" :value="item.EmployeeId"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index"> <div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index">
<el-col :span="4"> <el-col :span="4">
<div class="index"> <div class="index">
<p>第<span style="font-weight:700">{{index+1}}</span>位</p> <p>第<span style="font-weight:700;font-size:18px">{{index+1}}</span>位</p>
<!-- //1 成年 2小孩 3婴儿 4老人 --> <!-- //1 成年 2小孩 3婴儿 4老人 -->
<p style="background:#49C0A1;color:#fff"> <p style="background:#49C0A1;color:#fff">
<span v-if="item.ageType=='1'">成年</span> <span v-if="item.ageType=='1'">成年</span>
...@@ -132,27 +132,31 @@ ...@@ -132,27 +132,31 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="乘机人" :prop="'guestList.'+index+'.name'" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]"> <el-form-item label="乘机人" :prop="'guestList.'+index+'.name'" :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}]">
<el-input :disabled="disabled" size="mini" v-model="item.name"></el-input> <el-input :disabled="disabled" size="small" v-model="item.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="护照信息" :prop="'guestList.'+index+'.passportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]"> <el-form-item label="护照信息" :prop="'guestList.'+index+'.passportNo'" :rules="[{ required: true, message: '请输入护照信息', trigger: 'blur' }]">
<el-input :disabled="disabled" size="mini" v-model="item.passportNo"></el-input> <el-input :disabled="disabled" size="small" v-model="item.passportNo"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出生日期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]"> <el-form-item label="出生日期" :prop="'guestList.'+index+'.birthday'" :rules="[{ type: 'string', required: true, message: '请选择日期', trigger: 'change' }]">
<el-date-picker :disabled="disabled" size="mini" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.birthday" style="width: 100%;"></el-date-picker> <el-date-picker :disabled="disabled" size="small" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="item.birthday" style="width: 100%;"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]"> <el-form-item label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group :disabled="disabled" v-model="item.sex"> <el-radio-group v-show="!disabled" :disabled="disabled" v-model="item.sex">
<el-radio :label=1 :value=1>男</el-radio> <el-radio :label=1 :value=1>男</el-radio>
<el-radio :label=2 :value=2>女</el-radio> <el-radio :label=2 :value=2>女</el-radio>
</el-radio-group> </el-radio-group>
<div v-show="disabled" style="padding-left:15px">
<span v-show="item.sex==1">男</span>
<span v-show="item.sex==2">女</span>
</div>
</el-form-item> </el-form-item>
<el-form-item label="国籍"> <el-form-item label="国籍">
<el-select :disabled="disabled" size="mini" v-model="item.nationality" filterable placeholder="请选择国籍" style="height:28px"> <el-select :disabled="disabled" size="small" v-model="item.nationality" filterable placeholder="请选择国籍" style="height:28px">
<el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="(item,key) in countroylist" :key="key" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]"> <el-form-item label="手机号" :prop="'guestList.'+index+'.mobilePhone'" :rules="[{required: true, message: '电话号码不能为空', trigger: 'blur'}]">
<el-input :disabled="disabled" size="mini" v-model="item.mobilePhone"></el-input> <el-input :disabled="disabled" size="small" v-model="item.mobilePhone"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</div> </div>
...@@ -165,16 +169,16 @@ ...@@ -165,16 +169,16 @@
<p class="lxr">联系人信息</p> <p class="lxr">联系人信息</p>
<el-form style="width:90%" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm"> <el-form style="width:90%" :model="personNum" ref="personNum" label-width="100px" class="demo-ruleForm">
<el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }"> <el-form-item label="联系人" prop="contactName" :rules="{ required: true, message: '请输入联系人姓名', trigger: 'blur' }">
<el-input :disabled="disabled" size="mini" v-model="personNum.contactName"></el-input> <el-input :disabled="disabled" size="small" v-model="personNum.contactName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="contactMobile" :rules="{ required: true, message: '请输入联系电话', trigger: 'blur' }"> <el-form-item label="手机号" prop="contactMobile" :rules="{ required: true, message: '请输入联系电话', trigger: 'blur' }">
<el-input :disabled="disabled" size="mini" v-model="personNum.contactMobile"></el-input> <el-input :disabled="disabled" size="small" v-model="personNum.contactMobile"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮箱" prop="contactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]"> <el-form-item label="邮箱" prop="contactEmail" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input :disabled="disabled" size="mini" v-model="personNum.contactEmail"></el-input> <el-input :disabled="disabled" size="small" v-model="personNum.contactEmail"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="width:99%" label="备注"> <el-form-item style="width:99%" label="备注">
<el-input :disabled="disabled" size="mini" v-model="personNum.remarks"></el-input> <el-input :disabled="disabled" size="small" v-model="personNum.remarks"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -315,6 +319,12 @@ export default { ...@@ -315,6 +319,12 @@ export default {
} }
</script> </script>
<style> <style>
.OrderDetails .el-input__inner{
border-radius: 0px;
}
.OrderDetails .el-input.is-disabled .el-input__inner{
color: #000000;
}
.OrderDetails .el-input--mini .el-input__inner{ .OrderDetails .el-input--mini .el-input__inner{
height: 28px!important; height: 28px!important;
} }
......
src/components/Ticket/Pay.vue
View file @ 4cf9f7ea
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<p style="font-size:14px">订单提交成功！剩余支付时间 <p style="font-size:14px">订单提交成功！剩余支付时间
<span style="color:#FF680B;font-size:18px">{{time_15}}</span> <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="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice}}</span> <span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
</span> </span>
</p> </p>
<p style="font-size:12px">请您在 <p style="font-size:12px">请您在
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
订单号 : {{Commoditydetails.airOrderId}} 订单号 : {{Commoditydetails.airOrderId}}
<div class="triangle_border_left"></div> <div class="triangle_border_left"></div>
</div> </div>
<p style="text-align:center">支付金额 <p style="text-align:center;font-size:24px">支付金额
<span style="color:#FF680B;font-size:18px">￥{{Commoditydetails.preferPrice}}</span> <span style="color:#FF680B;font-size:30px">￥{{Commoditydetails.preferPrice | priceFormat}}</span>
</p> </p>
<el-row style="margin-top:15px" v-loading="codeLoading"> <el-row style="margin-top:15px" v-loading="codeLoading">
<el-col class="position" style="padding-right:50px" :span="12"> <el-col class="position" style="padding-right:50px" :span="12">
...@@ -94,12 +94,12 @@ ...@@ -94,12 +94,12 @@
</div> </div>
<div class="div_2"> <div class="div_2">
<p> <p>
<span>支付金额：￥12545</span> <span>支付金额：￥{{Commoditydetails.preferPrice | priceFormat}}</span>
<span>支付平台：支付宝</span> <!-- <span>支付平台：支付宝</span> -->
</p> </p>
<p> <p>
<span>订单编号：584569846568</span> <span>订单编号：{{Commoditydetails.airOrderId}}</span>
<span>下单时间：2019-02-02</span> <!-- <span>下单时间：2019-02-02</span> -->
</p> </p>
</div> </div>
<!-- <el-button size="mini" style="background:rgba(238,68,84,1);border-radius:4px;color:#fff">返回首页</el-button> --> <!-- <el-button size="mini" style="background:rgba(238,68,84,1);border-radius:4px;color:#fff">返回首页</el-button> -->
...@@ -176,7 +176,9 @@ export default { ...@@ -176,7 +176,9 @@ export default {
); );
}, },
Code(str) { Code(str) {
this.codeLoading=true; this.codeLoading=true;
console.log("this.codeLoading",this.codeLoading)
this.code_ts=""; this.code_ts="";
this.zfbpay_imgcode = false; this.zfbpay_imgcode = false;
this.wxpay_imgcode = false; this.wxpay_imgcode = false;
...@@ -206,20 +208,20 @@ export default { ...@@ -206,20 +208,20 @@ export default {
this.zfbpay_imgcode = true; this.zfbpay_imgcode = true;
} }
// if(res.data.data.IsUpdateAirOrderPayStatus==1){ if(res.data.data.IsUpdateAirOrderPayStatus==1){
// // 获取支付状态 // 获取支付状态
// this.apiJavaPost( this.apiJavaPost(
// "/api/dmc/airticket/SetB2BAirtickOrderPayStatus", "/api/dmc/airticket/SetB2BAirtickOrderPayStatus",
// { AirOrderId: this.AirOrderId }, { AirOrderId: this.AirOrderId },
// res => { res => {
// if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// }else{ }else{
// this.$message.error(res.data.message) this.$message.error(res.data.message)
// } }
// }, },
// null); null);
// } }
} }
}, },
...@@ -370,7 +372,7 @@ export default { ...@@ -370,7 +372,7 @@ export default {
position: absolute; position: absolute;
} }
.payvue_content .pay_img { .payvue_content .pay_img {
width: 340px; width: 350px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 6px 0px rgba(107, 107, 107, 0.2); box-shadow: 0px 0px 6px 0px rgba(107, 107, 107, 0.2);
padding: 28px 10px; padding: 28px 10px;
......
src/components/Ticket/TicketHome.vue
View file @ 4cf9f7ea
...@@ -15,27 +15,32 @@ ...@@ -15,27 +15,32 @@
<el-col :span="5"> <el-col :span="5">
<div class="city" style="margin-bottom:15px"> <div class="city" style="margin-bottom:15px">
<span>出发地 <i class="iconfont icon-vertical_line"></i> </span> <span>出发地 <i class="iconfont icon-vertical_line"></i> </span>
<el-select clearable style="width:65%" v-model="choose_info.departure_city" filterable placeholder="请选择"> <el-popover
<el-option :value=0 label="不限"></el-option> placement="bottom"
<el-option trigger="click">
v-for="item in cfd" <div v-show="startcity" class="citycompent">
:key="item.ID" <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
:label="item.Name" </div>
:value="item.ID"> <span slot="reference">
</el-option> <el-input clearable @focus="CityCompStatus('start')" class="ChooseCity" style="width:65%" v-model="choose_info.departure_cityname" placeholder="城市">
</el-select> </el-input>
</span>
</el-popover>
</div> </div>
<div class="city"> <div class="city">
<span>目的地 <i class="iconfont icon-vertical_line"></i> </span> <span>目的地 <i class="iconfont icon-vertical_line"></i> </span>
<el-select clearable style="width:65%" v-model="choose_info.arrival_city" filterable placeholder="请选择"> <el-popover
<el-option :value=0 label="不限"></el-option> placement="bottom"
<el-option trigger="click">
v-for="item in cfd" <div v-show="endcity" class="citycompent">
:key="item.ID" <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
:label="item.Name" </div>
:value="item.ID"> <span slot="reference">
</el-option> <el-input clearable @focus="CityCompStatus('end')" class="ChooseCity" style="width:65%" v-model="choose_info.arrival_cityname" placeholder="城市">
</el-select> </el-input>
</span>
</el-popover>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -61,14 +66,7 @@ ...@@ -61,14 +66,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<!-- <div class="city">
<span>归期 | </span>
<el-date-picker @change="changeEnd"
v-model="choose_info.qFlightDateEnd"
type="date" style="width:80%"
placeholder="选择日期">
</el-date-picker>
</div> -->
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<div style="margin-bottom:15px"> <div style="margin-bottom:15px">
...@@ -96,8 +94,14 @@ ...@@ -96,8 +94,14 @@
<span>航空公司 <i class="iconfont icon-vertical_line"></i> </span> <span>航空公司 <i class="iconfont icon-vertical_line"></i> </span>
<el-select clearable style="width:160px" filterable v-model="choose_info.airLineID" placeholder="请选择"> <el-select clearable 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
:key="item.AirLineId"></el-option> v-for="item in airlineList"
:key="item.AlCode"
:label="item.AlName"
:value="item.value">
<span style="float: left">{{ item.AlName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.AlCode }}</span>
</el-option>
</el-select> </el-select>
</div> </div>
<el-button @click="Search" size="small">搜索</el-button> <el-button @click="Search" size="small">搜索</el-button>
...@@ -233,14 +237,17 @@ ...@@ -233,14 +237,17 @@
<img style="width:20px;height:20px" :src="item.airlineUrl" alt=""> <img style="width:20px;height:20px" :src="item.airlineUrl" alt="">
<span style="margin-left:10px">{{item.airlineName}} </span> <span style="margin-left:10px">{{item.airlineName}} </span>
</p> </p>
<p class="time">出发时间：02-15 15:20</p> <p class="time">出发时间：{{item.goFlightTime}}</p>
<el-button class="goumai" size="mini">立即购买</el-button>
</div> </div>
</div> </div>
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<router-link to="/TicketList">
<span class="allyh"> <span class="allyh">
<img style="width:10px;height:13px" src="../../assets/img/ticket/qbyh.png" alt=""> <img style="width:10px;height:13px" src="../../assets/img/ticket/qbyh.png" alt="">
全部优惠</span> 更多机票</span></router-link>
</div> </div>
</el-col > </el-col >
</el-row> </el-row>
...@@ -249,10 +256,20 @@ ...@@ -249,10 +256,20 @@
</div> </div>
</template> </template>
<script> <script>
import ChooseCity from "@/components/Ticket/ChooseCity.vue"
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue"
import moment from 'moment' import moment from 'moment'
export default { export default {
components:{
"v-city":ChooseCity,
"v-city1":ChooseCity1
},
data() { data() {
return { return {
startcity:false,//出发城市组件
endcity:false,
cityStatus:"",
carousel_height: "0px", carousel_height: "0px",
bannerHeight: "282px", bannerHeight: "282px",
Youhui: { Youhui: {
...@@ -268,11 +285,13 @@ export default { ...@@ -268,11 +285,13 @@ export default {
qFlightDateEnd: "", qFlightDateEnd: "",
flight_number: "", flight_number: "",
airLineID: 0, airLineID: 0,
ticketType: 0, ticketType:2,
lineId: 0, lineId: 0,
isPayOrder: 0, isPayOrder: 0,
departure_city: 0, departure_city:0,
departure_cityname:"",
arrival_city: 0, arrival_city: 0,
arrival_cityname:"",
freightSpace: 0, freightSpace: 0,
airTicketScatterNum: 0, airTicketScatterNum: 0,
cr: 0, cr: 0,
...@@ -306,6 +325,36 @@ export default { ...@@ -306,6 +325,36 @@ export default {
this.CFD(); this.CFD();
}, },
methods: { methods: {
// 目的地城市信息
CityInfo1(val){
this.choose_info.arrival_city=val.ID;
this.choose_info.arrival_cityname=val.Name;
},
// 目的地关闭子组件
CityCompClose1(val){
this.endcity=false;
},
// 城市组件状态
CityCompStatus(str){
this.startcity=false;
this.endcity=false;
if(str=="start"){
this.startcity=true;
}else{
this.endcity=true;
}
},
// 出发地城市信息
CityInfo(val){
this.choose_info.departure_city=val.ID;
this.choose_info.departure_cityname=val.Name;
},
// 出发地关闭子组件
CityCompClose(val){
this.startcity=false;
},
DepartureCity(num) { DepartureCity(num) {
this.choose_info.departure_city=num; this.choose_info.departure_city=num;
this.Search(); this.Search();
...@@ -325,10 +374,9 @@ export default { ...@@ -325,10 +374,9 @@ export default {
// 航空公司下拉框 // 航空公司下拉框
initAirlines() { initAirlines() {
this.apipost( this.apipost(
"airline_post_GetList", "airline_get_GetB2BAirLineList",
{}, {},
res => { res => {
// console.log(res)
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.airlineList = res.data.data; this.airlineList = res.data.data;
} }
...@@ -355,7 +403,7 @@ export default { ...@@ -355,7 +403,7 @@ export default {
"/api/dmc/airticket/getB2BAirticketList", "/api/dmc/airticket/getB2BAirticketList",
this.Youhui, this.Youhui,
res => { res => {
// console.log("Youhui",res) console.log("Youhui",res)
this.yhList = res.data.data.pageData; this.yhList = res.data.data.pageData;
}, },
null null
...@@ -374,12 +422,24 @@ export default { ...@@ -374,12 +422,24 @@ export default {
@import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css"; @import "//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css";
@import "../../assets/global/global.css"; @import "../../assets/global/global.css";
@import "../../assets/css/reset.css"; @import "../../assets/css/reset.css";
.ticket_home{ .list_content .goumai{
font-family: 'PingFang'; position: absolute;
right:10px;
bottom:0px;
background: rgba(238,68,84,1);
color: #fff;
border: none;
}
.ticket_home .citycompent{
position: absolute;
top:36px;
}
.ticket_home .ChooseCity{
position: relative;
} }
.choose_back .msg .el-input-number--mini{ .choose_back .msg .el-input-number--mini{
line-height: 30px; line-height: 32px;
} }
.choose_back .msg .el-input__icon{ .choose_back .msg .el-input__icon{
line-height: 0; line-height: 0;
...@@ -405,7 +465,7 @@ export default { ...@@ -405,7 +465,7 @@ export default {
} }
.choose_back .msg .number{ .choose_back .msg .number{
width:170px; width:170px;
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;
...@@ -423,7 +483,12 @@ export default { ...@@ -423,7 +483,12 @@ export default {
font-size: 12px; font-size: 12px;
margin-top: 15px; margin-top: 15px;
} }
/* .choose_back .msg .city .icon-cha{
position: absolute;
right: ;
} */
.choose_back .msg .city{ .choose_back .msg .city{
position: relative;
padding:4px 0; padding:4px 0;
width:80%; width:80%;
height:36px; height:36px;
...@@ -445,7 +510,10 @@ export default { ...@@ -445,7 +510,10 @@ export default {
height: 100%; height: 100%;
} }
.ticket_home a{
color: #333333;
text-decoration: none;
}
.allyh { .allyh {
display: inline-block; display: inline-block;
...@@ -496,6 +564,7 @@ export default { ...@@ -496,6 +564,7 @@ export default {
width: 100%; width: 100%;
padding-left: 120px; padding-left: 120px;
box-sizing: border-box; box-sizing: border-box;
position: relative;
} }
.yh { .yh {
display: flex; display: flex;
......
src/components/Ticket/TicketList.vue
View file @ 4cf9f7ea
<template> <template>
<div style="min-height:100%;" @click="other=false" v-loading="loading" element-loading-text="加载中"> <div class="TicketList" style="min-height:100%;" @click="other=false" v-loading="loading" element-loading-text="加载中">
<div class="ticket_1" style="background:rgba(255,255,255,1);box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);padding-bottom:15px"> <div class="ticket_1" style="background:rgba(255,255,255,1);box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);padding-bottom:15px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20" :offset="2"> <el-col :span="20" :offset="2">
...@@ -12,50 +12,53 @@ ...@@ -12,50 +12,53 @@
<el-row class="msg" style="margin-top: 15px;"> <el-row class="msg" style="margin-top: 15px;">
<el-col :span="5"> <el-col :span="5">
<div class="city"> <div class="city">
<span>出发地 | </span> <span>出发地 <i class="iconfont icon-vertical_line"></i> </span>
<el-select v-model="choose_info.departure_city" clearable filterable placeholder="请选择">
<el-option :value="zero" label="不限"></el-option> <el-popover
<el-option placement="bottom"
v-for="item in cfd" trigger="click">
:key="item.ID" <div v-show="startcity" class="citycompent">
:label="item.Name" <v-city @CityInfo="CityInfo" @CityCompClose="CityCompClose"></v-city>
:value="item.ID"> </div>
</el-option> <span slot="reference">
</el-select> <el-input clearable @focus="CityCompStatus('start')" class="ChooseCity" style="width:65%" v-model="choose_info.departure_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="city"> <div class="city" style="margin-bottom:15px">
<span>舱位选择 | </span> <span>出发 <i class="iconfont icon-vertical_line"></i> </span>
<el-select v-model="choose_info.freightSpace" clearable placeholder="请选择"> <el-date-picker @change="changeStart"
<el-option :value="zero" label="不限"></el-option> value-format="yyyy-MM-dd"
<el-option v-model="choose_info.qFlightDateStart"
v-for="item in cawei" type="date" style="width:80%"
:key="item.id" placeholder="选择日期">
:label="item.title" </el-date-picker>
:value="item.id"> <!-- <span>{{startweek}}</span> -->
</el-option>
</el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="11">
<el-col :span="12">
<div style="margin-bottom:15px"> <div style="margin-bottom:15px">
<div class="number"> <div class="number">
<span>成人 | </span> <span>成人 <i class="iconfont icon-vertical_line"></i> </span>
<el-input-number size="mini" v-model="choose_info.cr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number> <el-input-number size="mini" v-model="choose_info.cr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div> </div>
<div class="number"> <div class="number">
<span>儿童 | </span> <span>儿童 <i class="iconfont icon-vertical_line"></i> </span>
<el-input-number size="mini" v-model="choose_info.child" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number> <el-input-number size="mini" v-model="choose_info.child" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div> </div>
<div class="number"> <div class="number">
<span>婴儿 | </span> <span>婴儿 <i class="iconfont icon-vertical_line"></i> </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>
<div class="number"> <div class="number">
<span>老人 | </span> <span>老人 <i class="iconfont icon-vertical_line"></i> </span>
<el-input-number size="mini" v-model="choose_info.lr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number> <el-input-number size="mini" v-model="choose_info.lr" @change="handleChange" :min="0" :max="10" label="描述文字"></el-input-number>
</div> </div>
...@@ -69,37 +72,51 @@ ...@@ -69,37 +72,51 @@
<el-row class="msg"> <el-row class="msg">
<el-col :span="5"> <el-col :span="5">
<div class="city"> <div class="city">
<span>目的地 | </span> <span>目的地 <i class="iconfont icon-vertical_line"></i> </span>
<el-select v-model="choose_info.arrival_city" clearable filterable placeholder="请选择">
<el-option :value="zero" label="不限"></el-option> <el-popover
<el-option placement="bottom"
v-for="item in cfd" trigger="click">
:key="item.ID" <div v-show="endcity" class="citycompent">
:label="item.Name" <v-city1 @CityInfo1="CityInfo1" @CityCompClose1="CityCompClose1"></v-city1>
:value="item.ID"> </div>
</el-option> <span slot="reference">
</el-select> <el-input clearable @focus="CityCompStatus('end')" class="ChooseCity" style="width:65%" v-model="choose_info.arrival_cityname" placeholder="城市">
</el-input>
</span>
</el-popover>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="city" style="margin-bottom:15px"> <div class="city">
<span>出发 | </span> <span>舱位选择 <i class="iconfont icon-vertical_line"></i> </span>
<el-date-picker @change="changeStart" <el-select v-model="choose_info.freightSpace" clearable placeholder="请选择">
value-format="yyyy-MM-dd" <el-option :value="zero" label="不限"></el-option>
v-model="choose_info.qFlightDateStart" <el-option
type="date" style="width:80%" v-for="item in cawei"
placeholder="选择日期"> :key="item.id"
</el-date-picker> :label="item.title"
<!-- <span>{{startweek}}</span> --> :value="item.id">
</el-option>
</el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="city"> <div class="city">
<span>航空公司 | </span> <span>航空公司 <i class="iconfont icon-vertical_line"></i> </span>
<el-select filterable clearable v-model="choose_info.airLineID" placeholder="请选择"> <el-select filterable clearable v-model="choose_info.airLineID" placeholder="请选择">
<el-option :value="zero" label="不限"></el-option> <el-option :value="zero" label="不限"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" <el-option
:key="item.AirLineId"></el-option> v-for="item in airlineList"
:key="item.AlCode"
:label="item.AlName"
:value="item.value">
<span style="float: left">{{ item.AlName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.AlCode }}</span>
</el-option>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
...@@ -118,18 +135,24 @@ ...@@ -118,18 +135,24 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="20" :offset="2"> <el-col :span="20" :offset="2">
<div class="date_list"> <div class="date_list">
<div @click="BeforeDate" style="color:#dddddd;font-size:20px" class="margin common">&lt;</div> <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':index==4}" v-for="(item,index) in dateList" :key="index">
<div> <div>
<p class="font_12" style="color:#FF680B">￥{{item.price}}</p> <p class="font_12" style="color:#FF680B">￥{{parseFloat(item.price) | priceFormat}}</p>
<p class="font_12">{{item.monthTime}} {{item.week}}</p> <p class="font_12">{{item.monthTime}} {{item.week}}</p>
</div> </div>
</div> </div>
<div @click="AfterDate" style="color:#dddddd;font-size:20px" class="margin common">&gt;</div> <div @click="AfterDate" style="color:#dddddd;font-size:20px" class="margin common">
<i class="iconfont icon-arrowright1"></i>
</div>
<div class="font_12" style="margin-top:20px;color:#FF680B;width:6%;position:relative"> <div class="font_12" style="margin-top:20px;color:#FF680B;width:6%;position:relative">
<span @click.stop="other=!other" style="cursor:pointer">其他日期</span> <el-popover
<div ref="otherdate" class="otherdate" v-show="other"> placement="bottom"
trigger="click">
<div ref="otherdate" class="otherdate">
<div style="font-size:16px;padding:10px"> <div style="font-size:16px;padding:10px">
<el-col :span="8"><span @click="ChangeMonth(1)" class="month_circle">&lt;</span> </el-col> <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">{{tomonth}}</el-col>
...@@ -142,6 +165,9 @@ ...@@ -142,6 +165,9 @@
</div> </div>
</div> </div>
<span slot="reference" style="cursor:pointer">其他日期</span>
</el-popover>
</div> </div>
</div> </div>
...@@ -279,7 +305,7 @@ ...@@ -279,7 +305,7 @@
</p> </p>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<p class="orange">￥{{item.scatterB2BPrice}}</p> <p class="orange">￥{{item.scatterB2BPrice | priceFormat}}</p>
<p class="font_12" style="margin-top:10px;"> <p class="font_12" style="margin-top:10px;">
<span v-if="item.freightSpace==1">头等舱</span> <span v-if="item.freightSpace==1">头等舱</span>
<span v-if="item.freightSpace==2">商务舱</span> <span v-if="item.freightSpace==2">商务舱</span>
...@@ -307,7 +333,9 @@ ...@@ -307,7 +333,9 @@
</el-row> </el-row>
</div> </div>
<div v-if="datalist.length==0" style="padding:15px 0;text-align:center"> <div v-if="datalist.length==0" style="padding:15px 0;text-align:center">
暂无数据..... <div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</div> </div>
...@@ -316,14 +344,22 @@ ...@@ -316,14 +344,22 @@
</div> </div>
</template> </template>
<script> <script>
import ChooseCity from "@/components/Ticket/ChooseCity.vue"
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue"
import moment from 'moment' import moment from 'moment'
import calendar from '@/components/mall/newcalendar.vue' import calendar from '@/components/mall/newcalendar.vue'
export default { export default {
components: { components: {
"v-calendar":calendar "v-calendar":calendar,
"v-city":ChooseCity,
"v-city1":ChooseCity1
}, },
data () { data () {
return { return {
startcity:false,//出发城市组件
endcity:false,
cityStatus:"",
zero:0, zero:0,
classArray:[], classArray:[],
today:moment().format("YYYY-MM-DD HH:mm:ss"), today:moment().format("YYYY-MM-DD HH:mm:ss"),
...@@ -395,7 +431,7 @@ export default { ...@@ -395,7 +431,7 @@ export default {
created(){ created(){
this.loading=true; this.loading=true;
// this.getList();
this.Datelist(); this.Datelist();
this.OtherDate(); this.OtherDate();
this.initAirlines(); this.initAirlines();
...@@ -405,8 +441,41 @@ export default { ...@@ -405,8 +441,41 @@ export default {
this.choose_info.timeSort=0; this.choose_info.timeSort=0;
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss") this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss")
}, },
methods: { methods: {
// 目的地城市信息
CityInfo1(val){
this.choose_info.arrival_city=val.ID;
this.choose_info.arrival_cityname=val.Name;
},
// 目的地关闭子组件
CityCompClose1(val){
this.endcity=false;
},
// 城市组件状态
CityCompStatus(str){
this.startcity=false;
this.endcity=false;
if(str=="start"){
this.startcity=true;
}else{
this.endcity=true;
}
},
// 出发地城市信息
CityInfo(val){
this.choose_info.departure_city=val.ID;
this.choose_info.departure_cityname=val.Name;
},
// 出发地关闭子组件
CityCompClose(val){
this.startcity=false;
},
PriceSort(num){ PriceSort(num){
this.choose_info.priceSort=num; this.choose_info.priceSort=num;
this.choose_info.timeSort=0; this.choose_info.timeSort=0;
...@@ -425,10 +494,12 @@ export default { ...@@ -425,10 +494,12 @@ export default {
}, },
Purchase(item){ Purchase(item){
let isLogin=this.$store.state.isLogin; let isLogin=this.$store.state.isLogin;
if(isLogin==0){ if(isLogin==0){
this.Error("请先登录！"); this.Error("请先登录！");
this.$router.push({path: `/login?type=1`}) this.$router.push({ path:'/login?type=1',query:{path:this.$route.name} })
// this.$router.push({path: `/login?type=1`})
}else{ }else{
this.$store.commit('HomePage','ticket') this.$store.commit('HomePage','ticket')
sessionStorage.setItem("Homepage",'ticket'); sessionStorage.setItem("Homepage",'ticket');
...@@ -455,7 +526,7 @@ export default { ...@@ -455,7 +526,7 @@ export default {
// 航空公司下拉框 // 航空公司下拉框
initAirlines() { initAirlines() {
this.apipost( this.apipost(
"airline_post_GetList", {}, "airline_get_GetB2BAirLineList", {},
res => { res => {
// console.log(res) // console.log(res)
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -505,8 +576,8 @@ export default { ...@@ -505,8 +576,8 @@ export default {
handleChange(){}, handleChange(){},
Search(){ Search(){
// console.log("this.choose_info",this.choose_info) // 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.loading=true;
this.getList();
this.Datelist(); this.Datelist();
sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info)); sessionStorage.setItem("ChooseInfo",JSON.stringify(this.choose_info));
this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss"); this.datainfo.qFlightDateStart=moment(this.choose_info.qFlightDateStart).format("YYYY-MM-DD HH:mm:ss");
...@@ -560,9 +631,9 @@ export default { ...@@ -560,9 +631,9 @@ export default {
this.apiJavaPost('/api/dmc/airticket/getB2BAirticketForMinPrice',this.datainfo,res=>{ this.apiJavaPost('/api/dmc/airticket/getB2BAirticketForMinPrice',this.datainfo,res=>{
// console.log(res); // console.log(res);
this.dateList=res.data.data;
this.getList(); this.getList();
this.dateList=res.data.data;
},null) },null)
}, },
...@@ -656,6 +727,14 @@ export default { ...@@ -656,6 +727,14 @@ export default {
<style> <style>
@import '../../assets/global/font.css'; @import '../../assets/global/font.css';
@import '../../assets/css/reset.css'; @import '../../assets/css/reset.css';
.TicketList .citycompent{
position: absolute;
top:36px;
}
.TicketList .ChooseCity{
position: relative;
}
.ticketlist_content .time_asc .ascending{ .ticketlist_content .time_asc .ascending{
border-bottom-color: rgba(238,68,84,1); border-bottom-color: rgba(238,68,84,1);
} }
...@@ -739,7 +818,7 @@ export default { ...@@ -739,7 +818,7 @@ export default {
width: 95px; width: 95px;
} }
.ticket_1 .msg .number{ .ticket_1 .msg .number{
width:150px; width:170px;
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);
...@@ -863,12 +942,15 @@ li{ ...@@ -863,12 +942,15 @@ li{
background: #FF6633; background: #FF6633;
color: #ffffff; color: #ffffff;
} }
.TicketList .el-popover{
border: none;
}
.otherdate{ .otherdate{
width: 520px; width: 520px;
position: absolute; position: absolute;
right: 0; right: 0;
z-index: 5; z-index: 5;
top:50px; top:10px;
background: #ffffff; background: #ffffff;
box-shadow:0px 4px 8px 0px rgba(107,107,107,0.4); box-shadow:0px 4px 8px 0px rgba(107,107,107,0.4);
box-sizing: border-box; box-sizing: border-box;
...@@ -952,7 +1034,7 @@ li{ ...@@ -952,7 +1034,7 @@ li{
color:rgba(102,102,102,1); color:rgba(102,102,102,1);
} }
.second .time{ .second .time{
font-size:16px; font-size:20px;
font-weight:400; font-weight:400;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
} }
......
src/components/global/head.vue
View file @ 4cf9f7ea
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.header .Info div{ .header .Info div{
float: left; float: left;
margin-top:10px; margin:8px 0;
} }
.header .ckxx{ .header .ckxx{
width:39px; width:39px;
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
background:rgba(73,192,161,1); background:rgba(73,192,161,1);
border-radius:50%; border-radius:50%;
color:#fff; color:#fff;
font-size: 10px; font-size: 12px;
text-align: center; text-align: center;
padding:6px;
} }
.header .zf{ .header .zf{
width:38px; width:38px;
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
line-height: 38px; line-height: 38px;
padding:7px;
/* margin-top:8px */ /* margin-top:8px */
} }
.header .fg{ .header .fg{
...@@ -169,10 +171,12 @@ export default { ...@@ -169,10 +171,12 @@ export default {
user(){ user(){
return this.$store.state.user return this.$store.state.user
}, },
homePage(){ homePage(){
return this.$store.state.homePage return this.$store.state.homePage
} }
}, },
watch:{ watch:{
homePage:{ homePage:{
handler: function(val, oldVal) { handler: function(val, oldVal) {
...@@ -180,7 +184,7 @@ export default { ...@@ -180,7 +184,7 @@ export default {
// console.log(oldVal) // console.log(oldVal)
}, },
deep: true deep: true
} },
}, },
created(){ created(){
let userInfo = this.$store.state.user; let userInfo = this.$store.state.user;
......
src/components/mall/newcalendar.vue
View file @ 4cf9f7ea
<style> <style>
.calendar-box .calendar{ .newcalendar-box .calendar{
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
table-layout: fixed; table-layout: fixed;
} }
.calendar-box .calendar th{ .newcalendar-box .calendar th{
height: 20px; height: 20px;
padding: 10px 0; padding: 10px 0;
line-height: 20px; line-height: 20px;
background: #eee; background: #eee;
color: #333; color: #999999;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
font-family: 'PingFangR'; font-family: 'PingFangR';
...@@ -50,19 +50,19 @@ ...@@ -50,19 +50,19 @@
text-align: center; text-align: center;
padding:0; padding:0;
margin: 10px 0; margin: 10px 0;
color: #ff4646; color: #EE4454;
} }
.dayList.yesPrice:hover{ .dayList.yesPrice:hover{
background: #FF680B; background: #FF680B;
color:#fff!important; color:#fff!important;
} }
.dayList.yesPrice:hover .price{ .dayList.yesPrice:hover .price{
color:#fff; color:#fff!important;
} }
</style> </style>
<template> <template>
<div class="calendar-box" id='calendar'> <div class="newcalendar-box" id='calendar'>
<table class="calendar" cellspacing=0 cellpadding=0> <table class="calendar" cellspacing=0 cellpadding=0>
<thead> <thead>
<th v-for="(i,index) in week" :key="index">{{i}}</th> <th v-for="(i,index) in week" :key="index">{{i}}</th>
......
src/main.js
View file @ 4cf9f7ea
...@@ -30,7 +30,8 @@ Vue.http = Vue.prototype.$http = axios ...@@ -30,7 +30,8 @@ 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) => {
// console.log("from",from.path)
sessionStorage.setItem("FromPath",from.path);
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)
...@@ -43,6 +44,7 @@ router.beforeEach((to, from, next) => { ...@@ -43,6 +44,7 @@ router.beforeEach((to, from, next) => {
} }
next() next()
}) })
Vue.prototype.getLocalStorage = function() { Vue.prototype.getLocalStorage = function() {
var localStorageData = window.localStorage["userInfo"]; var localStorageData = window.localStorage["userInfo"];
if (localStorageData != undefined) { if (localStorageData != undefined) {
...@@ -51,6 +53,22 @@ Vue.prototype.getLocalStorage = function() { ...@@ -51,6 +53,22 @@ Vue.prototype.getLocalStorage = function() {
return null; return null;
} }
}, },
// 注册
Vue.filter('priceFormat', function (value) {
if (value == null) {
return 0.00;
}
let nStr = value.toFixed(2)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
})
new Vue({ new Vue({
router, router,
store, store,
......
src/store.js
View file @ 4cf9f7ea
...@@ -22,7 +22,7 @@ export default new Vuex.Store({ ...@@ -22,7 +22,7 @@ export default new Vuex.Store({
state.isLogin = data; state.isLogin = data;
}, },
updateUser(state,data){ updateUser(state,data){
state.user = data state.user = data;
} }
}, },
actions: { actions: {
......
src/views/login.vue
View file @ 4cf9f7ea
...@@ -301,11 +301,20 @@ export default { ...@@ -301,11 +301,20 @@ export default {
let userInfo = r.data.data; let userInfo = r.data.data;
let userJson = JSON.stringify(userInfo); let userJson = JSON.stringify(userInfo);
localStorage.userInfo = userJson; localStorage.userInfo = userJson;
if(this.$route.query.id&&this.$route.query.path){ let FromPath=sessionStorage.getItem("FromPath");
this.$store.commit('changeLogin',1);
this.$store.commit('updateUser',userInfo);
if(FromPath){
this.$router.push({ path: FromPath})
}
else if(this.$route.query.id&&this.$route.query.path){
let path=`${this.$route.query.path}/${this.$route.query.id}`; let path=`${this.$route.query.path}/${this.$route.query.id}`;
this.$router.push({ path }) this.$router.push({ path })
}else{ }
location.href='/' else{
this.$router.push({ path: '/'})
} }
this.$message.success(r.data.message); this.$message.success(r.data.message);
this.loging=false; this.loging=false;
......
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