解决冲突

client/containers/PageContainer/PageContainer.jsx

@@ -5,17 +5,15 @@ import { connect }  from 'react-redux';
 import {getStoreInfo} from "../../actions/getStore";
 import {getStoreInfo} from "../../actions/getStore";
 import {getTroubleList} from "../../actions/getTroubles";
 import {getTroubleList} from "../../actions/getTroubles";
 import {initGetOtherProblem,addNewProbem} from "../../actions/otherQuestion"
 import {initGetOtherProblem,addNewProbem} from "../../actions/otherQuestion"
-
+import {getRefreshImg} from "../../actions/refreshImg"
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
-import TextAreaContainer from '../TextAreaContainer/TextAreaContainer'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
 import ReportDamagesListContainer from '../ReportDamagesListContainer/ReportDamagesListContainer'
 import ReportDamagesListContainer from '../ReportDamagesListContainer/ReportDamagesListContainer'
 import OtherQuestionContainer from '../OtherQuestionContainer/OtherQuestionContainer'
 import OtherQuestionContainer from '../OtherQuestionContainer/OtherQuestionContainer'
 import HomeContainer from '../HomeContainer/HomeContainer'
 import HomeContainer from '../HomeContainer/HomeContainer'
 import FinishAskContainer from '../FinishAskContainer/FinishAskContainer'
 import FinishAskContainer from '../FinishAskContainer/FinishAskContainer'
 import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
 import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
-import Qrcode from '../Qrcode/Qrcode'
 
 
 require('./index.css')
 require('./index.css')
 
 
@@ -41,12 +39,8 @@ class PageContainer extends React.Component {
             lastPage : '',
             lastPage : '',
             page : null,
             page : null,
             popupInfo : defaultPopupInfo,
             popupInfo : defaultPopupInfo,
-            pageStyle : {
-                // 'backgroundColor' : '#ffffff'
-            },
-            lastPageStyle:{
-
-            },
+            pageStyle : {},
+            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);
@@ -54,6 +48,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;
@@ -73,6 +73,10 @@ class PageContainer extends React.Component {
     componentWillUnmount(){
     componentWillUnmount(){
     }
     }
 
 
+    countBack(){
+
+    }
+
     hidePopup(){
     hidePopup(){
         this.setState({
         this.setState({
             popupInfo : defaultPopupInfo
             popupInfo : defaultPopupInfo
@@ -131,11 +135,14 @@ class PageContainer extends React.Component {
             case showPage[1]:
             case showPage[1]:
                 pages = <TroubleContainer
                 pages = <TroubleContainer
                     troubleList={state.troubleList}
                     troubleList={state.troubleList}
+                    refreshImg = {state.refreshImg}
                     storeInfo={state.storeInfo}
                     storeInfo={state.storeInfo}
                     userInfo={state.userInfo}
                     userInfo={state.userInfo}
                     initTroubleList={()=>dispatch(getTroubleList())}
                     initTroubleList={()=>dispatch(getTroubleList())}
                     showTextArea={(text)=>this.showTextArea(text)}
                     showTextArea={(text)=>this.showTextArea(text)}
-
+                    showPopup={(info)=>this.showPopup(info)}
+                    hidePopup={()=>this.hidePopup()}
+                    getRefreshImg={(errorId,type)=>dispatch(getRefreshImg(errorId,type))}
                 />;
                 />;
                 break;
                 break;
             case showPage[2]:
             case showPage[2]:
@@ -151,9 +158,6 @@ class PageContainer extends React.Component {
                             state = {state}
                             state = {state}
                         />;
                         />;
                 break;
                 break;
-            case showPage[6]:
-                pages = <Qrcode />;
-                break;
             case showPage[7]:
             case showPage[7]:
                 pages = <HomeContainer />;
                 pages = <HomeContainer />;
                 break;
                 break;
@@ -167,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()}