Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
华国豪
Athena
Commits
442101c6
Commit
442101c6
authored
Jul 19, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
ce754c07
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
81 additions
and
44 deletions
+81
-44
HotelDetail.vue
src/components/Hotel/HotelDetail.vue
+11
-2
HotelHome.vue
src/components/Hotel/HotelHome.vue
+19
-15
HotelList.vue
src/components/Hotel/HotelList.vue
+26
-16
HotelSure.vue
src/components/Hotel/HotelSure.vue
+25
-11
No files found.
src/components/Hotel/HotelDetail.vue
View file @
442101c6
...
...
@@ -526,6 +526,7 @@
<el-date-picker
class=
"HD_date_input"
v-model=
"SimilarMsg.arrivalDate"
style=
"width:190px;"
clear-icon=
""
size=
"small"
value-format=
"yyyy-MM-dd"
:picker-options=
"pickerOptions0"
type=
"date"
placeholder=
""
>
</el-date-picker>
...
...
@@ -533,6 +534,7 @@
<el-date-picker
class=
"HD_date_input"
v-model=
"SimilarMsg.departureDate"
style=
"width:190px;"
clear-icon=
""
size=
"small"
value-format=
"yyyy-MM-dd"
:picker-options=
"pickerOptions0"
type=
"date"
placeholder=
""
>
</el-date-picker>
...
...
@@ -788,6 +790,7 @@
</
template
>
<
script
>
import
HTMap
from
'../global/HTMap'
import
moment
from
"moment"
;
export
default
{
data
()
{
return
{
...
...
@@ -826,7 +829,13 @@ export default {
//浴室
bathRoom
:[],
//地图坐标
travelLngLat
:[]
travelLngLat
:[],
pickerOptions0
:
{
disabledDate
(
time
)
{
let
today_after7
=
moment
().
add
(
8
,
'days'
).
format
(
'YYYY-MM-DD'
);
return
time
.
getTime
()
<
new
Date
(
today_after7
).
getTime
()
-
8.64e7
;
}
}
};
},
mounted
()
{
...
...
@@ -1208,7 +1217,7 @@ export default {
let
msg
=
this
.
SimilarMsg
;
msg
.
roomOptionCd
=
roomOptionCd
;
msg
.
imgUrl
=
this
.
hotelDetails
.
hotelImageUrl1
;
sessionStorage
.
setItem
(
"HotelSure"
,
JSON
.
stringify
(
msg
));
this
.
$router
.
push
({
path
:
"/HotelSure"
...
...
src/components/Hotel/HotelHome.vue
View file @
442101c6
...
...
@@ -54,22 +54,15 @@
<el-option
value=
"山梨县"
label=
"山梨县"
></el-option>
</el-select>
<span
class=
"sx"
></span>
<el-date-picker
class=
"date_inputOne HO_input"
style=
"width:140px;"
prefix-icon=
"iconfont icon-img-rili"
clear-icon=
""
size=
"small"
<el-date-picker
style=
"width:290px;"
v-model=
"dateList"
type=
"daterange"
value-format=
"yyyy-MM-dd"
v-model=
"msg.StartDate"
type=
"date"
range-separator=
"-"
:picker-options=
"pickerOptions0"
placeholder=
"入住日"
>
</el-date-picker>
<span
class=
"Ht_hg"
></span>
<el-date-picker
class=
"date_input"
style=
"width:130px;"
prefix-icon=
"none"
clear-icon=
""
size=
"small"
value-format=
"yyyy-MM-dd"
v-model=
"msg.EndDate"
type=
"date"
:picker-options=
"pickerOptions0"
placeholder=
"离店日"
>
start-placeholder=
"入住日"
end-placeholder=
"离店日"
>
</el-date-picker>
<span
class=
"sx"
></span>
<el-popover
:visible-arrow=
"false"
...
...
@@ -329,6 +322,7 @@ export default {
}
},
isLogin
:
0
,
dateList
:
""
,
};
},
mounted
()
{
...
...
@@ -340,6 +334,13 @@ export default {
methods
:
{
//查询
Search
()
{
if
(
this
.
dateList
){
this
.
msg
.
StartDate
=
this
.
dateList
[
0
];
this
.
msg
.
EndDate
=
this
.
dateList
[
1
];
}
else
{
this
.
msg
.
StartDate
=
""
;
this
.
msg
.
EndDate
=
""
;
}
if
(
this
.
msg
.
place
==
''
){
this
.
Error
(
'请选择目的地'
);
return
;
...
...
@@ -424,6 +425,9 @@ export default {
let
w
=
document
.
body
.
clientWidth
;
this
.
carousel_height
=
w
*
0.269
*
0.75
+
"px"
;
this
.
banner_height
=
w
*
0.205
+
"px"
;
},
getDatelist
(
val
){
console
.
log
(
val
,
'date'
);
}
}
};
...
...
@@ -518,7 +522,7 @@ export default {
z-index
:
99
;
}
.Hotel_home
.Ht_ul
{
margin
:
0
20
px
;
margin
:
0
12
px
;
height
:
46px
;
line-height
:
46px
;
}
...
...
src/components/Hotel/HotelList.vue
View file @
442101c6
...
...
@@ -422,22 +422,14 @@
</el-select>
</div>
<div
class=
"HL_ComSearch HL_Two"
>
<el-date-picker
class=
"date_inputOne"
style=
"width:140px;"
prefix-icon=
"iconfont icon-img-rili"
clear-icon=
""
size=
"small"
<el-date-picker
v-model=
"dateList"
type=
"daterange"
value-format=
"yyyy-MM-dd"
v-model=
"msg.arrivalDate
"
range-separator=
"-
"
:picker-options=
"pickerOptions0"
type=
"date"
placeholder=
"入住日"
>
</el-date-picker>
<span
class=
"Ht_hg"
></span>
<el-date-picker
class=
"date_input"
style=
"width:140px;"
prefix-icon=
"none"
clear-icon=
""
size=
"small"
value-format=
"yyyy-MM-dd"
v-model=
"msg.departureDate"
:picker-options=
"pickerOptions0"
type=
"date"
placeholder=
"离店日"
>
start-placeholder=
"入住日"
end-placeholder=
"离店日"
>
</el-date-picker>
</div>
<div
class=
"HL_ComSearch HL_Three"
>
...
...
@@ -692,6 +684,9 @@ export default {
//酒店搜索关键字
keyWords
:
''
,
placeKeyWords
:
''
,
//日期
dateList
:[],
//数据
dataList
:[],
loading
:
false
,
//住宿类型
...
...
@@ -898,8 +893,8 @@ export default {
if
(
sessionStorage
.
getItem
(
"HotelInfo"
)){
let
msgList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"HotelInfo"
));
this
.
placeKeyWords
=
msgList
.
place
;
this
.
msg
.
arrivalDate
=
msgList
.
StartDate
;
this
.
msg
.
departureDate
=
msgList
.
EndDate
;
this
.
dateList
=
[]
;
this
.
dateList
.
push
(
msgList
.
StartDate
,
msgList
.
EndDate
)
;
this
.
auditNum
=
msgList
.
auditNum
;
this
.
childNum
=
msgList
.
childNum
;
this
.
room
=
msgList
.
room
;
...
...
@@ -953,6 +948,21 @@ export default {
},
//点击搜索
SearchHotel
(){
if
(
this
.
dateList
){
this
.
msg
.
arrivalDate
=
this
.
dateList
[
0
];
this
.
msg
.
departureDate
=
this
.
dateList
[
1
];
}
else
{
this
.
msg
.
arrivalDate
=
""
;
this
.
msg
.
departureDate
=
""
;
}
if
(
this
.
msg
.
arrivalDate
==
''
){
this
.
Error
(
'请选择入住日期'
);
return
;
}
if
(
this
.
msg
.
departureDate
==
''
){
this
.
Error
(
'请选择退房日期'
);
return
;
}
if
(
this
.
keyWords
==
''
){
this
.
msg
.
freewordType
=
1
;
this
.
msg
.
freeword
=
this
.
placeKeyWords
;
...
...
src/components/Hotel/HotelSure.vue
View file @
442101c6
...
...
@@ -335,13 +335,15 @@
<li
class=
"HS2_title"
>
房型信息
</li>
<li>
<div
v-if=
"dataList.roomRateDetails"
>
<template
v-if=
"dataList.roomRateDetails.roomType==1"
>
单人床
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
双床
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
大床房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
三人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
四床房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
日式房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
日式
&
西式混合房间
</
template
>
<template
v-if=
"dataList.roomRateDetails.roomType==1"
>
单人
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
双人
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
双
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
三件套
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
4床
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
日式房间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
和洋室
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==8"
>
半开房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==9"
>
其他的
</
template
>
</div>
</li>
</ul>
...
...
@@ -497,7 +499,7 @@
<div
class=
"HS_RightList"
>
<div
class=
"HS_RightTopImg"
>
<
template
v-if=
"dataList.roomRateDetails"
>
<img
:src=
"
dataList.roomRateDetails.roomImageURL
"
alt=
""
/>
<img
:src=
"
HotelImgUrl
"
alt=
""
/>
</
template
>
</div>
<div
class=
"HS_HotelRight"
>
...
...
@@ -534,8 +536,9 @@
<li>
<span
class=
"C9"
>
吸烟
</span>
<span
v-if=
"dataList.roomRateDetails"
>
<
template
v-if=
"dataList.roomRateDetails.smoking==0"
>
禁吸
</
template
>
<
template
v-if=
"dataList.roomRateDetails.smoking==1"
>
可吸烟
</
template
>
<
template
v-if=
"dataList.roomRateDetails.smoking==''"
></
template
>
<
template
v-else-if=
"dataList.roomRateDetails.smoking==0"
>
禁吸
</
template
>
<
template
v-else-if=
"dataList.roomRateDetails.smoking==1"
>
可吸烟
</
template
>
</span>
</li>
<li>
...
...
@@ -545,6 +548,14 @@
<
template
v-if=
"dataList.roomRateDetails.withBath==1"
>
有
</
template
>
</span>
</li>
<li>
<span
class=
"C9"
>
露天客房
</span>
<span
v-if=
"dataList.roomRateDetails"
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==0"
>
没有
</
template
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==1"
>
有
</
template
>
</span>
</li>
</ul>
</div>
<div
class=
"HS_RightBtm"
>
...
...
@@ -704,6 +715,8 @@ export default {
},{
num
:
20
},],
//传递的图片
HotelImgUrl
:
''
,
dataList
:[],
};
},
...
...
@@ -712,6 +725,7 @@ export default {
created
()
{
if
(
sessionStorage
.
getItem
(
"HotelSure"
)){
let
msgList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"HotelSure"
));
this
.
HotelImgUrl
=
msgList
.
imgUrl
;
this
.
msg
=
msgList
;
this
.
auditNum
=
0
;
this
.
childNum
=
0
;
...
...
@@ -854,7 +868,7 @@ export default {
this
.
sureMsg
.
departureDate
=
this
.
msg
.
departureDate
;
this
.
sureMsg
.
roomOptionCd
=
this
.
msg
.
roomOptionCd
;
this
.
sureMsg
.
HotelName
=
this
.
dataList
.
hotelName
;
this
.
sureMsg
.
HotelPic
=
this
.
dataList
.
roomRateDetails
.
roomImageURL
;
this
.
sureMsg
.
HotelPic
=
this
.
HotelImgUrl
;
this
.
dataList
.
roomGroup
.
forEach
(
x
=>
{
this
.
sureMsg
.
roomGroup
.
forEach
(
j
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment