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
8a2121c8
Commit
8a2121c8
authored
Jun 13, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
120215f2
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
5 deletions
+34
-5
ps8b67947fa38de6aa-9517-4c0f-a433-f178bd05084f.png
...ts/img/ps8b67947fa38de6aa-9517-4c0f-a433-f178bd05084f.png
+0
-0
bg1.png
src/assets/img/travel/bg1.png
+0
-0
bg2.png
src/assets/img/travel/bg2.png
+0
-0
qipao.png
src/assets/img/travel/qipao.png
+0
-0
list.vue
src/components/GroupTour/block/list.vue
+1
-1
Home.vue
src/components/Home.vue
+1
-1
OneDayDetailTwo.vue
src/components/mall/OneDayDetailTwo.vue
+17
-2
detailTwo.vue
src/components/mall/detailTwo.vue
+15
-1
No files found.
src/assets/img/ps8b67947fa38de6aa-9517-4c0f-a433-f178bd05084f.png
0 → 100644
View file @
8a2121c8
This diff is collapsed.
Click to expand it.
src/assets/img/travel/bg1.png
0 → 100644
View file @
8a2121c8
11.4 KB
src/assets/img/travel/bg2.png
0 → 100644
View file @
8a2121c8
11.6 KB
src/assets/img/travel/qipao.png
0 → 100644
View file @
8a2121c8
5.85 KB
src/components/GroupTour/block/list.vue
View file @
8a2121c8
...
...
@@ -298,7 +298,7 @@
<img
src=
"../../../assets/img/img-03.png"
style=
"width:100%"
v-else
/>
</div>
<div
class=
"box b2"
>
<
p>
这里是广告占位,讲述图片内容的详细讲解,位置有限,显示不完整的地方就用...
</p
>
<
!--
<p>
这里是广告占位,讲述图片内容的详细讲解,位置有限,显示不完整的地方就用...
</p>
--
>
<div
class=
"bottom"
>
查看详情
</div>
</div>
</div>
...
...
src/components/Home.vue
View file @
8a2121c8
...
...
@@ -998,7 +998,7 @@ export default {
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
idDes
)}
/`
+
tcid
// this.$router.push({ path })
let
routeData
=
this
.
$router
.
resolve
({
path
:
path
});
let
routeData
=
this
.
$router
.
resolve
({
path
:
path
,
query
:{
free
:
'free'
}
});
window
.
open
(
routeData
.
href
,
'_blank'
);
},
ClickTicket
(
item
){
...
...
src/components/mall/OneDayDetailTwo.vue
View file @
8a2121c8
...
...
@@ -76,16 +76,26 @@
<
template
>
<div
class=
"detail-box"
v-loading=
'loadingDataList'
id=
"pdfDom"
>
<el-row
v-if=
"loadNone==false"
>
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
>
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
v-if=
"local==0"
>
<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: '/OneDaySearch',query:{'
keywords':'','lineId':dataList.lineName
} }">
{{
dataList
.
lineName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/OneDaySearch',query:{'
lineId':dataList.lineId
} }">
{{
dataList
.
lineName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/OneDaySearch',query:{'keywords':'','lineId':dataList.lineName,'lineteamId':dataList.ltName} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
dataList
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
</el-col>
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
v-if=
"local==1"
>
<el-col
:span=
'12'
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
:to=
"
{ path: '/Localtourhome',query:{} }">当地游
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/LocalTourList',query:{'lineId':dataList.lineId} }">
{{
dataList
.
lineName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/LocalTourList',query:{'lineId':dataList.lineId,'ltId':dataList.lineteamId} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
dataList
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
</el-col>
</el-row>
<el-row
:gutter=
"20"
>
<el-col
:span=
"20"
:offset=
"2"
>
...
...
@@ -634,6 +644,7 @@ export default {
FlightList
:
[],
city
:
-
1
,
routed
:
"b2b_get_GetB2BTravelInfoV1"
,
local
:
0
,
}
},
watch
:
{
// 监听参数变化
changeCity
:
{
...
...
@@ -654,6 +665,9 @@ export default {
this
.
getList
()
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
bus
.
$on
(
'order-chosen'
,
this
.
orderChosen
)
if
(
this
.
$route
.
query
.
local
){
this
.
local
=
1
;
}
},
mounted
()
{
this
.
scrollobj
=
document
.
getElementsByClassName
(
'el-scrollbar__wrap'
)[
0
];
...
...
@@ -860,6 +874,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
)
}
...
...
src/components/mall/detailTwo.vue
View file @
8a2121c8
...
...
@@ -76,7 +76,7 @@
<
template
>
<div
class=
"detail-box"
v-loading=
'loadingDataList'
id=
"pdfDom"
>
<el-row
v-if=
"loadNone==false"
>
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
>
<el-col
:span=
"20"
:offset=
"2"
class=
"topic"
v-if=
"free==0"
>
<el-col
:span=
'12'
>
<el-breadcrumb
separator-class=
"el-icon-arrow-right"
>
<el-breadcrumb-item
:to=
"
{ path: '/heel',query:{} }">跟团游
</el-breadcrumb-item>
...
...
@@ -86,6 +86,16 @@
</el-breadcrumb>
</el-col>
</el-col>
<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>
{{
dataList
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
</el-col>
</el-row>
<el-row
:gutter=
"20"
>
<el-col
:span=
"20"
:offset=
"2"
>
...
...
@@ -736,6 +746,7 @@ export default {
FlightList
:
[],
city
:
-
1
,
teamType
:
0
,
free
:
0
,
}
},
watch
:
{
// 监听参数变化
changeCity
:
{
...
...
@@ -759,6 +770,9 @@ export default {
this
.
getList
()
this
.
isLogin
=
this
.
$store
.
state
.
isLogin
;
bus
.
$on
(
'order-chosen'
,
this
.
orderChosen
)
if
(
this
.
$route
.
query
.
free
){
this
.
free
=
1
;
}
},
mounted
()
{
this
.
scrollobj
=
document
.
getElementsByClassName
(
'el-scrollbar__wrap'
)[
0
];
...
...
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