Skip to content

J
jz_Travel
Commit 7ee86425 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents da1c02e2 3ed0e1b5
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 46 deletions
pages/hotel/components/hotel-good.vue
View file @ 7ee86425
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
dayObj:{ dayObj:{
type: Object, type: Object,
default: null default: null
},
searchObj:{
type:Object,
default:null
} }
}, },
data() { data() {
...@@ -60,7 +64,7 @@ ...@@ -60,7 +64,7 @@
goHotelDetail(id){ goHotelDetail(id){
let myDayObj = JSON.stringify(this.dayObj); let myDayObj = JSON.stringify(this.dayObj);
uni.navigateTo({ uni.navigateTo({
url: "/pages/hotel/detail?id=" + id + '&dayObj=' + myDayObj url: "/pages/hotel/detail?id=" + id + '&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj)
}); });
} }
} }
......
pages/hotel/components/recommed-hotel.vue
View file @ 7ee86425
<template> <template>
<view class="hotel-list-item"> <view>
<view class="img-box"> <view class="hotel-list-item" v-for="(item,index) in HotelArr" :key="index" @click="goHotelDetail(item.HotelId)">
<image src="http://imgfile.oytour.com/Upload/DMC/202105251114114560000000058.png" mode="aspectFill"></image> <view class="img-box">
</view> <image :src="item.CoverImg" mode="aspectFill"></image>
<view class="hotel-info"> </view>
<view class="hotel-name">乐山禅驿·嘉定院子酒店</view> <view class="hotel-info">
<view class="hotel-start"> <view class="hotel-name">{{item.HotelName}}</view>
<!-- TODO：判定是否为星级酒店，如果是显示星级，不是，显示另外一种方式 --> <view class="hotel-start">
<view class="rate" v-if="hotelType==0"> <!-- TODO：判定是否为星级酒店，如果是显示星级，不是，显示另外一种方式 -->
<u-rate active-color="#FEB969" inactive-color="#FFF" current="4" active-icon="star" inactive-icon="star" disabled></u-rate> <view class="rate" v-if="item.Star>=1&&item.Star<=5">
<text style="margin-left: 20rpx;vertical-align: top;">四星</text> <u-rate active-color="#FEB969" inactive-color="#FFF" :current="item.Star" active-icon="star" inactive-icon="star" disabled></u-rate>
<text style="margin-left: 20rpx;vertical-align: top;">{{item.StarName}}</text>
</view>
<view class="other-rate" v-if="item.Star==9">
<text>温泉酒店</text>
<span class="line"></span>
</view>
<view class="other-rate" v-if="item.Star==8">
<text>精选民宿</text>
<span class="line"></span>
</view>
</view> </view>
<view class="other-rate" v-if="hotelType==1"> <view class="localtion">{{item.Address}}</view>
<text>温泉酒店</text> <view>
<span class="line"></span> <u-tag text="亲子设施" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini"></u-tag>
</view> </view>
<view class="other-rate" v-if="hotelType==2"> <view class="price">
<text>精选民宿</text> <text>￥</text>
<span class="line"></span> <text class="money">{{item.B2BPrice}}</text>
<text>起</text>
</view> </view>
</view> </view>
<view class="localtion">距该酒店直线4.1公里·近九寨千古情景区·沟口</view>
<view>
<u-tag text="亲子设施" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini"></u-tag>
</view>
<view class="price">
<text>￥</text>
<text class="money">599</text>
<text>起</text>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -36,9 +38,17 @@ ...@@ -36,9 +38,17 @@
<script> <script>
export default { export default {
props:{ props:{
hotelType:{ HotelArr:{
type:Number, type:Array,
default:0 default:null
},
dayObj:{
type:Object,
default:null
},
searchObj:{
type:Object,
default:null
} }
}, },
data() { data() {
...@@ -46,6 +56,18 @@ ...@@ -46,6 +56,18 @@
key: value key: value
} }
}, },
mounted(){
console.log(this.dayObj,'dayObj');
console.log(this.searchObj,'searchObj');
},
methods:{
goHotelDetail(id){
let myDayObj = JSON.stringify(this.dayObj);
uni.navigateTo({
url: "/pages/hotel/detail?id=" + id +'&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj)
});
}
}
} }
</script> </script>
......
pages/hotel/detail.vue
View file @ 7ee86425
...@@ -174,12 +174,12 @@ ...@@ -174,12 +174,12 @@
<text>精选推荐</text> <text>精选推荐</text>
</view> </view>
<view class="flex" style="margin-left: 64rpx;"> <view class="flex" style="margin-left: 64rpx;">
<view class="nearby-type active">附近满足条件酒店(2)</view> <view class="nearby-type active">附近满足条件酒店({{HotelArr.length}})</view>
</view> </view>
</view> </view>
<view> <view>
<recommed-hotel></recommed-hotel> <recommed-hotel :HotelArr="HotelArr" :dayObj="dayObj" :searchObj="searchObj"></recommed-hotel>
<recommed-hotel :hotelType="1"></recommed-hotel> <!-- <recommed-hotel :hotelType="1"></recommed-hotel> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -257,6 +257,9 @@ ...@@ -257,6 +257,9 @@
RoomList: [], //可过滤房间 RoomList: [], //可过滤房间
dataList: {}, //数据 dataList: {}, //数据
isShowAll: false, //显示全部 isShowAll: false, //显示全部
HotelArr:[] ,//推荐酒店
searchObj:{},
dayObj:{}
} }
}, },
components: { components: {
...@@ -270,7 +273,8 @@ ...@@ -270,7 +273,8 @@
}, },
onLoad(options) { onLoad(options) {
this.id = options.id this.id = options.id;
this.roomMsg.HotelId = options.id;
let that = this let that = this
uni.getSystemInfo({ uni.getSystemInfo({
success(res) { success(res) {
...@@ -287,14 +291,40 @@ ...@@ -287,14 +291,40 @@
} }
if (options.dayObj) { if (options.dayObj) {
var tempDay = JSON.parse(options.dayObj); var tempDay = JSON.parse(options.dayObj);
this.dayObj = tempDay;
this.roomMsg.StartDate = tempDay.StartDate; this.roomMsg.StartDate = tempDay.StartDate;
this.roomMsg.EndDate = tempDay.EndDate; this.roomMsg.EndDate = tempDay.EndDate;
this.day = tempDay.day; this.day = tempDay.day;
this.startWeek = tempDay.startWeek; this.startWeek = tempDay.startWeek;
this.endWeek = tempDay.endWeek; this.endWeek = tempDay.endWeek;
}
if(options.searchObj){
this.searchObj = JSON.parse(options.searchObj);
} }
this.getRecomHotel();
}, },
methods: { methods: {
//获取推荐酒店
getRecomHotel(){
this.searchObj.HotelId = this.id
this.request2({
url: '/api/Hotel/AppGetHotelPage',
data: this.searchObj
},
res => {
if (res.resultCode == 1) {
console.log(res,'推荐酒店');
this.HotelArr=[];
let tempHotel = res.data.pageData;
tempHotel.forEach(x=>{
if(this.HotelArr.length<2){
this.HotelArr.push(x);
}
})
}
}
);
},
goMap(name, lon, lat) { goMap(name, lon, lat) {
wx.openLocation({ wx.openLocation({
latitude: lat, latitude: lat,
...@@ -322,20 +352,29 @@ ...@@ -322,20 +352,29 @@
url: "/pages/hotel/description?hotelObj="+encodeURIComponent(hotelObj) url: "/pages/hotel/description?hotelObj="+encodeURIComponent(hotelObj)
}) })
}, },
//返回周几
getWeek(date) {
console.log(date, 'date');
var weekArray = new Array("日", "一", "二", "三", "四", "五", "六");
var week = weekArray[new Date(date).getDay()]; //注意此处必须是先new一个Date
return '周' + week;
},
chosenDateResult(obj) { chosenDateResult(obj) {
console.log(obj, 'objjjj'); this.roomMsg.StartDate = obj.start;
obj.startDay = this.formatMonthDay(obj.startDay) this.roomMsg.EndDate = obj.end;
obj.endDay = this.formatMonthDay(obj.endDay) this.startWeek = obj.startWeek;
this.searchObj.date = obj this.endWeek = obj.endWeek;
this.day = obj.day;
this.getRoomType();
this.showTimePopup = false this.showTimePopup = false
}, },
//切换日期获取房型
getRoomType(){
this.request2({
url: '/api/Hotel/GetHotelRoom',
data: this.roomMsg
},
res => {
if (res.resultCode == 1) {
console.log(res, '房间数据');
this.RoomList = res.data.RoomList;
}
}
);
},
formatMonthDay(str) { formatMonthDay(str) {
let temp = str.split('-') let temp = str.split('-')
temp[0] = temp[0] > 9 ? temp[0] : "0" + temp[0] temp[0] = temp[0] > 9 ? temp[0] : "0" + temp[0]
...@@ -351,6 +390,7 @@ ...@@ -351,6 +390,7 @@
return d > 9 ? d : "0" + d return d > 9 ? d : "0" + d
}, },
getWeek(date) { getWeek(date) {
console.log(date,'date');
let day = date.getDay(); let day = date.getDay();
if (day === 1) { if (day === 1) {
var week = "一"; var week = "一";
...@@ -422,6 +462,9 @@ ...@@ -422,6 +462,9 @@
} else { } else {
this.isShowAll = false; this.isShowAll = false;
} }
if(num==0){
this.RoomList = this.dataList.RoomList;
}
}, },
changeLike() { changeLike() {
this.islike = !this.islike this.islike = !this.islike
......
pages/hotel/list.vue
View file @ 7ee86425
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</view> </view>
<scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop" <scroll-view :scroll-y="true" @scrolltolower="lower" :enable-back-to-top="true" :enable-flex="true" :scroll-top="scrollTop"
@scroll="scroll" style="height: calc(100% - 224rpx); padding-bottom: 0px;"> @scroll="scroll" style="height: calc(100% - 224rpx); padding-bottom: 0px;">
<hotel-good :HotelList="HotelList" :dayObj="dayObj"></hotel-good> <hotel-good :HotelList="HotelList" :dayObj="dayObj" :searchObj="searchObj"></hotel-good>
<u-loadmore v-if="showLoading" :status="status" :load-text="loadText" :font-size="24" :margin-top="20" <u-loadmore v-if="showLoading" :status="status" :load-text="loadText" :font-size="24" :margin-top="20"
:margin-bottom="20" bg-color="#F5F5F5" color="#111" /> :margin-bottom="20" bg-color="#F5F5F5" color="#111" />
</scroll-view> </scroll-view>
......
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