Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
3bf33ee9
Commit
3bf33ee9
authored
Aug 06, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
69ed4f78
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
14 deletions
+14
-14
travelFeature2.js
src/assets/utils/travelFeature2.js
+1
-1
commonHotelInfo.vue
src/components/commonPage/commonHotelInfo.vue
+2
-2
fiveday.vue
src/components/commonPage/fiveday.vue
+1
-1
fourday.vue
src/components/commonPage/fourday.vue
+1
-1
oneday.vue
src/components/commonPage/oneday.vue
+1
-1
threeday.vue
src/components/commonPage/threeday.vue
+1
-1
twoday.vue
src/components/commonPage/twoday.vue
+1
-1
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+6
-6
No files found.
src/assets/utils/travelFeature2.js
View file @
3bf33ee9
...
...
@@ -2,7 +2,7 @@ let travelFeatureTwo = {
HotelInit
:
function
(
index
,
data
)
{
// 酒店初始化
let
list
=
[];
for
(
let
item
of
data
[
index
].
HotelArray
)
{
if
(
item
.
HotelName
&&
item
.
HotelName
!==
''
&&
item
.
HotelName
!=
"温馨的家"
)
{
if
(
item
.
HotelName
&&
item
.
HotelName
!==
''
&&
item
.
HotelName
!=
"温馨的家"
&&
item
.
HotelName
!=
"机场附近酒店"
)
{
let
obj
=
{
name
:
''
,
description
:
''
,
...
...
src/components/commonPage/commonHotelInfo.vue
View file @
3bf33ee9
...
...
@@ -78,7 +78,7 @@
</
template
>
</td>
<td>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'
"
>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'
&&hotelSubItem.HotelName!='机场附近酒店'"
>
<
template
v-if=
"hotelSubItem.OPState==1"
>
<a
style=
"color:green"
>
OP-指定
</a>
</
template
>
...
...
@@ -88,7 +88,7 @@
</span>
</td>
<td>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'"
>
<span
v-if=
"hotelSubItem.HotelName!='温馨的家'
&&hotelSubItem.HotelName!='机场附近酒店'
"
>
<
template
v-if=
"hotelSubItem.DMCState==1"
>
<a
style=
"color:green"
>
地接-OK
</a>
</
template
>
...
...
src/components/commonPage/fiveday.vue
View file @
3bf33ee9
...
...
@@ -138,7 +138,7 @@
suffix
=
"或同級"
}
}
else
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
)
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
this
.
day
.
jiu2
[
0
].
name
!=
'机场附近酒店'
)
{
if
(
this
.
day
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
...
...
src/components/commonPage/fourday.vue
View file @
3bf33ee9
...
...
@@ -136,7 +136,7 @@ export default {
suffix
=
"或同級"
}
}
else
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
){
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
this
.
day
.
jiu2
[
0
].
name
!=
'机场附近酒店'
){
if
(
this
.
day
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
...
...
src/components/commonPage/oneday.vue
View file @
3bf33ee9
...
...
@@ -109,7 +109,7 @@
suffix
=
"或同級"
}
}
else
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
)
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
this
.
day
.
jiu2
[
0
].
name
!=
'机场附近酒店'
)
{
if
(
this
.
day
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
...
...
src/components/commonPage/threeday.vue
View file @
3bf33ee9
...
...
@@ -176,7 +176,7 @@ export default {
suffix
=
"或同級"
}
}
else
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
){
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
this
.
day
.
jiu2
[
0
].
name
!=
'机场附近酒店'
){
if
(
this
.
day
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
...
...
src/components/commonPage/twoday.vue
View file @
3bf33ee9
...
...
@@ -103,7 +103,7 @@ export default {
suffix
=
"或同級"
}
}
else
{
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
){
if
(
this
.
day
.
jiu2
.
length
==
1
&&
this
.
day
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
this
.
day
.
jiu2
[
0
].
name
!=
'机场附近酒店'
){
if
(
this
.
day
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
3bf33ee9
...
...
@@ -871,27 +871,27 @@
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<span
v-if=
"childItem.UseCount>0 && subItem.SubList.length==1"
>
<template
v-if=
"childItem.OPState==1&&childItem.HotelName!='温馨的家'"
>
<template
v-if=
"childItem.OPState==1&&childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
<a
style=
"color:green"
>
【OP-指定】
</a>
</
template
>
<
template
v-else-if=
"childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'"
>
<
template
v-else-if=
"childItem.OPState==2&&childItem.DMCState==0&&childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
<a
style=
"color:red"
>
【OP-指定】
</a>
</
template
>
<
template
v-else
>
<template
v-if=
"childItem.DMCState==1&&childItem.HotelName!='温馨的家'"
>
<template
v-if=
"childItem.DMCState==1&&childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
<a
style=
"color:green"
>
【地接-OK】
</a>
</
template
>
<
template
v-if=
"childItem.DMCState==2&&childItem.HotelName!='温馨的家'"
>
<
template
v-if=
"childItem.DMCState==2&&childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
<a
style=
"color:red"
>
【地接-暂定】
</a>
</
template
>
<
template
v-if=
"childItem.DMCState==0&&childItem.HotelName!='温馨的家'"
>
<
template
v-if=
"childItem.DMCState==0&&childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
<a
style=
"color:red"
>
【地接-未操作】
</a>
</
template
>
</template>
【
<span
style=
"color:green"
>
本团使用:{{childItem.UseCount}}
{{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}
</span>
】
</span>
<span
style=
"color:#E95252;"
v-if=
"childItem.HotelName!='温馨的家'"
>
【剩余:{{childItem.RemainingInventory}}】
<span
style=
"color:#E95252;"
v-if=
"childItem.HotelName!='温馨的家'
&&childItem.HotelName!='机场附近酒店'
"
>
【剩余:{{childItem.RemainingInventory}}】
</span>
</td>
<td>
...
...
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