Skip to content

A
Athena
Commit 2fd345ed authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 106603e1 36c69f59
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1054 additions and 206 deletions
src/components/Hotel/HotelDetail.vue
View file @ 2fd345ed
This diff is collapsed.
src/components/Hotel/HotelHome.vue
View file @ 2fd345ed
......@@ -152,21 +152,21 @@
</div>
<div class="banner_img" style="margin:0 auto;margin-top:30px;">
<div class="Ht_dangji">
<div class="item">
<div class="item" @click="goSearchDetail('大阪府')">
<img src="../../assets/img/hotel/daban.png" alt=""/>
<div class="line"></div>
<div class="Ht_diming">
大阪
</div>
</div>
<div class="item">
<div class="item" @click="goSearchDetail('东京都')">
<img src="../../assets/img/hotel/dongjing.png" alt=""/>
<div class="line"></div>
<div class="Ht_diming">
东京
</div>
</div>
<div class="item">
<div class="item" @click="goSearchDetail('京都府')">
<img src="../../assets/img/hotel/jingdu.png" alt=""/>
<div class="line"></div>
<div class="Ht_diming">
......@@ -215,33 +215,33 @@
</div>
<div class="Ht_hotArea">
<div class="Ht_hoAreaOne">
<img src="../../assets/img/hotel/mgw.png" alt=""/>
<img src="../../assets/img/hotel/mgw.png" @click="goSearchDetail('名古屋')" alt=""/>
<div>名古屋</div>
</div>
<div class="Ht_otherCommon">
<img src="../../assets/img/hotel/biefu.png" alt=""/>
<img src="../../assets/img/hotel/biefu.png" @click="goSearchDetail('大分县')" alt=""/>
<div>别府</div>
</div>
<div class="Ht_otherCommon">
<img src="../../assets/img/hotel/dongye.png" alt=""/>
<img src="../../assets/img/hotel/dongye.png" @click="goSearchDetail('北海道')" alt=""/>
<div>洞爷.登别.苫小牧</div>
</div>
</div>
<div class="Ht_hotArea" style="margin-top:3px;">
<div class="Ht_otherCommon" style="margin-left:0;">
<img src="../../assets/img/hotel/shangye.png" alt=""/>
<img src="../../assets/img/hotel/shangye.png" @click="goSearchDetail('东京都')" alt=""/>
<div>上野.浅草两国</div>
</div>
<div class="Ht_otherCommon">
<img src="../../assets/img/hotel/shenhu.png" alt=""/>
<div>神户.有马.明石头</div>
<img src="../../assets/img/hotel/shenhu.png" @click="goSearchDetail('兵库县')" alt=""/>
<div>神户.有马.明石</div>
</div>
<div class="Ht_otherCommon">
<img src="../../assets/img/hotel/xianggen.png" alt=""/>
<img src="../../assets/img/hotel/xianggen.png" @click="goSearchDetail('神奈川县')" alt=""/>
<div>箱根</div>
</div>
<div class="Ht_otherCommon">
<img src="../../assets/img/hotel/zhoubian.png" alt=""/>
<img src="../../assets/img/hotel/zhoubian.png" @click="goSearchDetail('京都府')" alt=""/>
<div>京都站周边</div>
</div>
</div>
......@@ -324,7 +324,7 @@ export default {
isShowPop:false,
pickerOptions0: {
disabledDate(time) {
let today_after7=moment().add(0,'days').format('YYYY-MM-DD');
let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
}
},
......@@ -340,12 +340,43 @@ export default {
methods: {
//查询
Search() {
console.log(this.msg,'msgggg');
if(this.msg.place==''){
this.Error('请选择目的地');
return;
}
if(this.msg.StartDate==''){
this.Error('请选择入住时间');
return;
}
if(this.msg.EndDate==''){
this.Error('请选择退房时间');
return;
}
this.$router.push({
path:"/HotelList",
query:{msg:JSON.stringify(this.msg)}
})
},
//首页点击跳转
goSearchDetail(keywords){
let msg = {
place:keywords,
StartDate:moment().format("YYYY-MM-DD"),
EndDate:moment().add(1,'days').format('YYYY-MM-DD'),
roomList:[
{
roomNum:1,
numberOfAdults:1,
numberOfChildren:0,
childAges:0
}
],
}
this.$router.push({
path:"/HotelList",
query:{msg:JSON.stringify(msg)}
})
},
//房间数改变
getRoomList(roomNum){
this.isShowPop=true;
......@@ -589,6 +620,9 @@ export default {
width:1200px;
margin:auto;
}
.Ht_hotArea>div{
cursor: pointer;
}
.Ht_special>div{
width:240px;
height:260px;
......
src/components/Hotel/HotelList.vue
View file @ 2fd345ed
......@@ -96,10 +96,10 @@
}
.HL_ScList{
width:100%;
height:43px;
height:40px;
display: flex;
align-items: center;
border-bottom:1px solid #DDDDDD;
/* border-bottom:1px solid #DDDDDD; */
position: relative;
}
.HL_ScList:last-child{
......@@ -107,7 +107,7 @@
}
.HL_Screen .HL_ScList span{
display:inline-block;
margin-right:60px;
margin-right:20px;
cursor: pointer;
padding:4px 8px;
......@@ -177,6 +177,7 @@
.HL_ListTable{
float:left;
width:840px;
/* width:100%; */
border-collapse:collapse;
}
.HL_ListTable td{
......@@ -206,6 +207,7 @@
position: relative;
margin-left:13px;
width:605px;
/* width:900px; */
height:148px;
}
.HL_ListTitle{
......@@ -328,7 +330,7 @@
cursor: pointer;
color:blue;
position: absolute;
right:55px;
right:10px;
top:14px;
}
.HotelList .pagination {
......@@ -355,7 +357,10 @@
color:rgb(239, 242, 247);
}
.HL_Maxheight{
height:150px!important;
height:114px!important;
}
.HL_Two .icon-img-rili{
margin-left:0!important;
}
</style>
......@@ -420,6 +425,7 @@
size="small"
value-format="yyyy-MM-dd"
v-model="msg.arrivalDate"
:picker-options="pickerOptions0"
type="date"
placeholder="入住日">
</el-date-picker>
......@@ -428,6 +434,7 @@
size="small"
value-format="yyyy-MM-dd"
v-model="msg.departureDate"
:picker-options="pickerOptions0"
type="date"
placeholder="离店日">
</el-date-picker>
......@@ -531,28 +538,6 @@
{{item.name}}
</span>
</div>
<!-- <div class="HL_ScList">
<span class="HL_Stitle">客房设施</span>
<span>禁烟</span>
<span>吸烟</span>
</div> -->
<!-- <div class="HL_ScList">
<span class="HL_Stitle">网络</span>
<span>WiFi（免费）</span>
<span>WiFi（收费）</span>
<span>有线（免费）</span>
<span>有线（收费）</span>
</div> -->
<!-- <div class="HL_ScList">
<span class="HL_Stitle">支付方法</span>
<span>可以网上支付</span>
<span>可以当地支付</span>
</div>
<div class="HL_ScList">
<span class="HL_Stitle">产品特性</span>
<span>越早预订越便宜</span>
<span>限定期限</span>
</div> -->
<div class="HL_ScList MoreList" style="height:auto;">
<div class="HL_Stitle" style="height:45px;" :class="isOpen==2?'HL_Maxheight':''">理念</div>
<div class="HL_Concept" :class="isOpen==1?'HL_minHeight':'HL_AutoHeight'">
......@@ -576,8 +561,8 @@
</div>
<div class="HL_ScList">
<span class="HL_Stitle">酒店名称</span>
<el-input type="text" class="HL_searchHotelName" style="width:320px;" v-model="keyWords" placeholder="请输入你想找的酒店名称" />
<span class="HL_searchBtn" @click="SearchHotel">搜索</span>
<el-input type="text" class="HL_searchHotelName" style="width:320px;" @keyup.native.enter="SearchHotel(),resetPageIndex()" v-model="keyWords" placeholder="请输入你想找的酒店名称" />
<span class="HL_searchBtn" @click="SearchHotel(),resetPageIndex()">搜索</span>
</div>
</div>
<div class="HL_BtmList">
......@@ -590,7 +575,8 @@
<i class="iconfont icon-jiantou-copy"></i> -->
</div>
<div class="clearfix" v-loading="loading">
<div style="width:838px;float:left;min-height:380px;">
<!-- <div style="width:838px;float:left;min-height:380px;"> -->
<div style="float:left;min-height:380px;" v-if="dataList.length>0">
<table class="HL_ListTable">
<tr v-for="item in dataList">
<td>
......@@ -636,26 +622,29 @@
</td>
</tr>
</table>
<div v-if="dataList.length==0" style="padding:15px 0;text-align:center">
<div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</div>
</div>
<div class="HL_Map">
<div class="HL_Map" v-if="travelLngLat.length>0">
<HTMap :dataList="travelLngLat" :type="1"></HTMap>
</div>
<div v-if="dataList.length==0" style="padding:15px 0;text-align:center">
<div class="empty-data"><i class="iconfont icon-kong"></i>
很抱歉，你想要的信息我们真的找不到了
</div>
</div>
</div>
</div>
<el-pagination v-if="dataList.length>0" class="pagination"
@current-change="CurrentChange"
:current-page.sync="currentPage"
background
layout="prev, pager, next"
layout="total, prev, pager, next"
:total="TotalPage">
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
import HTMap from '../global/HTMap'
export default {
data() {
return {
......@@ -681,6 +670,7 @@ export default {
},
//总页数
TotalPage:0,
currentPage:1,
monyMsg:{
//最小金额
searchMinRate:'',
......@@ -892,13 +882,20 @@ export default {
departureDate:'',
searchroomGroup:[],
lowrateBySetCurrency:''
}
},
pickerOptions0: {
disabledDate(time) {
let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
return time.getTime() < new Date(today_after7).getTime() - 8.64e7;
}
},
//坐标数组
travelLngLat:[]
};
},
mounted() {
let msgList = JSON.parse(this.$route.query.msg);
this.placeKeyWords = msgList.place;
console.log(msgList,'msgList');
this.msg.arrivalDate = msgList.StartDate;
this.msg.departureDate = msgList.EndDate;
this.auditNum = msgList.auditNum;
......@@ -910,6 +907,9 @@ export default {
},
created() {
},
components: {
HTMap
},
methods: {
CurrentChange(val) {
......@@ -1011,19 +1011,31 @@ export default {
this.msg.searchMealType.push(x.Id);
}
})
console.log(this.msg,'msg');
this.loading=true;
this.dataList = [];
this.travelLngLat=[];
this.apipost("dmc_post_Get_GetJAPAN_HotelList",this.msg,res => {
console.log(res,'resssss');
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'resssss');
this.dataList = res.data.data.hotelSummary;
if(Object.prototype.toString.call(res.data.data.hotelSummary) == '[object Object]'){
this.dataList.push(res.data.data.hotelSummary);
}else{
this.dataList = res.data.data.hotelSummary;
}
//获取酒店坐标
this.dataList.forEach(x=>{
x.reviewRating = parseFloat(x.reviewRating);
let obj = {
lat:x.latitudeW,
lng:x.longitudeW,
name:x.hotelName
}
this.travelLngLat.push(obj);
})
this.TotalPage = parseInt(res.data.data.numberOfResultMatched);
this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg;
console.log(this.travelLngLat,'travellngggg');
} else {
this.Error(res.data.message);
}
......@@ -1031,6 +1043,11 @@ export default {
err => {}
);
},
//重置页数
resetPageIndex() {
this.msg.displayFrom = 1;
this.currentPage=1;
},
//按人气排序
OrderBySource(type){
this.msg.sort=type;
......
src/components/Hotel/HotelPay.vue 0 → 100644
View file @ 2fd345ed
This diff is collapsed.
src/components/Hotel/HotelSure.vue
View file @ 2fd345ed
This diff is collapsed.
src/components/Ticket/EditTicketOrder.vue
View file @ 2fd345ed
......@@ -59,7 +59,7 @@
<el-col :span="8" style="text-align:right">
<p class="time">{{getlistSigel.backStartHouseTime}}</p>
<p>{{getlistSigel.goStartAirPlace}}</p>
<p>{{getlistSigel.backStartAirPlace}}</p>
</el-col>
<el-col :span="8" style="text-align:center">
<p>
......
src/components/Ticket/FillItinerary.vue
View file @ 2fd345ed
......@@ -52,7 +52,7 @@
<el-col :span="8" style="text-align:right">
<p class="time">{{getlistSigel.backStartHouseTime}}</p>
<p>{{getlistSigel.goStartAirPlace}}</p>
<p>{{getlistSigel.backStartAirPlace}}</p>
</el-col>
<el-col :span="8" style="text-align:center;color:#a8a8a8;padding:0 10px">
<p>
......
src/components/global/HTMap.vue 0 → 100644
View file @ 2fd345ed
<style>
.markers_labels{
margin-left: -24px !important;
margin-top: -43px !important;
}
.gm-svpc,.gm-style-mtc,.gm-style-cc{
display: none;
}
.classDetail{
height:244px;
width:100%
}
.ClassList{
width:100%;
height:380px;
}
</style>
<template>
<div >
<div id="map_canvas" :class="type==2?'classDetail':'ClassList'"></div>
</div>
</template>
<script>
export default {
props:["dataList","type"],
data(){
return{
show:false,
directionsService: new google.maps.DirectionsService(),
directionsDisplay: new google.maps.DirectionsRenderer(),
map:{},
}
},
created(){
},
destroyed: function() {
},
mounted(){
this.mapBuild() //初始化实例之后调用
},
methods:{
getDetailsRoutes(source,destination,map){
service = new google.maps.DistanceMatrixService();
service.getDistanceMatrix({
origins: [source],
destinations: [destination],
travelMode: google.maps.TravelMode.DRIVING,
unitSystem: google.maps.UnitSystem.METRIC,
avoidHighways: false,
avoidTolls: false
}, function (response, status) {
if (status == google.maps.DistanceMatrixStatus.OK && response.rows[0].elements[0].status != "ZERO_RESULTS") {
var distance = response.rows[0].elements[0].distance.text;
var duration = response.rows[0].elements[0].duration.text;
var dvDistance = document.getElementById("siteinfo_modal_label");
dvDistance.innerHTML = "";
dvDistance.innerHTML += "Distance: " + distance + "<br />";
dvDistance.innerHTML += "Duration:" + duration;
} else {
alert("Unable to find the distance via road.");
}
})
},
// 地图实例
mapBuild(){
let lat = parseFloat(this.dataList[0].lat)
let lng = parseFloat(this.dataList[0].lng)
let center = {lng: lng, lat: lat}
//创建地图实例，zoom是缩放比例
this.map = new google.maps.Map(document.getElementById('map_canvas'), {
zoom: 7,
center: center,
mapTypeId: google.maps.MapTypeId.ROADMAP
});
this.directionsDisplay.setMap(this.map);
this.calcRoute()
},
calcRoute: function() { // 创建路径规划
// 分解数据 获得起 止 以及中间数据
let lat = parseFloat(this.dataList[0].lat)
let lng = parseFloat(this.dataList[0].lng)
let elat = parseFloat(this.dataList[this.dataList.length-1].lat)
let elng = parseFloat(this.dataList[this.dataList.length-1].lng)
let _this = this;
let start = lat + ',' + lng;
let end = elat + ',' + elng;
let waypoints = [];
if (this.dataList.length > 2) {
this.dataList.forEach((x, index) => {
if (index >= 1 && index !== (this.dataList.length-1)) {
let obj = {
location: x.lat + ',' + x.lng
}
waypoints.push(obj)
}
});
}
let request = { // 组装连线数据
origin:start, // 起
destination:end, // 止
travelMode: google.maps.TravelMode.DRIVING,
};
if (waypoints.length > 0) {
request.waypoints = waypoints
}
console.log(waypoints)
_this.directionsService.route(request, function(result, status) {
if (status == google.maps.DirectionsStatus.OK) {
_this.directionsDisplay.setDirections(result);
}
});
},
},
}
</script>
src/components/newPersonalCenter/integral/RedEnvelopes.vue
View file @ 2fd345ed
......@@ -86,6 +86,7 @@
<el-col :span="13" style="position:relative;margin-top:15px">
<div class="progress progress1">
<span :style="'width:'+ item.width +'%;'"></span>
<!-- <span style="width:70%;"></span> -->
</div>
</el-col>
<el-col :span="2" style="text-align:center;margin-top:15px">
......@@ -485,7 +486,7 @@ export default {
border-radius: 15px;
overflow: hidden;
}
#Red .jyTtem0 .progress span {
#Red .jyTtem0 .progress span,#Red .jyTtem3 .progress span,#Red .jyTtem6 .progress span {
display: inline-block;
width: 60%;
height: 100%;
......@@ -500,7 +501,7 @@ export default {
text-align: center;
color:#fff;
}
#Red .jyTtem1 .progress span {
#Red .jyTtem1 .progress span,#Red .jyTtem4 .progress span,#Red .jyTtem7 .progress span {
display: inline-block;
width: 50%;
height: 100%;
......@@ -515,7 +516,7 @@ export default {
text-align: center;
color:#fff;
}
#Red .jyTtem2 .progress span {
#Red .jyTtem2 .progress span,#Red .jyTtem5 .progress span,#Red .jyTtem8 .progress span {
display: inline-block;
width: 70%;
height: 100%;
......
src/router.js
View file @ 2fd345ed
......@@ -412,6 +412,15 @@ export default new Router({
title: "酒店确认订单"
}
},
{
path: "/HotelPay",
name: "HotelPay",
component: resolve =>
require(["@/components/Hotel/HotelPay"], resolve),
meta: {
title: "酒店支付"
}
},
// {
// path: "/ticket/Pay/:id",
// name: "Pay",
......
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