Skip to content

S
SuperMan
Commit 002d09c0 authored by 黄奎's avatar 黄奎
Browse files
Options

地图调整

parent 515b9a5e
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 27 deletions
index.html
View file @ 002d09c0
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
......@@ -17,14 +18,26 @@
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=OV7BZ-ZT3HP-6W3DE-LKHM3-RSYRV-ULFZV"></script>
<script type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script>
<!--HK 2024-08-15 新加(避免提示为商用授权) Start-->
<script type="text/javascript" src="//api.map.baidu.com/api?key=&v=1.1&services=true&s=1"></script>
<script type="text/javascript" src="https://api.map.baidu.com/getscript?v=2.0&ak=&services=&t=20240731110958"></script>
<!--
<script charset="utf8" src="https://dlswbr.baidu.com/heicha/mw/abclite-2063-s.original.js?_=9975"></script>
<script type="text/javascript" src="https://api.map.baidu.com/getscript?v=1.1&ak=&services=true&t=20130716024058"></script>
<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&s=1"></script>
-->
<!--HK 2024-08-15 新加 End -->
<script src="/static/UE/ueditor.config.js"></script>
<script src="/static/UE/ueditor.all.js"></script>
<script src="/static/UE/lang/zh-cn/zh-cn.js"></script>
<script src="/static/UE/ueditor.parse.min.js"></script>
<title></title>
</head>
<body>
<div id="app">
</div>
</body>
</html>
\ No newline at end of file
</html>
src/components/Hotel/DiDa/HotelDetails.vue
View file @ 002d09c0
......@@ -625,6 +625,8 @@
<!-- 地图 -->
<div style="position: relative;min-height:240px;"
:style="{'width':DidaHotelImg&&DidaHotelImg.length>0?'40%':'100%'}">
<!-- <iframe v-if="hotelMapUrl&&hotelMapUrl!=''" style="height:100%;min-height:215px;width:100%" marginHeight=0 :src="hotelMapUrl" frameBorder=0
marginWidth=0 scrolling=no></iframe> -->
<div style="height:100%;min-height:215px;width:100%" id="mapContainer" class="rounded-borders"></div>
</div>
<!-- 地图 -->
......@@ -650,7 +652,7 @@
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" :gutter="35" style="margin-left:3%;margin-top:4px;">
<el-popover class="" style="z-index: 0; box-shadow: 0 0 50px #ddd !important" placement="right"
......@@ -827,7 +829,7 @@
<span class="q-pt-md "
v-if="getIsCancella(subItem.RatePlanCancellationPolicyList,subItem.TotalPrice)>0">
<el-popover class="CancellationPolicyList" width="400" placement="top" trigger="click">
<div style="display: block; line-height: 30px; height: auto;">
<div style="display:block;height:auto;">
<div v-for="( itemCancella, index1 ) in subItem.RatePlanCancellationPolicyList"
:key="index1">
<p v-if="index1==0">{{ getformatDateStr(itemCancella.FromDate) }}之前免费取消;</p>
......@@ -842,19 +844,17 @@
取消，收费 {{subItem.Currency}}{{getPrice(itemCancella.Amount)}};</p>
</div>
</div>
</div>
<span slot="reference">
<span class="nd-label_success"
v-if="getIsCancella(subItem.RatePlanCancellationPolicyList,subItem.TotalPrice)==1">限时取消</span>
<span v-else class="nd-label_warning">付费取消</span>
</span>
</el-popover>
<p v-if="getIsCancella(subItem.RatePlanCancellationPolicyList,subItem.TotalPrice)==1">
<p style="line-height:0px;padding-top:5px;" v-if="getIsCancella(subItem.RatePlanCancellationPolicyList,subItem.TotalPrice)==1">
{{ getformatDateStr(subItem.RatePlanCancellationPolicyList[subItem.RatePlanCancellationPolicyList.length-1].FromDate) }}之前免费取消;
</p>
<p v-else>
<p v-else style="line-height:0px;padding-top:5px;">
{{ getformatDateStr(subItem.RatePlanCancellationPolicyList[subItem.RatePlanCancellationPolicyList.length-1].FromDate) }}前收费{{subItem.Currency}}{{getPrice(subItem.RatePlanCancellationPolicyList[subItem.RatePlanCancellationPolicyList.length>1? subItem.RatePlanCancellationPolicyList.length-2:subItem.RatePlanCancellationPolicyList.length-1].Amount)}};
</p>
</span>
......@@ -1170,7 +1170,8 @@
return false;
}
}
}
},
hotelMapUrl: ""
};
},
methods: {
......@@ -1255,6 +1256,11 @@
this.loading = false
if (res.data.resultCode == 1) {
this.DidaHotelDetails = res.data.data
this.hotelMapUrl = `http://api.weboss.hk/baidu_map/api.php?prop1=` + this.DidaHotelDetails
.Name_CN + `&prop2=` + this.DidaHotelDetails.Address_CN + `&prop3=` + this.DidaHotelDetails
.Longitude + `,` + this.DidaHotelDetails
.Latitude + `&prop4=100%&prop5=100%`;
this.initMap(this.DidaHotelDetails.Longitude, this.DidaHotelDetails.Latitude, this.DidaHotelDetails
.Name_CN)
if (this.DidaHotelDetails.StarRating) {
......@@ -1276,9 +1282,6 @@
this.loading = false
if (res.data.resultCode == 1) {
this.DidaHotelRoomDetails = res.data.data
console.log(" this.msg", this.msg);
console.log("DidaHotelRoomDetails", res.data.data);
}
}, null)
},
......@@ -1503,13 +1506,11 @@
"dmc_post_GetDiDaPriceConfirm",
params,
res => {
console.log("dmc_post_GetDiDaPriceConfirm", res);
this.confirmLoading = false;
if (res.data.resultCode == 1) {
this.confirmPriceList = res.data.data.PriceDetails;
this.roomRateDetails = res.data.data.PriceDetails.HotelList[0];
}
console.log("res.data.data", res.data.data);
if (this.roomRateDetails && this.roomRateDetails.RatePlanList && this.roomRateDetails.RatePlanList
.length > 0) {
item.IsSellOut = 0;
......
src/components/Hotel/DiDa/HotelSure.vue
View file @ 002d09c0
......@@ -533,8 +533,9 @@
</div>
<div style="padding-bottom: 8px;">
<div style=" display: flex;">
<div style="width:50%;" v-if="roomRateDetails.RatePlanList && roomRateDetails.RatePlanList.length > 0"
v-for="(item, index) in roomRateDetails.RatePlanList" :key="index">
<template v-if="roomRateDetails.RatePlanList && roomRateDetails.RatePlanList.length > 0">
<div style="width:50%;"
v-for="(item, index) in roomRateDetails.RatePlanList" :key="`rd_rp_`+index">
<div class="q-pt-xs col q-px-lg q-mb-md8">
<span class="text-grey-6 q-pr-lg">房间数量</span>
<span class="text-grey-9"> {{ item.RoomOccupancy.RoomNum }} </span>
......@@ -548,6 +549,7 @@
</span>
</div>
</div>
</template>
<div class="q-pt-xs col q-px-lg q-mb-md8" style="width:50%;">
<div>
<span class="text-grey-6 q-pr-lg">报价是否即时确认</span>
......@@ -572,12 +574,12 @@
<template v-if="roomRateDetails.RatePlanList && roomRateDetails.RatePlanList.length > 0">
<table class="table-list" cellspacing="0">
<tr style="background-color: #f1f1f1;">
<td v-for="( itemp, indexp ) in roomRateDetails.RatePlanList[0].PriceList" :key="indexp">
<td v-for="( itemp, indexp ) in roomRateDetails.RatePlanList[0].PriceList" :key="`rp_`+indexp">
{{getWeekD(itemp.StayDate)}}
</td>
</tr>
<tr>
<td v-for="( itemp, indexp ) in roomRateDetails.RatePlanList[0].PriceList" :key="indexp">
<td v-for="( itemp, indexp ) in roomRateDetails.RatePlanList[0].PriceList" :key="`rpn_`+indexp">
<span class="text-red">{{DanWei }} {{itemp.Price}}</span>
<p>
<span :class="itemp.MealAmount>0?'text-green':'' ">
......@@ -645,7 +647,7 @@
</el-row>
<el-form-item label-width="0px" v-if="sureMsg.GuestList && sureMsg.GuestList.length > 0">
<template v-for="(item, subIndex) in sureMsg.GuestList">
<div v-for="(itemguest, numberOfAdultsIndex) in item.GuestInfo" :key="subIndex">
<div v-for="(itemguest, numberOfAdultsIndex) in item.GuestInfo" :key="`sg_`+subIndex+numberOfAdultsIndex">
<el-row style="margin-bottom:22px">
<el-col :gutter="35" style="width:26%;margin-right:24px;">
<el-form-item :label="numberOfAdultsIndex==0?'房间'+(subIndex + 1):''"
......@@ -695,8 +697,8 @@
</div>
</div>
<div class="col row q-mb-md" style="max-width: 1366px; min-width: 375px; margin: auto;width:1300px">
<el-button type="primary" :disabled="submDisabled" style="width:50%; margin:0 auto;" @click="submitForm('sureMsg')"
:loading="submLoading">下单</el-button>
<el-button type="primary" :disabled="submDisabled" style="width:50%; margin:0 auto;"
@click="submitForm('sureMsg')" :loading="submLoading">下单</el-button>
</div>
</div>
......@@ -1012,14 +1014,12 @@
"dmc_post_GetDiDaPriceConfirm",
this.params,
res => {
console.log("dmc_post_GetDiDaPriceConfirm", res);
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.PriceDetails;
this.roomRateDetails = res.data.data.PriceDetails.HotelList[0];
this.sureMsg.BookingID = res.data.data.PriceDetails.ReferenceNo;
this.sureMsg.checkInTime = res.data.data.PriceDetails.CheckInDate;
// this.sureMsg.HotelName = this.roomRateDetails.HotelName;
this.sureMsg.TotalPrice = this.roomRateDetails.TotalPrice;
this.sureMsg.RoomCount = this.$route.query.room;
this.DanWei = res.data.data.PriceDetails.HotelList[0].RatePlanList[0].Currency;
......@@ -1134,12 +1134,9 @@
if (this.$route.query.room) {
this.params.RoomCount = this.$route.query.room;
}
if (this.params.searchroomGroup && this.params.searchroomGroup != null) {
this.sureMsg.GuestList = [];
this.params.searchroomGroup.forEach((item, index) => {
console.log("item", item);
var guestInfoList = [];
let allprople = item.numberOfAdults + item.numberOfChildren;
for (let i = 1; i <= allprople; i++) {
......@@ -1157,7 +1154,6 @@
GuestInfo: guestInfoList
};
this.sureMsg.GuestList.push(obj);
console.log(" this.sureMsg.GuestList", this.sureMsg.GuestList);
});
}
},
......
src/components/LeaderManagement/leaderPayTicketDetail.vue
View file @ 002d09c0
......@@ -113,7 +113,6 @@
this.loading = false;
if (res.data.resultCode === 1) {
let data = res.data.data.ScenicList;
console.log("data", data);
let dataList = [];
if (date !== 'all') {
data.map(x => {
......
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