Commit 10db9024 authored by zhengke's avatar zhengke

修改

parent 401288ca
...@@ -182,32 +182,12 @@ ...@@ -182,32 +182,12 @@
<div style="width:394px;margin-top: -15px;" v-show="tag=='hotel'" class="visa hotel_tabcontent"> <div style="width:394px;margin-top: -15px;" v-show="tag=='hotel'" class="visa hotel_tabcontent">
<el-tabs v-model="hotel_tab" @tab-click="handleClick"> <el-tabs v-model="hotel_tab" @tab-click="handleClick">
<el-tab-pane label="国际酒店" name="gjjd"> <el-tab-pane label="国际酒店" name="gjjd">
<el-form ref="visa_form" :model="visa_form" label-width="60px"> <el-form label-width="60px">
<!-- <el-form-item label="目的地">
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input>
</el-form-item>
<el-form-item style="display:inline-block;width:50%;" label="入住日">
<el-date-picker style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item style="display:inline-block;width:50%;" label="离店日">
<el-date-picker style="width:100%" size="small"
v-model="visa_form.value1"
value-format="yyyy-MM-dd"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item> -->
<ul class="visaul_li"> <ul class="visaul_li">
<li>目的地</li> <li>目的地</li>
<li><span class="iconfont icon-vertical_line"></span></li> <li><span class="iconfont icon-vertical_line"></span></li>
<li> <li>
<el-input size="small" v-model="visa_form.name" placeholder="目的地"></el-input> <el-input size="small" v-model="HotelMsg.place" placeholder="目的地"></el-input>
</li> </li>
</ul> </ul>
<div style="margin-top:16px;overflow:auto"> <div style="margin-top:16px;overflow:auto">
...@@ -217,9 +197,10 @@ ...@@ -217,9 +197,10 @@
<li><span class="iconfont icon-vertical_line"></span></li> <li><span class="iconfont icon-vertical_line"></span></li>
<li> <li>
<el-date-picker prefix-icon=" " style="width:100%" size="small" <el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1" v-model="HotelMsg.StartDate"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
:picker-options="pickerOptions0"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</li> </li>
...@@ -231,8 +212,9 @@ ...@@ -231,8 +212,9 @@
<li><span class="iconfont icon-vertical_line"></span></li> <li><span class="iconfont icon-vertical_line"></span></li>
<li> <li>
<el-date-picker prefix-icon=" " style="width:100%" size="small" <el-date-picker prefix-icon=" " style="width:100%" size="small"
v-model="visa_form.value1" v-model="HotelMsg.EndDate"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:picker-options="pickerOptions0"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
...@@ -243,7 +225,7 @@ ...@@ -243,7 +225,7 @@
</div> </div>
<div style="overflow:auto;margin-top:10px"> <div style="overflow:auto;margin-top:10px">
<span class="form_btn">立即搜索</span> <span class="form_btn" @click="SearchHotel">立即搜索</span>
</div> </div>
</el-form> </el-form>
...@@ -395,6 +377,14 @@ ...@@ -395,6 +377,14 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 幸运大抽奖跳转 --><el-row style="margin: 20px 0;cursor: pointer;">
<img style="width:1160px;"
@click="FootgoUrl('TurnaroundDraw')"
class="huodong_img"
src="../assets/img/active/huodong_img.png"
alt
>
</el-row>
<!-- 自由行 --> <!-- 自由行 -->
<div class="travel Grouptour"> <div class="travel Grouptour">
...@@ -778,6 +768,24 @@ export default { ...@@ -778,6 +768,24 @@ export default {
}, },
TravelPriceList:[], TravelPriceList:[],
Travelload:false, Travelload:false,
//酒店查询信息
HotelMsg:{
place:'',
StartDate:'',
EndDate:'',
auditNum:1,
childNum:0,
room:1,
roomList:[
{
roomNum:1,
numberOfAdults:1,
numberOfChildren:0,
childAges:0
}
],
},
// 自由行 // 自由行
freeTravel:{}, freeTravel:{},
freelload:false, freelload:false,
...@@ -832,6 +840,12 @@ export default { ...@@ -832,6 +840,12 @@ export default {
isLogin:0, isLogin:0,
cityId:262, cityId:262,
companyId:0, companyId:0,
pickerOptions0: {
disabledDate(time) {
let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
}
},
}; };
}, },
props:['changeCity'], props:['changeCity'],
...@@ -1236,6 +1250,26 @@ export default { ...@@ -1236,6 +1250,26 @@ export default {
let w = document.body.clientWidth; let w = document.body.clientWidth;
this.carousel_height = w * 0.269 * 0.75 + "px"; this.carousel_height = w * 0.269 * 0.75 + "px";
this.banner_height = w * 0.205 + "px"; this.banner_height = w * 0.205 + "px";
},
//酒店点击查询
SearchHotel(){
if(this.HotelMsg.place==''){
this.Error('请输入目的地');
return;
}
if(this.HotelMsg.StartDate==''){
this.Error('请选择入住日期');
return;
}
if(this.HotelMsg.EndDate==''){
this.Error('请选择退房日期');
return;
}
sessionStorage.setItem("HotelInfo", JSON.stringify(this.HotelMsg));
let routeData = this.$router.resolve({
path: "HotelList"
});
window.open(routeData.href, '_blank');
} }
} }
}; };
......
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
<span class="HD_Top_Pinfo"><i>¥</i>{{price}}</span> <span class="HD_Top_Pinfo"><i>¥</i>{{price}}</span>
<span class="HD_Top_qi">/起</span> <span class="HD_Top_qi">/起</span>
<span>另付税:¥177</span> <span>另付税:¥177</span>
<input type="button" class="HD_SureBtn" value="立即预订"/> <input type="button" class="HD_SureBtn" style="display:none;" value="立即预订"/>
</div> </div>
<div class="HD_Top_ImgList clearfix"> <div class="HD_Top_ImgList clearfix">
<div class="HD_Top_FirstImg"> <div class="HD_Top_FirstImg">
...@@ -830,7 +830,10 @@ export default { ...@@ -830,7 +830,10 @@ export default {
}; };
}, },
mounted() { mounted() {
let msgList = JSON.parse(this.$route.query.PassMsg); },
created() {
if(sessionStorage.getItem("HotelDetail")){
let msgList = JSON.parse(sessionStorage.getItem("HotelDetail"));
this.msg.hotelId = msgList.hotelId; this.msg.hotelId = msgList.hotelId;
this.msg.groupBookingFlg = msgList.groupBookingFlg; this.msg.groupBookingFlg = msgList.groupBookingFlg;
this.price = msgList.lowrateBySetCurrency; this.price = msgList.lowrateBySetCurrency;
...@@ -840,8 +843,7 @@ export default { ...@@ -840,8 +843,7 @@ export default {
this.SimilarMsg.searchroomGroup = msgList.searchroomGroup; this.SimilarMsg.searchroomGroup = msgList.searchroomGroup;
this.getList(); this.getList();
this.getSimilar(); this.getSimilar();
}, }
created() {
}, },
components: { components: {
...@@ -854,7 +856,6 @@ export default { ...@@ -854,7 +856,6 @@ export default {
this.hotelDetails = res.data.data.hotelDetails; this.hotelDetails = res.data.data.hotelDetails;
this.hotelSummary = res.data.data.hotelSummary; this.hotelSummary = res.data.data.hotelSummary;
this.hotelDetails.roomReviewRating = parseFloat(this.hotelDetails.roomReviewRating); this.hotelDetails.roomReviewRating = parseFloat(this.hotelDetails.roomReviewRating);
console.log(res,'resss');
this.travelLngLat.push( this.travelLngLat.push(
{ {
lat:this.hotelSummary.latitudeW, lat:this.hotelSummary.latitudeW,
...@@ -1202,9 +1203,10 @@ export default { ...@@ -1202,9 +1203,10 @@ export default {
bookHotel(roomOptionCd){ bookHotel(roomOptionCd){
let msg = this.SimilarMsg; let msg = this.SimilarMsg;
msg.roomOptionCd = roomOptionCd; msg.roomOptionCd = roomOptionCd;
sessionStorage.setItem("HotelSure", JSON.stringify(msg));
this.$router.push({ this.$router.push({
path:"/HotelSure", path:"/HotelSure"
query:{msg:JSON.stringify(msg)}
}) })
} }
} }
......
...@@ -345,16 +345,16 @@ export default { ...@@ -345,16 +345,16 @@ export default {
return; return;
} }
if(this.msg.StartDate==''){ if(this.msg.StartDate==''){
this.Error('请选择入住时间'); this.Error('请选择入住日期');
return; return;
} }
if(this.msg.EndDate==''){ if(this.msg.EndDate==''){
this.Error('请选择退房时间'); this.Error('请选择退房日期');
return; return;
} }
sessionStorage.setItem("HotelInfo", JSON.stringify(this.msg));
this.$router.push({ this.$router.push({
path:"/HotelList", path:"/HotelList"
query:{msg:JSON.stringify(this.msg)}
}) })
}, },
//首页点击跳转 //首页点击跳转
......
...@@ -894,7 +894,10 @@ export default { ...@@ -894,7 +894,10 @@ export default {
}; };
}, },
mounted() { mounted() {
let msgList = JSON.parse(this.$route.query.msg); },
created() {
if(sessionStorage.getItem("HotelInfo")){
let msgList = JSON.parse(sessionStorage.getItem("HotelInfo"));
this.placeKeyWords = msgList.place; this.placeKeyWords = msgList.place;
this.msg.arrivalDate = msgList.StartDate; this.msg.arrivalDate = msgList.StartDate;
this.msg.departureDate = msgList.EndDate; this.msg.departureDate = msgList.EndDate;
...@@ -902,11 +905,8 @@ export default { ...@@ -902,11 +905,8 @@ export default {
this.childNum = msgList.childNum; this.childNum = msgList.childNum;
this.room = msgList.room; this.room = msgList.room;
this.msg.searchroomGroup = msgList.roomList; this.msg.searchroomGroup = msgList.roomList;
this.SearchHotel(); this.SearchHotel();
}, }
created() {
}, },
components: { components: {
HTMap HTMap
...@@ -1015,7 +1015,6 @@ export default { ...@@ -1015,7 +1015,6 @@ export default {
this.dataList = []; this.dataList = [];
this.travelLngLat=[]; this.travelLngLat=[];
this.apipost("dmc_post_Get_GetJAPAN_HotelList",this.msg,res => { this.apipost("dmc_post_Get_GetJAPAN_HotelList",this.msg,res => {
console.log(res,'resssss');
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if(Object.prototype.toString.call(res.data.data.hotelSummary) == '[object Object]'){ if(Object.prototype.toString.call(res.data.data.hotelSummary) == '[object Object]'){
...@@ -1035,7 +1034,6 @@ export default { ...@@ -1035,7 +1034,6 @@ export default {
}) })
this.TotalPage = parseInt(res.data.data.numberOfResultMatched); this.TotalPage = parseInt(res.data.data.numberOfResultMatched);
this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg; this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg;
console.log(this.travelLngLat,'travellngggg');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -1060,10 +1058,12 @@ export default { ...@@ -1060,10 +1058,12 @@ export default {
this.PassMsg.departureDate = this.msg.departureDate; this.PassMsg.departureDate = this.msg.departureDate;
this.PassMsg.searchroomGroup = this.msg.searchroomGroup; this.PassMsg.searchroomGroup = this.msg.searchroomGroup;
this.PassMsg.lowrateBySetCurrency = item.lowrateBySetCurrency; this.PassMsg.lowrateBySetCurrency = item.lowrateBySetCurrency;
sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg));
this.$router.push({ this.$router.push({
path:"/HotelDetail", path:"/HotelDetail"
query:{PassMsg:JSON.stringify(this.PassMsg)}
}) })
} }
} }
}; };
......
...@@ -166,20 +166,22 @@ export default { ...@@ -166,20 +166,22 @@ export default {
created() { created() {
this.visa=true; this.visa=true;
let msgList = JSON.parse(this.$route.query.msg); if(sessionStorage.getItem("HotelPayMsg")){
let userInfo = this.getLocalStorage(); let msgList = JSON.parse(sessionStorage.getItem("HotelPayMsg"));
let userInfo = this.getLocalStorage();
this.TotalPrice=msgList.bookMoney; this.TotalPrice=msgList.bookMoney;
this.bookingNumber=msgList.orderId; this.bookingNumber=msgList.orderId;
this.code.body=`酒店名称${msgList.hotelName},房间数${msgList.totalPnumber}人,总价格${msgList.bookMoney}元`; 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.attach=`${msgList.costType}|${userInfo.name}|${msgList.orderId}|${userInfo.customerId}|${msgList.RB_Branch_id}`
this.code.total_fee=msgList.bookMoney+''; this.code.total_fee=msgList.bookMoney+'';
this.code.CancelTime = moment(msgList.CancelTime).format('YYYY-MM-DD HH:mm:ss'); this.code.CancelTime = moment(msgList.CancelTime).format('YYYY-MM-DD HH:mm:ss');
this.Code('3'); this.Code('3');
}
}, },
destroyed: function () { destroyed: function () {
clearInterval(this.Pay_timer); clearInterval(this.Pay_timer);
......
...@@ -170,16 +170,16 @@ export default { ...@@ -170,16 +170,16 @@ export default {
}; };
}, },
created() { created() {
this.msgList = JSON.parse(this.$route.query.msg); if(sessionStorage.getItem("HotelPayMsg")){
this.TotalPrice=this.msgList.bookMoney; this.msgList = JSON.parse(sessionStorage.getItem("HotelPayMsg"));
this.bookingNumber=this.msgList.orderId; this.TotalPrice=this.msgList.bookMoney;
this.bookingNumber=this.msgList.orderId;
}
}, },
methods: { methods: {
gotoPay(){ gotoPay(){
this.$router.push({ this.$router.push({
path:"/HotelPay", path:"/HotelPay"
query:{msg:JSON.stringify(this.msgList)}
}) })
} }
} }
......
...@@ -608,7 +608,6 @@ export default { ...@@ -608,7 +608,6 @@ export default {
//备注 //备注
guestRequest:'', guestRequest:'',
CustomerId:0, CustomerId:0,
CreateBy:0,
HotelName:'', HotelName:'',
HotelPic:'', HotelPic:'',
}, },
...@@ -710,7 +709,10 @@ export default { ...@@ -710,7 +709,10 @@ export default {
}; };
}, },
mounted() { mounted() {
let msgList = JSON.parse(this.$route.query.msg); },
created() {
if(sessionStorage.getItem("HotelSure")){
let msgList = JSON.parse(sessionStorage.getItem("HotelSure"));
this.msg = msgList; this.msg = msgList;
this.auditNum=0; this.auditNum=0;
this.childNum=0; this.childNum=0;
...@@ -721,7 +723,6 @@ export default { ...@@ -721,7 +723,6 @@ export default {
let roomGroupLen = this.msg.searchroomGroup.length; let roomGroupLen = this.msg.searchroomGroup.length;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.sureMsg.CustomerId = userInfo.customerId; this.sureMsg.CustomerId = userInfo.customerId;
this.sureMsg.CreateBy = userInfo.createBy;
this.sureMsg.roomGroup=[]; this.sureMsg.roomGroup=[];
for(var i=0;i<roomGroupLen;i++){ for(var i=0;i<roomGroupLen;i++){
var obj = { var obj = {
...@@ -736,15 +737,12 @@ export default { ...@@ -736,15 +737,12 @@ export default {
} }
this.getWeek(); this.getWeek();
this.getBookInfo(); this.getBookInfo();
}, }
created() {
}, },
methods: { methods: {
//获取带过来信息 //获取带过来信息
getBookInfo(){ getBookInfo(){
this.apipost("dmc_post_Get_GetJAPAN_RoomsList",this.msg,res => { this.apipost("dmc_post_Get_GetJAPAN_RoomsList",this.msg,res => {
console.log(res,'bookMsg');
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
if(Object.prototype.toString.call(this.dataList.roomGroup) == '[object Object]'){ if(Object.prototype.toString.call(this.dataList.roomGroup) == '[object Object]'){
...@@ -817,16 +815,11 @@ export default { ...@@ -817,16 +815,11 @@ export default {
if(this.sureMsg.CustomerId==null||this.sureMsg.CustomerId==""){ if(this.sureMsg.CustomerId==null||this.sureMsg.CustomerId==""){
this.sureMsg.CustomerId=0 this.sureMsg.CustomerId=0
} }
if(this.sureMsg.CreateBy==null||this.sureMsg.CreateBy==""){
this.sureMsg.CreateBy=0
}
console.log(this.sureMsg,'确定');
this.sureMsg.totalChargeableRateInfo = this.totalPrice; this.sureMsg.totalChargeableRateInfo = this.totalPrice;
this.apipost("dmc_post_Get_GetJAPAN_HotelBooking",this.sureMsg,res => { this.apipost("dmc_post_Get_GetJAPAN_HotelBooking",this.sureMsg,res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success('预订成功'); this.Success('预订成功');
console.log(res.data.data,'ressss');
let num =0; let num =0;
this.sureMsg.roomGroup.forEach(x=>{ this.sureMsg.roomGroup.forEach(x=>{
num+=parseInt(x.roomFemaleCount)+parseInt(x.roomMaleCount)+parseInt(x.roomChildCount) num+=parseInt(x.roomFemaleCount)+parseInt(x.roomMaleCount)+parseInt(x.roomChildCount)
...@@ -841,9 +834,9 @@ export default { ...@@ -841,9 +834,9 @@ export default {
hotelName:res.data.data.parmResult.hotelName, hotelName:res.data.data.parmResult.hotelName,
totalPnumber:num totalPnumber:num
} }
sessionStorage.setItem("HotelPayMsg", JSON.stringify(msg));
this.$router.push({ this.$router.push({
path:"/HotelPayBefore", path:"/HotelPayBefore",
query:{msg:JSON.stringify(msg)}
}) })
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
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