Skip to content

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

update

parent 20d3c16e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 811 additions and 148 deletions
src/components/FreeTravel/FreeDetail.vue
View file @ 8e979134
...@@ -71,11 +71,12 @@ ...@@ -71,11 +71,12 @@
</span> </span>
</div> </div>
</el-popover> </el-popover>
<p class="f12">套餐列表</p> <p v-show="mealType.pkgs.length>0" class="f12">套餐列表</p>
<div style="margin-top:16px" class="typeList"> <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> <span :class="mealTypeindex==index?'mealactive':''" @click="getmealTypeItem(item,index)" v-for="(item,index) in mealType.pkgs" :key="index+100">{{item.pkg_name}}</span>
</div> </div>
<div v-show="mealTypeindex!=-1">
<p style="margin:15px 0" class="f12">范围</p> <p style="margin:15px 0" class="f12">范围</p>
<el-row style="margin-bottom:10px"> <el-row style="margin-bottom:10px">
<el-col :span="17"><span class="f12">{{mealTypeItem.price1_age_range}}</span></el-col> <el-col :span="17"><span class="f12">{{mealTypeItem.price1_age_range}}</span></el-col>
...@@ -97,6 +98,8 @@ ...@@ -97,6 +98,8 @@
<el-col :span="2"><span class="cee">￥{{mealTypeItem.price4_b2c}}</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-col :span="5"> <el-input-number size="mini" v-model="msgObj.price4_qty" :min="0" ></el-input-number></el-col>
</el-row> </el-row>
</div>
<p v-show="eventnoList.length>0" style="margin:15px 0" class="f12">场次</p> <p v-show="eventnoList.length>0" style="margin:15px 0" class="f12">场次</p>
<div style="margin-top:16px" class="typeList"> <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> <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 { ...@@ -209,7 +212,7 @@ export default {
data () { data () {
return { return {
eventTypeindex:-1, eventTypeindex:-1,
mealTypeindex:0, mealTypeindex:-1,
LiactiveIndex:0, LiactiveIndex:0,
value:4.2, value:4.2,
visible:false, visible:false,
...@@ -236,13 +239,15 @@ export default { ...@@ -236,13 +239,15 @@ export default {
event_backup_data:'', event_backup_data:'',
event_no:'1', event_no:'1',
Mobile_Device:null, Mobile_Device:null,
ProductPic:'',
ProductType:'',
}, },
eventnoList:[], eventnoList:[],
pkg_no:"", pkg_no:"",
} }
}, },
created(){ created(){
console.log(moment("2019-02-01").isBefore("2019-02-02")) this.isLogin=this.$store.state.isLogin;
}, },
mounted() { mounted() {
let list=[]; let list=[];
...@@ -255,6 +260,10 @@ export default { ...@@ -255,6 +260,10 @@ export default {
}, },
methods: { methods: {
YdBtn(){ YdBtn(){
if(this.isLogin==0){
this.Error("请先登录");
return;
}
let that=this; let that=this;
if(that.msgObj.s_date=="" || !that.msgObj.s_date){ if(that.msgObj.s_date=="" || !that.msgObj.s_date){
this.Error("请选择日期！") this.Error("请选择日期！")
...@@ -264,6 +273,9 @@ export default { ...@@ -264,6 +273,9 @@ export default {
this.Error("出行人数至少一人！"); this.Error("出行人数至少一人！");
return; 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.prod_name=that.dataDetail.prod_name;
that.msgObj.price1_age_range=that.mealTypeItem.price1_age_range; that.msgObj.price1_age_range=that.mealTypeItem.price1_age_range;
that.msgObj.price2_age_range=that.mealTypeItem.price2_age_range; that.msgObj.price2_age_range=that.mealTypeItem.price2_age_range;
...@@ -283,7 +295,6 @@ export default { ...@@ -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.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; 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; this.msgObj.prod_no=that.id;
// console.log("that.id",that.id)
if(this.getLocalStorage()){ if(this.getLocalStorage()){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.msgObj.CustomerId = userInfo.customerId; this.msgObj.CustomerId = userInfo.customerId;
...@@ -298,9 +309,12 @@ export default { ...@@ -298,9 +309,12 @@ export default {
this.msgObj.event_backup_data=item.is_hl; this.msgObj.event_backup_data=item.is_hl;
}, },
getmealTypeItem(item,index){ 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.mealTypeItem=item;
this.mealTypeindex=index; this.mealTypeindex=index;
this.getEventNoList(item.pkg_no); this.getEventNoList(item.pkg_no);
}, },
LiHover(item,index){ LiHover(item,index){
...@@ -308,7 +322,6 @@ export default { ...@@ -308,7 +322,6 @@ export default {
this.ActiveSrc=item.img_url; this.ActiveSrc=item.img_url;
}, },
ConcatImg(src){ ConcatImg(src){
// console.log("src",this.DomainUrl+src);
return this.DomainUrl+src; return this.DomainUrl+src;
}, },
getEventNoList(id){ getEventNoList(id){
...@@ -344,20 +357,13 @@ export default { ...@@ -344,20 +357,13 @@ export default {
if (res.data.data.result === "00") { if (res.data.data.result === "00") {
this.mealType=res.data.data; this.mealType=res.data.data;
// console.log("this.mealType",this.mealType)
this.msgObj.guid=this.mealType.guid; 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=this.mealType.sale_dates.saleDt;
this.dateList.forEach(item=>{ this.dateList.forEach(item=>{
item.YM=item.sale_day.substring(0,4)+"-"+item.sale_day.substring(4,6); 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); 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() this.GetCurrentDays()
}else{ }else{
...@@ -438,10 +444,10 @@ export default { ...@@ -438,10 +444,10 @@ export default {
this.GetCurrentDays(); this.GetCurrentDays();
}, },
SelectChild(item){ 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.s_date=item.date_str;
this.msgObj.dateStr=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; this.visible=false;
}, },
creatCalendar(list) { creatCalendar(list) {
......
src/components/FreeTravel/FreePay.vue 0 → 100644
View file @ 8e979134
This diff is collapsed.
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/mall/FreeCalendar.vue
View file @ 8e979134
...@@ -126,9 +126,13 @@ export default { ...@@ -126,9 +126,13 @@ export default {
},methods:{ },methods:{
selectDate(item){ selectDate(item){
console.log(item)
let a=false; let a=false;
a=moment(this.today).isBefore(moment(item.date_str)); 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){ if(item.pkg_no &&item.pkg_no!="" && a){
this.$emit('SelectChild',item); this.$emit('SelectChild',item);
} }
......
src/router.js
View file @ 8e979134
...@@ -709,6 +709,24 @@ export default new Router({ ...@@ -709,6 +709,24 @@ export default new Router({
title: "自由行-订单确认" 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