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
bf944c22
Commit
bf944c22
authored
Jun 13, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
d895f8cb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
91 additions
and
21 deletions
+91
-21
CustomizedTourism.vue
src/components/DependentTravel/CustomizedTourism.vue
+53
-8
PersonalTailor.vue
src/components/DependentTravel/PersonalTailor.vue
+21
-6
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+13
-4
newHead.vue
src/components/global/newHead.vue
+4
-3
No files found.
src/components/DependentTravel/CustomizedTourism.vue
View file @
bf944c22
...
...
@@ -12,7 +12,10 @@
<div
class=
"text"
>
<span
class=
"bottom"
:class=
"actice_step>0?'bule_back':''"
>
<span
class=
"circle"
>
<i
class=
"iconfont icon-yuandian"
></i>
<!--
<i
class=
"iconfont icon-yuandian"
></i>
-->
<span
class=
"wc"
>
<span
class=
"lc"
></span>
</span>
</span>
<p>
提交需求
</p>
</span>
...
...
@@ -26,7 +29,10 @@
<div
class=
"text"
>
<span
class=
"bottom"
:class=
"actice_step>1?'bule_back':''"
>
<span
class=
"circle"
>
<i
class=
"iconfont icon-yuandian"
></i>
<!--
<i
class=
"iconfont icon-yuandian"
></i>
-->
<span
class=
"wc"
>
<span
class=
"lc"
></span>
</span>
</span>
<p>
设计方案
</p>
</span>
...
...
@@ -43,7 +49,10 @@
<div
class=
"text"
>
<span
class=
"bottom"
:class=
"actice_step>2?'bule_back':''"
>
<span
class=
"circle"
>
<i
class=
"iconfont icon-yuandian"
></i>
<!--
<i
class=
"iconfont icon-yuandian"
></i>
-->
<span
class=
"wc"
>
<span
class=
"lc"
></span>
</span>
</span>
<p
>
签证合同
</p>
</span>
...
...
@@ -57,7 +66,10 @@
<div
class=
"text"
>
<span
class=
"bottom"
:class=
"actice_step>4?'bule_back':''"
>
<span
class=
"circle"
>
<i
class=
"iconfont icon-yuandian"
></i>
<!--
<i
class=
"iconfont icon-yuandian"
></i>
-->
<span
class=
"wc"
>
<span
class=
"lc"
></span>
</span>
</span>
<p>
恭喜成团
</p>
</span>
...
...
@@ -71,7 +83,10 @@
<div
class=
"text"
>
<span
class=
"bottom"
:class=
"actice_step>5?'bule_back':''"
>
<span
class=
"circle"
>
<i
class=
"iconfont icon-yuandian"
></i>
<!--
<i
class=
"iconfont icon-yuandian"
></i>
-->
<span
class=
"wc"
>
<span
class=
"lc"
></span>
</span>
</span>
<p>
成团结束
</p>
</span>
...
...
@@ -502,6 +517,7 @@ export default {
.CustomizedTourism
.bule_back
p
{
color
:
#409EFF
!important
;
font-family
:
"PingFangR"
;
}
.top
.el-col-4
{
width
:
20%
;
...
...
@@ -509,21 +525,50 @@ export default {
}
.CustomizedTourism
.bottom
{
display
:
inline-block
;
background
:
#fff
;
/* background: #fff; */
position
:
relative
;
}
.CustomizedTourism
.text
.circle
{
display
:
inline-block
;
width
:
48px
;
height
:
48px
;
/*
width: 48px;
height: 48px;
*/
border-radius
:
50%
;
line-height
:
48px
;
text-align
:
center
;
}
.CustomizedTourism
.text
.bule_back
.circle
.wc
{
background
:
rgba
(
149
,
191
,
255
,
0.4
);
}
.CustomizedTourism
.text
.circle
.wc
{
display
:
inline-block
;
width
:
19px
;
height
:
19px
;
background
:
rgba
(
231
,
231
,
231
,
1
);
border-radius
:
50%
;
position
:
relative
;
/* top: 4px; */
text-align
:
center
;
line-height
:
19px
;
}
.CustomizedTourism
.text
.bule_back
.circle
.wc
.lc
{
background
:
#558EE5
;
}
.CustomizedTourism
.text
.circle
.wc
.lc
{
width
:
9px
;
height
:
9px
;
display
:
inline-block
;
background
:
rgba
(
175
,
175
,
175
,
1
);
border-radius
:
50%
;
}
.CustomizedTourism
.text
.iconfont
{
color
:
#e1e1e1
;
}
.CustomizedTourism
.text
p
{
font-size
:
12px
;
position
:
absolute
;
top
:
50px
;
width
:
70px
;
left
:
-25px
;
}
.CustomizedTourism
.text
{
text-align
:
center
;
...
...
src/components/DependentTravel/PersonalTailor.vue
View file @
bf944c22
...
...
@@ -19,7 +19,7 @@
.PersonalTailor
.main
.info
{
position
:
relative
;}
.PersonalTailor
.main
.info
.info_
{
position
:
relative
;
height
:
5
45
px
;
height
:
5
80
px
;
padding
:
20px
20px
20px
30px
;
}
.PersonalTailor
.main
.info
.info_.info_left
{
...
...
@@ -54,7 +54,7 @@
}
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_left
.iconfont
,
._sub_right
.iconfont
{
display
:
inline-block
;
background
-color
:
#95BFFF
;
background
:
rgba
(
149
,
191
,
255
,
0.5
)
;
width
:
30px
;
height
:
30px
;
border-radius
:
50%
;
...
...
@@ -65,7 +65,7 @@
}
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_right
.iconfont
{
color
:
#999999
;
background
-color
:
#BBBBBB
;
background
:
rgba
(
187
,
187
,
187
,
0.5
)
;
}
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_left
{
width
:
45%
;
...
...
@@ -83,8 +83,12 @@
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_line
span
{
width
:
100%
;
display
:
inline-block
;
border-top
:
1px
dashed
#AAAAAA
;
/* border-top: 1px dashed #AAAAAA; */
height
:
1px
;
background-image
:
linear-gradient
(
to
right
,
#AAAAAA
0%
,
#AAAAAA
50%
,
transparent
50%
);
background-size
:
8px
8px
;
background-repeat
:
repeat-x
;
}
.PersonalTailor
.main
.info
.info_.info_left
.info_left_sub
._sub_right._active
.iconfont
{
color
:
#558EE5
;
...
...
@@ -98,6 +102,7 @@
}
.PersonalTailor
._checkd
.el-col._active
{
border
:
2px
solid
#EE4454
;
color
:
#EE4454
;
}
.PersonalTailor
._for_tips
{
color
:
#999999
;
...
...
@@ -173,6 +178,7 @@
margin
:
50px
auto
20px
auto
;
padding-bottom
:
50px
;
overflow
:
auto
;
font-family
:
"微软雅黑"
;
}
.PersonalTailor
.content
>
div
{
float
:
left
;
...
...
@@ -180,6 +186,14 @@
.PersonalTailor
.content
>
div
p
{
margin
:
16px
0
;
font-size
:
18px
;
}
.PersonalTailor
.el-form-item__label
{
font-size
:
12px
;
color
:
#333333
;
}
.PersonalTailor
.el-input__inner
{
border-radius
:
0
;
}
</
style
>
<
template
>
...
...
@@ -335,7 +349,8 @@
</el-row>
</el-col>
<el-col
class=
"ordershow"
el-col
:span=
"18"
:offset=
"3"
v-show=
"orderShow"
>
<!-- -->
<el-col
v-show=
"orderShow"
class=
"ordershow"
el-col
:span=
"18"
:offset=
"3"
>
<div
class=
"content"
>
<div
style=
"padding-top:50px;padding-left:100px;"
>
<div
style=
"position:relative"
>
...
...
@@ -347,7 +362,7 @@
</div>
<p>
<p
style=
"margin-top: 40px;"
>
我们正在为您分配定制师
</p>
<p>
...
...
src/components/LocalTour/Localtourhome.vue
View file @
bf944c22
...
...
@@ -380,17 +380,26 @@ export default {
this
.
GetCuntryTicket
();
this
.
getFoodCountryItem
();
this
.
scrollobj
=
document
.
getElementsByClassName
(
"el-scrollbar__wrap"
)[
0
];
let
self
=
this
bus
.
$on
(
'Headmsg'
,
(
e
)
=>
{
self
.
message
=
e
this
.
goAnchor
(
e
);
this
.
$nextTick
(
function
()
{
this
.
goAnchor
(
e
);
})
})
},
methods
:
{
goAnchor
(
selector
)
{
var
anchor
=
document
.
getElementById
(
selector
);
this
.
scrollobj
.
scrollTop
=
anchor
.
offsetTop
;
this
.
$nextTick
(
function
()
{
var
anchor
=
document
.
getElementById
(
selector
);
if
(
anchor
.
offsetTop
){
this
.
scrollobj
.
scrollTop
=
anchor
.
offsetTop
;
}
})
// window.scrollTo({
// left: 0,
// top: 0,
...
...
src/components/global/newHead.vue
View file @
bf944c22
...
...
@@ -219,11 +219,11 @@
<span>
当地游
</span>
<span
class=
"__splice"
>
|
</span>
</div>
<
!-- <
div class="localtour">
<div
class=
"localtour"
>
<span
@
click=
"GoLocalTour('outoneday')"
>
一日游
</span>
<span
@
click=
"GoLocalTour('PlayTicket')"
>
游玩门票
</span>
<span
@
click=
"GoLocalTour('LocalFood')"
>
当地美食
</span>
</div>
-->
</div>
</li>
<!-- <li :class="{_active: navActive === 3}">
<div @click="handleSelect('/OneDayTour', 3), navActive = 3">
...
...
@@ -294,8 +294,9 @@ export default {
}
},
methods
:{
GoLocalTour
(
str
){
this
.
$router
.
push
({
name
:
"Localtourhome"
});
bus
.
$emit
(
'Headmsg'
,
str
);
// this.$router.push({name: "Localtourhome", query:{str: str}});
// let routeData =this.$router.resolve({name: "Localtourhome", query:{str: str}});
// // let routeData = this.$router.resolve({ path:path});
// window.open(routeData.href, '_blank');
...
...
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