Skip to content

M
max_android_panel
Commit f3304357 by Zhang Xin
Options

fix rem bug

parent 5b862bed
Showing with 83 additions and 30 deletions
client/components/CommonComponent/ButtonComponent/index.css
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.buttonComponent{ .buttonComponent{
width: 2.3333333333333335rem; width: 2.3333333333333335rem;
height: 0.6666666666666666rem; height: 0.6666666666666666rem;
border: 2px solid #e5e5e5; border: 2px solid transparent;
background-color: #ffffff; background-color: #ffffff;
line-height: 0.6666666666666666rem; line-height: 0.6666666666666666rem;
text-align: center; text-align: center;
......
client/components/CommonComponent/SkuInfoComponent/index.css
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
/*.skuInfoComponent .shelfInfo{*/ /*.skuInfoComponent .shelfInfo{*/
/*line-height: 50px;*/ /*line-height: 50px;*/
/*flex: 1;*/ /*flex: 1;*/
/*white-space: nowrap;*/
/*overflow: hidden;*/
/*text-overflow: ellipsis;*/
/*}*/ /*}*/
/*.skuInfoComponent .img{*/ /*.skuInfoComponent .img{*/
/*width: 200px;*/ /*width: 200px;*/
...@@ -39,6 +42,9 @@ ...@@ -39,6 +42,9 @@
.skuInfoComponent .shelfInfo{ .skuInfoComponent .shelfInfo{
line-height: 0.4166666666666667rem; line-height: 0.4166666666666667rem;
flex: 1; flex: 1;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.skuInfoComponent .img{ .skuInfoComponent .img{
width: 1.6666666666666667rem; width: 1.6666666666666667rem;
......
client/components/RecoveryComponent/RecoverySecondPage/RecoverySecondPage.jsx
...@@ -39,7 +39,7 @@ export default class RecoverySecondPage extends React.Component{ ...@@ -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"} key={"recoveryContainerShelfWrong1"} text={"货品不符"} option={this.uploadWrongSku}/> let btnDom1 = <Button btnContainer={"recoveryPopInfoWrongSkuBtn1 font32 bordere5e5e5"} 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/ReplenishComponent/ReplenishScanPage/ReplenishScanPage.jsx
...@@ -123,10 +123,16 @@ export default class ReplenishScanPage extends React.Component{ ...@@ -123,10 +123,16 @@ export default class ReplenishScanPage extends React.Component{
getOtherHeader(){ getOtherHeader(){
let {headerInfo} = this.props; let {headerInfo} = this.props;
let {taskInfo={}} = headerInfo; let {taskInfo={}} = headerInfo;
let btnStyle = {
display: 'inline-block',
float: 'right',
transform: 'translateY(20%)',
position: 'relative'
};
return <div className={"otherHeader replenishScanQrcodeHeader font32 clearfix colfff "}> return <div className={"otherHeader replenishScanQrcodeHeader font32 clearfix colfff "}>
<i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={()=>this.goBack.bind(this)(1)}/> <i className={"iconfont middle icon font50 icon-circle-left circleIcon fl"} onClick={()=>this.goBack.bind(this)(1)}/>
<span className={"middle"}>任务目标：将{taskInfo.area || ""}区补货箱中的货品扫码后放到货架上</span> <span className={"middle"}>任务目标：将{taskInfo.area || ""}区补货箱中的货品扫码后放到货架上</span>
<Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} style={{display:'inline-block'}} text={"扫描结束"} option={this.handleScanOver}/> <Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} style={btnStyle} text={"扫描结束"} option={this.handleScanOver}/>
</div> </div>
} }
......
client/containers/HomePageContainer/HomePageContainer.jsx
...@@ -18,7 +18,13 @@ export default class HomePageContainer extends React.Component{ ...@@ -18,7 +18,13 @@ export default class HomePageContainer extends React.Component{
let props = this.props; let props = this.props;
let {headerInfo={}} = props; let {headerInfo={}} = props;
let {taskInfo={}} = headerInfo; let {taskInfo={}} = headerInfo;
let buttonStyle={background:'#ff775c',margin:"0 auto",marginTop:'77px'}; let marginTop = UTILPATH.getRemByPx(77);
let marginTop50 = UTILPATH.getRemByPx(50);
let marginTop20 = UTILPATH.getRemByPx(20);
let padding = UTILPATH.getRemByPx(8);
let marginTop160 = UTILPATH.getRemByPx(160);
let imgStyle = taskInfo.area ? {marginTop: marginTop160} : {};
let buttonStyle={background:'#ff775c',margin:"0 auto",marginTop:marginTop};
return( return(
<div> <div>
<HeaderComponent <HeaderComponent
...@@ -26,12 +32,12 @@ export default class HomePageContainer extends React.Component{ ...@@ -26,12 +32,12 @@ export default class HomePageContainer extends React.Component{
headerInfo={headerInfo} headerInfo={headerInfo}
/> />
<div className={"homeContainer"} > <div className={"homeContainer"} >
<img className={"homeIcon"} src={UTILPATH.localImg.homePage} alt=""/> <img className={"homeIcon"} style={imgStyle} src={UTILPATH.localImg.homePage} alt=""/>
{ {
taskInfo.area ? <div className={'homeWelcom font30 clo333'} style={{marginTop:'50px'}}>欢迎来到<span className="homeArea font50 colff775c" style={{padding:'0 8px'}}>{taskInfo.area || ''}</span>区</div> taskInfo.area ? <div className={'homeWelcom font30 clo333'} style={{marginTop:marginTop50}}>欢迎来到<span className="homeArea font50 colff775c" style={{padding:`0 ${padding}`}}>{taskInfo.area || ''}</span>区</div>
: null : null
} }
<div className={"homeText font42"} style={{fontWeight:'800',marginTop:'20px'}}>下午好, 你辛苦了！</div> <div className={"homeText font42"} style={{fontWeight:'800',marginTop:marginTop20}}>下午好, 你辛苦了！</div>
<Button text={'开始工作'} btnContainer={'colfff font30'} style={buttonStyle} option={this.start.bind(this)}/> <Button text={'开始工作'} btnContainer={'colfff font30'} style={buttonStyle} option={this.start.bind(this)}/>
</div> </div>
</div> </div>
......
client/containers/ReplenishContainer/index.css
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
/*.replenishSkuInfo .skuInfo img{*/ /*.replenishSkuInfo .skuInfo img{*/
/*width: 100%;*/ /*width: 100%;*/
/*height: auto;*/ /*height: 100%;*/
/*}*/ /*}*/
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
} }
.replenishSkuInfo .skuInfo img{ .replenishSkuInfo .skuInfo img{
width: 100%; width: 100%;
height: auto; height: 100%;
} }
.replenishSkuInfo .skuInfo .skuPos{ .replenishSkuInfo .skuInfo .skuPos{
line-height: 0.38333333333333336rem; line-height: 0.38333333333333336rem;
......
client/css/color.css
...@@ -39,3 +39,6 @@ ...@@ -39,3 +39,6 @@
.backff775c{ .backff775c{
background-color: #ff775c!important; background-color: #ff775c!important;
} }
.bordere5e5e5{
border-color: #e5e5e5!important;
}
\ No newline at end of file
client/css/common.css
...@@ -50,17 +50,31 @@ body,.ant-modal-mask , .ant-modal-wrap ,.totalClass,.storeManagerQrcodeComponent ...@@ -50,17 +50,31 @@ body,.ant-modal-mask , .ant-modal-wrap ,.totalClass,.storeManagerQrcodeComponent
box-sizing: border-box; box-sizing: border-box;
transform: translateX(5%); transform: translateX(5%);
} }
/*.commonPage .pageTitle{*/
/*width: 100%;*/
/*background: #e0e0e0;*/
/*line-height: 100px;*/
/*white-space: nowrap;*/
/*margin: 50px 0;*/
/*position: relative;*/
/*border-top-right-radius: 10px;*/
/*border-top-left-radius: 10px;*/
/*}*/
.commonPage .pageTitle{ .commonPage .pageTitle{
width: 100%; width: 100%;
background: #e0e0e0; background: #e0e0e0;
/* border: 2px solid #e5e5e5; */ /* border: 2px solid #e5e5e5;
line-height: 100px; */
line-height: 0.8333333333333334rem;
white-space: nowrap; white-space: nowrap;
margin: 50px 0; margin: 0.4166666666666667rem 0;
position: relative; position: relative;
border-top-right-radius: 10px; border-top-right-radius: 0.08333333333333333rem;
border-top-left-radius: 10px; border-top-left-radius: 0.08333333333333333rem;
} }
.commonPage .pagebox{ .commonPage .pagebox{
flex: 1; flex: 1;
width: 100%; width: 100%;
......
client/css/font.css
...@@ -29,6 +29,7 @@ body{ ...@@ -29,6 +29,7 @@ body{
@value font70: 70px; @value font70: 70px;
@value font90: 90px; @value font90: 90px;
@value font100: 100px; @value font100: 100px;
@value font110: 110px;
@value font150: 150px; @value font150: 150px;
.font10 { .font10 {
...@@ -255,6 +256,18 @@ body{ ...@@ -255,6 +256,18 @@ body{
font-size: calc(var(--font3) * font100 * var(--base)) !important; font-size: calc(var(--font3) * font100 * var(--base)) !important;
} }
.font110 {
font-size: calc(font110 * var(--base)) !important;
}
[data-dpr="2"] .font110 {
font-size: calc(var(--font2) * font110 * var(--base)) !important;
}
[data-dpr="3"] .font110 {
font-size: calc(var(--font3) * font110 * var(--base)) !important;
}
.font150 { .font150 {
font-size: calc(font150 * var(--base)) !important; font-size: calc(font150 * var(--base)) !important;
} }
......
client/env/development.js
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
* Created by ruibing on 16/11/2. * Created by ruibing on 16/11/2.
*/ */
module.exports = { module.exports = {
domain: 'http://192.168.10.128:8080/web/', domain: 'http://192.168.10.88:8080/maxbox/web/',
uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble' uploadImg : 'https://preprod.mjitech.com/static/uploadTrouble'
} }
\ No newline at end of file
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