Commit a29267a8 authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

parents 4a8a1764 7ef67f53
...@@ -26,6 +26,11 @@ class DidaService { ...@@ -26,6 +26,11 @@ class DidaService {
return request('dmc_post_GetDidaBedTypeBaseInfo', param, false) return request('dmc_post_GetDidaBedTypeBaseInfo', param, false)
} }
//道旅酒店详情
static async GetHotelRoomsList(param:any): Promise<HttpResponse> {
return request('dmc_post_GetDiDaPriceSearchList', param)
}
// 道旅酒店列表 // 道旅酒店列表
static async GetDidaHotelList(param: any): Promise<HttpResponse> { static async GetDidaHotelList(param: any): Promise<HttpResponse> {
param.reviewRatingUpperLimits = param.reviewRatingUpperLimits && param.reviewRatingUpperLimits != '' ? param.reviewRatingUpperLimits : 0 param.reviewRatingUpperLimits = param.reviewRatingUpperLimits && param.reviewRatingUpperLimits != '' ? param.reviewRatingUpperLimits : 0
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import svgIcon from '../../global/svg-icon.vue' import svgIcon from '../../global/svg-icon.vue'
import { computed, inject, provide, reactive, ref, toRefs, defineComponent, onMounted, watch } from 'vue' import { computed, inject, provide, reactive, ref, toRefs, defineComponent, onMounted, watch } from 'vue'
import HotelService from '../../../api/scattered' import DidaService from "../../../api/didahotel";
import message from '../../../utils/message' import message from '../../../utils/message'
import { ApiResult } from '../../../@types/enumHelper' import { ApiResult } from '../../../@types/enumHelper'
import { date } from 'quasar' import { date } from 'quasar'
...@@ -189,15 +189,9 @@ ...@@ -189,15 +189,9 @@
data.childNum = getParamsMsg.childNum?getParamsMsg.childNum:'' data.childNum = getParamsMsg.childNum?getParamsMsg.childNum:''
data.room = data.theRooms[search.searchroomGroup.length-1] data.room = data.theRooms[search.searchroomGroup.length-1]
// data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD') data.dateRange.to = search.CheckInDate
// data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD') data.dateRange.from = search.CheckOutDate
// data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}` data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate}`
// search.arrivalDate = data.dateRange.from
// search.departureDate = data.dateRange.to
data.dateRange.to = search.arrivalDate
data.dateRange.from = search.departureDate
data.dateRangeFormat = `${search.arrivalDate} - ${search.departureDate}`
data.RoomTypeList = useHotel.getHotelRoomType() data.RoomTypeList = useHotel.getHotelRoomType()
data.scatteredRoomTypeList = useHotel.getHotelScatRoom() data.scatteredRoomTypeList = useHotel.getHotelScatRoom()
...@@ -297,7 +291,7 @@ ...@@ -297,7 +291,7 @@
initHotel() { initHotel() {
data.loading = true data.loading = true
let param = Object.assign(search) let param = Object.assign(search)
HotelService.GetHotelRoomsList(param) DidaService.GetHotelRoomsList(param)
.then(r => { .then(r => {
data.SimilarList = [] as Array<any> data.SimilarList = [] as Array<any>
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
...@@ -370,10 +364,10 @@ ...@@ -370,10 +364,10 @@
search.childNum = data.childNum; search.childNum = data.childNum;
}, },
dateRangeHandler(e: any) { dateRangeHandler(e: any) {
search.arrivalDate = `${e.from.year}/${e.from.month}/${e.from.day}` search.CheckInDate = `${e.from.year}/${e.from.month}/${e.from.day}`
if(search.arrivalDate!=`${e.to.year}/${e.to.month}/${e.to.day}`){ if(search.CheckInDate!=`${e.to.year}/${e.to.month}/${e.to.day}`){
search.departureDate = `${e.to.year}/${e.to.month}/${e.to.day}` search.CheckOutDate = `${e.to.year}/${e.to.month}/${e.to.day}`
data.dateRangeFormat = `${search.arrivalDate} - ${search.departureDate} ` data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate} `
if (qDateProxy.value) qDateProxy.value.hide() if (qDateProxy.value) qDateProxy.value.hide()
}else{ }else{
// message.errorMsg(`${t('v101.scatteredDetails.timeTis')}`) // message.errorMsg(`${t('v101.scatteredDetails.timeTis')}`)
......
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