fix css & UI

client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx

@@ -86,7 +86,7 @@ export default class HeaderComponent extends React.Component{
                 <div className={"headerContent rightContent fr "}>
                 <div className={"headerContent rightContent fr "}>
                     {
                     {
                         storeInfo && storeInfo.id ? <div className={"locationInfo"}>
                         storeInfo && storeInfo.id ? <div className={"locationInfo"}>
-                            <i className={"iconfont icon-address colfff font50"}></i>
+                            <i className={"iconfont icon-address colfff font70"}></i>
                             <div className={"local colfff"}>
                             <div className={"local colfff"}>
                                 <p className={"font30"}>{storeInfo.name}</p>
                                 <p className={"font30"}>{storeInfo.name}</p>
                                 <p className={"font24"}>ID : {storeInfo.id}</p>
                                 <p className={"font24"}>ID : {storeInfo.id}</p>

client/components/RecoveryComponent/RecoveryScanPage/RecoveryScanPage.jsx

@@ -75,7 +75,7 @@ export default class RecoveryScanPage extends React.Component{
     wrongQrcode(){
     wrongQrcode(){
         //拿错货品
         //拿错货品
         let {showPopup,hidePopup} = this.props;
         let {showPopup,hidePopup} = this.props;
-        let btnDom = <Button btnContainer={"recoveryContainerQrcode font32"} key={"recoveryContainerWrongQrcode"} style={{marginTop:'10%'}} text={"关闭"} option={hidePopup}/>
+        let btnDom = <Button btnContainer={"recoveryContainerQrcode font32 bordere5e5e5"} key={"recoveryContainerWrongQrcode"} style={{marginTop:'10%'}} text={"关闭"} option={hidePopup}/>
         let popDom =
         let popDom =
             <PopModel popupTitle={"遇到问题-货品不对"} classContainer={"recoveryPopInfo"}>
             <PopModel popupTitle={"遇到问题-货品不对"} classContainer={"recoveryPopInfo"}>
                 <div className={"icon iconfont icon-wrong font150 colf00"} />
                 <div className={"icon iconfont icon-wrong font150 colf00"} />

client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx

@@ -39,7 +39,7 @@ export default class RecoverySecondPage extends React.Component{
     wrongSku(){
     wrongSku(){
         //货道商品不符
         //货道商品不符
         let {showPopup,hidePopup} = this.props;
         let {showPopup,hidePopup} = this.props;
-        let btnDom1 = <Button btnContainer={"recoveryPopInfoWrongSkuBtn1 font32 bordere5e5e5"} key={"recoveryContainerShelfWrong1"} text={"货品不符"} option={this.uploadWrongSku}/>
+        let btnDom1 = <Button btnContainer={"recoveryPopInfoWrongSkuBtn1 font32"} key={"recoveryContainerShelfWrong1"} text={"货品不符"} option={this.uploadWrongSku}/>
         let btnDom2 = <Button btnContainer={"recoveryPopInfoWrongSkuBtn2 backff775c colfff font32"} key={"recoveryContainerShelfWrong2"} text={"关闭窗口"} option={hidePopup}/>
         let btnDom2 = <Button btnContainer={"recoveryPopInfoWrongSkuBtn2 backff775c colfff font32"} key={"recoveryContainerShelfWrong2"} text={"关闭窗口"} option={hidePopup}/>
         let popDom =
         let popDom =
             <PopModel popupTitle={"遇到问题-货品不符"} classContainer={"recoveryPopInfo"}>
             <PopModel popupTitle={"遇到问题-货品不符"} classContainer={"recoveryPopInfo"}>

client/components/RecoveryComponent/RecoverySecondPage/index.css

@@ -20,7 +20,6 @@
 
 
 .recoverySecondPage .recoverySecondPageBtn {
 .recoverySecondPage .recoverySecondPageBtn {
     background: #ff7860;
     background: #ff7860;
-    width: 410px;
 }*/
 }*/
 
 
 /*---------px rem 分割线-----------*/
 /*---------px rem 分割线-----------*/
@@ -45,7 +44,6 @@
 
 
 .recoverySecondPage .recoverySecondPageBtn {
 .recoverySecondPage .recoverySecondPageBtn {
     background: #ff7860;
     background: #ff7860;
-    width: 3.4166666666666665rem;
 }
 }
 
 
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Q0FFQzs7QUFFRDs7Q0FFQzs7QUFFRDtJQUNJLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1Ysb0NBQTRCO1lBQTVCLDRCQUE0QjtJQUM1QixZQUFZO0NBQ2Y7O0FBRUQ7SUFDSSxpQkFBaUI7Q0FDcEI7O0FBRUQ7SUFDSSxvQkFBb0I7SUFDcEIsYUFBYTtDQUNoQjs7QUFFRCxrQ0FBa0M7O0FBRWxDO0NBQ0M7O0FBRUQ7Q0FDQzs7QUFFRDtJQUNJLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1Ysb0NBQTRCO1lBQTVCLDRCQUE0QjtJQUM1QixZQUFZO0NBQ2Y7O0FBRUQ7SUFDSSxrQ0FBa0M7Q0FDckM7O0FBRUQ7SUFDSSxvQkFBb0I7SUFDcEIsNkJBQTZCO0NBQ2hDIiwiZmlsZSI6ImluZGV4LmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi5yZWNvdmVyeVNlY29uZFBhZ2Uge1xyXG5cclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYm94IHtcclxuXHJcbn1cclxuXHJcbi5yZWNvdmVyeVNlY29uZFBhZ2UgLmJ0biB7XHJcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XHJcbiAgICBsZWZ0OiA1MCU7XHJcbiAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoLTUwJSk7XHJcbiAgICBib3R0b206IDIwJTtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYnRuIC50ZXh0IHtcclxuICAgIG1hcmdpbi10b3A6IDQwcHg7XHJcbn1cclxuXHJcbi5yZWNvdmVyeVNlY29uZFBhZ2UgLnJlY292ZXJ5U2Vjb25kUGFnZUJ0biB7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmY3ODYwO1xyXG4gICAgd2lkdGg6IDQxMHB4O1xyXG59XHJcblxyXG4vKi0tLS0tLS0tLXB4IHJlbSDliIblibLnur8tLS0tLS0tLS0tLSovXHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIHtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYm94IHtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYnRuIHtcclxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcclxuICAgIGxlZnQ6IDUwJTtcclxuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWCgtNTAlKTtcclxuICAgIGJvdHRvbTogMjAlO1xyXG59XHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIC5idG4gLnRleHQge1xyXG4gICAgbWFyZ2luLXRvcDogMC4zMzMzMzMzMzMzMzMzMzMzcmVtO1xyXG59XHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIC5yZWNvdmVyeVNlY29uZFBhZ2VCdG4ge1xyXG4gICAgYmFja2dyb3VuZDogI2ZmNzg2MDtcclxuICAgIHdpZHRoOiAzLjQxNjY2NjY2NjY2NjY2NjVyZW07XHJcbn1cclxuIl19 */
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Q0FFQzs7QUFFRDs7Q0FFQzs7QUFFRDtJQUNJLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1Ysb0NBQTRCO1lBQTVCLDRCQUE0QjtJQUM1QixZQUFZO0NBQ2Y7O0FBRUQ7SUFDSSxpQkFBaUI7Q0FDcEI7O0FBRUQ7SUFDSSxvQkFBb0I7SUFDcEIsYUFBYTtDQUNoQjs7QUFFRCxrQ0FBa0M7O0FBRWxDO0NBQ0M7O0FBRUQ7Q0FDQzs7QUFFRDtJQUNJLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1Ysb0NBQTRCO1lBQTVCLDRCQUE0QjtJQUM1QixZQUFZO0NBQ2Y7O0FBRUQ7SUFDSSxrQ0FBa0M7Q0FDckM7O0FBRUQ7SUFDSSxvQkFBb0I7SUFDcEIsNkJBQTZCO0NBQ2hDIiwiZmlsZSI6ImluZGV4LmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi5yZWNvdmVyeVNlY29uZFBhZ2Uge1xyXG5cclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYm94IHtcclxuXHJcbn1cclxuXHJcbi5yZWNvdmVyeVNlY29uZFBhZ2UgLmJ0biB7XHJcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XHJcbiAgICBsZWZ0OiA1MCU7XHJcbiAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZVgoLTUwJSk7XHJcbiAgICBib3R0b206IDIwJTtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYnRuIC50ZXh0IHtcclxuICAgIG1hcmdpbi10b3A6IDQwcHg7XHJcbn1cclxuXHJcbi5yZWNvdmVyeVNlY29uZFBhZ2UgLnJlY292ZXJ5U2Vjb25kUGFnZUJ0biB7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmY3ODYwO1xyXG4gICAgd2lkdGg6IDQxMHB4O1xyXG59XHJcblxyXG4vKi0tLS0tLS0tLXB4IHJlbSDliIblibLnur8tLS0tLS0tLS0tLSovXHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIHtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYm94IHtcclxufVxyXG5cclxuLnJlY292ZXJ5U2Vjb25kUGFnZSAuYnRuIHtcclxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcclxuICAgIGxlZnQ6IDUwJTtcclxuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlWCgtNTAlKTtcclxuICAgIGJvdHRvbTogMjAlO1xyXG59XHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIC5idG4gLnRleHQge1xyXG4gICAgbWFyZ2luLXRvcDogMC4zMzMzMzMzMzMzMzMzMzMzcmVtO1xyXG59XHJcblxyXG4ucmVjb3ZlcnlTZWNvbmRQYWdlIC5yZWNvdmVyeVNlY29uZFBhZ2VCdG4ge1xyXG4gICAgYmFja2dyb3VuZDogI2ZmNzg2MDtcclxuICAgIHdpZHRoOiAzLjQxNjY2NjY2NjY2NjY2NjVyZW07XHJcbn1cclxuIl19 */
\ No newline at end of file

client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx

@@ -198,7 +198,7 @@ export default class ReplenishSkuPage extends React.Component{
                         <SkuInfoComponent showPopup={showPopup} hidePopup={hidePopup} style={{display:"flex",marginTop:marginTop,padding:"0"}} skuInfo={taskList} />
                         <SkuInfoComponent showPopup={showPopup} hidePopup={hidePopup} style={{display:"flex",marginTop:marginTop,padding:"0"}} skuInfo={taskList} />
                     </div>
                     </div>
                     <div className={"btn pageBtn"}>
                     <div className={"btn pageBtn"}>
-                        <Button btnContainer={"replenishWrongSkuBtn backff775c colfff font32 bordere5e5e5"} key={"replenishWrongSkuBtn"} text={'货品不符'} option={this.handleWrongSkuQuestion}/>
+                        <Button btnContainer={"replenishWrongSkuBtn backff775c colfff font32"} key={"replenishWrongSkuBtn"} text={'货品不符'} option={this.handleWrongSkuQuestion}/>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

client/containers/ReplenishContainer/index.css

@@ -27,6 +27,7 @@
     left: 50%;
     left: 50%;
     -webkit-transform: translateX(-50%);
     -webkit-transform: translateX(-50%);
             transform: translateX(-50%);
             transform: translateX(-50%);
+    padding-top : 12px;
 }
 }
 .replenishSkuInfo .skuName{
 .replenishSkuInfo .skuName{
     text-align: left;
     text-align: left;
@@ -124,6 +125,7 @@
     left: 50%;
     left: 50%;
     -webkit-transform: translateX(-50%);
     -webkit-transform: translateX(-50%);
     transform: translateX(-50%);
     transform: translateX(-50%);
+    padding-top: 0.1rem;
 }
 }
 .replenishSkuInfo .skuName{
 .replenishSkuInfo .skuName{
     text-align: left;
     text-align: left;

client/css/common.css

@@ -77,7 +77,7 @@ body, .ant-modal-mask, .ant-modal-wrap, .totalClass, .storeManagerQrcodeComponen
      */
      */
     line-height: 0.8333333333333334rem;
     line-height: 0.8333333333333334rem;
     white-space: nowrap;
     white-space: nowrap;
-    margin: 0.4166666666666667rem 0;
+    margin: 0.3166666666666667rem 0;
     position: relative;
     position: relative;
     border-top-right-radius: 0.08333333333333333rem;
     border-top-right-radius: 0.08333333333333333rem;
     border-top-left-radius: 0.08333333333333333rem;
     border-top-left-radius: 0.08333333333333333rem;