Commit 4cf9f7ea authored by huangyuanyuan's avatar huangyuanyuan

update

parent 1d6e0420
......@@ -59,12 +59,12 @@ export default {
<style>
@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';
body,html{
padding: 0px;
margin: 0px;
font-family:'微软雅黑',' Microsoft YaHei';
font-family:'微软雅黑',' Microsoft YaHei','PingFang','PingFangR';
-webkit-font-smoothing: antialiased;
height: 100%;
}
......
......@@ -259,5 +259,7 @@ var commonUtils = {
}
return dateStr;
},
}
export default commonUtils
......@@ -78,12 +78,16 @@
</el-table-column>
<el-table-column
prop="preferPrice"
label="实付金额">
<template slot-scope="scope">
{{scope.row.preferPrice | priceFormat}}
</template>
</el-table-column>
<el-table-column
prop="refund"
label="退款金额">
<template slot-scope="scope">
{{scope.row.refund | priceFormat}}
</template>
</el-table-column>
<el-table-column
prop="createTime"
......@@ -112,10 +116,6 @@
<el-table-column label="操作">
<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"
size="mini" style="border:1px solid #EE4454;color:#EE4454"
@click="handlePay(scope.$index, scope.row)">去付款</el-button>
......@@ -124,7 +124,7 @@
</template>
</el-table-column>
</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
@current-change="Currentchange"
background
......@@ -178,6 +178,18 @@ export default {
if(res.data.resultCode==1){
this.$message.success("请求成功!")
this.List();
let msg={
AirOrderId:row.id,
MsgType:Refund
}
// 推送接口
this.apipost("airline_get_GetB2BAirLineList",msg,
res => {
// console.log(res)
},
err => {
}
);
}else{
this.Error(res.data.message);
......@@ -230,7 +242,7 @@ export default {
this.form.endTime=this.form.time[1];
}
this.apiJavaPost('/api/dmc/airticket/GetB2BAirtickOrderPageList',this.form,res=>{
// console.log(res);
console.log(res);
this.loading=false;
if(res.data.resultCode==1){
this.tableData=res.data.data.pageData;
......@@ -247,6 +259,9 @@ export default {
</script>
<style>
.AirlineTicketOrder .el-input__inner{
border-radius: 0;
}
.AirlineTicketOrder .el-table__header{
background: #DDDDDD;
}
......
<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>
<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>
This diff is collapsed.
......@@ -110,7 +110,7 @@
<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>
<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-select>
</div>
......@@ -120,7 +120,7 @@
<div class="tx_list" style="margin:10px 0" v-for="(item,index) in personNum.guestList" :key="index">
<el-col :span="4">
<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老人 -->
<p style="background:#49C0A1;color:#fff">
<span v-if="item.ageType=='1'">成年</span>
......@@ -132,27 +132,31 @@
</el-col>
<el-col :span="20">
<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 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 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 label="性别" :prop="'guestList.'+index+'.sex'" :rules="[{ required: true, message: '请选择性别', trigger: 'change' }]">
<el-radio-group :disabled="disabled" v-model="item.sex">
<el-radio :label=1 :value=1></el-radio>
<el-radio :label=2 :value=2></el-radio>
<el-radio-group v-show="!disabled" :disabled="disabled" v-model="item.sex">
<el-radio :label=1 :value=1></el-radio>
<el-radio :label=2 :value=2></el-radio>
</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 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-select>
</el-form-item>
<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-col>
</div>
......@@ -165,16 +169,16 @@
<p class="lxr">联系人信息</p>
<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-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 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 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 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>
</div>
......@@ -315,6 +319,12 @@ export default {
}
</script>
<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{
height: 28px!important;
}
......
......@@ -7,7 +7,7 @@
<p style="font-size:14px">订单提交成功!剩余支付时间
<span style="color:#FF680B;font-size:18px">{{time_15}}</span>
<span style="text-align:center;float:right">应付金额
<span style="color:#FF680B;font-size:18px">{{Commoditydetails.preferPrice}}</span>
<span style="color:#FF680B;font-size:18px">{{Commoditydetails.preferPrice | priceFormat}}</span>
</span>
</p>
<p style="font-size:12px">请您在
......@@ -21,8 +21,8 @@
订单号 : {{Commoditydetails.airOrderId}}
<div class="triangle_border_left"></div>
</div>
<p style="text-align:center">支付金额
<span style="color:#FF680B;font-size:18px">{{Commoditydetails.preferPrice}}</span>
<p style="text-align:center;font-size:24px">支付金额
<span style="color:#FF680B;font-size:30px">{{Commoditydetails.preferPrice | priceFormat}}</span>
</p>
<el-row style="margin-top:15px" v-loading="codeLoading">
<el-col class="position" style="padding-right:50px" :span="12">
......@@ -94,12 +94,12 @@
</div>
<div class="div_2">
<p>
<span>支付金额:¥12545</span>
<span>支付平台:支付宝</span>
<span>支付金额:¥{{Commoditydetails.preferPrice | priceFormat}}</span>
<!-- <span>支付平台:支付宝</span> -->
</p>
<p>
<span>订单编号:584569846568</span>
<span>下单时间:2019-02-02</span>
<span>订单编号:{{Commoditydetails.airOrderId}}</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> -->
......@@ -176,7 +176,9 @@ export default {
);
},
Code(str) {
this.codeLoading=true;
console.log("this.codeLoading",this.codeLoading)
this.code_ts="";
this.zfbpay_imgcode = false;
this.wxpay_imgcode = false;
......@@ -206,20 +208,20 @@ export default {
this.zfbpay_imgcode = true;
}
// if(res.data.data.IsUpdateAirOrderPayStatus==1){
// // 获取支付状态
// this.apiJavaPost(
// "/api/dmc/airticket/SetB2BAirtickOrderPayStatus",
// { AirOrderId: this.AirOrderId },
// res => {
// if (res.data.resultCode == 1) {
// }else{
// this.$message.error(res.data.message)
// }
// },
// null);
// }
if(res.data.data.IsUpdateAirOrderPayStatus==1){
// 获取支付状态
this.apiJavaPost(
"/api/dmc/airticket/SetB2BAirtickOrderPayStatus",
{ AirOrderId: this.AirOrderId },
res => {
if (res.data.resultCode == 1) {
}else{
this.$message.error(res.data.message)
}
},
null);
}
}
},
......@@ -370,7 +372,7 @@ export default {
position: absolute;
}
.payvue_content .pay_img {
width: 340px;
width: 350px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 6px 0px rgba(107, 107, 107, 0.2);
padding: 28px 10px;
......
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
.header .Info div{
float: left;
margin-top:10px;
margin:8px 0;
}
.header .ckxx{
width:39px;
......@@ -11,8 +11,9 @@
background:rgba(73,192,161,1);
border-radius:50%;
color:#fff;
font-size: 10px;
font-size: 12px;
text-align: center;
padding:6px;
}
.header .zf{
width:38px;
......@@ -23,6 +24,7 @@
font-size: 12px;
text-align: center;
line-height: 38px;
padding:7px;
/* margin-top:8px */
}
.header .fg{
......@@ -169,10 +171,12 @@ export default {
user(){
return this.$store.state.user
},
homePage(){
return this.$store.state.homePage
}
},
watch:{
homePage:{
handler: function(val, oldVal) {
......@@ -180,7 +184,7 @@ export default {
// console.log(oldVal)
},
deep: true
}
},
},
created(){
let userInfo = this.$store.state.user;
......
<style>
.calendar-box .calendar{
.newcalendar-box .calendar{
width: 100%;
overflow: hidden;
table-layout: fixed;
}
.calendar-box .calendar th{
.newcalendar-box .calendar th{
height: 20px;
padding: 10px 0;
line-height: 20px;
background: #eee;
color: #333;
color: #999999;
text-align: center;
font-size: 14px;
font-family: 'PingFangR';
......@@ -50,19 +50,19 @@
text-align: center;
padding:0;
margin: 10px 0;
color: #ff4646;
color: #EE4454;
}
.dayList.yesPrice:hover{
background: #FF680B;
color:#fff!important;
}
.dayList.yesPrice:hover .price{
color:#fff;
color:#fff!important;
}
</style>
<template>
<div class="calendar-box" id='calendar'>
<div class="newcalendar-box" id='calendar'>
<table class="calendar" cellspacing=0 cellpadding=0>
<thead>
<th v-for="(i,index) in week" :key="index">{{i}}</th>
......
......@@ -30,7 +30,8 @@ Vue.http = Vue.prototype.$http = axios
Vue.commonUtils = Vue.prototype.$commonUtils=commonUtils
Vue.prototype.$echarts = echarts
router.beforeEach((to, from, next) => {
// console.log("from",from.path)
sessionStorage.setItem("FromPath",from.path);
if (to.meta.title) {
if(localStorage.g && localStorage.g!='undefined'){
if(JSON.parse(localStorage.g).i!=2)
......@@ -43,6 +44,7 @@ router.beforeEach((to, from, next) => {
}
next()
})
Vue.prototype.getLocalStorage = function() {
var localStorageData = window.localStorage["userInfo"];
if (localStorageData != undefined) {
......@@ -51,6 +53,22 @@ Vue.prototype.getLocalStorage = function() {
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({
router,
store,
......
......@@ -22,7 +22,7 @@ export default new Vuex.Store({
state.isLogin = data;
},
updateUser(state,data){
state.user = data
state.user = data;
}
},
actions: {
......
......@@ -301,11 +301,20 @@ export default {
let userInfo = r.data.data;
let userJson = JSON.stringify(userInfo);
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}`;
this.$router.push({ path })
}else{
location.href='/'
}
else{
this.$router.push({ path: '/'})
}
this.$message.success(r.data.message);
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