Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
max_android_panel
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xin
max_android_panel
Commits
a3801e6c
Commit
a3801e6c
authored
Jul 17, 2018
by
Zhang Xin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
4c35b702
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
client/actions/refreshImg.js
+0
-1
client/containers/PageContainer/PageContainer.jsx
+17
-7
No files found.
client/actions/refreshImg.js
View file @
a3801e6c
...
...
@@ -33,7 +33,6 @@ const refreshImg = (data)=>{
const
getRefreshImg
=
(
errorId
,
type
)
=>
{
console
.
log
(
errorId
,
type
)
return
(
dispatch
)
=>
{
// fetch(domain + '/web/flush_image.action',{
// credentials : 'include',
...
...
client/containers/PageContainer/PageContainer.jsx
View file @
a3801e6c
...
...
@@ -40,12 +40,8 @@ class PageContainer extends React.Component {
lastPage
:
''
,
page
:
null
,
popupInfo
:
defaultPopupInfo
,
pageStyle
:
{
// 'backgroundColor' : '#ffffff'
},
lastPageStyle
:{
},
pageStyle
:
{},
lastPageStyle
:{},
};
this
.
getPages
=
this
.
getPages
.
bind
(
this
);
this
.
showPopup
=
this
.
showPopup
.
bind
(
this
);
...
...
@@ -53,6 +49,12 @@ class PageContainer extends React.Component {
this
.
showQrCode
=
this
.
showQrCode
.
bind
(
this
);
this
.
saveLastPage
=
this
.
saveLastPage
.
bind
(
this
);
this
.
goBack
=
this
.
goBack
.
bind
(
this
);
this
.
maxCountBackTime
=
300
;
this
.
count
=
1000
;
this
.
countbackTimer
=
null
;
}
componentWillMount
()
{
let
{
dispatch
}
=
this
.
props
;
...
...
@@ -72,6 +74,10 @@ class PageContainer extends React.Component {
componentWillUnmount
(){
}
countBack
(){
}
hidePopup
(){
this
.
setState
({
popupInfo
:
defaultPopupInfo
...
...
@@ -165,10 +171,14 @@ class PageContainer extends React.Component {
return pages;
}
handleTouch()
{
}
render()
{
let
{
state
}
=
this
.
props
;
return
(
<
div
className=
{
"pageContainer "
}
style=
{
this
.
state
.
pageStyle
}
>
<
div
className=
{
"pageContainer "
}
style=
{
this
.
state
.
pageStyle
}
onTouch=
""
>
<
PopupComponent
popupInfo=
{
this
.
state
.
popupInfo
}
/>
{
this
.
getPages
()
}
...
...
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