修改字体和间距

client/actions/TokeStokeContainer.js

@@ -3,6 +3,7 @@ import tokeActionType from '../actiontype/TokeStokeContainer'
 import {getTaskList} from './common'
 import {getTaskList} from './common'
 console.log(tokeActionType,'dhakjshdjhasjhdjshj')
 console.log(tokeActionType,'dhakjshdjhasjhdjshj')
 let domain = ENV.domain;
 let domain = ENV.domain;
+let domain1='http://192.168.10.176:8080/web/'
 //点击提交后台核对商品数量
 //点击提交后台核对商品数量
 const checkProductQuantity = (data)=>{
 const checkProductQuantity = (data)=>{
       let {commonInfo,tokeProductInfo}=data;
       let {commonInfo,tokeProductInfo}=data;

client/actions/barcodeCommon.js

@@ -3,7 +3,7 @@ import {saveCommonInfo} from './common'
 import barcodeActionType from '../actiontype/barcodeCommon'
 import barcodeActionType from '../actiontype/barcodeCommon'
 import replenishAction from './replenish'
 import replenishAction from './replenish'
 let domain = ENV.domain;
 let domain = ENV.domain;
-
+let domain1='http://192.168.10.176:8080/web/'
 //test 输入条形码获取商品信息
 //test 输入条形码获取商品信息
 
 
 const getBarCodeProductInfo = (data)=>{
 const getBarCodeProductInfo = (data)=>{

client/actions/breakaegContainer.js

 import fetch from 'isomorphic-fetch'
 import fetch from 'isomorphic-fetch'
 import {getTaskList} from "./common";
 import {getTaskList} from "./common";
 let domain = ENV.domain;
 let domain = ENV.domain;
+let domain1='http://192.168.10.176:8080/web/'
 //提交遗留上报的商品
 //提交遗留上报的商品
 let myHeaders = new Headers({
 let myHeaders = new Headers({
     // 'Access-Control-Allow-Origin': '*',
     // 'Access-Control-Allow-Origin': '*',

client/actions/common.js

@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
 import actionType from '../actiontype/common'
 import actionType from '../actiontype/common'
 import {addErrorInfo} from './uploadError'
 import {addErrorInfo} from './uploadError'
 let domain = ENV.domain;
 let domain = ENV.domain;
-
+let domain2='http://192.168.10.176:8080/web/'
 let domain1 = "http://192.168.10.169:7788/web/"
 let domain1 = "http://192.168.10.169:7788/web/"
 
 
 let myHeaders = new Headers({
 let myHeaders = new Headers({

client/components/BreakageComponent/BreakageCode/BreakageCode.jsx

@@ -10,8 +10,8 @@ class BreakageCode extends React.Component{
        return (
        return (
            <div className={'breakageContent'} style={{width:'100%',height:'100%',background:'rgba(0,0,0,1)'}}>
            <div className={'breakageContent'} style={{width:'100%',height:'100%',background:'rgba(0,0,0,1)'}}>
                 <div className={"breakageCodeHeader font32  colfff "}>
                 <div className={"breakageCodeHeader font32  colfff "}>
-                    <i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={this.changeSanCodePage.bind(this)} style={{flexBasis:'100px'}}/>
-                    <span className={"font40"}>请输入遗留商品的条形码</span>
+                    <i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={this.changeSanCodePage.bind(this)} />
+                    <span className={"font40"} style={{marginLeft:'1rem'}}>请输入遗留商品的条形码</span>
                     <span className={'font30'}>条形码残缺?</span>
                     <span className={'font30'}>条形码残缺?</span>
                 </div>
                 </div>
                 <BarcodeComponent getBarCodeProductInfo={this.props.getBarCodeProductInfo}
                 <BarcodeComponent getBarCodeProductInfo={this.props.getBarCodeProductInfo}

client/components/BreakageComponent/BreakageCode/index.css

@@ -39,7 +39,7 @@
     justify-content: space-between;
     justify-content: space-between;
     align-items: center;
     align-items: center;
     text-align: center;
     text-align: center;
-    padding: 0 0.16666666666666666rem;
+    padding: 0 0.26666666666666666rem;
     box-sizing: border-box;
     box-sizing: border-box;
 }
 }
 
 

client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx

@@ -88,6 +88,7 @@ class BreakageProductDetail extends React.Component{
                               </div>
                               </div>
                               <div className={'breakProductPosition'}>
                               <div className={'breakProductPosition'}>
                                   {breakageProductInfo.product.skuPositionList[positionColor]?<img src={breakageProductInfo.product.skuPositionList[positionColor].filePath} alt=""/>:<img src={UTILPATH.localImg.defaultImg} alt="" />}
                                   {breakageProductInfo.product.skuPositionList[positionColor]?<img src={breakageProductInfo.product.skuPositionList[positionColor].filePath} alt=""/>:<img src={UTILPATH.localImg.defaultImg} alt="" />}
+                                  <span className={'font28 col333'} style={{marginTop:'0.2rem',display:'inline-block'}}>{breakageProductInfo.product.skuPositionList[positionColor]?breakageProductInfo.product.skuPositionList[positionColor].name:123}</span>
                               </div>
                               </div>
                         </div>
                         </div>
                       </div> 
                       </div> 

client/components/BreakageComponent/SanCodeComponent/index.css

@@ -19,7 +19,7 @@
 .breakageContent .breakageSanCodeHeader {
 .breakageContent .breakageSanCodeHeader {
     display: flex;
     display: flex;
     justify-content: space-between;
     justify-content: space-between;
-    padding: 0 0.16666666666666666rem;
+    padding: 0 0.26666666666666666rem;
     width: 100%;
     width: 100%;
     line-height: 0.8166666666666667rem;
     line-height: 0.8166666666666667rem;
 }
 }

client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx

@@ -7,7 +7,7 @@ class DefaultComponent extends React.Component{
     render(){
     render(){
         return (
         return (
             <div className={'breakageContent'}>
             <div className={'breakageContent'}>
-            <p className={'currentTarget col333 font40'} ><span>任务目标:</span>请仔细检查非货道区是否有遗留的商品</p>
+            <p className={'currentTarget col333 font40'}  style={{width:'100%',textAlign:'center'}}><span>任务目标:</span>请仔细检查非货道区是否有遗留的商品</p>
             <Button 
             <Button 
                  text={'有,扫码上报'} 
                  text={'有,扫码上报'} 
                  btnContainer={'col333 font30 bordere5e5e5'}
                  btnContainer={'col333 font30 bordere5e5e5'}

client/containers/BreakageContainer/index.css

@@ -29,7 +29,7 @@
 
 
 .rightContainer .breakageContent .currentTarget {
 .rightContainer .breakageContent .currentTarget {
     margin-top: 2.25rem;
     margin-top: 2.25rem;
-    margin-left: 2.5rem;
+    /* margin-left: 2.5rem; */
 }
 }
 
 
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLFlBQVk7SUFDWixhQUFhO0lBQ2IsaUJBQWlCO0NBQ3BCOztBQUVEO0lBQ0ksWUFBWTtJQUNaLGFBQWE7Q0FDaEI7O0FBRUQ7SUFDSSxrQkFBa0I7SUFDbEIsbUJBQW1CO0NBQ3RCOztBQUVELGtDQUFrQzs7QUFFbEM7SUFDSSxZQUFZO0lBQ1osYUFBYTtJQUNiLGlCQUFpQjtDQUNwQjs7QUFFRDtJQUNJLFlBQVk7SUFDWixhQUFhO0NBQ2hCOztBQUVEO0lBQ0ksb0JBQW9CO0lBQ3BCLG9CQUFvQjtDQUN2QiIsImZpbGUiOiJpbmRleC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuQnJlYWthZ2VDb250YWluZXIge1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmZmO1xyXG59XHJcblxyXG4ucmlnaHRDb250YWluZXIgLmJyZWFrYWdlQ29udGVudCB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxufVxyXG5cclxuLnJpZ2h0Q29udGFpbmVyIC5icmVha2FnZUNvbnRlbnQgLmN1cnJlbnRUYXJnZXQge1xyXG4gICAgbWFyZ2luLXRvcDogMjcwcHg7XHJcbiAgICBtYXJnaW4tbGVmdDogMzAwcHg7XHJcbn1cclxuXHJcbi8qLS0tLS0tLS0tcHggcmVtIOWIhuWJsue6vy0tLS0tLS0tLS0tKi9cclxuXHJcbi5CcmVha2FnZUNvbnRhaW5lciB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxuICAgIGJhY2tncm91bmQ6ICNmZmY7XHJcbn1cclxuXHJcbi5yaWdodENvbnRhaW5lciAuYnJlYWthZ2VDb250ZW50IHtcclxuICAgIHdpZHRoOiAxMDAlO1xyXG4gICAgaGVpZ2h0OiAxMDAlO1xyXG59XHJcblxyXG4ucmlnaHRDb250YWluZXIgLmJyZWFrYWdlQ29udGVudCAuY3VycmVudFRhcmdldCB7XHJcbiAgICBtYXJnaW4tdG9wOiAyLjI1cmVtO1xyXG4gICAgbWFyZ2luLWxlZnQ6IDIuNXJlbTtcclxufVxyXG4iXX0= */
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLFlBQVk7SUFDWixhQUFhO0lBQ2IsaUJBQWlCO0NBQ3BCOztBQUVEO0lBQ0ksWUFBWTtJQUNaLGFBQWE7Q0FDaEI7O0FBRUQ7SUFDSSxrQkFBa0I7SUFDbEIsbUJBQW1CO0NBQ3RCOztBQUVELGtDQUFrQzs7QUFFbEM7SUFDSSxZQUFZO0lBQ1osYUFBYTtJQUNiLGlCQUFpQjtDQUNwQjs7QUFFRDtJQUNJLFlBQVk7SUFDWixhQUFhO0NBQ2hCOztBQUVEO0lBQ0ksb0JBQW9CO0lBQ3BCLG9CQUFvQjtDQUN2QiIsImZpbGUiOiJpbmRleC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuQnJlYWthZ2VDb250YWluZXIge1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmZmO1xyXG59XHJcblxyXG4ucmlnaHRDb250YWluZXIgLmJyZWFrYWdlQ29udGVudCB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxufVxyXG5cclxuLnJpZ2h0Q29udGFpbmVyIC5icmVha2FnZUNvbnRlbnQgLmN1cnJlbnRUYXJnZXQge1xyXG4gICAgbWFyZ2luLXRvcDogMjcwcHg7XHJcbiAgICBtYXJnaW4tbGVmdDogMzAwcHg7XHJcbn1cclxuXHJcbi8qLS0tLS0tLS0tcHggcmVtIOWIhuWJsue6vy0tLS0tLS0tLS0tKi9cclxuXHJcbi5CcmVha2FnZUNvbnRhaW5lciB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxuICAgIGJhY2tncm91bmQ6ICNmZmY7XHJcbn1cclxuXHJcbi5yaWdodENvbnRhaW5lciAuYnJlYWthZ2VDb250ZW50IHtcclxuICAgIHdpZHRoOiAxMDAlO1xyXG4gICAgaGVpZ2h0OiAxMDAlO1xyXG59XHJcblxyXG4ucmlnaHRDb250YWluZXIgLmJyZWFrYWdlQ29udGVudCAuY3VycmVudFRhcmdldCB7XHJcbiAgICBtYXJnaW4tdG9wOiAyLjI1cmVtO1xyXG4gICAgbWFyZ2luLWxlZnQ6IDIuNXJlbTtcclxufVxyXG4iXX0= */
\ No newline at end of file