Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
campSite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨梦雪
campSite
Commits
b1b0d2ca
Commit
b1b0d2ca
authored
Sep 19, 2023
by
wuwangwolihui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营地2.0-整合修改
parent
402f8751
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
86 deletions
+10
-86
src/App.vue
src/App.vue
+3
-2
src/views/base/active/ActiveInfo.vue
src/views/base/active/ActiveInfo.vue
+2
-43
src/views/base/myInfo/index.vue
src/views/base/myInfo/index.vue
+1
-0
src/views/index/camp/Index.vue
src/views/index/camp/Index.vue
+1
-0
src/views/index/recruit/Index.vue
src/views/index/recruit/Index.vue
+3
-41
No files found.
src/App.vue
View file @
b1b0d2ca
...
@@ -22,8 +22,9 @@
...
@@ -22,8 +22,9 @@
}
}
},
},
watch
:
{
watch
:
{
'
$route.path
'
(
val
)
{
'
$route
'
(
val
)
{
this
.
$store
.
commit
(
'
setActiveIndex
'
,
val
)
console
.
log
(
val
.
query
.
jxcode
)
this
.
$store
.
commit
(
'
setActiveIndex
'
,
val
.
path
)
}
}
}
}
};
};
...
...
src/views/base/active/ActiveInfo.vue
View file @
b1b0d2ca
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</div>
</div>
<div
class=
"active-area"
>
<div
class=
"active-area"
>
<div
class=
"left-area card-box"
ref=
"left-area"
>
<div
class=
"left-area card-box"
ref=
"left-area"
>
<div
class=
"left-area-box"
:style=
"leftAreaBoxStyle"
>
<div
class=
"left-area-box"
>
<ul
v-if=
"activeContent==1 && anchorList.length>0"
>
<ul
v-if=
"activeContent==1 && anchorList.length>0"
>
<li
v-for=
"(item,index) in anchorList"
:key=
"index"
>
<li
v-for=
"(item,index) in anchorList"
:key=
"index"
>
<a
@
click=
"anchorSkip(item.id)"
>
{{item.name}}
</a>
<a
@
click=
"anchorSkip(item.id)"
>
{{item.name}}
</a>
...
@@ -206,7 +206,6 @@
...
@@ -206,7 +206,6 @@
anchorList2
:
[],
anchorList2
:
[],
activeContent
:
1
,
activeContent
:
1
,
minHeight
:
'
339
'
,
minHeight
:
'
339
'
,
leftAreaBoxStyle
:
{}
}
}
},
},
created
()
{
created
()
{
...
@@ -216,48 +215,7 @@
...
@@ -216,48 +215,7 @@
}
}
this
.
getInfo
()
this
.
getInfo
()
},
},
mounted
()
{
window
.
addEventListener
(
'
scroll
'
,
this
.
handleScrollY
,
true
);
},
destroyed
()
{
window
.
removeEventListener
(
'
scroll
'
,
this
.
handleScrollY
,
true
);
},
methods
:
{
methods
:
{
handleScrollY
()
{
// active-area距离顶部的高度
let
activeAreaToTop
=
document
.
querySelector
(
'
.active-area
'
).
offsetTop
;
// left-area的宽度
let
leftAreaWidth
=
document
.
querySelector
(
'
.left-area
'
).
offsetWidth
;
// footer的高度
let
footerHeight
=
document
.
querySelector
(
'
.footer
'
).
offsetHeight
;
// 页面滚动高度
let
scrollTop
=
document
.
documentElement
.
scrollTop
;
// left-area-box的高度
let
Height
=
document
.
querySelector
(
'
.left-area-box
'
).
offsetHeight
;
// active-info-container的高度
let
contentHeight
=
document
.
querySelector
(
'
.active-info-container
'
).
offsetHeight
;
// body的高度
let
bodyHeight
=
document
.
body
.
offsetHeight
;
if
(
scrollTop
>=
(
activeAreaToTop
-
20
))
{
if
(
scrollTop
>=
(
contentHeight
-
bodyHeight
+
180
)
&&
bodyHeight
<=
(
footerHeight
+
Height
+
80
))
{
this
.
leftAreaBoxStyle
=
{
position
:
'
absolute
'
,
bottom
:
'
0px
'
,
width
:
leftAreaWidth
+
'
px
'
,
}
return
false
;
}
this
.
leftAreaBoxStyle
=
{
position
:
'
fixed
'
,
top
:
'
100px
'
,
width
:
leftAreaWidth
+
'
px
'
,
}
}
else
{
this
.
leftAreaBoxStyle
=
{}
}
},
// 立即报名按钮
// 立即报名按钮
signUp
()
{
signUp
()
{
let
allToken
=
window
.
localStorage
.
getItem
(
'
index-token-all
'
);
let
allToken
=
window
.
localStorage
.
getItem
(
'
index-token-all
'
);
...
@@ -541,6 +499,7 @@
...
@@ -541,6 +499,7 @@
text-align
:
center
;
text-align
:
center
;
border-bottom
:
1px
solid
#cccccc
;
border-bottom
:
1px
solid
#cccccc
;
cursor
:
pointer
;
cursor
:
pointer
;
border-left
:
4px
solid
transparent
;
&
:hover
,
&
:hover
,
&
.is-active
{
&
.is-active
{
...
...
src/views/base/myInfo/index.vue
View file @
b1b0d2ca
...
@@ -221,6 +221,7 @@
...
@@ -221,6 +221,7 @@
margin
:
10px
0
;
margin
:
10px
0
;
font-size
:
15px
;
font-size
:
15px
;
list-style
:
none
;
list-style
:
none
;
border-left
:
4px
solid
transparent
;
img
{
img
{
vertical-align
:
middle
;
vertical-align
:
middle
;
...
...
src/views/index/camp/Index.vue
View file @
b1b0d2ca
...
@@ -315,6 +315,7 @@
...
@@ -315,6 +315,7 @@
margin
:
10px
0
;
margin
:
10px
0
;
font-size
:
15px
;
font-size
:
15px
;
list-style
:
none
;
list-style
:
none
;
border-left
:
4px
solid
transparent
;
img
{
img
{
vertical-align
:
middle
;
vertical-align
:
middle
;
...
...
src/views/index/recruit/Index.vue
View file @
b1b0d2ca
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<!--
</div>
-->
<!--
</div>
-->
<div
class=
"active-area"
>
<div
class=
"active-area"
>
<div
class=
"left-area card-box"
>
<div
class=
"left-area card-box"
>
<div
class=
"left-area-box"
:style=
"leftAreaBoxStyle"
>
<div
class=
"left-area-box"
>
<ul
class=
"left"
v-if=
"anchorList.length>0"
>
<ul
class=
"left"
v-if=
"anchorList.length>0"
>
<li
:key=
"index"
v-for=
"(item,index) in anchorList"
>
<li
:key=
"index"
v-for=
"(item,index) in anchorList"
>
<a
@
click=
"anchorSkip(item.id)"
>
{{
item
.
name
}}
</a>
<a
@
click=
"anchorSkip(item.id)"
>
{{
item
.
name
}}
</a>
...
@@ -56,7 +56,6 @@
...
@@ -56,7 +56,6 @@
info
:
{},
info
:
{},
anchorList
:
[],
anchorList
:
[],
minHeight
:
'
339
'
,
minHeight
:
'
339
'
,
leftAreaBoxStyle
:
{}
};
};
},
},
created
()
{
created
()
{
...
@@ -76,45 +75,7 @@
...
@@ -76,45 +75,7 @@
}
}
},
},
mounted
()
{
window
.
addEventListener
(
'
scroll
'
,
this
.
handleScrollY
,
true
);
},
destroyed
()
{
window
.
removeEventListener
(
'
scroll
'
,
this
.
handleScrollY
,
true
);
},
methods
:
{
methods
:
{
handleScrollY
()
{
// left-area的宽度
let
leftAreaWidth
=
document
.
querySelector
(
'
.left-area
'
).
offsetWidth
;
// footer的高度
let
footerHeight
=
document
.
querySelector
(
'
.footer
'
).
offsetHeight
;
// 页面滚动高度
let
scrollTop
=
document
.
documentElement
.
scrollTop
;
// left-area-box的高度
let
Height
=
document
.
querySelector
(
'
.left-area-box
'
).
offsetHeight
;
// index-container的高度
let
contentHeight
=
document
.
querySelector
(
'
.index-container
'
).
offsetHeight
;
// body的高度
let
bodyHeight
=
document
.
body
.
offsetHeight
;
if
(
scrollTop
>=
(
98
))
{
if
(
scrollTop
>=
(
contentHeight
-
bodyHeight
+
218
)
&&
bodyHeight
<=
(
footerHeight
+
Height
+
188
))
{
this
.
leftAreaBoxStyle
=
{
position
:
'
absolute
'
,
bottom
:
'
0px
'
,
width
:
leftAreaWidth
+
'
px
'
,
}
return
false
;
}
this
.
leftAreaBoxStyle
=
{
position
:
'
fixed
'
,
top
:
'
138px
'
,
width
:
leftAreaWidth
+
'
px
'
,
}
}
else
{
this
.
leftAreaBoxStyle
=
{}
}
},
toLogin
()
{
toLogin
()
{
let
code
=
this
.
$store
.
state
.
indexIdentity
;
let
code
=
this
.
$store
.
state
.
indexIdentity
;
if
(
!
window
.
localStorage
.
getItem
(
"
index-token-all
"
))
{
if
(
!
window
.
localStorage
.
getItem
(
"
index-token-all
"
))
{
...
@@ -299,13 +260,14 @@
...
@@ -299,13 +260,14 @@
text-decoration
:
none
;
text-decoration
:
none
;
color
:
#333333
;
color
:
#333333
;
width
:
100%
;
width
:
100%
;
font-size
:
1
5
px
;
font-size
:
1
8
px
;
/*height: 44px;*/
/*height: 44px;*/
line-height
:
44px
;
line-height
:
44px
;
margin
:
10px
0
;
margin
:
10px
0
;
text-align
:
center
;
text-align
:
center
;
border-bottom
:
1px
solid
#cccccc
;
border-bottom
:
1px
solid
#cccccc
;
cursor
:
pointer
;
cursor
:
pointer
;
border-left
:
4px
solid
transparent
;
&
:hover
,
&
:hover
,
&
.is-active
{
&
.is-active
{
...
...
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