Skip to content

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

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

parents 4783a6c3 62517d21
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 795 additions and 20 deletions
src/components/Ticket/FillItinerary.vue
View file @ dbbbdd03
......@@ -207,7 +207,7 @@
<el-input size="small" v-model="personNum.ContactEmail"></el-input>
</el-form-item>
<el-form-item style="width:450px" label="备注">
<el-input size="small" type="textarea" v-model="personNum.Remarks"></el-input>
<el-input size="small" type="textarea" style="width:970px;" v-model="personNum.Remarks"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -234,7 +234,7 @@
</div>
<span class="kdj">
<span v-if="item.overlapUse==1">可叠加</span>
<span v-else>不可叠加</span>
<span v-else class="fillDisBuke">不可叠加</span>
</span>
<p style="margin-top:10px">
......@@ -242,9 +242,12 @@
<span v-else>{{item.denomination}}折</span>
</p>
<p style="font-size:14px">满{{item.useCondition}}使用</p>
<p style="font-size:12px;color:#4C58A4;margin-top:6px">
<p v-if="item.overlapUse==1" style="font-size:12px;color:#4C58A4;margin-top:6px">
有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
</p>
<p v-else style="font-size:12px;color:#d1d1d1;margin-top:6px">
有效期：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}
</p>
<div v-if="Platfrom(item.fromPlatform)" class="_choice_box">
<span v-if="!item.active"></span>
......@@ -261,7 +264,8 @@
<!-- 提交订单 -->
<div class='tjorder' v-show="!personnums">
<div style="width:80%;margin:0 auto;color:#cccccc;position:relative">
<p style="font-size:14px;text-align:right;">条款和限制<span style="color:#49C0A1">《网上购票须知》</span> </p>
<p style="font-size:14px;text-align:right;">
<el-checkbox v-model="checkedXieyi">我已阅读并同意</el-checkbox><span style="color:#49C0A1;cursor:pointer;" @click.stop="showTips=true">《网上购票须知》</span>
<p>
<span>总价</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.PreferPrice| priceFormat}}</span>
......@@ -282,6 +286,23 @@
</div>
</div>
<!-- 网上购票须知弹窗 -->
<el-dialog custom-class='w800' title="网上购票须知" :visible.sync="showTips" center>
<div class="buyTicketxu">
<div>1.购买我司机票为团队机票，需起飞前3天出票，提供票号。</div>
<div>2.购买我司机票为团队机票，若起飞提前7天内此团未拼成团，不低于（10人）我司无责任取消，支付的金额原路退回</div>
<div>3.购买我司机票为团队机票，支付后此票 不退、不签、不改，请您知晓！</div>
<div>4.购买我司机票为团队机票，名字出票后，不可更换字母，不可换人</div>
<div>5.购买我司机票为团队机票，大人、孩童同价，婴儿我社无权代理出票，请您致电航司电话进行购买婴儿票</div>
<div>6.购买我司机票为团队机票，最终解释权归四川和平国际旅行社有限公司所有</div>
</div>
</el-dialog>
<!-- 验证是否可以下单弹窗 -->
<el-dialog custom-class='w400' title="温馨提示" :visible.sync="OrderTips" center>
<div class="buyTicketxu" style="color:red;">
<div>该时间段无法下单，下单时间为9:30-20:00</div>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -331,6 +352,9 @@ export default {
ActivateCode:'',
Verification:'',
showTips:false,
checkedXieyi:false,
OrderTips:false,
}
},
created(){
......@@ -344,12 +368,42 @@ export default {
},err => {});
},
mounted () {
if(this.$route.query.isNew){
this.getTime();
}
this.GetDes();
this.GetCountroy()
this.SellInfo();
this.getUserCanUseCouponList();
//检测是否第一次弹出弹窗旅客须知
if(sessionStorage.getItem('isFirstLoad')==null){
this.showTips=true;
sessionStorage.setItem("isFirstLoad",1);
}
// if (localStorage.getItem('wasVisited') != undefined||localStorage.getItem('wasVisited') != null) {
// this.showTips=false;
// } else {
// localStorage.setItem('wasVisited', 1);
// this.showTips=true;
// }
},
methods: {
//调用后台时间确认是否可以下单
getTime(){
let msg={
Type:1
}
this.apipost(
"sellorder_get_GetNewServerTime", {},
res => {
if (res.data.resultCode != 1) {
this.OrderTips=true;
}
},
err => {
}
);
},
Platfrom(str){
if(str){
if(str.indexOf('0')!=-1 || str.indexOf('3')!=-1){
......@@ -367,7 +421,6 @@ export default {
dom.click()
},
clickCoupon: function (item) {
console.log("item",item);
let list = [];
if (!item.active) { // 是否选中
if(item.denomination>this.SettlementPrice){
......@@ -636,6 +689,10 @@ export default {
this.personnums=false;
},
submitForm() {
if(!this.checkedXieyi){
this.Error('请阅读并同意购票须知');
return;
}
let status1=false;
let status2=false;
this.$refs.personNumList.validate((valid) => {
......@@ -652,6 +709,12 @@ export default {
return;
}
});
let saleName='';
this.SellInfoList.forEach(x=>{
if(this.personNum.EnterID==x.EmployeeId){
saleName=x.EmName;
}
})
if(status1&&status2){
this.submitLoad=true;
this.personNum.CustomerId=this.userInfo.customerId;
......@@ -662,13 +725,19 @@ export default {
this.submitLoad=false;
if (res.data.resultCode == 1) {
this.personNum={};
this.$router.push({
name: "Pay",
this.personNum={};
// this.$router.push({
// name: "Pay",
// query: {
// id: res.data.data,
// }
// });
this.$router.push({
name: "TicketPaybefore",
query: {
id: res.data.data,
}
});
saleName:saleName
}
});
}else{
this.$message.error(res.data.message)
}
......@@ -956,4 +1025,26 @@ font-size: 14px;
height: 50px;
box-shadow:0px 1px 0px 0px rgba(238,238,238,1);
}
.fillDisBuke{
background-color:#d1d1d1;
display:inline-block;
width:100%;
height:100%;
}
.FillItinerary .el-checkbox__label{
color: #fff;
}
.FillItinerary .el-checkbox__input.is-checked+.el-checkbox__label{
color: #f56c6c;
}
.FillItinerary .el-checkbox__input.is-checked .el-checkbox__inner, .loginNationalDay .el-checkbox__input.is-indeterminate .el-checkbox__inner{
background-color: #f56c6c;
border-color: #f56c6c;
}
.buyTicketxu div{
margin-bottom:10px;
}
.w800{width: 800px;}
.w400{width:400px;}
</style>
src/components/Ticket/NewChooseCity.vue 0 → 100644
View file @ dbbbdd03
This diff is collapsed.
src/components/Ticket/NewChooseCity1.vue 0 → 100644
View file @ dbbbdd03
This diff is collapsed.
src/components/Ticket/TicketHome.vue
View file @ dbbbdd03
......@@ -283,7 +283,7 @@
</div>
</template>
<script>
import ChooseCity from "@/components/Ticket/ChooseCity.vue";
import ChooseCity from "@/components/Ticket/NewChooseCity.vue";
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue";
import moment from "moment";
export default {
......
src/components/Ticket/TicketList.vue
View file @ dbbbdd03
......@@ -318,7 +318,7 @@
</div>
</template>
<script>
import ChooseCity from "@/components/Ticket/ChooseCity.vue";
import ChooseCity from "@/components/Ticket/NewChooseCity.vue";
import ChooseCity1 from "@/components/Ticket/ChooseCity1.vue";
import moment from "moment";
import calendar from "@/components/mall/newcalendar.vue";
......@@ -494,7 +494,8 @@ export default {
sessionStorage.setItem("Homepage", "ticket");
// localStorage.homePage = 'ticket';
this.$router.push({
path: `/ticket/FillItinerary/${item.id}`
path: `/ticket/FillItinerary/${item.id}`,
query: { isNew: 'isNewAdd' }
});
}
},
......
src/components/Ticket/TicketPaybefore.vue 0 → 100644
View file @ dbbbdd03
<style>
.orderSuccess{
width: 300px;
height: auto;
margin: auto;
text-align: left;
color: #333;
font-size: 18px;
margin-top: 50px;
}
.orderSpan{
position: relative;
margin-left:10px;
top:3px;
color:#49C0A1;
}
.orderContract{
font-size:14px;
margin-bottom:20px;
text-align:left;
}
.LookBtn{
width:70px;
height:30px;
background-color: #EE4454;
color:#fff;
border: none;
outline: none;
cursor: pointer;
border-radius: 4px;
margin:43px 0 0 60px;
}
</style>
<template>
<div class="orderSuccess">
<div>
<img style="vertical-align:middle;" src="../../assets/img/hotel/smile.png" alt=""/>
<span class="orderSpan">订单预订成功</span>
</div>
<div class="orderContract" style="margin-top:30px;">订单正在确认中请稍候...</div>
<div class="orderContract">或与服务专员&nbsp;<span style="color:red;font-weight:bold;">{{saleName}}</span>&nbsp;联系</div>
<div class="orderContract">确认之后会有短信请注意查收</div>
<input type="button" class="LookBtn" @click="goOrders" value="查看订单"/>
</div>
</template>
<script>
export default {
data() {
return {
saleName:'',
};
},
created() {
},
mounted(){
if(this.$route.query.saleName){
this.saleName=this.$route.query.saleName
}
},
methods: {
goOrders(path){
this.$router.push({ path: '/newPersonalCenter?key=8-5'})
}
}
}
</script>
src/components/newPersonalCenter/block/model/TkOrder.vue
View file @ dbbbdd03
......@@ -120,9 +120,14 @@
<span v-if="scope.row.refundStatus==3">已退款</span>
</p> -->
<p>
<span v-if="scope.row.orderState==1">待付款</span>
<span v-if="scope.row.orderState==2">正常</span>
<span v-if="scope.row.orderState==3">取消</span>
<template v-if="scope.row.airConfirm==2">
<span >待确认</span>
</template>
<template v-else>
<span v-if="scope.row.orderState==1">待付款</span>
<span v-if="scope.row.orderState==2">正常</span>
<span v-if="scope.row.orderState==3">取消</span>
</template>
</p>
</div>
<!-- <p @click="OrderDes(scope.row)" style="color:#DDDDDD;cursor:pointer">订单详情</p> -->
......@@ -132,7 +137,7 @@
<el-table-column label="操作">
<template slot-scope="scope">
<el-button v-show="scope.row.orderState==1"
<el-button v-show="scope.row.orderState==1&&scope.row.airConfirm!=2"
size="mini" style="border:1px solid #EE4454;color:#EE4454"
@click="handlePay(scope.$index, scope.row)">去付款</el-button>
<!-- <el-button v-show="scope.row.status==1 && scope.row.refundStatus==1"
......@@ -160,6 +165,10 @@ export default {
Type: "全部",
ID: 0
},
{
Type:'待确认',
ID: 4
},
{
Type: "待付款",
ID: 1
......@@ -171,7 +180,7 @@ export default {
{
Type: "取消",
ID: 3
}
},
],
totalCount:0,
provideItem:[],
......
src/router.js
View file @ dbbbdd03
......@@ -385,6 +385,15 @@ export default new Router({
title: "行程填写"
}
},
{
path:'ticket/TicketPaybefore',
name: "TicketPaybefore",
component: resolve =>
require(["@/components/Ticket/TicketPaybefore"], resolve),
meta: {
title: "订单预订成功"
}
},
{
path: "/HotelHome",
name: "HotelHome",
......
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