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
607a0613
Commit
607a0613
authored
Apr 24, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自由行详情,列表,首页底部
parent
01563958
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
253 additions
and
100 deletions
+253
-100
home.css
src/assets/css/home.css
+5
-5
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+197
-67
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+23
-16
Home.vue
src/components/Home.vue
+11
-8
TicketHome.vue
src/components/Ticket/TicketHome.vue
+3
-0
TicketList.vue
src/components/Ticket/TicketList.vue
+4
-4
router.js
src/router.js
+10
-0
No files found.
src/assets/css/home.css
View file @
607a0613
...
...
@@ -627,7 +627,7 @@ p {
color
:
#666666
;
}
.Home
.home_footer
.float
.iconfont
{
font-size
:
3
0
px
;
font-size
:
3
2
px
;
margin
:
15px
10px
;
}
.Home
.home_footer
.float
ul
li
{
...
...
@@ -635,10 +635,10 @@ p {
font-size
:
12px
;
color
:
#666666
;
width
:
50%
;
padding
:
1
px
0
;
padding
:
5
px
0
;
}
.Home
.home_footer
.float
p
{
padding
:
1
px
0
;
padding
:
5
px
0
;
}
.Home
.home_footer
.el-col-6
{
padding-left
:
40px
;
...
...
@@ -655,8 +655,8 @@ p {
top
:
-2px
;
display
:
inline-block
;
font-size
:
12px
;
height
:
3
4
px
;
width
:
5
0
px
;
height
:
3
6
px
;
width
:
5
4
px
;
text-align
:
center
;
line-height
:
34px
;
background
:
url('../img/home/qipao.png')
no-repeat
;
...
...
src/components/DependentTravel/IndependentList.vue
View file @
607a0613
This diff is collapsed.
Click to expand it.
src/components/DependentTravel/IndependentTravel.vue
View file @
607a0613
...
...
@@ -76,7 +76,7 @@
</div>
<div
class=
"Season_content"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index+100"
v-if=
"index
<3
"
>
<div
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
@
click=
"goUrl('detail',item.id,item.tcid)"
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<!--
<img
ref=
"img0"
id=
"img0"
src=
"../../assets/img/visa/country1.png"
alt=
""
>
-->
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
...
...
@@ -90,14 +90,14 @@
<div
style=
"padding: 3px 10px 10px;"
>
<p
style=
"font-size:16px;font-weight:600;text-align:center;background-color: white;"
>
{{
item
.
titl
e
}}
</p>
>
{{
item
.
lineNam
e
}}
</p>
<div
class=
"text"
>
<p>
{{
item
.
lineNam
e
}}
</p>
<p>
{{
item
.
titl
e
}}
</p>
<p>
{{
item
.
ltName
}}
</p>
</div>
</div>
<div>
<el-button
size=
"mini"
class=
"btn"
>
立即购买
</el-button>
<el-button
size=
"mini"
class=
"btn"
@
click=
"goUrl('detail',item.id,item.tcid)"
>
立即购买
</el-button>
</div>
</div>
</div>
...
...
@@ -105,7 +105,7 @@
<div
v-if=
"TreatmentList.length>3"
class=
"Season_content"
style=
"padding: 0px 120px;"
>
<div
v-for=
"(item,index) in TreatmentList"
:key=
"index"
v-if=
"index>2 && index
<5
"
>
<div
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
@
click=
"goUrl('detail',item.id,item.tcid)"
class=
"Season_content_list"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<div
style=
"position:relative;height: 35px;background-color: white;bottom: -5px;"
>
<div
:class=
"SeasonBtn==0 ? 'Season_moneyActive' :''"
class=
"Season_money"
>
<p
style=
"font-size:12px;padding-top:10px"
>
RMB
</p>
...
...
@@ -118,9 +118,9 @@
<div
style=
"padding: 3px 10px 10px;"
>
<p
style=
"font-size:16px;font-weight:600;text-align:center;background-color: white;"
>
{{
item
.
titl
e
}}
</p>
>
{{
item
.
lineNam
e
}}
</p>
<div
class=
"text"
>
<p>
{{
item
.
lineNam
e
}}
</p>
<p>
{{
item
.
titl
e
}}
</p>
<p>
{{
item
.
ltName
}}
</p>
</div>
</div>
...
...
@@ -157,12 +157,12 @@
<el-col
:span=
"10"
>
<div>
<p
class=
"zyx_title"
>
{{
item
.
titl
e
}}
{{
item
.
lineNam
e
}}
<span
class=
"persontravel"
>
{{
item
.
totalPosition
}}
人成行
</span>
</p>
<div
class=
"zyx_content"
>
<p>
余位
{{
item
.
surplus
}}
</p>
<p>
{{
item
.
lineNam
e
}}
</p>
<p>
{{
item
.
titl
e
}}
</p>
<p>
{{
item
.
ltName
}}
</p>
...
...
@@ -178,7 +178,7 @@
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
...
...
@@ -189,12 +189,12 @@
<el-col
:span=
"10"
>
<div>
<p
class=
"zyx_title"
>
{{
item
.
titl
e
}}
{{
item
.
lineNam
e
}}
<span
class=
"persontravel"
>
{{
item
.
totalPosition
}}
人成行
</span>
</p>
<div
class=
"zyx_content"
>
<p>
余位
{{
item
.
surplus
}}
</p>
<p>
{{
item
.
lineNam
e
}}
</p>
<p>
{{
item
.
titl
e
}}
</p>
<p>
{{
item
.
ltName
}}
</p>
...
...
@@ -210,7 +210,7 @@
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
...
...
@@ -233,12 +233,12 @@
<el-col
:span=
"10"
>
<div>
<p
class=
"zyx_title"
>
{{
item
.
titl
e
}}
{{
item
.
lineNam
e
}}
<span
class=
"persontravel"
>
{{
item
.
totalPosition
}}
人成行
</span>
</p>
<div
class=
"zyx_content"
>
<p>
余位
{{
item
.
surplus
}}
</p>
<p>
{{
item
.
lineNam
e
}}
</p>
<p>
{{
item
.
titl
e
}}
</p>
<p>
{{
item
.
ltName
}}
</p>
...
...
@@ -254,7 +254,7 @@
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
<el-button
@
click=
"goUrl('detail',item.id,item.tcid)"
size=
"mini"
style=
"background:#EE4454;color:#fff;width:180px;padding: 8px 15px;border: 1px solid #ee4454;margin-top"
>
立即抢购
</el-button>
...
...
@@ -385,6 +385,13 @@ export default {
},
},
methods
:
{
//
goUrl
(
path
,
id
,
tcid
){
// detailTwo
path
=
'detailThree'
path
=
`
${
path
}
/
${
encodeURIComponent
(
id
)}
/`
+
tcid
this
.
$router
.
push
({
path
})
},
HotCrash
(){
this
.
apipost
(
'b2b_get_GetB2BFreeRecommendPageList'
,
this
.
commonmsg2
,
...
...
src/components/Home.vue
View file @
607a0613
...
...
@@ -910,7 +910,7 @@
<el-row
class=
"home_footer"
>
<el-col
:span=
"6"
>
<div
class=
"float"
><i
class=
"iconfont icon-icon-test6"
></i></div>
<div
class=
"float"
style=
"width:
200
px"
>
<div
class=
"float"
style=
"width:
198
px"
>
<p
class=
"color_33"
>
印象之旅
</p>
<ul>
<li>
跟团游
</li>
...
...
@@ -926,7 +926,7 @@
</div>
</el-col>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
5
"
>
<div
class=
"float"
><i
class=
"iconfont icon-icon-test7"
></i></div>
<div
class=
"float"
>
<p
class=
"color_33"
>
优惠渠道
</p>
...
...
@@ -939,7 +939,7 @@
</div>
</el-col>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
5
"
>
<div
class=
"float"
><i
class=
"iconfont icon-cailiao"
></i></div>
<div
class=
"float"
>
<p
class=
"color_33"
>
定制旅游
</p>
...
...
@@ -951,7 +951,7 @@
</div>
</el-col>
<el-col
:span=
"
6
"
>
<el-col
:span=
"
5
"
>
<div
class=
"float"
><i
class=
"iconfont icon-putonghuiyuan"
></i></div>
<div
class=
"float"
>
<p
class=
"color_33"
>
个人中心
</p>
...
...
@@ -964,23 +964,26 @@
</div>
</el-col>
<el-col
:span=
"3"
style=
"text-align:center"
>
<p
style=
"color:#666666;font-size:14px;"
>
微信扫描小程序
</p>
<div
style=
"width:118px;height:118px;border:1px dashed #eeeeee;display: inline-block;margin-top:5px"
><img
src=
"../assets/img/xiaocx.png"
alt=
""
></div>
</el-col>
</el-row>
</div>
<div
class=
"phone"
>
<
!--
<
div
class=
"phone"
>
<div
style=
"width:1180px;height:100%;margin:0 auto;display:flex;align-items:center;justify-content: flex-end;"
>
<el-col
:span=
"1"
><i
class=
"iconfont icon-Shape2"
style=
"color:#fff;font-size:30px"
></i></el-col>
<el-col
:span=
"4"
style=
"color:#fff"
>
<p>
客服服务电话
<!--
<img
src=
"../assets/img/home/qipao.png"
alt=
""
>
-->
<span
class=
"qipao"
>
24小时
</span>
</p>
<p
style=
"font-size:18px;font-weight:700"
>
028-
88888888
</p>
<p
style=
"font-size:18px;font-weight:700"
>
028-
62051755
</p>
</el-col>
</div>
</div>
</div>
-->
</div>
</
template
>
...
...
src/components/Ticket/TicketHome.vue
View file @
607a0613
...
...
@@ -449,6 +449,9 @@ export default {
@import
"//at.alicdn.com/t/font_863923_3d1f1rd9oj6.css"
;
@import
"../../assets/global/global.css"
;
@import
"../../assets/css/reset.css"
;
.ticket_home
.ch
{
font-weight
:
700
;
}
.choose_form
.el-input__inner
{
border-radius
:
0
;
}
...
...
src/components/Ticket/TicketList.vue
View file @
607a0613
...
...
@@ -405,10 +405,10 @@ export default {
mounted
()
{},
created
()
{
this
.
loading
=
true
;
this
.
choose_info
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"ChooseInfo"
));
this
.
datainfo
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"ChooseInfo"
));
if
(
sessionStorage
.
getItem
(
"ChooseInfo"
)){
this
.
choose_info
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"ChooseInfo"
));
this
.
datainfo
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"ChooseInfo"
));
}
this
.
choose_info
.
priceSort
=
0
;
this
.
choose_info
.
timeSort
=
0
;
if
(
...
...
src/router.js
View file @
607a0613
...
...
@@ -57,6 +57,16 @@ export default new Router({
title
:
'团队详情-印象之旅~感动与世界同步'
}
},
// 自由行详情
{
path
:
"/detailThree/:id/:tcid"
,
name
:
"detailThree"
,
component
:
resolve
=>
require
([
"@/components/mall/detailThree"
],
resolve
),
meta
:
{
title
:
"团队详情-印象之旅~感动与世界同步"
}
},
{
path
:
"/OneDayDetailTwo/:id/:tcid"
,
name
:
"OneDayDetailTwo"
,
...
...
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