Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
pingan-maruko
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e314d3fa
authored
Jun 17, 2020
by
doszhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dos
parent
ae06e6b7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
Public/static/css/index.css
+2
-1
Public/static/js/common.js
+14
-4
No files found.
Public/static/css/index.css
View file @
e314d3fa
...
@@ -75,7 +75,8 @@ body {
...
@@ -75,7 +75,8 @@ body {
.wrap-inner
{
.wrap-inner
{
position
:
absolute
;
position
:
absolute
;
overflow
:
scroll
;
overflow-y
:
scroll
;
overflow-x
:
hidden
;
left
:
0
;
left
:
0
;
width
:
640px
;
width
:
640px
;
height
:
1238px
;
height
:
1238px
;
...
...
Public/static/js/common.js
View file @
e314d3fa
...
@@ -140,8 +140,8 @@ function showItem() {
...
@@ -140,8 +140,8 @@ function showItem() {
clearTimeout
(
scrollTimer
)
clearTimeout
(
scrollTimer
)
}
}
scrollTimer
=
setTimeout
(()
=>
{
scrollTimer
=
setTimeout
(()
=>
{
const
scrollTop
=
$
(
'.
contai
ner'
).
scrollTop
();
const
scrollTop
=
$
(
'.
wrap-in
ner'
).
scrollTop
();
const
scrollLeft
=
$
(
'.
contai
ner'
).
scrollLeft
();
const
scrollLeft
=
$
(
'.
wrap-in
ner'
).
scrollLeft
();
if
(
nowShowIndex
==
1
&&
scrollTop
>
700
)
{
if
(
nowShowIndex
==
1
&&
scrollTop
>
700
)
{
$
(
'.title'
).
show
();
$
(
'.title'
).
show
();
nowShowIndex
++
nowShowIndex
++
...
@@ -163,7 +163,12 @@ function toscene(event) {
...
@@ -163,7 +163,12 @@ function toscene(event) {
}
}
function
toPage2
()
{
function
toPage2
()
{
$
(
'.container'
).
css
(
'overflow-x'
,
'scroll'
).
css
(
'overflow-y'
,
'hidden'
).
addClass
(
'fix'
);
$
(
'.wrap-inner'
).
css
({
overflowX
:
'scroll'
,
overflowY
:
'hidden'
,
transform
:
'translate(0,0)'
,
top
:
0
})
$
(
'.page1'
).
hide
();
$
(
'.page1'
).
hide
();
$
(
'.page2'
).
show
();
$
(
'.page2'
).
show
();
fireworkLock
=
true
;
fireworkLock
=
true
;
...
@@ -184,7 +189,12 @@ function showResult(event) {
...
@@ -184,7 +189,12 @@ function showResult(event) {
}
}
function
retry
()
{
function
retry
()
{
$
(
'.container'
).
css
(
'overflow-x'
,
'hidden'
).
css
(
'overflow-y'
,
'scroll'
);
$
(
'.wrap-inner'
).
css
({
overflowX
:
'scroll'
,
overflowY
:
'hidden'
,
transform
:
'translate(0,-50%)'
,
top
:
'50%'
})
$
(
'.page'
).
hide
();
$
(
'.page'
).
hide
();
$
(
'.page1'
).
show
();
$
(
'.page1'
).
show
();
fireworkLock
=
false
fireworkLock
=
false
...
...
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