Commit ece8eaeb authored by wuchun's avatar wuchun

1

parent 97c43b7a
...@@ -30,7 +30,10 @@ class DidaService { ...@@ -30,7 +30,10 @@ class DidaService {
static async GetHotelRoomsList(param:any): Promise<HttpResponse> { static async GetHotelRoomsList(param:any): Promise<HttpResponse> {
return request('dmc_post_GetDiDaPriceSearchList', param) return request('dmc_post_GetDiDaPriceSearchList', param)
} }
//道旅酒店详情
static async GetHotelDetails(param:any): Promise<HttpResponse> {
return request('dmc_post_GetDidaHotelDetails', 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
......
...@@ -120,14 +120,19 @@ ...@@ -120,14 +120,19 @@
<script lang="ts"> <script lang="ts">
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import svgIcon from '../../global/svg-icon.vue'
import HotelService from "../../../api/scattered"; import HotelService from "../../../api/scattered";
import { DirtionmaryHelper } from "../../../config/dictionary"; import { DirtionmaryHelper } from "../../../config/dictionary";
import message from "../../../utils/message"; import message from "../../../utils/message";
import { defineComponent, inject, reactive, toRefs, watch } from "vue";
import { date, useQuasar } from "quasar";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import DidaService from "../../../api/didahotel"; import DidaService from "../../../api/didahotel";
import { HotelArea, useHotel } from "../../../utils/hotelRate"; import { HotelArea, useHotel } from "../../../utils/hotelRate";
import { computed, inject, provide, reactive, ref, toRefs, defineComponent, onMounted, watch } from 'vue'
import { ApiResult } from '../../../@types/enumHelper'
import { date } from 'quasar'
import { useQuasar } from 'quasar'
import useScrollModule from '../../../module/scrollbar/scrollModule'
import { moneyFormat } from '../../../utils/tools'
export default defineComponent({ export default defineComponent({
components: { svgIcon }, components: { svgIcon },
props:[''], props:[''],
...@@ -290,15 +295,15 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate"; ...@@ -290,15 +295,15 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
DidaService.GetHotelRoomsList(param) DidaService.GetHotelRoomsList(param)
.then(r => { .then(r => {
data.SimilarList = [] as Array<any> data.SimilarList = [] as Array<any>
console.log("道旅酒店详情",r.data); console.log("道旅酒店详情",r.data.data.PriceDetails.HotelList);
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
if ( if (
Object.prototype.toString.call(r.data.data.roomRateDetails) == Object.prototype.toString.call(r.data.data.PriceDetails.HotelList) ==
"[object Object]" "[object Object]"
) { ) {
data.SimilarList.push(r.data.data.roomRateDetails); data.SimilarList.push(r.data.data.PriceDetails.HotelList);
} else { } else {
data.SimilarList = r.data.data.roomRateDetails; data.SimilarList = r.data.data.PriceDetails.HotelList;
} }
data.SimilarList.forEach(x => { data.SimilarList.forEach(x => {
if ( if (
......
...@@ -312,7 +312,7 @@ export default defineComponent({ ...@@ -312,7 +312,7 @@ export default defineComponent({
HotelMealTypes: [] as Array<HotelRate>, //餐型 HotelMealTypes: [] as Array<HotelRate>, //餐型
HotelDidaPropertyCategory:[] as Array<HotelRate>, HotelDidaPropertyCategory:[] as Array<HotelRate>,
keyWords: "" as stringify, keyWords: "" as stringify,
placeKeyWords: t("v101.scattered.HotelArea1"), CityCode : t("v101.scattered.HotelArea1"),
}); });
for (let i = 1; i < 11; i++) { for (let i = 1; i < 11; i++) {
data.theRooms.push(i); data.theRooms.push(i);
...@@ -326,6 +326,7 @@ export default defineComponent({ ...@@ -326,6 +326,7 @@ export default defineComponent({
data.scrollStyle = useScrollModule().scrollStyle; data.scrollStyle = useScrollModule().scrollStyle;
const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any; const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any;
// data.searchClone = JSON.parse(JSON.stringify(search.msg))
if (search.searchroomGroup && search.searchroomGroup.length == 0) { if (search.searchroomGroup && search.searchroomGroup.length == 0) {
search.searchroomGroup.push({ search.searchroomGroup.push({
roomNum: 1, roomNum: 1,
...@@ -347,7 +348,7 @@ export default defineComponent({ ...@@ -347,7 +348,7 @@ export default defineComponent({
data.hotelsRates = useHotel.getHotelRate(); data.hotelsRates = useHotel.getHotelRate();
data.HotelMealTypes = useHotel.getHotelMeal(); data.HotelMealTypes = useHotel.getHotelMeal();
data.HotelConceptTypes = useHotel.getHotelConcept(); data.HotelConceptTypes = useHotel.getHotelConcept();
data.CityCode=data.CityCode;
const methods = { const methods = {
//设置房间里面成人数改变总成人数和儿童数 //设置房间里面成人数改变总成人数和儿童数
setPeopleNum() { setPeopleNum() {
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<div class="row q-px-lg q-mb-lg" :class="{ 'row justify-between': $q.platform.is.desktop }"> <div class="row q-px-lg q-mb-lg" :class="{ 'row justify-between': $q.platform.is.desktop }">
<div :class="{ 'row items-center': $q.platform.is.desktop, 'row wrap': $q.platform.is.mobile }"> <div :class="{ 'row items-center': $q.platform.is.desktop, 'row wrap': $q.platform.is.mobile }">
<div class="mobile-only row items-center"> <div class="mobile-only row items-center">
<div class="text-weight-bold fz20 ellipsis" style="width: 280px">{{ hotelSummary.hotelName }}</div> <div class="text-weight-bold fz20 ellipsis" style="width: 280px">{{ hotelSummary.Name_CN }}</div>
</div> </div>
<div class="text-weight-bold fz20 ellipsis desktop-only">{{ hotelSummary.hotelName }}</div> <div class="text-weight-bold fz20 ellipsis desktop-only">{{ hotelSummary.Name_CN }}</div>
<div :class="{'q-pt-sm':$q.platform.is.mobile}"> <div :class="{'q-pt-sm':$q.platform.is.mobile}">
<span class=" text-orange text-weight-bold fz18" :class="{'q-pl-lg':$q.platform.is.desktop}"> <span class=" text-orange text-weight-bold fz18" :class="{'q-pl-lg':$q.platform.is.desktop}">
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
<span class="text-grey-8 q-pl-xs">/{{$t('v101.scattered.qi')}}</span> <span class="text-grey-8 q-pl-xs">/{{$t('v101.scattered.qi')}}</span>
</div> </div>
<div :class="{'q-ml-md':$q.platform.is.desktop,'q-pt-sm q-pl-sm':$q.platform.is.mobile}"> <div :class="{'q-ml-md':$q.platform.is.desktop,'q-pt-sm q-pl-sm':$q.platform.is.mobile}">
<q-rating v-model="hotelSummary.reviewRating" size="1.5em" color="orange" :max="hotelSummary.reviewRating" readonly /> <q-rating v-model="hotelSummary.StarRating" size="1.5em" color="orange" :max="hotelSummary.StarRating" readonly />
</div> </div>
</div> </div>
</div> </div>
<div class="col" :class="{'q-px-lg':$q.platform.is.desktop,'q-px-md':$q.platform.is.mobile}"> <div class="col" :class="{'q-px-lg':$q.platform.is.desktop,'q-px-md':$q.platform.is.mobile}">
<div class="row nowrap"> <div class="row nowrap">
<q-icon class="text-grey-13 q-mr-xs" name="place" size="xs"></q-icon> <q-icon class="text-grey-13 q-mr-xs" name="place" size="xs"></q-icon>
<span class="col fz14 text-weight-bold text-blick">{{ hotelSummary.address }}</span> <span class="col fz14 text-weight-bold text-blick">{{ hotelSummary.Address_CN }}</span>
</div> </div>
<div class="q-py-lg no-wrap col" :class="{ 'row': $q.platform.is.desktop, 'column': $q.platform.is.mobile }"> <div class="q-py-lg no-wrap col" :class="{ 'row': $q.platform.is.desktop, 'column': $q.platform.is.mobile }">
<div class="row rounded-borders relative-position" :class="{ 'col-6': $q.platform.is.desktop, 'height-320': $q.platform.is.mobile }" style="overflow: hidden" v-if="h.List"> <div class="row rounded-borders relative-position" :class="{ 'col-6': $q.platform.is.desktop, 'height-320': $q.platform.is.mobile }" style="overflow: hidden" v-if="h.List">
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
import { DirtionmaryHelper } from 'src/config/dictionary' import { DirtionmaryHelper } from 'src/config/dictionary'
import { currentRouter } from 'src/router' import { currentRouter } from 'src/router'
import { HotelArea, useHotel } from '../../utils/hotelRate' import { HotelArea, useHotel } from '../../utils/hotelRate'
import DetailsList from "../../components/scattered/list/DetailsList.vue" import DetailsList from "../../components/scattered/dida/DetailsList.vue"
import DidaService from 'src/api/didahotel'
export default defineComponent({ export default defineComponent({
components: { ImagePreview, GoogleMap, Marker, DetailsList }, components: { ImagePreview, GoogleMap, Marker, DetailsList },
props: { props: {
...@@ -269,21 +270,18 @@ ...@@ -269,21 +270,18 @@
data.loading = true data.loading = true
data.params.hotelId = data.urlParamsMsg.hotelId data.params.hotelId = data.urlParamsMsg.hotelId
let param = Object.assign(data.params) let param = Object.assign(data.params)
HotelService.GetHotelDetailScat(param) DidaService.GetHotelDetails(param)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
data.h = r.data.data.hotelDetails; data.h = r.data.data;
data.hotelSummary = r.data.data.hotelSummary; console.log("道旅酒店详情1",r.data.data);
data.hotelSummary = r.data.data;
data.h.roomReviewRating = parseFloat( data.h.roomReviewRating = parseFloat(
data.h.roomReviewRating data.h.roomReviewRating
); );
data.h.hotelRooms = data.h.hotelRooms.substr(8) data.h.hotelRooms = data.h.hotelRooms.substr(8)
data.h.List = [] data.h.List = []
data.h.List.push(data.h.hotelImageUrl1)
data.h.List.push(data.h.hotelImageUrl2)
data.h.List.push(data.h.hotelImageUrl3)
data.h.List.push(data.h.hotelImageUrl4)
data.h.List.push(data.h.hotelImageUrl5)
data.images = data.h.List data.images = data.h.List
//拆分网络连接 //拆分网络连接
if (data.h.internetAccessibilityOfTheRoom != "") { if (data.h.internetAccessibilityOfTheRoom != "") {
...@@ -533,7 +531,7 @@ ...@@ -533,7 +531,7 @@
data.Services.push(data.ServicesList[33].name); data.Services.push(data.ServicesList[33].name);
} }
} }
methods.initMap(data.hotelSummary.longitudeW, data.hotelSummary.latitudeW) methods.initMap(data.hotelSummary.Longitude, data.hotelSummary.Latitude)
} else { } else {
message.errorMsg(r.data.message) message.errorMsg(r.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