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
215acca5
Commit
215acca5
authored
Jul 04, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改跟团游跳转
parent
9b0e7199
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
504 additions
and
503 deletions
+504
-503
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+2
-2
list.vue
src/components/GroupTour/block/list.vue
+4
-8
index.vue
src/components/GroupTour/index.vue
+5
-6
detailTwo.vue
src/components/mall/detailTwo.vue
+3
-2
search.vue
src/components/mall/search.vue
+489
-485
index.vue
src/components/trade/order/index.vue
+1
-0
No files found.
src/components/DependentTravel/IndependentList.vue
View file @
215acca5
...
...
@@ -127,7 +127,7 @@
<img
:src=
'compressImg(item.imgCover[0].Url, "filt", 245, "")'
alt=
""
:onerror=
"errorImg"
>
</el-col>
<el-col
class=
"div_2"
:span=
"14"
style=
"font-size:12px"
>
<p
@
click=
"goUrl('detail',item.id,item.tcid)"
class=
"visa_title"
style=
"font-size:16px;color:#000000"
>
<p
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
class=
"visa_title"
style=
"font-size:16px;color:#000000"
>
{{
item
.
lineName
}}
+
{{
item
.
ltName
}}
+
{{
item
.
productRecommend
}}
</p>
<p
v-if=
"item.priceTags"
><span
v-for=
"(tag,index) in item.priceTags"
:key=
"index+100"
class=
tag
>
{{
tag
}}
</span></p>
...
...
@@ -140,7 +140,7 @@
¥
<span
style=
"font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span><span
style=
"font-size:12px"
>
起
</span>
</el-col>
<el-col
:span=
"3"
style=
"text-align:right"
>
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
size=
"small"
style=
"border:1px solid #FF6633;color:#FF6633;"
>
立即预定
</el-button>
<el-button
@
click=
"goUrl('detail
Two
',item.id,item.tcid)"
size=
"small"
style=
"border:1px solid #FF6633;color:#FF6633;"
>
立即预定
</el-button>
</el-col>
</el-row>
<el-pagination
style=
"margin:15px;text-align:right"
...
...
src/components/GroupTour/block/list.vue
View file @
215acca5
...
...
@@ -299,7 +299,7 @@
<div
class=
"box b2"
>
<!--
<p>
这里是广告占位,讲述图片内容的详细讲解,位置有限,显示不完整的地方就用...
</p>
-->
<div
class=
"bottom"
>
<router-link
style=
"color:#ffffff;text-decoration: none;"
:to=
"
{ path: '/search',query:{'keywords':'','line
Id':dataList.name
} }">查看详情
</router-link>
<router-link
style=
"color:#ffffff;text-decoration: none;"
:to=
"
{ path: '/search',query:{'keywords':'','line
Name':dataList.name,'lineId':dataList.id
} }">查看详情
</router-link>
</div>
</div>
</div>
...
...
@@ -312,7 +312,7 @@
<el-tab-pane
:label=
"lineItem.name"
:name=
"`$
{lineItem.id}_${index}`">
</el-tab-pane>
</
template
>
</el-tabs>
<div
class=
"more"
><router-link
style=
"color:#888888;text-decoration: none;"
:to=
"{ path: '/search',query:{'keywords':'','line
Id':dataList.name
} }"
>
更多特惠>>
</router-link></div>
<div
class=
"more"
><router-link
style=
"color:#888888;text-decoration: none;"
:to=
"{ path: '/search',query:{'keywords':'','line
Name':dataList.name,'lineId':dataList.id
} }"
>
更多特惠>>
</router-link></div>
</el-row>
<el-row
class=
"right_bottom"
:gutter=
"20"
>
<
template
v-if=
"dataList.pageData && dataList.pageData.length > 0"
>
...
...
@@ -412,11 +412,7 @@ export default {
}
},
methods
:
{
GoMore
(
path
,
dataList
){
console
.
log
(
dataList
)
return
;
this
.
$router
.
push
({
path
})
},
goUrl
(
id
,
obj
){
let
path
=
'detailTwo'
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/
${
obj
.
tcid
}
`
;
...
...
@@ -442,7 +438,7 @@ export default {
}
},
mounted
(){
console
.
log
(
"dataList"
,
this
.
dataList
)
},
created
()
{
this
.
MsgBus
.
$on
(
'reloadList'
,
this
.
reloaditem
)
...
...
src/components/GroupTour/index.vue
View file @
215acca5
...
...
@@ -73,7 +73,7 @@
<!--
</router-link>
-->
</el-carousel-item>
<el-carousel-item>
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Id':'出境日本线
'}}">
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Name':'出境日本线','lineId':'14
'}}">
<img
src=
'../../assets/img/groupTour/01.jpg'
>
</router-link>
</el-carousel-item>
...
...
@@ -83,17 +83,17 @@
</router-link>
</el-carousel-item>
<el-carousel-item>
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Id':'出境韩国线
'}}">
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Name':'出境韩国线','lineId':'5
'}}">
<img
src=
'../../assets/img/groupTour/03.jpg'
>
</router-link>
</el-carousel-item>
<el-carousel-item>
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Id':'出境东南亚线
'}}">
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Name':'出境东南亚线','lineId':'1
'}}">
<img
src=
'../../assets/img/groupTour/04.jpg'
>
</router-link>
</el-carousel-item>
<el-carousel-item>
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Id':'出境中南半岛线
'}}">
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','line
Name':'出境中南半岛线','lineId':'9
'}}">
<img
src=
'../../assets/img/groupTour/05.jpg'
>
</router-link>
</el-carousel-item>
...
...
@@ -187,7 +187,7 @@ export default {
// 系列
GoLine
(
item
,
line
){
this
.
$router
.
push
({
path
:
'/search'
,
query
:{
keywords
:
""
,
lineId
:
item
.
line
Name
,
lineteamId
:
line
.
ltName
}
})
query
:{
keywords
:
""
,
lineId
:
item
.
line
Id
,
lineName
:
item
.
lineName
,
lineteamId
:
line
.
lineteamId
,
lineteamName
:
line
.
ltName
}
})
},
// 景点
TagGourl
(
path
,
item
,
num
){
...
...
@@ -200,7 +200,6 @@ export default {
this
.
lineLoad
=
true
;
this
.
apiJavaPost
(
'/api/b2b/group/getHomeLineSort'
,
msg
,
res
=>
{
this
.
lineLoad
=
false
;
console
.
log
(
res
)
if
(
res
.
data
.
resultCode
==
1
){
this
.
lineList
=
res
.
data
.
data
;
...
...
src/components/mall/detailTwo.vue
View file @
215acca5
...
...
@@ -80,8 +80,8 @@
<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.line
Name,'lineteamId
':dataList.ltName} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/search',query:{'keywords':'','lineId':dataList.line
Id,'lineName':dataList.line
Name} }">
{{
dataList
.
lineName
}}
</el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: '/search',query:{'keywords':'','lineId':dataList.line
Id,'lineName':dataList.lineName,'lineteamId':dataList.lineteamId,'lineteamName
':dataList.ltName} }">
{{
dataList
.
ltName
}}
</el-breadcrumb-item>
<el-breadcrumb-item>
{{
dataList
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
...
...
@@ -949,6 +949,7 @@ export default {
this
.
clickDate
=
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
startDate
?
data
.
currentPriceInfo
.
startDate
:
''
;
this
.
FlightList
=
data
.
currentPriceInfo
&&
data
.
currentPriceInfo
.
priceFlight
?
data
.
currentPriceInfo
.
priceFlight
:
''
;
this
.
dataList
=
data
;
console
.
log
(
"this.dataList "
,
this
.
dataList
)
this
.
toDayObj
=
data
.
currentPriceInfo
;
this
.
imgCover
=
JSON
.
parse
(
this
.
dataList
.
imgCover
);
this
.
showType
=
this
.
feature
.
featureType
;
...
...
src/components/mall/search.vue
View file @
215acca5
This diff is collapsed.
Click to expand it.
src/components/trade/order/index.vue
View file @
215acca5
...
...
@@ -488,6 +488,7 @@ export default {
PredictRoomNum
:
fcnt
,
BigRoomNum
:
this
.
chosenObj
.
dcf
,
TripleRoomNum
:
this
.
chosenObj
.
srf
,
TradeDate
:
moment
().
format
(
'YYYY-MM-DD'
),
CostType
:
0
,
MinOrderPrice
:
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