Skip to content

M
max_android_panel
Commit da424e86 by Zhang Xin
Options

add asycn & await

parent 186dc590
Showing with 98 additions and 71 deletions
client/actions/chooseTaskContainer.js
...@@ -12,28 +12,33 @@ const willCloseDoor=(data,flag=false)=>{ ...@@ -12,28 +12,33 @@ 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);
return (dispatch)=>{ return async (dispatch)=>{
fetch(url,{ let success = (json)=>{
credentials : 'include', UTILPATH.myLogger.info("finish_task response ",json);
method : 'POST', if(flag){
mode : 'cors', //回收箱完成
headers:{ dispatch(getTaskList(data))
'Access-Control-Allow-Origin': '*', }
'Content-Type': 'application/json; charset=UTF-8' };
}, let fail = (err)=>{
body:JSON.stringify(bodyData) UTILPATH.myLogger.error(`finish_task error ${err}`);
}).then((response)=>response.json()) };
.then((json)=>{ try {
UTILPATH.myLogger.info("finish_task response ",json); let result = await fetch(url,{
if(flag){ credentials : 'include',
//回收箱完成 method : 'POST',
dispatch(getTaskList(data)) mode : 'cors',
} headers:{
}).catch(e=>{ 'Access-Control-Allow-Origin': '*',
UTILPATH.myLogger.error(`finish_task error ${e}`); 'Content-Type': 'application/json; charset=UTF-8'
// dispatch(willCloseDoor(data,flag)); },
}) body:JSON.stringify(bodyData)
} }).then((response)=>response.json());
return success(result)
} catch (err) {
return fail(err)
}
}
} }
/** /**
...@@ -80,9 +85,10 @@ const closeDoorSuccess=(data,stopFlag=false)=>{ ...@@ -80,9 +85,10 @@ const closeDoorSuccess=(data,stopFlag=false)=>{
const askForNextTask = (taskId)=>{ const askForNextTask = (taskId)=>{
UTILPATH.myLogger.info("askForNextTask power_cut_close_door taskId ",taskId); let url = domain+`machine_pad/power_cut_close_door/${taskId}`;
UTILPATH.myLogger.info("askForNextTask power_cut_close_door url ",url);
return (dispatch) =>{ return (dispatch) =>{
fetch(domain+`machine_pad/power_cut_close_door/${taskId}`,{ fetch(url,{
credentials : 'include', credentials : 'include',
method : 'POST', method : 'POST',
mode : 'cors', mode : 'cors',
......
client/actions/common.js
...@@ -12,29 +12,36 @@ let myHeaders = new Headers({ ...@@ -12,29 +12,36 @@ let myHeaders = new Headers({
//获取店铺信息 //获取店铺信息
const getStoreInfo = (storeId)=>{ const getStoreInfo = (storeId)=>{
return(dispatch)=>{ return async (dispatch)=>{
let bodyData = {storeId}; let bodyData = {storeId};
UTILPATH.myLogger.info("getMachineData request ",bodyData); UTILPATH.myLogger.info("getMachineData request ",bodyData);
fetch(domain + 'pad_warehouse/getMachineData.action',{
credentials : 'include',
method : 'POST',
mode : 'cors',
headers:myHeaders,
body: JSON.stringify(bodyData)
}).then((response)=>response.json())
.then(json=>{
UTILPATH.myLogger.info("getMachineData response ",json);
let storeInfo = Object.assign({},{id:storeId});
if(json.meta.success && json.data.warehouse){
storeInfo = Object.assign({},storeInfo,json.data.warehouse)
}
dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
}).catch(e=>{
UTILPATH.myLogger.error(`getMachineData error ${e}`);
dispatch(getStoreInfo(storeId));
})
let success = (json)=>{
UTILPATH.myLogger.info("getMachineData response ",json);
let storeInfo = Object.assign({},{id:storeId});
if(json.meta.success && json.data.warehouse){
storeInfo = Object.assign({},storeInfo,json.data.warehouse)
}
dispatch(saveCommonInfo(Object.assign({},{storeInfo})));
};
let fail = (e)=>{
UTILPATH.myLogger.error(`getMachineData error ${e}`);
dispatch(getStoreInfo(storeId));
};
try{
let res = await fetch(domain + 'pad_warehouse/getMachineData.action',{
credentials : 'include',
method : 'POST',
mode : 'cors',
headers:myHeaders,
body: JSON.stringify(bodyData)
}).then((response)=>response.json());
return success(res);
}catch (e) {
return fail(e)
}
} }
}; };
......
client/actions/recovery.js
...@@ -13,7 +13,7 @@ let lock = false; ...@@ -13,7 +13,7 @@ let lock = false;
const finishBoxRecovery = (info)=>{ const finishBoxRecovery = (info)=>{
//已放入回收箱 //已放入回收箱
return (dispatch)=>{ return async dispatch => {
if(!lock){ if(!lock){
lock = true; lock = true;
let {userInfo={},taskInfo={},storeInfo={},taskList={}} = info; let {userInfo={},taskInfo={},storeInfo={},taskList={}} = info;
...@@ -27,23 +27,31 @@ const finishBoxRecovery = (info)=>{ ...@@ -27,23 +27,31 @@ const finishBoxRecovery = (info)=>{
}); });
UTILPATH.myLogger.info("update_machine_recovery_sku request ",bodyData); UTILPATH.myLogger.info("update_machine_recovery_sku request ",bodyData);
let url=`${domain}machine_pad/update_machine_recovery_sku.action`; let url=`${domain}machine_pad/update_machine_recovery_sku.action`;
fetch(url,{
credentials : 'include', let success = (res)=>{
method : 'POST', dispatch(saveProductInfo({}));
mode : 'cors', dispatch(getTaskList(info,()=>{
headers: myHeaders,
body:JSON.stringify(bodyData)
}).then(response=>response.json())
.then((json)=>{
dispatch(saveProductInfo({}));
dispatch(getTaskList(info,()=>{
lock = false;
}));
}).catch(e=>{
lock = false; lock = false;
UTILPATH.myLogger.error(`update_machine_recovery_sku error ${e}`); }));
// dispatch(finishBoxRecovery(info)) };
})
let fail = (err)=>{
lock = false;
UTILPATH.myLogger.error(`update_machine_recovery_sku error ${err}`);
};
try {
const result = await fetch(url,{
credentials : 'include',
method : 'POST',
mode : 'cors',
headers: myHeaders,
body:JSON.stringify(bodyData)
}).then(response=>response.json());
return success(result)
} catch (err) {
return fail(err)
}
} }
} }
}; };
......
client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx
...@@ -43,8 +43,10 @@ export default class ReplenishSkuPage extends React.Component{ ...@@ -43,8 +43,10 @@ export default class ReplenishSkuPage extends React.Component{
this.setState({ this.setState({
btnClock : true btnClock : true
},()=>{ },()=>{
this.props.finishBoxRecovery(); this.props.finishBoxRecovery().then(()=>{
this.continueScan() this.continueScan()
});
}) })
} }
} }
......
client/containers/HomePageContainer/HomePageContainer.jsx
...@@ -45,16 +45,20 @@ export default class HomePageContainer extends React.Component{ ...@@ -45,16 +45,20 @@ export default class HomePageContainer extends React.Component{
},()=>{ },()=>{
UTILPATH.myLogger.info("logout startStopServer ",this.props.startStopServer); UTILPATH.myLogger.info("logout startStopServer ",this.props.startStopServer);
if(this.props.startStopServer){ if(this.props.startStopServer){
this.props.willCloseDoor(); this.props.willCloseDoor().then(()=>{
this.props.endCountBack(); this.props.endCountBack();
this.props.tempLogout() this.props.tempLogout()
});
}else{ }else{
this.props.willCloseDoor(); 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));
this.props.changeIsSend(true); this.props.changeIsSend(true);
// this.props.tempLogout() // this.props.tempLogout()
});
} }
}) })
......
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