Merge branch 'dev' into old

client/components/RecoveryComponent/RecoveryScanPage/RecoveryScanPage.jsx

@@ -71,6 +71,7 @@ export default class RecoveryScanPage extends React.Component{
                 <div className={"colfff font30 scanText"} style={{marginBottom:'0.5rem'}}>目标回收数量：<span className={"font40 colff775c"}>{taskList.targetNum || 0}</span> 已回收数量：<span className={"font40 colff775c"}>{taskList.recoverNum || 0}</span></div>
                 <div className={"barcodeInputText font30"}>{this.state.barcodeErrorText}</div>
                 <input value={this.state.barcodeText} autoFocus={true} className={"barcodeInput font30 col000"} type="text" onChange={this.handleInputChange.bind(this)}/>
+                <br/>
                 {/*<div className={"barcodeInputTip font30 colff775c"} onClick={()=>this.changeShowInput()}><span className={"colfff"}>or</span>条形码扫描</div>*/}
                 <Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} text={"确定"} option={this.submitBarcode}/>
                 <div className={"colfff scanInfo font30"} style={{marginTop:'1.5rem'}}>
@@ -138,13 +139,14 @@ export default class RecoveryScanPage extends React.Component{
         let barcodeText = this.state.barcodeText;
         let {showPopup,getBarCodeProductInfo,headerInfo} = this.props;
         let {taskList={}} = headerInfo;
+        let barcodeList = taskList.barcode.split("|");
         if(barcodeText){
             barcodeText = barcodeText.trim();
             if(this.checkNumber(barcodeText)){
                 this.setState({
                     barcodeErrorText : ''
                 });
-                if(taskList.barcode && parseInt(barcodeText) === parseInt(taskList.barcode)){
+                if(taskList.barcode && barcodeList.indexOf(barcodeText) > -1){
                     this.correctQrcode()
                 }else{
                     this.wrongQrcode()

client/components/RecoveryComponent/RecoveryScanPage/index.css

@@ -114,7 +114,7 @@
 .recoveryBarcodeInputDom .barcodeInputBarcode {
     border: none;
     display: inline-block;
-    margin-top: 0.9166666666666666rem;
+    margin-top: 0.5166666666666666rem;
 }
 
 .recoveryScanDom {

client/containers/PageContainer/PageContainer.jsx

@@ -231,17 +231,14 @@ class PageContainer extends React.Component {
 
     handleCloseDoor(){
         let {dispatch,state} = this.props;
-        // dispatch(logout());
-        // this.endCountBack();
-        // remove(CONFIG.socketType.GETSTOREINFO,this)
-        // remove(CONFIG.socketType.GETSOCKETMSG,this)
-        dispatch(closeDoorSuccess(state.commonInfo));
         this.setState({
             showPage : showPage[initPage],
             showClock : false,
             popupInfo : defaultPopupInfo,
             successCloseDoor : true,
             isSend:false
+        },()=>{
+            dispatch(closeDoorSuccess(state.commonInfo));
         });
     }