ç改成正常测试版本

client/containers/PageContainer/PageContainer.jsx

@@ -410,7 +410,9 @@ class PageContainer extends React.Component {
 
 
     endCountBack(){
     endCountBack(){
         this.countBackTime = -1;
         this.countBackTime = -1;
-        clearTimeout(this.countbackTimer);
+        if(this.countbackTimer){
+            clearTimeout(this.countbackTimer);
+        }
         this.countbackTimer = null;
         this.countbackTimer = null;
         UTILPATH.myLogger.info("endCountBack countBackTime ",this.countBackTime);
         UTILPATH.myLogger.info("endCountBack countBackTime ",this.countBackTime);
     }
     }
@@ -425,7 +427,7 @@ class PageContainer extends React.Component {
     }
     }
 
 
     countBack(){
     countBack(){
-        UTILPATH.myLogger.info("countBack countBackTime ",this.countBackTime);
+        // UTILPATH.myLogger.info("countBack countBackTime ",this.countBackTime);
         if(!this.countbackTimer && this.countBackTime >= 0){
         if(!this.countbackTimer && this.countBackTime >= 0){
             this.countBackTime--;
             this.countBackTime--;
             this.countbackTimer = window.setTimeout(()=>{
             this.countbackTimer = window.setTimeout(()=>{
@@ -527,8 +529,9 @@ class PageContainer extends React.Component {
         let btnBorderRadius = UTILPATH.getRemByPx(10);
         let btnBorderRadius = UTILPATH.getRemByPx(10);
 
 
         //老机器
         //老机器
-        this.handleCloseDoor();
+        // this.handleCloseDoor();
 
 
+        /*
         this.setState({
         this.setState({
             popupInfo:defaultPopupInfo
             popupInfo:defaultPopupInfo
         },()=>{
         },()=>{
@@ -551,6 +554,7 @@ class PageContainer extends React.Component {
 
 
 
 
         })
         })
+        */
 
 
     }
     }
 
 
@@ -799,7 +803,6 @@ class PageContainer extends React.Component {
                                   closeDoor={true}
                                   closeDoor={true}
                                   tempLogout={()=>this.tempLogout.bind(this)()}
                                   tempLogout={()=>this.tempLogout.bind(this)()}
                                   changeIsSend ={this.changeIsSend.bind(this)}
                                   changeIsSend ={this.changeIsSend.bind(this)}
-                                  beginCloseDoor={this.beginCloseDoor.bind(this)}
                                   endCountBack={this.endCountBack}
                                   endCountBack={this.endCountBack}
                 />;
                 />;
                 break;
                 break;

client/env/development.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://preprod.mjitech.com/web/',
+    domain: 'https://test.mjitech.com/web/',
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
 }
 }
\ No newline at end of file

client/env/production.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://preprod.mjitech.com/web/',
+    domain: 'https://test.mjitech.com/web/',
     uploadImg : "https://preprod.mjitech.com/static/uploadTrouble"
     uploadImg : "https://preprod.mjitech.com/static/uploadTrouble"
 }
 }
\ No newline at end of file

client/env/test.js

@@ -2,6 +2,6 @@
  * Created by ruibing on 16/11/2.
  * Created by ruibing on 16/11/2.
  */
  */
 module.exports = {
 module.exports = {
-    domain: 'https://preprod.mjitech.com/web/',
+    domain: 'https://test.mjitech.com/web/',
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
     uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
 }
 }
\ No newline at end of file

client/util/logger.js

 import fetch from 'isomorphic-fetch';
 import fetch from 'isomorphic-fetch';
 
 
 let domain = "";
 let domain = "";
-const domainPort = "7780";
+const domainPort = "7788";
 const myHeaders = new Headers({
 const myHeaders = new Headers({
     // 'Access-Control-Allow-Origin': '*',
     // 'Access-Control-Allow-Origin': '*',
     // 'Content-Type': 'text/plain;charset=UTF-8',
     // 'Content-Type': 'text/plain;charset=UTF-8',

client/util/socket.js

@@ -3,7 +3,7 @@ import myLogger from './logger'
 
 
 let domainIp = '192.168.10.';
 let domainIp = '192.168.10.';
 
 
-const domainPort = "7780";
+const domainPort = "7788";
 
 
 const socket = {};
 const socket = {};