Skip to content

M
max_android_panel
Commit 2936bf90 by Zhang Xin
Options

fix bug

parent da424e86
Showing with 32 additions and 5 deletions
client/containers/PageContainer/PageContainer.jsx
...@@ -159,6 +159,33 @@ class PageContainer extends React.Component { ...@@ -159,6 +159,33 @@ class PageContainer extends React.Component {
let that = this; let that = this;
let {dispatch} = this.props; let {dispatch} = this.props;
/**
* 测试数据
* @type {number}
let employeeId = 14;
let area = "B";
let storeId = 50;
let maxTime = 300;
dispatch(getStoreInfo(storeId));
dispatch(saveCommonInfo({userInfo:{employeeId}}));
dispatch(getUserinfo(employeeId,storeId));
dispatch(saveCommonInfo(Object.assign({},{taskInfo:{area:area,taskId:0,currentTaskType:'OPEN'}})));
if(!this.state.startCountback){
this.setState({
successCloseDoor : false,
area:area,
showAlarm : false,
maxTime : maxTime,
startCountback : true
},()=>{
//开门开始倒计时
this.countBackTime = maxTime;
this.beginCountBack()
});
}
*/
on(CONFIG.socketType.GETSTOREINFO,this,function (data) { on(CONFIG.socketType.GETSTOREINFO,this,function (data) {
UTILPATH.myLogger.info(CONFIG.socketType.GETSTOREINFO ,data); UTILPATH.myLogger.info(CONFIG.socketType.GETSTOREINFO ,data);
dispatch(saveCommonInfo({ip:data.ip})); dispatch(saveCommonInfo({ip:data.ip}));
...@@ -979,7 +1006,7 @@ class PageContainer extends React.Component { ...@@ -979,7 +1006,7 @@ class PageContainer extends React.Component {
showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()} showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
willCloseDoor={()=>{dispatch(willCloseDoor(commonInfo,false))}} willCloseDoor={async ()=>{return await dispatch(willCloseDoor(commonInfo,false))}}
/>; />;
break; break;
...@@ -997,7 +1024,7 @@ class PageContainer extends React.Component { ...@@ -997,7 +1024,7 @@ class PageContainer extends React.Component {
changePages={(data)=>this.changePages(data)} changePages={(data)=>this.changePages(data)}
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
willCloseDoor={()=>{dispatch(willCloseDoor(commonInfo,false))}} willCloseDoor={async ()=>{return await dispatch(willCloseDoor(commonInfo,false))}}
closeDoor={true} closeDoor={true}
tempLogout={()=>this.tempLogout.bind(this)()} tempLogout={()=>this.tempLogout.bind(this)()}
changeIsSend ={this.changeIsSend.bind(this)} changeIsSend ={this.changeIsSend.bind(this)}
...@@ -1054,7 +1081,7 @@ class PageContainer extends React.Component { ...@@ -1054,7 +1081,7 @@ class PageContainer extends React.Component {
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
getTaskName={()=>dispatch(getTaskName(commonInfo.taskInfo.currentTaskType,2))} getTaskName={()=>dispatch(getTaskName(commonInfo.taskInfo.currentTaskType,2))}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(commonInfo))} finishBoxRecovery={async ()=>{ return await dispatch(finishBoxRecovery(commonInfo))}}
uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))} uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}} getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
/>; />;
...@@ -1064,7 +1091,7 @@ class PageContainer extends React.Component { ...@@ -1064,7 +1091,7 @@ class PageContainer extends React.Component {
headerInfo = {commonInfo} headerInfo = {commonInfo}
showPopup={(info)=>this.showPopup(info)} showPopup={(info)=>this.showPopup(info)}
hidePopup={()=>this.hidePopup()} hidePopup={()=>this.hidePopup()}
willCloseDoor={()=>{dispatch(willCloseDoor(commonInfo,true))}} willCloseDoor={async ()=>{return await dispatch(willCloseDoor(commonInfo,true))}}
/>; />;
break; break;
case showPage[11]: case showPage[11]:
...@@ -1076,7 +1103,7 @@ class PageContainer extends React.Component { ...@@ -1076,7 +1103,7 @@ class PageContainer extends React.Component {
emptyBarcodeInfo={()=>dispatch(saveProductInfo({}))} emptyBarcodeInfo={()=>dispatch(saveProductInfo({}))}
replenishInfo={state.replenishInfo} replenishInfo={state.replenishInfo}
getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}} getBarCodeProductInfo={(barcode)=>{dispatch(getBarCodeProductInfo({barcode,commonInfo}))}}
finishBoxRecovery={()=>dispatch(finishBoxRecovery(commonInfo))} finishBoxRecovery={async ()=> { return await dispatch(finishBoxRecovery(commonInfo))}}
emptyErrorInfo={()=>dispatch(replenishAction.emptyErrorInfo())} emptyErrorInfo={()=>dispatch(replenishAction.emptyErrorInfo())}
uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))} uploadError={(exceptionType)=>dispatch(uploadError(commonInfo,exceptionType))}
finishReplenish={(source)=>dispatch(replenishAction.finishReplenish(commonInfo,source))} finishReplenish={(source)=>dispatch(replenishAction.finishReplenish(commonInfo,source))}
......
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