Skip to content

A
Athena
Commit 3ef76a6e authored by zhengke's avatar zhengke
Browse files
Options

修改

parent b9673e0b
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 57 deletions
src/components/Hotel/HotelList.vue
View file @ 3ef76a6e
...@@ -251,9 +251,6 @@ ...@@ -251,9 +251,6 @@
font-size:22px; font-size:22px;
margin-right:5px; margin-right:5px;
} }
.HL_ListPrice span label{
margin-right:5px;
}
.HL_ListBtn{ .HL_ListBtn{
width:80px; width:80px;
height:28px; height:28px;
...@@ -368,6 +365,13 @@ ...@@ -368,6 +365,13 @@
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.HL_listType{
position: absolute;
right: 40px;
top:30px;
color:#10A200;
font-size:14px;
}
</style> </style>
<template> <template>
...@@ -575,9 +579,9 @@ ...@@ -575,9 +579,9 @@
</div> </div>
<div class="clearfix" v-loading="loading"> <div class="clearfix" v-loading="loading">
<!-- <div style="width:838px;float:left;min-height:380px;"> --> <!-- <div style="width:838px;float:left;min-height:380px;"> -->
<div style="float:left;min-height:380px;" v-if="dataList.length>0"> <div style="float:left;min-height:380px;" v-if="dataList2.length>0">
<table class="HL_ListTable"> <table class="HL_ListTable">
<tr v-for="item in dataList"> <tr v-for="item in dataList2">
<td> <td>
<div class="clearfix"> <div class="clearfix">
<div class="HL_ListImg" :style="`background-image: url(${item.hotelImageUrl})`"> <div class="HL_ListImg" :style="`background-image: url(${item.hotelImageUrl})`">
...@@ -611,7 +615,22 @@ ...@@ -611,7 +615,22 @@
地址：{{item.address}} 地址：{{item.address}}
</div> </div>
<div class="HL_ListPrice"> <div class="HL_ListPrice">
<span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起 <span><label>¥</label>
<template v-if="item.type==1">
{{getPrice(item.lowrateBySetCurrency)}}
</template>
<template v-else>
{{item.lowrateBySetCurrency}}
</template>
</span>起
</div>
<div class="HL_listType">
<template v-if="item.type==2">
自营
</template>
<template v-else>
jalan
</template>
</div> </div>
<input type="button" class="HL_ListBtn" @click="goHotelDetail(item,'HotelDetail')" value="查看详情"/> <input type="button" class="HL_ListBtn" @click="goHotelDetail(item,'HotelDetail')" value="查看详情"/>
</div> </div>
...@@ -623,14 +642,14 @@ ...@@ -623,14 +642,14 @@
<div class="HL_Map" v-if="travelLngLat.length>0"> <div class="HL_Map" v-if="travelLngLat.length>0">
<HTMap :dataList="travelLngLat" :type="1"></HTMap> <HTMap :dataList="travelLngLat" :type="1"></HTMap>
</div> </div>
<div v-if="dataList.length==0" style="padding:15px 0;text-align:center"> <div v-if="dataList2.length==0" style="padding:15px 0;text-align:center">
<div class="empty-data"><i class="iconfont icon-kong"></i> <div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了 很抱歉，你想要的信息我们真的找不到了
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<el-pagination v-if="dataList.length>0" class="pagination" <el-pagination v-if="dataList2.length>0" class="pagination"
@current-change="CurrentChange" @current-change="CurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
background background
...@@ -698,6 +717,7 @@ export default { ...@@ -698,6 +717,7 @@ export default {
dateList:[], dateList:[],
//数据 //数据
dataList:[], dataList:[],
dataList2:[],
loading:false, loading:false,
//住宿类型 //住宿类型
hotelObj:[{ hotelObj:[{
...@@ -1069,14 +1089,20 @@ export default { ...@@ -1069,14 +1089,20 @@ export default {
}) })
this.loading=true; this.loading=true;
this.dataList = []; this.dataList = [];
this.dataList2 = [];
this.travelLngLat=[]; this.travelLngLat=[];
this.apipost("dmc_post_Get_GetJAPAN_HotelList",this.msg,res => { this.apipost("dmc_post_Get_GetJAPAN_HotelList",this.msg,res => {
this.loading=false; this.loading=false;
console.log(res,'resssss');
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if(Object.prototype.toString.call(res.data.data.hotelSummary) == '[object Object]'){ if (res.data.data.parmResult&& res.data.data.parmResult.hotelSummary) {
this.dataList.push(res.data.data.hotelSummary); this.dataList = res.data.data.parmResult.hotelSummary;
}else{ }
this.dataList = res.data.data.hotelSummary; var ourHotelList = res.data.data.ourHotelList;
if(ourHotelList&&ourHotelList.length>0){
ourHotelList.forEach(x=>{
x.type=2
})
} }
//获取酒店坐标 //获取酒店坐标
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
...@@ -1087,10 +1113,32 @@ export default { ...@@ -1087,10 +1113,32 @@ export default {
name:x.hotelName name:x.hotelName
} }
this.travelLngLat.push(obj); this.travelLngLat.push(obj);
x.type=1
}) })
this.TotalPage = parseInt(res.data.data.numberOfResultMatched);
this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg; this.dataList2 = ourHotelList.concat(this.dataList);
this.JapanIncrease = res.data.data.JapanIncrease;
// this.TotalPage = parseInt(res.data.data.parmResult.numberOfResultMatched);
let Number1 = res.data.data.parmResult.numberOfResultMatched;
let TotalPage=0;
if(Number1){
TotalPage = parseInt(res.data.data.parmResult.numberOfResultMatched);
}else{
TotalPage = 0;
}
let TotalourHotel=ourHotelList[0].totalHotelCount;
let c = TotalPage+TotalourHotel
let d = c/2
if(c%2==1){
this.TotalPage=(c/2)+1
}else{
this.TotalPage=c/2
}
this.PassMsg.groupBookingFlg = res.data.data.parmResult.groupBookingFlg;
this.JapanIncrease = res.data.data.parmResult.JapanIncrease;
} else { } else {
//this.Error(res.data.message); //this.Error(res.data.message);
} }
...@@ -1110,43 +1158,56 @@ export default { ...@@ -1110,43 +1158,56 @@ export default {
}, },
//跳转详情 //跳转详情
goHotelDetail(item,path){ goHotelDetail(item,path){
this.PassMsg.hotelId = item.hotelId, if(item.type==2){
this.PassMsg.arrivalDate=this.msg.arrivalDate; let routeData = this.$router.resolve({
this.PassMsg.departureDate = this.msg.departureDate; name: "SupplierView",
this.PassMsg.searchroomGroup = this.msg.searchroomGroup; query: {
this.PassMsg.lowrateBySetCurrency = this.getPrice(item.lowrateBySetCurrency); HotelId:item.hotelId,
arrivalDate:this.msg.arrivalDate,
this.PassMsg.room = this.room departureDate:this.msg.departureDate
this.PassMsg.auditNum = this.auditNum; }
sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg)); });
window.open(routeData.href, "_blank");
}else{
this.PassMsg.hotelId = item.hotelId,
this.PassMsg.arrivalDate=this.msg.arrivalDate;
this.PassMsg.departureDate = this.msg.departureDate;
this.PassMsg.searchroomGroup = this.msg.searchroomGroup;
this.PassMsg.lowrateBySetCurrency = this.getPrice(item.lowrateBySetCurrency);
this.PassMsg.room = this.room
this.PassMsg.auditNum = this.auditNum;
sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg));
var jsonstr= JSON.stringify(this.PassMsg);
let routeData = this.$router.resolve({
name: "HotelDetail",
query: {
msg:encodeURIComponent(jsonstr),
}
});
window.open(routeData.href, "_blank");
}
var jsonstr= JSON.stringify(this.PassMsg);
this.$router.push({
path:"/HotelDetail",
query:{
msg:encodeURIComponent(jsonstr),
}
})
// let routeData = this.$router.resolve({
// name: path,
// });
// window.open(routeData.href, "_blank");
}, },
//主题特色 //主题特色
getTravelFeature(feature){ getTravelFeature(feature) {
let fea = feature.split(','); let newArr = [];
let newArr=[]; if (feature != '') {
if(fea[0]==1){ let fea = feature.split(',');
newArr.push('从车站步行5分钟');
} if (fea[0] == 1) {
if(fea[1]==1){ newArr.push('从车站步行5分钟');
newArr.push('有温泉'); }
} if (fea[1] == 1) {
if(fea[2]==1){ newArr.push('有温泉');
newArr.push('离海滩5分钟'); }
} if (fea[2] == 1) {
if(fea[3]==1){ newArr.push('离海滩5分钟');
newArr.push('退房11点以后'); }
if (fea[3] == 1) {
newArr.push('退房11点以后');
}
} }
return newArr; return newArr;
}, },
......
src/components/Hotel/SupplierView.vue
View file @ 3ef76a6e
...@@ -641,7 +641,7 @@ ...@@ -641,7 +641,7 @@
<div>床型：{{item.BedType}}</div> <div>床型：{{item.BedType}}</div>
</li> </li>
<li style="width:180px;" class="HD_OneLi"> <li style="width:180px;" class="HD_OneLi">
<div>面积：{{item.Area}} ㎡</div> <div>面积：{{item.Area}}</div>
</li> </li>
<li class="HD_FreeWifi" style="width:256px;margin-right:20px;"> <li class="HD_FreeWifi" style="width:256px;margin-right:20px;">
<div>前台服务时间至 {{tempData.ServiceTime}}</div> <div>前台服务时间至 {{tempData.ServiceTime}}</div>
...@@ -782,8 +782,8 @@ export default { ...@@ -782,8 +782,8 @@ export default {
// RoomStatus:0 // RoomStatus:0
HotelId:'', HotelId:'',
RoomType:0, RoomType:0,
CheckInTime:moment().format("YYYY-MM-DD"), CheckInTime:'',
CheckOutTime:moment().add(1,'days').format('YYYY-MM-DD'), CheckOutTime:'',
RoomNum:1, RoomNum:1,
IsExtraBed:0, IsExtraBed:0,
IsSmoke:0, IsSmoke:0,
...@@ -822,16 +822,26 @@ export default { ...@@ -822,16 +822,26 @@ export default {
}; };
}, },
mounted() { mounted() {
if (this.$route.query.HotelId) {
this.HotelId = this.$route.query.HotelId;
this.msg.HotelId = this.$route.query.HotelId;
}
this.getList(); this.getList();
this.getData(); this.getData();
this.getMealType(); this.getMealType();
}, },
created() { created() {
if (this.$route.query.HotelId) {
this.HotelId = this.$route.query.HotelId;
this.msg.HotelId = this.$route.query.HotelId;
}
if(this.$route.query.arrivalDate){
this.msg.CheckInTime=this.$route.query.arrivalDate
}else{
this.msg.CheckInTime=moment().format("YYYY-MM-DD");
}
if(this.$route.query.departureDate){
this.msg.CheckOutTime=this.$route.query.departureDate
}else{
this.msg.CheckOutTime = moment().add(1,'days').format('YYYY-MM-DD')
}
}, },
components: { components: {
HTMap HTMap
......
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