Skip to content

B
bigwood
Commit a68627a3 authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 9ce32917
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 56 deletions
src/components/scattered/dida/DetailsList.vue
View file @ a68627a3
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
<div class="row no-wrap justify-end q-pt-md text-right"> <div class="row no-wrap justify-end q-pt-md text-right">
<span class="text-blue bg-blue-1 q-px-sm q-mr-sm" style="white-space: nowrap;"> <span class="text-blue text-right q-pt-md" style="white-space: nowrap;">
剩余库存：{{item.InventoryCount}} <span>库存：{{item.InventoryCount}}</span>
</span> </span>
</div> </div>
</div> </div>
...@@ -69,39 +69,36 @@ ...@@ -69,39 +69,36 @@
<div class="col q-ml-lg q-pt-lg q-pb-md q-pr-md" > <div class="col q-ml-lg q-pt-lg q-pb-md q-pr-md" >
<div class="col q-pt-sm" :class="{'row items-center no-wrap': $q.platform.is.desktop,'common': $q.platform.is.mobile}"> <div class="col q-pt-sm" :class="{'row items-center no-wrap': $q.platform.is.desktop,'common': $q.platform.is.mobile}">
<div class="absolute text-white q-px-lg" style="left: 0;top: 0;border-bottom-right-radius: 10px;" <div class="absolute text-white q-px-lg" style="left: 25%;top: 0;border-bottom-right-radius: 10px;"
:class="item.BreakfastType==2?'HD_Black':'HD_Green'">{{item.BreakfastType==1?"含早":"不含早"}}</div> :class="item.BreakfastType==2?'HD_Black':'HD_Green'">{{item.BreakfastType==1?"含早":"不含早"}}</div>
<div class="col-3" :class="{'q-pl-lg':$q.platform.is.desktop}" v-if="$q.platform.is.desktop">{{item.RatePlanName}}</div> <div class="col-3" :class="{'q-pl-lg':$q.platform.is.desktop}" v-if="$q.platform.is.desktop">{{item.RatePlanName}}</div>
<div class="col-2 text-grey-6" v-if="item.PriceList&&item.PriceList!=null"> <div class="col-2 text-grey-6" v-if="item.PriceList&&item.PriceList!=null">
<q-card class="row q-mb-md" style="box-shadow:none;" v-for="(itemPrice,indexPrice) in item.PriceList" :key="indexPrice" v-loading="loading"> <q-card class="row q-mb-md" style="box-shadow:none;" v-for="(itemPrice,indexPrice) in item.PriceList" :key="indexPrice" v-loading="loading">
<div class="text-right text-green q-pt-md"> <div class="text-right text-green q-pt-md">
{{getformatDateStr(itemPrice.StayDate)}} 报价:{{itemPrice.Price}}</div> {{getformatDateStr(itemPrice.StayDate)}} 报价:{{itemPrice.Price}}</div>
</q-card> </q-card>
</div> </div>
<div v-if="item.RatePlanCancellationPolicyList&&item.RatePlanCancellationPolicyList!=null"> <div v-if="item.RatePlanCancellationPolicyList&&item.RatePlanCancellationPolicyList!=null">
<q-card class="row q-mb-md" style="box-shadow:none;" v-for="(itemCancella,index1) in item.RatePlanCancellationPolicyList" :key="index1" v-loading="loading"> <q-card class="row q-mb-md " style="box-shadow:none;" v-for="(itemCancella,index1) in item.RatePlanCancellationPolicyList" :key="index1" v-loading="loading">
<div class="column q-pl-md q-pr-md"> <div class="column q-pl-md q-pr-md">
<span class="text-right q-pt-md">{{getformatDateStr(itemCancella.FromDate)}}开始取消罚金({{item.Currency}}):{{itemCancella.Amount}}</span> <span class="text-right text-grey-6 q-pt-md">{{getformatDateStr(itemCancella.FromDate)}}起取消({{item.Currency}}):-{{itemCancella.Amount}}</span>
<span></span> <span></span>
</div> </div>
</q-card> </q-card>
</div> </div>
<div class="row no-wrap justify-end items-center" :class="{'q-pl-lg':$q.platform.is.desktop}"> <div class="row no-wrap justify-end items-center " :class="{'q-pl-lg':$q.platform.is.desktop}">
<div class="row no-wrap items-center q-pr-lg"> <div class="row no-wrap items-center q-pr-lg ">
<span class="text-grey-6">{{item.Currency}}</span> <span class="text-grey-6">{{item.Currency}}</span>
<span class="fz20 text-red q-px-sm">{{getPrice(item.TotalPrice)}}</span> <span class="fz20 text-red q-px-sm" >{{getPrice(item.TotalPrice)}}</span>
</div> </div>
<div class="q-pt-xs"> <div class="q-pt-xs" style="position:absolute; right:3%;">
<q-btn class="bg-green-6 hover q-px-md q-py-xs q-ml-xs text-white" @click="goUrl('/scattered/HotelSure',subItem)" :label="$t('v101.scatteredDetails.yuyue')"/> <q-btn class="bg-green-6 hover q-px-md q-py-xs q-ml-xs text-white" @click="goUrl('/scattered/HotelSure',subItem)" :label="$t('v101.scatteredDetails.yuyue')"/>
</div> </div>
</div> </div>
</div> </div>
<div class="q-pt-sm">
<!-- <span class="text-green fz12 q-px-sm" style="border:1px solid green">{{item.StandardOccupancy}}</span> -->
</div>
</div> </div>
</div> </div>
</q-card> </q-card>
...@@ -208,12 +205,11 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate"; ...@@ -208,12 +205,11 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
}, },
//日期格式化 //日期格式化
getformatDateStr(value){ getformatDateStr(value){
var dt = new Date(value);
var dt = new Date(value); let year = dt.getFullYear();
let year = dt.getFullYear(); let month = (dt.getMonth()+1).toString().padStart(2,'0');
let month = (dt.getMonth()+1).toString().padStart(2,'0'); let date = (dt.getDate()+1).toString().padStart(2,'0');
let date = (dt.getDate()+1).toString().padStart(2,'0'); return year+"-"+month+"-"+date;
return year+"-"+month+"-"+date;
}, },
//获取房型 //获取房型
...@@ -228,7 +224,7 @@ return year+"-"+month+"-"+date; ...@@ -228,7 +224,7 @@ return year+"-"+month+"-"+date;
} }
return roomtypeName; return roomtypeName;
}, },
//获取道旅房型列表 //获取道旅房型列表
getdidaBedType() { getdidaBedType() {
DidaService.GetDidaBedType({}).then((res) => { DidaService.GetDidaBedType({}).then((res) => {
console.log("getdidaBedType", res); console.log("getdidaBedType", res);
...@@ -331,9 +327,6 @@ return year+"-"+month+"-"+date; ...@@ -331,9 +327,6 @@ return year+"-"+month+"-"+date;
return cd >= date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD') return cd >= date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
}, },
} }
watch(search.searchroomGroup, (n, o) => {
})
onMounted(()=>{ onMounted(()=>{
methods.getdidaBedType(); methods.getdidaBedType();
methods.initHotel() methods.initHotel()
......
src/components/scattered/dida/DidaHeader.vue
View file @ a68627a3
...@@ -204,6 +204,7 @@ import { ...@@ -204,6 +204,7 @@ import {
onMounted, onMounted,
watch, watch,
} from "vue"; } from "vue";
import message from '../../../utils/message'
import { NCascader, NSelect } from "naive-ui"; import { NCascader, NSelect } from "naive-ui";
import { date } from "quasar"; import { date } from "quasar";
import { HotelRate, HotelArea, useHotel } from "../../../utils/hotelRate"; import { HotelRate, HotelArea, useHotel } from "../../../utils/hotelRate";
......
src/components/scattered/dida/DidaListTable.vue
View file @ a68627a3
...@@ -206,7 +206,6 @@ ...@@ -206,7 +206,6 @@
<script lang="ts"> <script lang="ts">
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
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 { defineComponent, inject, reactive, toRefs, watch } from "vue";
......
src/pages/scattered/didaDetails.vue
View file @ a68627a3
...@@ -256,6 +256,7 @@ import DidaService from 'src/api/didahotel' ...@@ -256,6 +256,7 @@ import DidaService from 'src/api/didahotel'
// $router.push({ path:url }) // $router.push({ path:url })
}, },
initMap(lat: any, lng: any) { initMap(lat: any, lng: any) {
console.log("我是地图，我来了",lat);
let country=localStorage.getItem(DirtionmaryHelper.USER_IN_COUNTRY) ?? 'GW' let country=localStorage.getItem(DirtionmaryHelper.USER_IN_COUNTRY) ?? 'GW'
if(country!='CN'){ if(country!='CN'){
data.center = { lat: parseFloat(lng), lng: parseFloat(lat) } data.center = { lat: parseFloat(lng), lng: parseFloat(lat) }
...@@ -280,9 +281,8 @@ import DidaService from 'src/api/didahotel' ...@@ -280,9 +281,8 @@ import DidaService from 'src/api/didahotel'
data.h.roomReviewRating = parseFloat( data.h.roomReviewRating = parseFloat(
data.h.roomReviewRating data.h.roomReviewRating
); );
data.h.hotelRooms = data.h.hotelRooms.substr(8)
data.h.List = [] data.h.List = []
data.h.List.push("http://upload.oytour.com/image/index?filePath=/Upload/DMC/20200212065038003.jpg&process=resize,m_filt,w_663,h_") data.h.List.push("")
data.images = data.h.List data.images = data.h.List
methods.initMap(data.hotelSummary.Longitude, data.hotelSummary.Latitude) methods.initMap(data.hotelSummary.Longitude, data.hotelSummary.Latitude)
} else { } else {
......
src/pages/scattered/didaHotel.vue
View file @ a68627a3
...@@ -13,37 +13,17 @@ ...@@ -13,37 +13,17 @@
useI18n useI18n
} from 'vue-i18n' } from 'vue-i18n'
import svgIcon from '../../components/global/svg-icon.vue' import svgIcon from '../../components/global/svg-icon.vue'
import { import { defineComponent,inject,provide,reactive,ref,toRefs} from 'vue'
defineComponent, import { DirtionmaryHelper} from '../../config/dictionary'
inject,
provide,
reactive,
ref,
toRefs
} from 'vue'
import {
DirtionmaryHelper
} from '../../config/dictionary'
import DidaHeader from '../../components/scattered/dida/DidaHeader.vue' import DidaHeader from '../../components/scattered/dida/DidaHeader.vue'
import DidaListTable from '../../components/scattered/dida/DidaListTable.vue' import DidaListTable from '../../components/scattered/dida/DidaListTable.vue'
import { import { date} from 'quasar'
date
} from 'quasar'
export default defineComponent({ export default defineComponent({
components: { components: { svgIcon, DidaHeader,DidaListTable},
svgIcon,
DidaHeader,
DidaListTable
},
setup() { setup() {
const data = reactive({}) const data = reactive({})
let { let { setTitle } = useMetaModule()
setTitle const { locale, t} = useI18n()
} = useMetaModule()
const {
locale,
t
} = useI18n()
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
pageTitle.value = t('menu.scattered.didaName') pageTitle.value = t('menu.scattered.didaName')
...@@ -66,7 +46,7 @@ ...@@ -66,7 +46,7 @@
provide(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM, search) provide(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM, search)
const menu = inject(DirtionmaryHelper.DIDAMENU_KEYS) as any const menu = inject(DirtionmaryHelper.MENU_KEYS) as any
menu.value = 23 menu.value = 23
const methods = {} const methods = {}
return { return {
......
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