Skip to content

B
bigwood
Commit d6505780 authored by 吴春's avatar 吴春
Browse files
Options

1

parent 0a6725b9
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 131 deletions
src/components/hotel/list/hotelDetails.vue
View file @ d6505780
......@@ -83,6 +83,9 @@
</GoogleMap>
</div>
</div>
<div class="bg-light-blue-1 q-pa-md fz14 rounded-borders">
<div class="text-weight-bold">{{ $t('hotel.details.xiangqing') }}</div>
<div class="text-grey-8 q-mt-sm">{{ h.Descriptions }}</div>
......
src/components/scattered/dida/DetailsList.vue
View file @ d6505780
......@@ -7,34 +7,7 @@
</q-popup-proxy>
</q-field>
<!-- <div class="row" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-select :class="{'q-ml-lg':$q.platform.is.desktop}" style="min-width: 90px;z-index: 99999;"
v-model="search.BedTypeID"
dense
:options="HotelRoomTypes"
emit-value
option-label="Name_CN"
option-value="ID"
clearable
map-options
:label="$t('v101.scattered.fangxingtype')"
standout
/>
</div>
<div class="row" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-select :class="{'q-ml-lg':$q.platform.is.desktop}" style="min-width: 90px;z-index: 99999;"
v-model="search.BreakfastTypeID"
dense
:options="HotelMealTypes"
emit-value
option-label="Name_CN"
option-value="ID"
clearable
map-options
:label="$t('v101.scattered.canxingtype')"
standout
/>
</div> -->
<div class="row" :class="{'q-mt-sm':$q.platform.is.mobile}">
<q-select :class="{'q-ml-lg':$q.platform.is.desktop}" style="min-width: 90px;z-index: 99999;" unelevated v-model="room" dense :options="theRooms" emit-value option-label="name" option-value="id" map-options :label="$t('v101.scattered.kefang')" standout @update:model-value="getRoomList">
</q-select>
......@@ -305,8 +278,8 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
.then(r => {
data.SimilarList = [] as Array<any>
console.log("道旅酒店详情",r.data.data.HotelList);
context.emit('getPriceDetails',r.data.data.HotelList[0].LowestPrice)
if (r.data.resultCode == ApiResult.SUCCESS) {
if (r.data.data.HotelList&&r.data.data.HotelList.length>0){
if (r.data.resultCode == ApiResult.SUCCESS) {
if (
Object.prototype.toString.call(r.data.data.HotelList[0].GroupRatePlanList) ==
"[object Object]"
......@@ -317,6 +290,13 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
}
console.log(" 道旅data.SimilarList", data.SimilarList);
}
context.emit('getPriceDetails',r.data.data.HotelList[0].LowestPrice)
}else{
context.emit('getPriceDetails', {Currency:"",Value:0})
}
data.loading = false
}).catch(e => {
data.loading = false
......
src/components/scattered/dida/DidaHeader.vue
View file @ d6505780
......@@ -186,7 +186,8 @@
</q-card>
</q-popup-proxy>
</q-btn>
<q-btn color="primary" unelevated :label="$t('query')" />
<q-btn color="primary" unelevated :label="$t('query')" :loading="loading" @click="setData"/>
</div>
</template>
......
src/components/scattered/order/OrderdDiDaDetail.vue
View file @ d6505780
......@@ -18,7 +18,7 @@
<div class="column" :class="{'col q-pl-lg':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}">
<div class="text-red fz18 text-weight-bold">{{item.Hotel.HotelName}}</div>
<div class="q-pt-xs">
<q-icon class="text-grey-13 q-mr-xs" name="place" size="xs"></q-icon>
<span class="text-grey-6 q-pr-lg">{{$t('v101.scatteredOrder.shifu')}}</span>
<span class="col fz14 text-weight-bold text-blick">{{item.Hotel.TotalPrice}}</span>
</div>
......@@ -30,13 +30,13 @@
</span>
</div>
<div class="q-pt-xs">
<span class="text-grey-6 q-pr-lg">{{$t('v101.scatteredOrder.xiyan')}}</span>
<span class="text-grey-6 q-pr-lg">{{$t('v103.scheduledTripDetails.itineraryDetails.canshi')}}</span>
<span class="text-grey-9">
{{itemrate.BreakfastType==1?"不含早":"含早"}}
</span>
</div>
<div class="q-pt-xs">
<span class="text-grey-6 q-pr-lg">{{$t('v101.scatteredOrder.cesuo')}}</span>
<span class="text-grey-6 q-pr-lg">{{$t('v101.scatteredOrder.jiagejihua')}}</span>
<span class="text-grey-9">
{{itemrate.RatePlanName}}
</span>
......@@ -69,6 +69,7 @@
<span class="text-grey-6 ScatteredOrderdDetail">{{$t('v101.scatteredOrder.fangxingxinxi')}}</span>
<div class="q-pl-lg">
<span class="q-pr-lg">
{{roomtypeName}}
<!-- {{parmResult?getGradeType(parmResult.gradeType):''}}{{parmResult?getRoomType(parmResult.roomType):''}} -->
</span>
</div>
......@@ -106,12 +107,12 @@
<span>{{item.Contact.Name.First + item.Contact.Name.Last}}</span>
</div>
</div>
<div class="row items-center no-wrap q-mb-md">
<!-- <div class="row items-center no-wrap q-mb-md">
<span class="text-grey-6 ScatteredOrderdDetail">{{$t('v101.scatteredOrder.dangqiandizhi')}}</span>
<div class="q-pl-lg row">
<span>{{parmResultRoomInfo.guestAddress}}</span>
</div>
</div>
</div> -->
<div class="row items-center no-wrap q-mb-md">
<span class="text-grey-6 ScatteredOrderdDetail">{{$t('v101.scatteredOrder.Email')}}</span>
<div class="q-pl-lg">
......@@ -127,7 +128,7 @@
<div class="row items-center no-wrap q-mb-md">
<span class="text-grey-6 ScatteredOrderdDetail">{{$t('v101.scatteredOrder.kehubeizhu')}}</span>
<div class="q-pl-lg">
<span v-if="model.Remark">{{model.Remark}}</span>
<span >{{item.CustomerRequest}}</span>
</div>
</div>
</div>
......@@ -169,7 +170,8 @@ export default defineComponent({
loading: false,
RoomTypeList: [] as Array<HotelArea>,//房间等级
scatteredRoomTypeList: [] as Array<HotelArea>,//散客房间类型
})
roomtypeName : ""
})
data.scrollStyle = useScrollModule().scrollStyle
data.RoomTypeList = useHotel.getHotelRoomType()
......@@ -211,15 +213,15 @@ export default defineComponent({
},
//获取房型
getRoomType(roomtypeId) {
let roomtypeName = "";
if (roomtypeId>0) {
data.HotelRoomTypes.forEach((item) => {
if (item.ID == roomtypeId) {
roomtypeName=item.Name_CN;
this.roomtypeName=item.Name_CN;
}
});
}
return roomtypeName;
return this.roomtypeName;
},
//获取道旅床类型列表
getdidaBedType() {
......
src/pages/scattered/didaDetails.vue
View file @ d6505780
......@@ -7,13 +7,14 @@
<div class="text-weight-bold fz20 ellipsis" style="width: 280px">{{ hotelSummary.Name_CN }}</div>
</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}" v-if="LowPriceInfo">
<span class=" text-orange text-weight-bold fz18" :class="{'q-pl-lg':$q.platform.is.desktop}">
{{LowPriceInfo.Currency}}
{{LowPriceInfo.Value}}
</span>
<span class="text-grey-8 q-pl-xs">/{{$t('v101.scattered.qi')}}</span>
</div>
<div :class="{'q-ml-md':$q.platform.is.desktop,'q-pt-sm q-pl-sm':$q.platform.is.mobile}">
<q-rating v-model="hotelSummary.StarRating" size="1.5em" color="orange" :max="hotelSummary.StarRating" readonly />
</div>
......@@ -63,93 +64,9 @@
</div>
</div>
<DetailsList @goUrl="goUrl" @getPriceDetails="getPriceDetails"></DetailsList>
<div class="bg-light-blue-1 q-pa-md fz14 rounded-borders">
<div class="text-weight-bold">{{ $t('v101.scatteredDetails.jiudianxinxi') }}</div>
<!-- <div class="text-grey-8 q-mt-sm">{{ h.Descriptions }}</div> -->
</div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-3':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi1') }}</div>
<div class="col text-subtitle2 text-weight-bolder">{{ h.pickupService?h.pickupService:'--' }}</div>
</div>
</div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-3':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi2') }}</div>
<div class="col text-subtitle2 text-weight-bolder">{{ h.amenitiesNotes?h.amenitiesNotes:'--' }}</div>
</div>
</div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-3':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi3') }}</div>
<div class="col text-subtitle2 text-weight-bolder">
{{ h.hotelRooms!=''?h.hotelRooms:'--' }}
</div>
</div>
</div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-3':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi4') }}</div>
<div class="col row text-subtitle2 text-weight-bolder">
<template v-if="InterArr.length>0">
<div class="q-mb-md q-mr-md" v-for="x in InterArr">
<span class="rounded-borders bg-blue-1 text-blue q-px-sm q-py-xs">{{x}}</span>
</div>
</template>
<template v-else>--</template>
</div>
</div>
</div>
<div :class="{'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg" :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi5') }}</div>
<div class="text-subtitle2 text-weight-bolder" :class="{'col':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<table :class="{'hotel-details-table':$q.platform.is.desktop,'hotel-details-tableMoblie':$q.platform.is.mobile}">
<tr>
<td colspan="3" class="td01">{{$t('v101.scatteredDetails.shiwai')}}</td>
<td colspan="3" class="td01">{{$t('v101.scatteredDetails.wunei')}}</td>
<td colspan="3" class="td01">{{$t('v101.scatteredDetails.zhengqiyu')}}</td>
</tr>
<tr>
<template v-for="item in 3">
<td class="td02">{{$t('v101.scatteredDetails.nan')}}</td>
<td class="td02">{{$t('v101.scatteredDetails.nv')}}</td>
<td class="td02">{{$t('v101.scatteredDetails.hunyu')}}</td>
</template>
</tr>
<tr>
<td>{{bathRoom[0]}}</td>
<td>{{bathRoom[1]}}</td>
<td>{{bathRoom[2]}}</td>
<td>{{bathRoom[3]}}</td>
<td>{{bathRoom[4]}}</td>
<td>{{bathRoom[5]}}</td>
<td>{{bathRoom[6]}}</td>
<td>{{bathRoom[7]}}</td>
<td>{{bathRoom[8]}}</td>
</tr>
</table>
<div class="row wrap q-pt-md">
<span class="rounded-borders bg-blue-1 text-blue q-mr-md q-px-sm q-py-xs q-mb-sm" v-for="item in HotSpring">{{item}}</span>
</div>
</div>
</div>
</div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row">
<div class="f12 text-grey-500" :class="{'col-2':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">{{ $t('v101.scatteredDetails.titlexinxi6') }}</div>
<div class="row wrap text-subtitle2 text-weight-bolder" :class="{'col':$q.platform.is.desktop,'col-12 q-pt-sm':$q.platform.is.mobile}">
<span class="rounded-borders bg-blue-1 text-blue q-mr-md q-px-sm q-py-xs q-mb-sm" v-for="item in Services">{{item}}</span>
</div>
</div>
</div>
<div class="q-mt-lg">
<div class="bg-orange-1 q-pa-md rounded-borders fz14" style="border: 1px dashed orange">
<div class="text-weight-bold">{{ $t('v101.scatteredDetails.miaoshu') }}</div>
<div class="text-grey-700 q-mt-sm">{{ h.hotelDescription }}</div>
</div>
</div>
</div>
</div>
<q-inner-loading :showing="loading" :label="$t('loading')" label-class="text-grey-6 f12" />
......
src/pages/scattered/didaHotelSure.vue
View file @ d6505780
......@@ -11,7 +11,7 @@
<span class="fz18 q-pl-lg">{{$t('v101.scatteredOrder.prompt2')}}</span>
</div>
</div>
<div class="col bg-white rounded-border q-mb-md q-pa-lg" :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<div class="col bg-white rounded-border q-mb-md q-pa-lg" :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile}" v-if="roomRateDetails.RatePlanList&&roomRateDetails.RatePlanList.length>0" >
<q-img v-if="params.imgUrl" :class="{'col-1 q-mr-lg':$q.platform.is.desktop,'col-12 q-mb-sm':$q.platform.is.mobile}" :src="params.imgUrl" style="height: auto;display: inline-block;" :style="{'height':$q.platform.is.mobile?'150px':'auto'}" spinner-color="drk" spinner-size="20px" heigth="100%" mode="cover" :ratio="1"/>
<div class="col column q-pl-xs">
<div class="text-red fz18 text-weight-bold">{{roomRateDetails.HotelName}}</div>
......@@ -48,6 +48,7 @@
</span>
</div>
</div>
</div>
<div class="col row items-end q-pl-lg" :class="{'justify-end':$q.platform.is.mobile}">
<div class="column">
......@@ -71,6 +72,9 @@
</div>
</div>
</div>
<div v-else class="col q-pa-lg text-center">
{{$t('noneData')}}
</div>
<div class="col column bg-white rounded-border q-mb-md">
<div class="bg-light-blue-1 q-py-md q-px-lg fz14 rounded-borders row items-center text-weight-bold">
{{$t('v101.scatteredOrder.yudinxinx')}}
......@@ -604,7 +608,7 @@
RB_Branch_id:r.data.data.RB_Branch_id,
costType:r.data.data.costType,
orderId:r.data.data.orderId,
bookingNumber:r.data.data.BookingDetails.BookingID,
bookingNumber:r.data.data.ResultData.BookingDetails.BookingID,
bookMoney:data.SettlementPrice,
CancelTime:r.data.data.CancelTime,
hotelName:data.sureMsg.hotelName,
......
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