自己梳ç理捕èŽ补货逻辑

client/components/RecoveryComponent/RecoveryScanPage/index.css

@@ -27,21 +27,6 @@
     margin-top: 110px;
     margin-top: 110px;
 }
 }
 
 
-.replenishScanPageErrorSku .handleForgetSku{
-    line-height: 90px;
-}
-.replenishScanPageErrorSku .btn{
-    flex-direction: column;
-    align-items: center;
-}
-
-.replenishScanPageForgetSku .replenishSkuInfo{
-    margin-top: 8%;
-}
-
-
-
-
 .recoveryScanDom{
 .recoveryScanDom{
     position: relative;
     position: relative;
     width: 100%;
     width: 100%;

client/components/ReplenishComponent/ReplenishScanPage/index.css

@@ -38,3 +38,35 @@
 .replenishScanPageForgetSku .replenishSkuInfo{
 .replenishScanPageForgetSku .replenishSkuInfo{
     margin-top: 8%;
     margin-top: 8%;
 }
 }
+
+.replenishScanDom{
+    position: relative;
+    width: 100%;
+    height: 90%;
+    text-align: center;
+}
+.replenishScanDom>div{
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+}
+.replenishScanDom .scanText{
+    top: 8%;
+}
+.replenishScanDom .scanTips{
+    top: 80%;
+}
+.replenishScanDom .scanTips>span{
+    margin-right: 20px;
+}
+.replenishScanDom .scanInfo{
+    top: 90%;
+    width: 100%;
+    white-space: nowrap;
+}
+.replenishScanDom .scanInfo>span{
+    margin-right: 30px;
+}
+.replenishScanDom .scanInfo>span:last-child{
+    margin-right: 0;
+}
\ No newline at end of file

client/containers/ReplenishContainer/ReplenishContainer.jsx

@@ -33,17 +33,18 @@ export default class ReplenishContainer extends React.Component{
 
 
     componentWillReceiveProps(nextProps){
     componentWillReceiveProps(nextProps){
         console.log("componentWillReceiveProps ",nextProps)
         console.log("componentWillReceiveProps ",nextProps)
-        if(nextProps.barcodeInfo && nextProps.barcodeInfo.product && nextProps.replenishInfo && !nextProps.replenishInfo.errorInfo){
+        if(nextProps.barcodeInfo && nextProps.barcodeInfo.product && nextProps.replenishInfo && (!nextProps.replenishInfo.errorInfo || !nextProps.replenishInfo.errorInfo.errorMessage)){
             //有条形码信息且 没有错误信息 进入条形码扫描成功页面
             //有条形码信息且 没有错误信息 进入条形码扫描成功页面
             console.log("in ",this.state.pageType,typeof this.state.pageType);
             console.log("in ",this.state.pageType,typeof this.state.pageType);
             if(this.state.pageType !== 2){
             if(this.state.pageType !== 2){
-                console.log("2222222")
+                console.log("2222222");
+                nextProps.hidePopup();
                 this.setState({
                 this.setState({
                     pageType : 2,
                     pageType : 2,
                     showScanQrcode : false
                     showScanQrcode : false
                 })
                 })
             }
             }
-        }else if(nextProps.replenishInfo && nextProps.replenishInfo.errorInfo){
+        }else if(nextProps.replenishInfo && nextProps.replenishInfo.errorInfo && nextProps.replenishInfo.errorInfo.errorMessage){
             //有错误信息，再对应页面弹出错误信息弹窗，要区分错误信息
             //有错误信息，再对应页面弹出错误信息弹窗，要区分错误信息
         }
         }
     }
     }