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
2a792a43
Commit
2a792a43
authored
Jun 13, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
8a2121c8
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
16 deletions
+22
-16
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+1
-1
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+1
-1
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+1
-1
OnedayList.vue
src/components/LocalTour/OnedayList.vue
+1
-1
TicketHome.vue
src/components/Ticket/TicketHome.vue
+3
-1
OneDayDetailTwo.vue
src/components/mall/OneDayDetailTwo.vue
+1
-1
detailTwo.vue
src/components/mall/detailTwo.vue
+3
-6
VisaHomePage.vue
src/components/visa/VisaHomePage.vue
+8
-2
Visalist.vue
src/components/visa/Visalist.vue
+3
-2
No files found.
src/components/DependentTravel/IndependentList.vue
View file @
2a792a43
...
...
@@ -254,7 +254,7 @@ export default {
// detailTwo
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
}})
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
,
free
:
'free'
}})
},
proving
(){
this
.
minPrice
=
this
.
minPrice
.
replace
(
/
[^\.\d]
/g
,
''
)
...
...
src/components/DependentTravel/IndependentTravel.vue
View file @
2a792a43
...
...
@@ -395,7 +395,7 @@ export default {
//
goUrl
(
path
,
id
,
tcid
){
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
}})
this
.
$router
.
push
({
path
,
query
:{
teamType
:
1
,
free
:
'free'
}})
},
HotCrash
(){
this
.
apipost
(
'b2b_get_GetB2BFreeRecommendPageList'
,
...
...
src/components/LocalTour/Localtourhome.vue
View file @
2a792a43
...
...
@@ -442,7 +442,7 @@ export default {
let
path
=
'OneDayDetailTwo'
;
path
=
`
${
path
}
/
${
encodeURIComponent
(
item
.
idDes
)}
/
${
item
.
tcid
}
`
;
this
.
$router
.
push
({
path
})
this
.
$router
.
push
({
path
,
query
:{
local
:
'local'
}
})
},
GoFoodDes
(
item
){
this
.
$router
.
push
({
...
...
src/components/LocalTour/OnedayList.vue
View file @
2a792a43
...
...
@@ -68,7 +68,7 @@ export default {
goOneDayDetail
(
item
){
let
path
=
'OneDayDetailTwo'
;
path
=
`
${
path
}
/
${
encodeURIComponent
(
item
.
idDes
)}
/
${
item
.
tcid
}
`
;
this
.
$router
.
push
({
path
})
this
.
$router
.
push
({
path
,
query
:{
local
:
'local'
}
})
if
(
this
.
Historylist
.
length
>
4
||
this
.
Historylist
.
length
==
4
){
this
.
Historylist
.
pop
();
}
...
...
src/components/Ticket/TicketHome.vue
View file @
2a792a43
...
...
@@ -260,7 +260,7 @@
<p
class=
"des"
style=
"padding-top:26px;"
>
<!-- -->
<span>
{{
item
.
flightList
[
0
].
departureName
}}
-
{{
item
.
flightList
[
item
.
flightList
.
length
-
1
].
arrivalCityName
}}
</span>
<span
class=
"money"
>
¥
{{
item
.
scatterB2BPrice
|
priceFormat
}}
</span>
<span
class=
"money"
>
¥
{{
(
isLogin
!=
1
?
item
.
scatterB2CPrice
:
item
.
scatterB2BPrice
)
|
priceFormat
}}
</span>
</p>
<p
style=
"display:flex;align-items:center"
>
<img
style=
"width:20px;height:20px"
:src=
"item.airlineUrl"
alt=
""
>
...
...
@@ -352,12 +352,14 @@ export default {
platformType
:
1
},
slideList
:[],
isLogin
:
0
,
};
},
mounted
()
{
this
.
loadSize
();
},
created
()
{
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
this
.
JXYH
();
this
.
initAirlines
();
this
.
CFD
();
...
...
src/components/mall/OneDayDetailTwo.vue
View file @
2a792a43
...
...
@@ -874,7 +874,7 @@ export default {
this
.
htmlTitle
=
this
.
dataList
.
ltName
;
this
.
showFlight
=
true
this
.
$forceUpdate
()
console
.
log
(
"dataList"
,
this
.
dataList
);
//
console.log("dataList",this.dataList);
}
else
{
this
.
$message
.
error
(
r
.
data
.
message
)
}
...
...
src/components/mall/detailTwo.vue
View file @
2a792a43
...
...
@@ -89,9 +89,8 @@
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
v-if=
"free==1"
>
<el-col
:span=
'12'
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
:to=
"
{ path: '/heel',query:{} }">自由行
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/search',query:{'keywords':'','lineId':dataList.lineName} }">
{{
dataList
.
lineName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/search',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/IndependentTravel',query:{} }">自由行
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/IndependentList',query:{'lineteamId':dataList.lineteamId} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
dataList
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
...
...
@@ -908,11 +907,9 @@ export default {
},
getData
:
function
(
msg
)
{
this
.
loadingDataList
=
true
console
.
log
(
'api'
,
msg
)
this
.
apipost
(
'b2b_get_GetB2BTravelInfoV1'
,
msg
,
r
=>
{
if
(
r
.
data
.
resultCode
==
1
){
let
data
=
(
r
.
data
.
data
);
console
.
log
(
"data"
,
data
)
this
.
sonData
=
data
;
this
.
dayList
=
data
.
dayList
;
this
.
feature
=
data
.
feature
;
...
...
@@ -978,6 +975,7 @@ export default {
this
.
htmlTitle
=
this
.
dataList
.
ltName
;
this
.
showFlight
=
true
this
.
$forceUpdate
()
// console.log("dataList",this.dataList)
}
else
{
this
.
$message
.
error
(
r
.
data
.
message
)
}
...
...
@@ -985,7 +983,6 @@ export default {
},
null
)
},
creatCalendar
(
list
){
// 创建日历
console
.
log
(
"list"
,
list
)
let
dateList
=
[];
if
(
list
&&
list
.
length
>
0
){
...
...
src/components/visa/VisaHomePage.vue
View file @
2a792a43
...
...
@@ -110,7 +110,9 @@
</div>
<div>
<p
class=
"title"
>
{{
item
.
countryName
}}
</p>
<p
class=
"money"
>
¥
{{
item
.
visaPrice
|
priceFormat
}}
</p>
<p
class=
"money"
>
¥
{{
(
isLogin
!=
1
?
item
.
visaB2CPrice
:
item
.
visaPrice
)
|
priceFormat
}}
</p>
<p>
<span
class=
"gq"
>
<span
v-if=
"item.visaType==1"
>
个签
</span>
...
...
@@ -202,7 +204,7 @@
<img
:src=
"item.countryIcon"
alt=
""
>
<div
class=
"visa_content"
>
<p
class=
"visa_title"
>
{{
item
.
name
}}
</p>
<p
class=
"visa_money"
>
¥
{{
item
.
visaPrice
|
priceFormat
}}
</p>
<p
class=
"visa_money"
>
¥
{{
(
isLogin
!=
1
?
item
.
visaB2CPrice
:
item
.
visaPrice
)
|
priceFormat
}}
</p>
</div>
</div>
...
...
@@ -287,8 +289,12 @@ export default {
platformType
:
1
},
slideList
:[],
isLogin
:
0
,
}
},
created
(){
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
},
mounted
()
{
this
.
companyId
=
this
.
$store
.
state
.
site
this
.
changeScreen
()
...
...
src/components/visa/Visalist.vue
View file @
2a792a43
...
...
@@ -106,7 +106,7 @@
<p>
提前预定:
{{
item
.
bookAdvance
}}
个工作日
</p>
</el-col>
<el-col
:span=
"4"
style=
"color:#FF680B;font-size:16px;"
>
¥
<span
style=
"font-weight:700"
>
{{
item
.
visaPrice
|
priceFormat
}}
</span><span
style=
"font-size:12px"
>
起
</span>
¥
<span
style=
"font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
visaB2CPrice
:
item
.
visaPrice
)
|
priceFormat
}}
</span><span
style=
"font-size:12px"
>
起
</span>
</el-col>
<el-col
:span=
"3"
style=
"text-align:right"
>
<el-button
@
click=
"GourlItem(item)"
size=
"small"
style=
"border:1px solid #FF6633;color:#FF6633;"
>
立即预定
</el-button>
...
...
@@ -162,12 +162,13 @@ export default {
total
:
0
,
datalist
:[],
pageCount
:
0
,
isLogin
:
0
,
}
},
created
(){
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
if
(
this
.
$route
.
query
.
searchKey
){
this
.
listmsg
.
searchKey
=
this
.
$route
.
query
.
searchKey
;
}
...
...
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