Skip to content

A
Athena
Commit 8e979134 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 20d3c16e
Hide whitespace changes
Inline Side-by-side
Showing with 811 additions and 148 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 8e979134
......@@ -71,32 +71,35 @@
</span>
</div>
</el-popover>
<p class="f12">套餐列表</p>
<p v-show="mealType.pkgs.length>0" class="f12">套餐列表</p>
<div style="margin-top:16px" class="typeList">
<span :class="mealTypeindex==index?'mealactive':''" @click="getmealTypeItem(item,index)" v-for="(item,index) in mealType.pkgs" :key="index+100">{{item.pkg_name}}</span>
</div>
<p style="margin:15px 0" class="f12">范围</p>
<el-row style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price1_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price1_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price1_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price2_age_range!='~' && mealTypeItem.price2_age_range!='0~0'" style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price2_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price2_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price2_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price3_age_range!='~'&& mealTypeItem.price3_age_range!='0~0'" style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price3_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price3_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price3_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price4_age_range!='~'&& mealTypeItem.price4_age_range!='0~0'">
<el-col :span="17"><span class="f12">{{mealTypeItem.price4_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price4_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price4_qty" :min="0" ></el-input-number></el-col>
</el-row>
<div v-show="mealTypeindex!=-1">
<p style="margin:15px 0" class="f12">范围</p>
<el-row style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price1_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price1_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price1_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price2_age_range!='~' && mealTypeItem.price2_age_range!='0~0'" style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price2_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price2_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price2_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price3_age_range!='~'&& mealTypeItem.price3_age_range!='0~0'" style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price3_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price3_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price3_qty" :min="0" ></el-input-number></el-col>
</el-row>
<el-row v-if="mealTypeItem.price4_age_range!='~'&& mealTypeItem.price4_age_range!='0~0'">
<el-col :span="17"><span class="f12">{{mealTypeItem.price4_age_range}}</span></el-col>
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price4_b2c}}</span></el-col>
<el-col :span="5"> <el-input-number size="mini" v-model="msgObj.price4_qty" :min="0" ></el-input-number></el-col>
</el-row>
</div>
<p v-show="eventnoList.length>0" style="margin:15px 0" class="f12">场次</p>
<div style="margin-top:16px" class="typeList">
<span :class="eventTypeindex==index?'mealactive':''" @click="getEventTypeItem(item,index)" v-for="(item,index) in eventnoList" :key="index+100">{{item.day}}</span>
......@@ -209,7 +212,7 @@ export default {
data () {
return {
eventTypeindex:-1,
mealTypeindex:0,
mealTypeindex:-1,
LiactiveIndex:0,
value:4.2,
visible:false,
......@@ -236,13 +239,15 @@ export default {
event_backup_data:'',
event_no:'1',
Mobile_Device:null,
ProductPic:'',
ProductType:'',
},
eventnoList:[],
pkg_no:"",
}
},
created(){
console.log(moment("2019-02-01").isBefore("2019-02-02"))
this.isLogin=this.$store.state.isLogin;
},
mounted() {
let list=[];
......@@ -255,6 +260,10 @@ export default {
},
methods: {
YdBtn(){
if(this.isLogin==0){
this.Error("请先登录");
return;
}
let that=this;
if(that.msgObj.s_date=="" || !that.msgObj.s_date){
this.Error("请选择日期！")
......@@ -264,6 +273,9 @@ export default {
this.Error("出行人数至少一人！");
return;
}
that.msgObj.DomainUrl=that.DomainUrl;
that.msgObj.ProductPic=that.dataDetail.prod_img_url;
that.msgObj.ProductType=that.dataDetail.prod_type;
that.msgObj.prod_name=that.dataDetail.prod_name;
that.msgObj.price1_age_range=that.mealTypeItem.price1_age_range;
that.msgObj.price2_age_range=that.mealTypeItem.price2_age_range;
......@@ -283,7 +295,6 @@ export default {
that.msgObj.total_price=that.msgObj.price1_qty*that.mealTypeItem.price1+that.msgObj.price2_qty*that.mealTypeItem.price2+that.msgObj.price3_qty*that.mealTypeItem.price3+that.msgObj.price4_qty*that.mealTypeItem.price4;
that.msgObj.MySelfTotalPrice=that.msgObj.price1_qty*that.mealTypeItem.price1_b2c+that.msgObj.price2_qty*that.mealTypeItem.price2_b2c+that.msgObj.price3_qty*that.mealTypeItem.price3_b2c+that.msgObj.price4_qty*that.mealTypeItem.price4_b2c;
this.msgObj.prod_no=that.id;
// console.log("that.id",that.id)
if(this.getLocalStorage()){
let userInfo = this.getLocalStorage();
this.msgObj.CustomerId = userInfo.customerId;
......@@ -298,9 +309,12 @@ export default {
this.msgObj.event_backup_data=item.is_hl;
},
getmealTypeItem(item,index){
// console.log(item);
console.log("item",item)
this.msgObj.ProductPKGName=item.pkg_name;
this.msgObj.pkg_no=item.pkg_no;
this.mealTypeItem=item;
this.mealTypeindex=index;
this.getEventNoList(item.pkg_no);
},
LiHover(item,index){
......@@ -308,7 +322,6 @@ export default {
this.ActiveSrc=item.img_url;
},
ConcatImg(src){
// console.log("src",this.DomainUrl+src);
return this.DomainUrl+src;
},
getEventNoList(id){
......@@ -344,20 +357,13 @@ export default {
if (res.data.data.result === "00") {
this.mealType=res.data.data;
// console.log("this.mealType",this.mealType)
this.msgObj.guid=this.mealType.guid;
if(this.mealType.pkgs.length>0){
this.mealTypeItem=this.mealType.pkgs[0];
console.log("this.mealTypeItem",this.mealTypeItem)
this.pkg_no=this.mealTypeItem.pkg_no;
this.getEventNoList(id);
}
this.dateList=this.mealType.sale_dates.saleDt;
this.dateList.forEach(item=>{
item.YM=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6);
item.dateStr=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6)+"-"+item.sale_day.substring(6,8);
})
// console.log("this.dateList",this.dateList);
this.GetCurrentDays()
}else{
......@@ -438,10 +444,10 @@ export default {
this.GetCurrentDays();
},
SelectChild(item){
this.msgObj.pkg_no=item.pkg_no;
// this.msgObj.pkg_no=item.pkg_no;
this.msgObj.s_date=item.date_str;
this.msgObj.dateStr=item.date_str;
// console.log("this.msgObj",item)
console.log("this.msgObj",this.msgObj.pkg_no)
this.visible=false;
},
creatCalendar(list) {
......
src/components/FreeTravel/FreePay.vue 0 → 100644
View file @ 8e979134
<template>
<div class="pay_vue">
<el-row v-show="order_exit=='1'" :gutter="18">
<el-col :span="18" :offset="3">
<!-- 头部 -->
<div class="head" style="margin-top:20px;">
<div style="box-sizing:border-box;">
<div style="float:left;">
<i class="iconfont icon-jinggao"></i>
<div style="margin-left:50px">
<p style="font-size:14px;font-weight:600">
订单提交成功！
</p>
<p style="font-size:12px">请您在
<span style="color:#FF680B;">12小时</span>
内完成支付，否则订单会自动取消</p>
</div>
</div>
<div style="text-align:center;float:right">
<span style="font-weight:200;font-size:12px;margin-right:10px;">应付金额</span>
<span style="color:#FF680B;font-size:18px;font-weight:bold;">{{code.total_fee}}</span>
<span style="font-size:12px;color:#333333">元</span>
</div>
</div>
</div>
<div class="payvue_content" style="margin-bottom:30px;">
<div class="ordernum">
订单号 : {{code.orderId}}
<div class="triangle_border_left"></div>
</div>
<p style="text-align:center;font-size:18px;color:#333333">支付金额
<span style="font-size:18px;color:#FF680B;">￥</span>
<span style="color:#FF680B;font-size:30px;font-weight:bold;">{{code.total_fee}}</span>
</p>
<el-row style="margin-top:30px" v-loading="codeLoading">
<el-col class="position" style="padding-right:50px" :span="12">
<div style="float:right" class="pay_img">
<div class="w21">
<img class="title_img" src="../../assets/img/ticket/zfb.png" alt="">
<div class="title_content">
<p>支付宝</p>
<p>
<span @click="Code('3')" style="cursor:pointer;color:#FF680B;font-size:14px">点击生成二维码</span>
打开支付宝扫码支付
</p>
</div>
</div>
<div v-show="zfbpay_imgcode" style="text-align:center">
<img class="pay_imgcode" :src="codeInfo.CodeURL" alt="">
<p style="color:#FF680B;cursor:pointer" @click="Code('3')" v-show="code_ts!=''">{{code_ts}}</p>
<!-- <p>二维码有效时限
<span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
</p> -->
</div>
</div>
</el-col>
<el-col class="position" style="padding-left:50px" :span="12">
<div class="pay_img">
<div class="w21">
<img class="title_img" src="../../assets/img/ticket/weixin.png" alt="">
<div class="title_content">
<p>微信</p>
<p>
<span @click="Code('1')" style="cursor:pointer;color:#FF680B;font-size:14px">点击生成二维码</span>
打开微信扫码支付
</p>
</div>
</div>
<div v-show="wxpay_imgcode" style="text-align:center">
<img class="pay_imgcode" :src="codeInfo.CodeURL" alt="">
<p style="color:#FF680B;cursor:pointer" @click="Code('1')" v-show="code_ts!=''">{{code_ts}}</p>
<!-- <p>二维码有效时限
<span style="color:#FF680B;font-size:14px">{{time_zfb_5}}</span>
</p> -->
</div>
</div>
</el-col>
</el-row>
</div>
</el-col>
</el-row>
<!-- 订单自动取消 -->
<div v-show="order_exit=='2'" style="margin:20px auto;text-align:center">
<span>{{order_exit_info}}</span>
<router-link to="/HotelSure" style="color:#ee4454;text-decoration:underline">返回重新下单>></router-link>
</div>
<div class="orderPay" v-show="order_exit=='3'">
<div class="div_1">
<img src="../../assets/img/ticket/gou.png" alt="">
<div style="padding-left:80px;box-sizing: border-box;width:100%">
<p style="font-size:24px;color:#333;font-weight:700">订单支付成功！</p>
<p style="font-size:12px;color:#333">如有疑问 可致电028-565464646
<!-- <router-link to="/newPersonalCenter?key=8-1" style="color:#ee4454;text-decoration:underline">查看订单>></router-link> -->
</p>
</div>
</div>
<div class="div_2">
<p>
<span>支付金额：￥{{code.total_fee}}</span>
</p>
<p>
<span>订单编号：{{code.orderId}}</span>
</p>
</div>
<img class="back" src="../../assets/img/ticket/back.png" alt="">
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
visa:false,
zfbpay_imgcode: false,
wxpay_imgcode: false,
time_15: 0,
time_zfb_5: 0,
code: {
OrderSource: 1,
body: "",
attach: "",
total_fee: "",
payway: "",
CancelTime:''
},
AirOrderId:0,
Commoditydetails: {},
codeInfo:{},
order_exit:'1',
order_exit_info:"",
order_status:false,
timer:"",
code_yxq:0,
code_timer:'',
code_ts:"",
codeLoading:false,
PayOrder:"",
Pay_timer:"",
CodeVialdTime:0,
payway:-1,
Visainfo:{},
//应付总额
TotalPrice:0,
//订单号
bookingNumber:0
};
},
created() {
this.visa=true;
if(sessionStorage.getItem("FreePay")){
this.code = JSON.parse(sessionStorage.getItem("FreePay"));
// let userInfo = this.getLocalStorage();
// this.TotalPrice=msgList.bookMoney;
// this.bookingNumber=msgList.orderId;
// this.code.body=`酒店名称${msgList.hotelName}，房间数${msgList.totalPnumber}人，总价格${msgList.bookMoney}元`;
// this.code.attach=`${msgList.costType}|${userInfo.name}|${msgList.orderId}|${userInfo.customerId}|${msgList.RB_Branch_id}`
// this.code.total_fee=msgList.bookMoney+'';
// this.code.CancelTime = moment(code.CancelTime).format('YYYY-MM-DD HH:mm:ss');
this.Code('3');
}
},
destroyed: function () {
clearInterval(this.Pay_timer);
},
methods: {
Code(str) {
// console.log("this.code",this.code)
this.payway=str?this.payway=str:this.payway;
this.codeLoading=true;
this.code_ts="";
this.zfbpay_imgcode = false;
this.wxpay_imgcode = false;
this.code.payway = this.payway;
this.apipost(
"OnlinePay_post_GetCodeUrlForCommonB2B",
this.code,
res => {
this.codeLoading=false;
if (res.data.resultCode == 1) {
this.codeInfo=res.data.data;
this.code_yxq=moment(this.codeInfo.ExpireDate).format('x')-moment(this.codeInfo.NowDate).format('x');
if((this.code_yxq/1000)>this.CodeVialdTime){
this.CodeVialdTime=(this.code_yxq/1000);
}
this.PayOrder=this.codeInfo.Pay_Order;
clearInterval(this.Pay_timer);
this.Time5();
this.PayStatus();
if (this.payway == "1") {
//微信
this.wxpay_imgcode = true;
} else if (this.payway == "3") {
//支付宝
this.zfbpay_imgcode = true;
}
if(res.data.data.IsUpdateAirOrderPayStatus==1){
// 获取支付状态
}
}else{
this.Error(res.data.message)
}
},
err => {}
);
},
Time15() {
clearInterval(this.timer);
this.CodeVialdTime =parseInt(this.Commoditydetails.timeMillisecond / 1000);
this.timer = setInterval(() => {
this.CodeVialdTime--;
if (this.CodeVialdTime <= 0) {
clearInterval(this.timer);
clearInterval(this.Pay_timer);
this.order_exit='2';
this.order_exit_info="订单支付超时，请重新下单！"
}
this.time_15 = this.s_to_hs(this.CodeVialdTime);
}, 1000);
},
// 验证是否支付成功
PayStatus(){
this.Pay_timer = setInterval(() => {
this.apipost(
"ticket_get_GetAirPayMoneyIsSuccess",
{PayOrder:this.PayOrder},
res => {
// res.data.resultCode =1;
if (res.data.resultCode == 1) {
clearInterval(this.Pay_timer);
this.order_exit='3';
}else{
// this.$message.error(res.message)
// this.payok=false;
}
},
err => {}
);
}, 10000);
},
s_to_hs(s) {
//计算分钟
//算法：将秒数除以60，然后下舍入，既得到分钟数
var h;
h = Math.floor(s / 60);
//计算秒
//算法：取得秒%60的余数，既得到秒数
s = s % 60;
//将变量转换为字符串
h += "";
s += "";
//如果只有一位数，前面增加一个0
h = h.length == 1 ? "0" + h : h;
s = s.length == 1 ? "0" + s : s;
return h + "分" + s + "秒";
},
Time5() {
clearInterval(this.code_timer);
let numall = this.code_yxq /1000;
this.code_timer = setInterval(() => {
numall--;
if (numall <= 0) {
if(this.CodeVialdTime>0){
this.Code();
}else{
this.code_ts="二维码有效时限过期，点击重新生成"
clearInterval(this.code_timer);
}
}
this.time_zfb_5 = this.s_to_hs(numall);
}, 1000);
},
}
};
</script>
<style>
.pay_vue{
font-family: "PingFang"
}
.pay_vue .icon-jinggao{
color: #49C0A1;
font-size: 38px;
position: absolute;
}
.pay_vue .orderPay .div_2 p span:nth-child(2){
float: right;
}
.pay_vue .orderPay .div_2 {
margin-top: 20px;
width: 320px;
}
.pay_vue .orderPay .div_2 p{
padding:6px 0;
margin:20px 0;
font-size: 12px;
color:#333;
border-bottom:1px solid rgba(221,221,221,1);
}
.pay_vue .orderPay .div_1 img{
width: 54px;
height:54px;
position: absolute;
}
.pay_vue .orderPay .div_1{
position: relative;
box-sizing: border-box;
}
.pay_vue .orderPay{
padding-top:130px;
padding-left:150px;
margin:30px auto;
width:1039px;
height:553px;
position: relative;
box-shadow:0px 4px 38px 0px rgba(107,107,107,0.2);
box-sizing: border-box;
}
.pay_vue .orderPay .back{
position: absolute;
width: 384px;
height: 289px;
right:10px;
top:110px;
}
.position {
box-sizing: border-box;
}
.payvue_content .pay_img .pay_imgcode {
display: block;
margin: 15px auto;
width: 216px;
height: 216px;
}
.payvue_content .pay_img .w21 .title_content {
padding-left: 70px;
box-sizing: border-box;
overflow: auto;
}
.payvue_content .pay_img .w21 {
position: relative;
}
.payvue_content .pay_img .title_img {
width: 47px;
height: 47px;
border-radius: 50%;
position: absolute;
}
.payvue_content .pay_img {
width: 350px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 6px 0px rgba(107, 107, 107, 0.2);
padding: 28px 10px;
box-sizing: border-box;
}
.payvue_content .ordernum {
position: relative;
width: 203px;
height: 35px;
line-height: 35px;
background: #49c0a1;
font-size: 14px;
font-weight: 400;
color: rgba(255, 255, 255, 1);
padding-left: 16px;
box-sizing: border-box;
margin-left:-7px;
border-right-color: transparent;
}
.payvue_content .triangle_border_left{
width:0;
height:0;
border-width:17px 17px 17px 0;
border-style:solid;
border-color:transparent #30a19b transparent transparent;/*透明 灰 透明 透明 */
position: absolute;
right:0;
top:0px;
}
.payvue_content .ordernum:after { /*书签的夹角*/
content: '';
position: absolute;
top: 35px;
left: 0px;
border: 3px solid #49c0a1;
border-left-color: transparent;
border-bottom-color: transparent;
}
.pay_vue p {
margin: 0;
}
.pay_vue .head {
padding: 4px 0;
position: relative;
height: 40px;
}
.payvue_content {
min-height:479px;
position: relative;
margin-top: 15px;
padding-bottom: 25px;
padding-top: 16px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 4px 38px 0px rgba(107, 107, 107, 0.2);
}
</style>
src/components/FreeTravel/FreePayBefore.vue 0 → 100644
View file @ 8e979134
<style>
.payBefore_vue{
width:1200px;
height:auto;
margin:auto;
}
.payBefore_vue .head{
padding: 4px 0;
position: relative;
height: 40px;
width:100%;
}
.payBefore_vue .icon-jinggao{
color: #49C0A1;
font-size: 38px;
position: absolute;
}
.payBefore_content{
min-height: 380px;
position: relative;
margin-top: 15px;
padding-bottom: 25px;
padding-top: 16px;
background: rgba(255, 255, 255, 1);
-webkit-box-shadow: 0px 4px 38px 0px rgba(107, 107, 107, 0.2);
box-shadow: 0px 4px 38px 0px rgba(107, 107, 107, 0.2);
}
.payBefore_content .ordernum{
position: relative;
width: 203px;
height: 35px;
line-height: 35px;
background: #49c0a1;
font-size: 14px;
font-weight: 400;
color: rgba(255, 255, 255, 1);
padding-left: 16px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin-left: -7px;
border-right-color: transparent;
}
.payBefore_content .triangle_border_left{
width: 0;
height: 0;
border-width: 17px 17px 17px 0;
border-style: solid;
border-color: transparent #30a19b transparent transparent;
position: absolute;
right: 0;
top: 0px;
}
.PayBefore_Left{
float:left;
margin-left:173px;
width:435px;
height:150px;
margin-top:30px;
}
.PayBefore_Right{
float:left;
margin-left:26px;
width:349px;
height:218px;
}
.PayBefore_Right img{
width:100%;
}
.PB_img{
width:54px;
height:54px;
float:left;
}
.PB_img img{
width:100%;
}
.PB_Detail{
float:left;
width:363px;
font-size:12px;
color:#333333;
margin-left:10px;
}
.PB_Detail div:first-child{
font-size:24px;
font-weight: bold;
margin-bottom:5px;
}
.HP_time{
color:#EE4454;
font-weight: bold;
}
.HP_zhifu{
width:70px;
height:30px;
background-color: #EE4454;
color:#fff;
border: none;
outline: none;
cursor: pointer;
border-radius: 4px;
margin-top:43px;
}
</style>
<template>
<div class="payBefore_vue">
<!-- 头部 -->
<div class="head" style="margin-top:20px;">
<div style="box-sizing:border-box;">
<div style="float:left;">
<i class="iconfont icon-jinggao"></i>
<div style="margin-left:50px">
<p style="font-size:14px;font-weight:600">
订单提交成功！
</p>
<p style="font-size:12px">请您在
<span style="color:#FF680B;">12小时</span>
内完成支付，否则订单会自动取消</p>
</div>
</div>
<div style="text-align:center;float:right">
<span style="font-weight:200;font-size:12px;margin-right:10px;">应付金额</span>
<span style="color:#FF680B;font-size:18px;font-weight:bold;">{{TotalPrice}}</span>
<span style="font-size:12px;color:#333333">元</span>
</div>
</div>
</div>
<div class="payBefore_content" style="margin-bottom:30px;">
<div class="ordernum">
订单号 : {{bookingNumber}}
<div class="triangle_border_left"></div>
</div>
<div class="clearfix" style="margin-top:45px;">
<div class="PayBefore_Left clearfix">
<div class="PB_img">
<img src="../../assets/img/hotel/smile.png" alt=""/>
</div>
<div class="PB_Detail">
<div>
恭喜您下单成功！
</div>
<div>
为了保证您能够顺利下单，请您在<span class="HP_time">12小时</span>内完成付款，如果在此
时间内未能完成付款我们将自动取消此订单
</div>
</div>
<div>
<input v-if="isShowBtn" type="button" class="HP_zhifu" @click="gotoPay('FreePay')" value="立即支付" />
<!-- <input v-if="!isShowBtn" type="button" class="HP_zhifu" @click="gotoPay('HotelHome')" value="返回首页" /> -->
</div>
</div>
<div class="PayBefore_Right">
<img src="../../assets/img/hotel/paySuccess.png" alt=""/>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//应付总额
TotalPrice:0,
//订单号
bookingNumber:0,
msgList:'',
isShowBtn:true,
};
},
created() {
if(sessionStorage.getItem("FreePay")){
this.msgList = JSON.parse(sessionStorage.getItem("FreePay"));
this.TotalPrice=this.msgList.total_fee;
this.bookingNumber=this.msgList.orderId;
}
},
methods: {
gotoPay(path){
this.$router.push({
path:path
})
}
}
};
</script>
<style>
</style>
src/components/FreeTravel/OrderConfirmation.vue
View file @ 8e979134
......@@ -33,11 +33,20 @@
</el-select>
<el-input size="mini" style="width:300px" v-model="freeMsg.buyer_tel_number"></el-input>
</el-form-item>
<el-form-item label="Email" prop="buyer_email" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
]">
<el-form-item label="Email" prop="buyer_email" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
<el-input placeholder="接收确认邮件，获得出行资讯" size="mini" style="width:300px" v-model="freeMsg.buyer_email"></el-input>
</el-form-item>
<el-form-item label="导览语系">
<el-form-item label="国籍" prop="buyer_country" :rules="[{required: true, message: '国籍不能为空', trigger: 'blur'}]">
<el-select @change="GenderSelect" v-show="tel_country_code.length>0" v-model="freeMsg.buyer_country" size="mini" style="margin-right:8px" filterable placeholder="请选择">
<el-option
v-for="(item,index) in tel_country_code"
:key="index"
:label="item.Country_Name"
:value="item.Country_Code">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="guide_langList.length>0" label="导览语系">
<el-select @change="GenderSelect" size="mini" style="margin-right:8px" v-model="freeMsg.guide_lang" filterable placeholder="请选择">
<el-option
v-for="item in guide_langList"
......@@ -55,7 +64,7 @@
</div>
</el-form>
<el-form class="OrderConForm" ref="listform" :model="listform" label-width="100px">
<el-form v-show="listform.customNew.length>0" class="OrderConForm" ref="listform" :model="listform" label-width="100px">
<!-- 必填多个客户freeMsg -->
<div class="commomStyle">
<div v-show="item.cus_type!='contact'" v-for="(item,index) in listform.customNew" :key="index">
......@@ -140,30 +149,24 @@
</el-form-item>
<el-form-item label="信用卡持有人">
<el-input placeholder="信用卡cvv" size="mini" style="width:220px" v-model="payObj.credit_card.holder"></el-input>
<el-input placeholder="信用卡cvv" size="mini" style="width:220px" v-model="payObj.credit_card.type"></el-input>
</el-form-item>
<el-form-item label="信用卡类型">
<el-select size="mini" style="margin-right:8px" v-model="payObj.credit_card.type" filterable placeholder="请选择">
<!-- <el-option
v-for="(item,index) in tel_country_code"
:key="index"
:label="item.info"
:value="item.code">
</el-option> -->
</el-select>
<el-input placeholder="信用卡类型" size="mini" style="width:220px" v-model="payObj.credit_card.holder"></el-input>
</el-form-item>
</div>
</div>
</el-form>
<div :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
<el-button :loading="BtnLoading" @click="PayBtn" class="OrderConBtn">
下一步，支付
</div>
</el-button>
</div>
</div>
<div class="right" style="width:388px;box-sizing:border-box">
<div style="border:1px solid rgba(224, 224, 224, 1);box-sizing:border-box">
<div style="width:388px;height:194px;border-radius:3px;">
<img style="width:100%;height:100%" src="../../assets/img//juan/dongjin.png" alt="">
<img style="width:100%;height:100%" :src="picUrl" :onerror="defaultImg" alt="">
</div>
<div style="padding:15px">
<el-row class="cee f22">
......@@ -228,6 +231,7 @@ import moment from 'moment'
export default {
data () {
return {
defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
BtnLoading:false,
dataDetail:{},
form:{},
......@@ -265,13 +269,14 @@ export default {
listform:{
customNew:[],
},
picUrl:"",
}
},
created(){
this.freeMsg = JSON.parse(sessionStorage.getItem("freeMsg"));
let id = this.$route.query.id;
this.freeMsg.buyer_country="TW";
this.freeMsg.buyer_country="CN";
this.freeMsg.guide_lang="zh-tw";
this.freeMsg.custom=[];
this.freeMsg.pay={};
......@@ -286,7 +291,7 @@ export default {
// type: ""
// }
};
console.log("this.freeMsg",this.freeMsg)
// console.log("this.freeMsg",this.freeMsg)
this.getDetails(id)
this.GetInfo();
},
......@@ -370,8 +375,20 @@ export default {
console.log("res",res);
this.BtnLoading=false;
if(res.data.data.orderId) {
if(res.data.data&&res.data.data.orderId) {
this.Success("下单成功！")
let msg={};
let userInfo = this.getLocalStorage();
let user = userInfo.customerId;
let data=res.data.data;
msg.CancelTime=data.CancelTime;
msg.OrderSource=15;
msg.total_fee=data.TotalPrice;
msg.body=data.Describe;
msg.orderId=data.orderId;
msg.attach=`${data.costType}|${userInfo.name}|${data.orderId}|${userInfo.customerId}|${data.RB_Branch_id}`;
sessionStorage.setItem("FreePay",JSON.stringify(msg));
this.$router.push({name:'FreePayBefore'})
}else{
this.$message.error(res.data.message)
}
......@@ -402,57 +419,38 @@ export default {
// console.log(data)
this.dataDetail = data;
this.booking_field=data.booking_field;
let customObj=this.booking_field.custom;
let list_option=this.booking_field.custom.cus_type.list_option;
if(list_option.length==0){
this.markMsg.peopleType=1;
}
this.listform.customNew=[];
let peoplenum=this.freeMsg.price1_qty+this.freeMsg.price2_qty+this.freeMsg.price3_qty+this.freeMsg.price4_qty;
if(list_option.length==0){
this.markMsg.peopleType=1;
let msg={
cus_type:"cus_01",
english_last_name:"",
english_first_name:'',
native_last_name:'',
native_first_name:'',
gender:'F',
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_number:"",
};
this.listform.customNew.push(msg);
}
list_option.forEach(item => {
if(item=="cus_01"){
this.picUrl=this.dataDetail.DomainUrl+this.dataDetail.ProductPic;
if(this.booking_field.custom&&this.booking_field.custom.cus_type&&this.booking_field.custom.cus_type.list_option.length>0){
let customObj=this.booking_field.custom;
let list_option=this.booking_field.custom.cus_type.list_option;
if(list_option.length==0){
this.markMsg.peopleType=1;
}
this.listform.customNew=[];
let peoplenum=this.freeMsg.price1_qty+this.freeMsg.price2_qty+this.freeMsg.price3_qty+this.freeMsg.price4_qty;
if(list_option.length==0){
this.markMsg.peopleType=1;
let msg={
cus_type:"cus_01",
english_last_name:"",
english_first_name:'',
native_last_name:'',
native_first_name:'',
gender:'F',
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_number:"",
};
this.listform.customNew.push(msg);
}
if(item=="contact"){
this.concat=true;
let msg={
cus_type:"cus_01",
english_last_name:"",
english_first_name:'',
native_last_name:'',
native_first_name:'',
gender:'F',
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_number:"",
};
this.listform.customNew.push(msg);
}
if(item=="cus_02"){
this.markMsg.peopleType=2;
for(let i=0;i<peoplenum;i++){
let msg={
cus_type:"cus_02",
list_option.forEach(item => {
if(item=="cus_01"){
this.markMsg.peopleType=1;
let msg={
cus_type:"cus_01",
english_last_name:"",
english_first_name:'',
native_last_name:'',
......@@ -465,50 +463,43 @@ export default {
tel_number:"",
};
this.listform.customNew.push(msg);
}
if(item=="contact"){
this.concat=true;
}
}
console.log("this.listform.customNew",this.listform.customNew)
});
// 判断生日是否必填
if(customObj.birth){
this.markMsg.birth=true;
}
// 英文名
if(customObj.english_first_name){
this.markMsg.english_first_name=true;
}
if(customObj.english_last_name){
this.markMsg.english_last_name=true;
}
// 性别
if(customObj.gender){
this.markMsg.gender=true;
}
// 导游语言
if(customObj.guide_lang){
this.markMsg.guide_lang=true;
this.guide_langList=customObj.guide_lang.list_option;
}
// 导游语言
if(customObj.native_first_name){
this.markMsg.native_first_name=true;
}
// 导游语言
if(customObj.native_last_name){
this.markMsg.native_last_name=true;
}
// 国家区域
if(customObj.tel_country_code){
this.markMsg.tel_country_code=true;
// this.tel_country_code=customObj.tel_country_code.list_option;
}
// 电话号码
if(customObj.tel_number){
this.markMsg.tel_number=true;
if(item=="cus_02"){
this.markMsg.peopleType=2;
for(let i=0;i<peoplenum;i++){
let msg={
cus_type:"cus_02",
english_last_name:"",
english_first_name:'',
native_last_name:'',
native_first_name:'',
gender:'F',
birth:'',
nationality:'CN',
passport_no:'',
tel_country_code:'',
tel_number:"",
};
this.listform.customNew.push(msg);
}
}
console.log("this.listform.customNew",this.listform.customNew)
});
// 导游语言
if(customObj.guide_lang){
this.markMsg.guide_lang=true;
this.guide_langList=customObj.guide_lang.list_option;
}
}
} else {
......@@ -538,7 +529,6 @@ export default {
.OrderCon .OrderConBtn{
width:100%;
height:66px;
line-height:66px;
background:rgba(238,68,84,1);
border-radius:4px;
text-align: center;
......
src/components/mall/FreeCalendar.vue
View file @ 8e979134
......@@ -126,9 +126,13 @@ export default {
},methods:{
selectDate(item){
console.log(item)
let a=false;
a=moment(this.today).isBefore(moment(item.date_str));
if(item.date_str==this.today){
a=true;
}
console.log('a',a)
if(item.pkg_no &&item.pkg_no!="" && a){
this.$emit('SelectChild',item);
}
......
src/router.js
View file @ 8e979134
......@@ -709,6 +709,24 @@ export default new Router({
title: "自由行-订单确认"
}
},
{
path: "/FreePayBefore",
name: "FreePayBefore",
component: resolve =>
require(["@/components/FreeTravel/FreePayBefore.vue"], resolve),
meta: {
title: "自由行-订单确认"
}
},
{
path: "/FreePay",
name: "FreePay",
component: resolve =>
require(["@/components/FreeTravel/FreePay.vue"], resolve),
meta: {
title: "自由行-支付"
}
},
]
},
{
......
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