Commit a3801e6c by Zhang Xin

fix

parent 4c35b702
...@@ -33,7 +33,6 @@ const refreshImg = (data)=>{ ...@@ -33,7 +33,6 @@ const refreshImg = (data)=>{
const getRefreshImg = (errorId,type)=>{ const getRefreshImg = (errorId,type)=>{
console.log(errorId,type)
return(dispatch)=>{ return(dispatch)=>{
// fetch(domain + '/web/flush_image.action',{ // fetch(domain + '/web/flush_image.action',{
// credentials : 'include', // credentials : 'include',
......
...@@ -40,12 +40,8 @@ class PageContainer extends React.Component { ...@@ -40,12 +40,8 @@ class PageContainer extends React.Component {
lastPage : '', lastPage : '',
page : null, page : null,
popupInfo : defaultPopupInfo, popupInfo : defaultPopupInfo,
pageStyle : { pageStyle : {},
// 'backgroundColor' : '#ffffff' lastPageStyle:{},
},
lastPageStyle:{
},
}; };
this.getPages = this.getPages.bind(this); this.getPages = this.getPages.bind(this);
this.showPopup = this.showPopup.bind(this); this.showPopup = this.showPopup.bind(this);
...@@ -53,6 +49,12 @@ class PageContainer extends React.Component { ...@@ -53,6 +49,12 @@ class PageContainer extends React.Component {
this.showQrCode = this.showQrCode.bind(this); this.showQrCode = this.showQrCode.bind(this);
this.saveLastPage = this.saveLastPage.bind(this); this.saveLastPage = this.saveLastPage.bind(this);
this.goBack = this.goBack.bind(this); this.goBack = this.goBack.bind(this);
this.maxCountBackTime = 300;
this.count = 1000;
this.countbackTimer = null;
} }
componentWillMount() { componentWillMount() {
let {dispatch} = this.props; let {dispatch} = this.props;
...@@ -72,6 +74,10 @@ class PageContainer extends React.Component { ...@@ -72,6 +74,10 @@ class PageContainer extends React.Component {
componentWillUnmount(){ componentWillUnmount(){
} }
countBack(){
}
hidePopup(){ hidePopup(){
this.setState({ this.setState({
popupInfo : defaultPopupInfo popupInfo : defaultPopupInfo
...@@ -165,10 +171,14 @@ class PageContainer extends React.Component { ...@@ -165,10 +171,14 @@ class PageContainer extends React.Component {
return pages; return pages;
} }
handleTouch(){
}
render() { render() {
let {state} = this.props; let {state} = this.props;
return ( return (
<div className={"pageContainer "} style={this.state.pageStyle}> <div className={"pageContainer "} style={this.state.pageStyle} onTouch="">
<PopupComponent popupInfo={this.state.popupInfo} /> <PopupComponent popupInfo={this.state.popupInfo} />
{this.getPages()} {this.getPages()}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment