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
62e82868
Commit
62e82868
authored
Jun 13, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
bf944c22
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
73 additions
and
42 deletions
+73
-42
home.css
src/assets/css/home.css
+5
-2
banner.png
src/assets/img/ticket/banner.png
+0
-0
IndependentTravel.vue
src/components/DependentTravel/IndependentTravel.vue
+34
-22
PersonalTailor.vue
src/components/DependentTravel/PersonalTailor.vue
+1
-1
diving.vue
src/components/GroupTour/block/diving.vue
+1
-0
index.vue
src/components/GroupTour/index.vue
+18
-6
Home.vue
src/components/Home.vue
+1
-1
FillItinerary.vue
src/components/Ticket/FillItinerary.vue
+7
-4
TicketHome.vue
src/components/Ticket/TicketHome.vue
+6
-6
No files found.
src/assets/css/home.css
View file @
62e82868
...
...
@@ -141,16 +141,19 @@ p {
.Home
li
{
list-style
:
none
;
}
.Home
.Home_top
.tag_left
li
:
la
st-child
{
.Home
.Home_top
.tag_left
li
:
fir
st-child
{
border
:
none
;
}
.Home
.Home_top
.tag_left
.tag_active
{
border
:
none
;
}
.Home
.Home_top
.tag_left
li
{
height
:
25%
;
color
:
#fff
;
font-size
:
12px
;
padding-top
:
12px
;
box-sizing
:
border-box
;
border-
bottom
:
1px
dashed
#737373
;
border-
top
:
1px
dashed
#737373
;
cursor
:
pointer
;
}
.Home
.Home_top
.tag_left
{
...
...
src/assets/img/ticket/banner.png
View replaced file @
bf944c22
View file @
62e82868
451 KB
|
W:
|
H:
265 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/components/DependentTravel/IndependentTravel.vue
View file @
62e82868
...
...
@@ -12,7 +12,7 @@
<!--
<div
class=
"boxCont"
></div>
-->
</div>
</div>
<el-row
class=
"back_middle"
:style=
"
{zoom: zoom}"
>
<el-row
class=
"back_middle"
>
<img
class=
"left1"
src=
"../../assets/img/travel/left1.png"
alt
>
<img
class=
"right1"
src=
"../../assets/img/travel/right1.png"
alt
>
<el-row
class=
"max-w1500"
:gutter=
"0"
>
...
...
@@ -172,13 +172,13 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:
2
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span
style=
"font-size:
3
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
<i
class=
"iconfont icon-dingweiweizhi"
></i>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px
;margin-left:7px
"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
@
click=
"goUrl('detailTwo',item.id,item.tcid)"
size=
"mini"
...
...
@@ -204,13 +204,13 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:
2
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span
style=
"font-size:
3
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
<i
class=
"iconfont icon-dingweiweizhi"
></i>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px
;margin-left:7px
"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
@
click=
"goUrl('detailTwo',item.id,item.tcid)"
size=
"mini"
...
...
@@ -220,7 +220,7 @@
</el-col>
<el-col
:span=
"12"
style=
"position:relative"
>
<div
class=
"div_back"
style=
"position:relative;"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<img
class=
"img2"
src=
"../../assets/img/travel/
1
.png"
alt
>
<img
class=
"img2"
src=
"../../assets/img/travel/
2
.png"
alt
>
</div>
</el-col>
<el-col
:span=
"2"
>
</el-col>
...
...
@@ -228,7 +228,7 @@
<el-row
class=
"zyx"
v-for=
"(item,index) in HotCrashList"
:key=
"index"
v-if=
"index==2"
>
<el-col
:span=
"12"
style=
"position:relative"
>
<div
class=
"div_back"
style=
"position:relative;"
:style=
"
{backgroundImage:'url('+item.imgCover[0].Url+')'}">
<img
class=
"img2"
src=
"../../assets/img/travel/
1
.png"
alt
>
<img
class=
"img2"
src=
"../../assets/img/travel/
3
.png"
alt
>
</div>
</el-col>
<el-col
:span=
"2"
>
</el-col>
...
...
@@ -248,13 +248,13 @@
<div
class=
"zyx_pay"
>
<span
style=
"color:#FF6633;font-size:12px"
>
<span>
¥
</span>
<span
style=
"font-size:
2
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span
style=
"font-size:
3
0px;font-weight:700"
>
{{
(
isLogin
!=
1
?
item
.
b2CPrice
:
item
.
b2BPrice
)
|
NoDesnum
}}
</span>
<span>
起
</span>
</span>
<span
style=
"color:#EE4454;margin-left:20px"
>
<i
class=
"iconfont icon-dingweiweizhi"
></i>
</span>
<span
style=
"font-size:12px"
>
{{
item
.
startCityName
}}
出发
</span>
<span
style=
"font-size:12px
;margin-left:7px
"
>
{{
item
.
startCityName
}}
出发
</span>
</div>
<el-button
@
click=
"goUrl('detailTwo',item.id,item.tcid)"
size=
"mini"
...
...
@@ -542,15 +542,19 @@ export default {
}
.zyx
.persontravel
{
font-size
:
12px
;
background
:
#5597ff
;
/* background: #5597ff; */
color
:
#fff
;
padding
:
2px
6px
;
padding-bottom
:
5px
;
font-weight
:
100
;
border-radius
:
4px
;
margin-left
:
12px
;
background-image
:
url('../../assets/img/travel/qipao.png')
;
background-size
:
100%
100%
;
background-repeat
:
no-repeat
;
}
.zyx_pay
{
margin
:
2
5
px
0
;
margin
:
2
0
px
0
;
}
.zyx_content
{
margin-top
:
10px
;
...
...
@@ -670,11 +674,14 @@ export default {
._someone_item_top
{
padding
:
5px
;
width
:
90px
;
height
:
225
px
;
height
:
300
px
;
border-radius
:
34px
;
border
:
1px
dashed
#666666
;
/* border: 1px dashed #666666; */
margin
:
0
auto
;
background-image
:
url('../../assets/img/travel/bg1.png')
;
background-size
:
100%
100%
;
}
._someone_item_top
>
div
{
width
:
100%
;
height
:
100%
;
...
...
@@ -683,25 +690,25 @@ export default {
display
:
flex
;
}
._someone_item_top
>
div
>
p
{
width
:
2
0
px
;
height
:
170
px
;
width
:
2
5
px
;
height
:
235
px
;
writing-mode
:
tb
;
font-family
:
"PingFangR"
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
._someone_item_top
>
div
>
p
._name
{
margin-left
:
1
5
px
;
margin-left
:
1
0
px
;
text-align
:
center
;
padding-top
:
5
PX
;
font-size
:
20px
;
}
._someone_item_top
>
div
>
p
._xianlu
{
padding
:
0
6px
;
margin-left
:
15px
;
padding-top
:
20
PX
;
font-size
:
2
0
px
;
height
:
158
px
;
font-size
:
2
4
px
;
height
:
230
px
;
}
._someone_item_bottom
{
width
:
192px
;
...
...
@@ -709,7 +716,7 @@ export default {
border-radius
:
50%
;
background-color
:
#e5e5e5
;
margin-top
:
-55px
;
padding
:
8
px
;
padding
:
4
px
;
}
._someone_item_bottom
._someone_item_bottom_head
{
width
:
192px
;
...
...
@@ -732,8 +739,12 @@ export default {
transition
:
all
linear
0.5s
;
overflow
:
hidden
;
}
._someone_item
:hover
._someone_item_bottom
{
box-shadow
:
0px
8px
14px
0px
rgba
(
0
,
0
,
0
,
0.2
);
}
._someone_item
:hover
._someone_item_top
{
border-color
:
#76a9fa
;
background-image
:
url('../../assets/img/travel/bg2.png')
;
}
._someone_item
:hover
._someone_item_top
>
div
{
background-color
:
#76a9fa
;
...
...
@@ -841,7 +852,7 @@ export default {
margin
:
15px
auto
;
background
:
rgba
(
0
,
0
,
0
,
0
);
border
:
1px
solid
#313131
;
/* border-radius: 16px; */
border-radius
:
10px
;
font-family
:
"MicrosoftYaHei"
;
}
...
...
@@ -1020,6 +1031,7 @@ p {
background-color
:
rgba
(
255
,
255
,
255
,
0.8
);
width
:
1200px
;
margin
:
80px
auto
0
auto
;
border-radius
:
8px
;
}
.footer_box
>
p
{
font-weight
:
bold
;
...
...
src/components/DependentTravel/PersonalTailor.vue
View file @
62e82868
...
...
@@ -88,7 +88,7 @@
background-image
:
linear-gradient
(
to
right
,
#AAAAAA
0%
,
#AAAAAA
50%
,
transparent
50%
);
background-size
:
8px
8px
;
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_right._active
.iconfont
{
color
:
#558EE5
;
...
...
src/components/GroupTour/block/diving.vue
View file @
62e82868
<
style
>
.diving
{
margin
:
30px
0
;
background
:
#ffffff
;
}
.diving
>
p
{
font-size
:
24px
;
...
...
src/components/GroupTour/index.vue
View file @
62e82868
<
style
>
@import
"../../assets/css/groupTour/index.css"
;
.GroupTour
.el-tabs__nav-wrap
::after
{
background-color
:
transparent
;
}
</
style
>
<
template
>
<el-row
class=
"GroupTour"
>
...
...
@@ -60,14 +63,23 @@
</el-row>
<el-row
class=
"_list"
v-loading=
"loading"
>
<!-- 跳水特价 -->
<Vdiving
:data=
"tiaoshui"
:isLogin=
"isLogin"
class=
"w1180"
/>
<div
style=
"background:#ffffff"
>
<Vdiving
:data=
"tiaoshui"
:isLogin=
"isLogin"
class=
"w1180"
/>
</div>
<!-- 线路列表 -->
<p
class=
"tit w1180"
>
出境跟团游
</p>
<template
v-for=
"(item, index) in recoItems.line"
v-if=
"recoItems.line && recoItems.line.length > 0 && index
<
3
&&
(
item
.
lineTeam
&&
item
.
lineTeam
.
length
>
0)">
<Vlist
:dataList=
"item"
:index=
"index"
:isLogin=
"isLogin"
@
sonMethods=
"loadModuleDataNoLoop"
class=
"w1180"
/>
</
template
>
<div
style=
"background:#F8F8F8"
>
<p
class=
"tit w1180"
style=
"margin:20px auto;text-align:center;font-size:24px;color:#666666"
>
出境跟团游
</p>
<template
v-for=
"(item, index) in recoItems.line"
v-if=
"recoItems.line && recoItems.line.length > 0 && index
<
3
&&
(
item
.
lineTeam
&&
item
.
lineTeam
.
length
>
0)">
<Vlist
:dataList=
"item"
:index=
"index"
:isLogin=
"isLogin"
@
sonMethods=
"loadModuleDataNoLoop"
class=
"w1180"
/>
</
template
>
</div>
<!-- 热门 -->
<Vhot
:data=
"tehuis"
/>
<div
style=
"margin:20px 0"
>
<Vhot
:data=
"tehuis"
/>
</div>
<!-- 线路列表 -->
<
template
v-for=
"(item, index) in recoItems.line"
v-if=
"recoItems.line && recoItems.line.length > 0 && index > 2 && (item.lineTeam && item.lineTeam.length > 0)"
>
<Vlist
:dataList=
"item"
:index=
"index"
:isLogin=
"isLogin"
@
sonMethods=
"loadModuleDataNoLoop"
class=
"w1180"
/>
...
...
src/components/Home.vue
View file @
62e82868
...
...
@@ -962,7 +962,7 @@ export default {
path
=
`
${
path
}
/
${
encodeURIComponent
(
item
.
idDes
)}
/
${
item
.
tcid
}
`
;
// this.$router.push({ path })
let
routeData
=
this
.
$router
.
resolve
({
path
:
path
});
let
routeData
=
this
.
$router
.
resolve
({
path
:
path
,
query
:{
local
:
"local"
}
});
window
.
open
(
routeData
.
href
,
'_blank'
);
},
ClickLocal
(
item
){
...
...
src/components/Ticket/FillItinerary.vue
View file @
62e82868
<
template
>
<div
class=
"FillItinerary"
>
<el-row
:gutter=
"20"
style=
"background:#f5f5f5
"
>
<el-col
:span=
"18"
:offset=
"3"
>
<el-row
style=
"width:1200px;margin:0 auto
"
>
<!-- 订单详情 -->
<div
class=
"ticket_list"
>
<el-col
:span=
"9"
style=
"position:relative"
>
...
...
@@ -203,7 +203,7 @@
</el-form-item>
</el-form>
</div>
</el-col>
</el-row>
<!-- 提交订单 -->
<div
class=
'tjorder'
v-show=
"!personnums"
>
...
...
@@ -441,8 +441,11 @@ export default {
.personnum_form
{
margin-left
:
20px
;
}
.personnum_form
.el-form-item__label
{
padding
:
0
5px
0
0
;
}
.personnum_form
.el-form-item
{
width
:
200
px
!important
;
width
:
189
px
!important
;
display
:
inline-block
;
margin
:
0
;
}
...
...
src/components/Ticket/TicketHome.vue
View file @
62e82868
...
...
@@ -568,7 +568,7 @@ export default {
background-size
:
100%
100%
;
}
.ticket_home
.destion
{
width
:
1
200
px
;
width
:
1
034
px
;
margin
:
0
auto
;
overflow
:
auto
;
}
...
...
@@ -676,7 +676,7 @@ export default {
.ticket_home
.yh
{
padding
:
0
2px
;
padding-top
:
20px
;
width
:
1
200
px
;
width
:
1
118
px
;
margin
:
0
auto
;
display
:
flex
;
justify-content
:
space-between
;
...
...
@@ -724,12 +724,12 @@ export default {
position
:
relative
;
}
.carousel_small
{
width
:
226
px
;
height
:
155
px
;
width
:
194
px
;
height
:
132
px
;
}
.carousel_large
{
width
:
483
px
;
height
:
322
px
;
width
:
412
px
;
height
:
274
px
;
}
...
...
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