关门优化5

client/actions/chooseTaskContainer.js

@@ -13,7 +13,7 @@ const willCloseDoor=(data,flag=false)=>{
     UTILPATH.myLogger.info("finish_task url ",url);
     UTILPATH.myLogger.info("finish_task url ",url);
     UTILPATH.myLogger.info("finish_task flag ",flag);
     UTILPATH.myLogger.info("finish_task flag ",flag);
     UTILPATH.myLogger.info("finish_task request ",bodyData);
     UTILPATH.myLogger.info("finish_task request ",bodyData);
-    
+    console.log('datadata',data)
     return async (dispatch)=>{
     return async (dispatch)=>{
         let success = (json)=>{
         let success = (json)=>{
             UTILPATH.myLogger.info("finish_task response ",json);
             UTILPATH.myLogger.info("finish_task response ",json);
@@ -39,8 +39,8 @@ const willCloseDoor=(data,flag=false)=>{
             }).then((response)=>{
             }).then((response)=>{
             
             
                 if(response.status==200&&response){
                 if(response.status==200&&response){
-                  return  response.json()
-                   
+                    response.json()
+                    
                 }else{
                 }else{
                     var error = new Error(response.statusText)
                     var error = new Error(response.statusText)
                     error.response = response
                     error.response = response
@@ -50,6 +50,7 @@ const willCloseDoor=(data,flag=false)=>{
            }).catch(()=>{
            }).catch(()=>{
             alert('网络状态不好，请稍后重试')
             alert('网络状态不好，请稍后重试')
            })
            })
+          
             return success(result)
             return success(result)
         } catch (err) {
         } catch (err) {
            
            

client/containers/HomePageContainer/HomePageContainer.jsx

@@ -4,7 +4,7 @@ import Button from '../../components/CommonComponent/ButtonComponent/ButtonCompo
 import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
 import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
 import {sendMsg} from "../../util/socket";
 import {sendMsg} from "../../util/socket";
 require('./index.css');
 require('./index.css');
-
+let domain = ENV.domain;
 export default class HomePageContainer extends React.Component{
 export default class HomePageContainer extends React.Component{
     constructor(props){
     constructor(props){
         super(props);
         super(props);
@@ -65,12 +65,24 @@ export default class HomePageContainer extends React.Component{
                 }else{
                 }else{
                     //正常调用
                     //正常调用
                     try {
                     try {
-                             
-                    
-                        this.onConnectionChange()
-                        const { rtt, downlink, effectiveType, saveData } = navigator.connection;
-                       if(rtt<20000){
-                        this.props.willCloseDoor().then(()=>{
+                        console.log('有网络',this.props.headerInfo.taskInfo.area,this.props.headerInfo.storeInfo.id,this.props.headerInfo.taskInfo.taskId,this.props.headerInfo.taskInfo.currentTaskType,
+                        this.props.headerInfo.userInfo.employeeId
+                        ) 
+                     
+                        this.axios.post(domain+'machine_pad/finish_task.action',{
+                            area:this.props.headerInfo.taskInfo.area,
+                            storeId:this.props.headerInfo.storeInfo.id,
+                            taskId:this.props.headerInfo.taskInfo.taskId,
+                            taskType:this.props.headerInfo.taskInfo.currentTaskType,
+                            userId:this.props.headerInfo.userInfo.employeeId
+
+                        }).then((res)=>{
+                            if(res.status!=200){
+                                var error = new Error(response.statusText)
+                                error.response = response
+                                throw error
+                            }else{
+                            this.props.willCloseDoor().then(()=>{
                             this.props.endCountBack();
                             this.props.endCountBack();
                             let msg={type:'WILL_CLOSEDOOR'};
                             let msg={type:'WILL_CLOSEDOOR'};
                             sendMsg(JSON.stringify(msg));
                             sendMsg(JSON.stringify(msg));
@@ -78,13 +90,30 @@ export default class HomePageContainer extends React.Component{
                             // this.props.tempLogout()
                             // this.props.tempLogout()
                             console.log('有网络',this.props)
                             console.log('有网络',this.props)
                         })
                         })
-                       }else{
-                        this.setState({ closeDoorStatus : 0},()=>{
-                            alert('当前网络不佳，请稍后重试'+rtt+'/'+downlink+'/'+effectiveType)
-                        }) 
+                            }
+                        })
+                        .catch((err)=>{
+                            this.setState({ closeDoorStatus : 0},()=>{
+                                        alert('当前网络不佳，请稍后重试')
+                                    }) 
+                        })
+                      
+                       
+                    //     this.props.willCloseDoor().then(()=>{
+                    //         this.props.endCountBack();
+                    //         let msg={type:'WILL_CLOSEDOOR'};
+                    //         sendMsg(JSON.stringify(msg));
+                    //         this.props.changeIsSend(true);
+                    //         // this.props.tempLogout()
+                    //         console.log('有网络',this.props)
+                    //     })
+                    //    }else{
+                    //     this.setState({ closeDoorStatus : 0},()=>{
+                    //         alert('当前网络不佳，请稍后重试')
+                    //     }) 
                           
                           
 
 
-                       }
+                    //    }
                     
                     
                     } catch (error) {
                     } catch (error) {
                         console.log(error,'cuowu')
                         console.log(error,'cuowu')
@@ -178,7 +207,7 @@ export default class HomePageContainer extends React.Component{
     }
     }
  
  
 }
 }
-
+11
 HomePageContainer.propTypes = {
 HomePageContainer.propTypes = {
 };
 };
 
 

client/index.js

@@ -8,7 +8,9 @@ import thunkMiddleware from 'redux-thunk';
 require('./index.css');
 require('./index.css');
 import PageContainer from './containers/PageContainer/PageContainer';
 import PageContainer from './containers/PageContainer/PageContainer';
 const env = process.env.NODE_ENV;
 const env = process.env.NODE_ENV;
-
+import axios from 'axios'
+React.Component.prototype.axios=axios
+axios.defaults.withCredentials=true
 function activateVendor() {
 function activateVendor() {
     const logMiddleware = createLogger();
     const logMiddleware = createLogger();
     return (
     return (

package.json

@@ -46,6 +46,7 @@
     "webpack-dev-server": "^2.11.2"
     "webpack-dev-server": "^2.11.2"
   },
   },
   "dependencies": {
   "dependencies": {
+    "axios": "^0.19.0",
     "cross-env": "^5.2.0",
     "cross-env": "^5.2.0",
     "react": "^16.4.1",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-dom": "^16.4.1",