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
2cb102f0
Commit
2cb102f0
authored
Sep 02, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s
parent
03065c12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1050 additions
and
913 deletions
+1050
-913
HotelDetail.vue
src/components/Hotel/HotelDetail.vue
+961
-877
HotelList.vue
src/components/Hotel/HotelList.vue
+3
-3
HotelSure.vue
src/components/Hotel/HotelSure.vue
+51
-21
HotelOrder.vue
src/components/newPersonalCenter/block/model/HotelOrder.vue
+2
-2
OpHotelOrderDetail.vue
...ents/newPersonalCenter/block/model/OpHotelOrderDetail.vue
+33
-10
No files found.
src/components/Hotel/HotelDetail.vue
View file @
2cb102f0
This diff is collapsed.
Click to expand it.
src/components/Hotel/HotelList.vue
View file @
2cb102f0
...
@@ -736,7 +736,7 @@ export default {
...
@@ -736,7 +736,7 @@ export default {
Id
:
1
,
Id
:
1
,
isCked
:
false
isCked
:
false
},{
},{
name
:
'双
床
'
,
name
:
'双
人间
'
,
Id
:
2
,
Id
:
2
,
isCked
:
false
isCked
:
false
},{
},{
...
@@ -748,7 +748,7 @@ export default {
...
@@ -748,7 +748,7 @@ export default {
Id
:
4
,
Id
:
4
,
isCked
:
false
isCked
:
false
},{
},{
name
:
'四
床房
'
,
name
:
'四
人间
'
,
Id
:
5
,
Id
:
5
,
isCked
:
false
isCked
:
false
},{
},{
...
@@ -756,7 +756,7 @@ export default {
...
@@ -756,7 +756,7 @@ export default {
Id
:
6
,
Id
:
6
,
isCked
:
false
isCked
:
false
},{
},{
name
:
'日式
&西式混合房间
'
,
name
:
'日式
+西式混合
'
,
Id
:
7
,
Id
:
7
,
isCked
:
false
isCked
:
false
}],
}],
...
...
src/components/Hotel/HotelSure.vue
View file @
2cb102f0
...
@@ -352,15 +352,14 @@
...
@@ -352,15 +352,14 @@
<li
class=
"HS2_title"
>
房型信息
</li>
<li
class=
"HS2_title"
>
房型信息
</li>
<li>
<li>
<div
v-if=
"dataList.roomRateDetails"
>
<div
v-if=
"dataList.roomRateDetails"
>
<template
v-if=
"dataList.roomRateDetails.roomType==1"
>
单人
</
template
>
<template
v-if=
"dataList.roomRateDetails.roomType==1"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
单人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
双人
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
双人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
双
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
大床房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
三件套
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
三人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
4床
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
四人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
日式房间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
日式房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
和洋室
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
日式+西式混合
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==8"
>
半开房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==8"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
大床房(小型)
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==9"
>
其他的
</
template
>
</div>
</div>
</li>
</li>
</ul>
</ul>
...
@@ -550,15 +549,14 @@
...
@@ -550,15 +549,14 @@
<li>
<li>
<span
class=
"C9"
>
房型
</span>
<span
class=
"C9"
>
房型
</span>
<span
v-if=
"dataList.roomRateDetails"
>
<span
v-if=
"dataList.roomRateDetails"
>
<
template
v-if=
"dataList.roomRateDetails.roomType==1"
>
单人
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==1"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
单人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
双人
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==2"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
双人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
双
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==3"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
大床房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
三件套
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==4"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
三人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
4床
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==5"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
四人间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
日式房间
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==6"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
日式房
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
和洋室
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==7"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
日式+西式混合
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==8"
>
半开双
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==8"
>
{{
getGradeType
(
dataList
.
roomRateDetails
.
gradeType
)
}}
大床房(小型)
</
template
>
<
template
v-if=
"dataList.roomRateDetails.roomType==9"
>
其他的
</
template
>
</span>
</span>
</li>
</li>
<!-- <li>
<!-- <li>
...
@@ -574,7 +572,7 @@
...
@@ -574,7 +572,7 @@
<li
v-if=
"dataList.roomRateDetails&&dataList.roomRateDetails.smoking!=''"
>
<li
v-if=
"dataList.roomRateDetails&&dataList.roomRateDetails.smoking!=''"
>
<span
class=
"C9"
>
吸烟
</span>
<span
class=
"C9"
>
吸烟
</span>
<span
v-if=
"dataList.roomRateDetails"
>
<span
v-if=
"dataList.roomRateDetails"
>
<
template
v-if=
"dataList.roomRateDetails.smoking==0"
>
禁
吸
</
template
>
<
template
v-if=
"dataList.roomRateDetails.smoking==0"
>
禁
烟
</
template
>
<
template
v-if=
"dataList.roomRateDetails.smoking==1"
>
可吸烟
</
template
>
<
template
v-if=
"dataList.roomRateDetails.smoking==1"
>
可吸烟
</
template
>
</span>
</span>
</li>
</li>
...
@@ -588,7 +586,7 @@
...
@@ -588,7 +586,7 @@
<li>
<li>
<span
class=
"C9"
>
露天客房
</span>
<span
class=
"C9"
>
露天客房
</span>
<span
v-if=
"dataList.roomRateDetails"
>
<span
v-if=
"dataList.roomRateDetails"
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==0"
>
没有
</
template
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==0"
>
无
</
template
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==1"
>
有
</
template
>
<
template
v-if=
"dataList.roomRateDetails.withOpenAirBath==1"
>
有
</
template
>
</span>
</span>
</li>
</li>
...
@@ -800,6 +798,31 @@ export default {
...
@@ -800,6 +798,31 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
//获取房型
getGradeType
(
type
){
let
gradeType
=
''
switch
(
parseInt
(
type
)){
case
1
:
gradeType
=
"标准"
break
;
case
2
:
gradeType
=
"普通"
break
;
case
3
:
gradeType
=
"经济"
break
;
case
4
:
gradeType
=
"精品"
break
;
case
5
:
gradeType
=
"豪华"
break
;
case
6
:
gradeType
=
"套房"
break
;
}
return
gradeType
;
},
//获取带过来信息
//获取带过来信息
getBookInfo
(){
getBookInfo
(){
this
.
apipost
(
"dmc_post_Get_GetJAPAN_RoomsList"
,
this
.
msg
,
res
=>
{
this
.
apipost
(
"dmc_post_Get_GetJAPAN_RoomsList"
,
this
.
msg
,
res
=>
{
...
@@ -1023,7 +1046,14 @@ export default {
...
@@ -1023,7 +1046,14 @@ export default {
path
:
"/HotelPayBefore"
,
path
:
"/HotelPayBefore"
,
})
})
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
var
that
=
this
if
(
res
.
data
.
message
==
'Room rate(s) for 1 day(s) changed'
){
that
.
Confirm
(
"当前酒店价格已发生变化,需要重新加载?"
,
function
()
{
that
.
getBookInfo
();
});
}
else
{
that
.
Error
(
res
.
data
.
message
);
}
}
}
},
},
err
=>
{}
err
=>
{}
...
...
src/components/newPersonalCenter/block/model/HotelOrder.vue
View file @
2cb102f0
...
@@ -202,10 +202,10 @@ export default {
...
@@ -202,10 +202,10 @@ export default {
//取消
//取消
canCelHotel
(
ThirdOrderNo
){
canCelHotel
(
ThirdOrderNo
){
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
let
EmployeeId
=
userInfo
.
Employee
Id
;
let
customerId
=
userInfo
.
customer
Id
;
let
msg
=
{
let
msg
=
{
bookingNumber
:
ThirdOrderNo
,
bookingNumber
:
ThirdOrderNo
,
CancelBy
:
Employee
Id
,
CancelBy
:
customer
Id
,
CancelType
:
2
CancelType
:
2
}
}
this
.
apipost
(
this
.
apipost
(
...
...
src/components/newPersonalCenter/block/model/OpHotelOrderDetail.vue
View file @
2cb102f0
...
@@ -345,15 +345,14 @@
...
@@ -345,15 +345,14 @@
<li
class=
"HS2_title"
>
房型信息
</li>
<li
class=
"HS2_title"
>
房型信息
</li>
<li>
<li>
<div>
<div>
<template
v-if=
"details.parmResult.roomType==1"
>
单人
</
template
>
<template
v-if=
"details.parmResult.roomType==1"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
单人间
</
template
>
<
template
v-if=
"details.parmResult.roomType==2"
>
双人
</
template
>
<
template
v-if=
"details.parmResult.roomType==2"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
双人间
</
template
>
<
template
v-if=
"details.parmResult.roomType==3"
>
双
</
template
>
<
template
v-if=
"details.parmResult.roomType==3"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
大床房
</
template
>
<
template
v-if=
"details.parmResult.roomType==4"
>
三人间
</
template
>
<
template
v-if=
"details.parmResult.roomType==4"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
三人间
</
template
>
<
template
v-if=
"details.parmResult.roomType==5"
>
4床
</
template
>
<
template
v-if=
"details.parmResult.roomType==5"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
四人间
</
template
>
<
template
v-if=
"details.parmResult.roomType==6"
>
日式房间
</
template
>
<
template
v-if=
"details.parmResult.roomType==6"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
日式房
</
template
>
<
template
v-if=
"details.parmResult.roomType==7"
>
和洋室
</
template
>
<
template
v-if=
"details.parmResult.roomType==7"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
日式+西式混合房
</
template
>
<
template
v-if=
"details.parmResult.roomType==8"
>
半开房
</
template
>
<
template
v-if=
"details.parmResult.roomType==8"
>
{{
getGradeType
(
details
.
parmResult
.
gradeType
)
}}
大床房(小型)
</
template
>
<
template
v-if=
"details.parmResult.roomType==9"
>
其他的
</
template
>
</div>
</div>
</li>
</li>
</ul>
</ul>
...
@@ -461,7 +460,31 @@ export default {
...
@@ -461,7 +460,31 @@ export default {
})
})
},
},
methods
:
{
methods
:
{
//获取房型
getGradeType
(
type
){
let
gradeType
=
''
switch
(
parseInt
(
type
)){
case
1
:
gradeType
=
"标准"
break
;
case
2
:
gradeType
=
"普通"
break
;
case
3
:
gradeType
=
"经济"
break
;
case
4
:
gradeType
=
"精品"
break
;
case
5
:
gradeType
=
"豪华"
break
;
case
6
:
gradeType
=
"套房"
break
;
}
return
gradeType
;
}
}
}
};
};
</
script
>
</
script
>
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