Skip to content

M
max_android_panel
Commit 57dba521 by wujiabao
Options

change pxtorem

parent 341f5c8e
Showing with 103 additions and 12 deletions
client/components/BreakageComponent/BreakageProductDetail/BreakageProductDetail.jsx
......@@ -29,7 +29,7 @@ class BreakageProductDetail extends React.Component{
Object.keys(breakageProductInfo).length>0?
<div className={'breakageContent'}>
<div className={'commonPage'}>
<div className={'pageTitle clo333 font40'} style={{marginBottom:'20px'}}>
<div className={'pageTitle clo333 font40'} style={{marginBottom:UTILPATH.getRemByPx(20)}}>
<span>上报遗留货品信息</span>
</div>
<div className={'pagebox'}>
......@@ -38,7 +38,7 @@ class BreakageProductDetail extends React.Component{
<div className={'breakProductImg'}>
<img src={breakageProductInfo.product.skuImage} alt=""/>
</div>
<div style={{marginTop:'30px',textAlign:'left',marginLeft:'10px'}}>
<div style={{marginTop:UTILPATH.getRemByPx(30),textAlign:'left',marginLeft:UTILPATH.getRemByPx(10)}}>
<h2 className={'col333 font40'} style={{fontWeight:'800'}}>{breakageProductInfo.product.skuName}</h2>
<p className={'col333 font28'} style={{marginTop:'20px'}}><span>条形码:</span>{breakageProductInfo.product.barcode}</p>
</div>
......@@ -80,7 +80,7 @@ class BreakageProductDetail extends React.Component{
</div>
</div>
</div>
<Button btnContainer={'colfff font30 backff775c'} text={'提交'} style={{position:'absolute',bottom:'120px',left:'50%',transform:'translate(-50%)'}} option={this.changePageDefault.bind(this)} />
<Button btnContainer={'colfff font30 backff775c'} text={'提交'} style={{position:'absolute',bottom:UTILPATH.getRemByPx(120),left:'50%',transform:'translate(-50%)'}} option={this.changePageDefault.bind(this)} />
</div>:null
}
</div>
......
client/components/BreakageComponent/SanCodeComponent/SanCodeComponent.jsx
......@@ -16,7 +16,7 @@ class SanCodeComponent extends React.Component{
</div>
<div className="handMovementCode">
<p className="colfff font30">or<span className="colff7860" style={{marginLeft:'15px'}} onClick={this.changeSanCodePage.bind(this)}>手动输入条形码</span></p>
<p className="colfff font30">or<span className="colff7860" style={{marginLeft:UTILPATH.getRemByPx(15)}} onClick={this.changeSanCodePage.bind(this)}>手动输入条形码</span></p>
</div>
</div>
}
......
client/components/BreakageComponent/SanCodeComponent/index.css
.breakageContent .breakageSanCodeHeader{
/* .breakageContent .breakageSanCodeHeader{
display: flex;
justify-content: space-between;
padding:0 20px;
......@@ -11,4 +11,18 @@
position: absolute;
bottom:120px;
text-align: center;
} */
.breakageContent .breakageSanCodeHeader{
display: flex;
justify-content: space-between;
padding:0 0.16666666666666666rem;
width:100%;
line-height: 0.8166666666666667rem;
}
.breakageContent .handMovementCode{
width:100%;
height:0.3333333333333333rem;
position: absolute;
bottom:1rem;
text-align: center;
}
\ No newline at end of file
client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx
......@@ -17,7 +17,7 @@ class DefaultComponent extends React.Component{
<Button
text={'没有'}
btnContainer={'col333 font30'}
style={{marginTop:'30px',marginLeft:'50%',transform:'translate(-50%)'}}
style={{marginTop:UTILPATH.getRemByPx(30),marginLeft:'50%',transform:'translate(-50%)'}}
option={this.props.pullTaskList}
/>
</div>
......
client/containers/BreakageContainer/index.css
.BreakageContainer{
/* .BreakageContainer{
width:100%;
height:100%;
background:#fff;
......@@ -10,4 +10,17 @@
.rightContainer .breakageContent .currentTarget{
margin-top:270px;
margin-left:300px;
} */
.BreakageContainer{
width:100%;
height:100%;
background:#fff;
}
.rightContainer .breakageContent{
width:100%;
height:100%;
}
.rightContainer .breakageContent .currentTarget{
margin-top:2.25rem;
margin-left:2.5rem;
}
client/containers/TakeStokeContainer/TakeStokeContainer.jsx
......@@ -57,8 +57,8 @@ class TakeStokeContaniner extends React.Component {
<span className={'addNum'} onClick={this.productNum.bind(this,'add')}>＋</span>
</p>
</div>
<Button text={'提交'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'80px'}} option={this.checkProductNum.bind(this)} />
</div>:<Button option={this.clickPutIn.bind(this)} text={'已放入'} btnContainer={'backff775c font32 colfff'} style={{marginTop:'280px'}} />
<Button text={'提交'} btnContainer={'backff775c font32 colfff'} style={{marginTop:UTILPATH.getRemByPx(80)}} option={this.checkProductNum.bind(this)} />
</div>:<Button option={this.clickPutIn.bind(this)} text={'已放入'} btnContainer={'backff775c font32 colfff'} style={{marginTop:UTILPATH.getRemByPx(280)}} />
}
</div>
</div>
......
client/containers/TakeStokeContainer/index.css
.TokeStokeContainer{
/* .TokeStokeContainer{
background:#fff;
width:100%;
height:100%;
......@@ -59,7 +59,70 @@
padding:20px 33px;
}
.TokeStokeContent .commonPage .buttonComponent{
/* position: absolute; */
margin-left:600px;
/* bottom:100px; */
} */
.TokeStokeContainer{
background:#fff;
width:100%;
height:100%;
}
.TokeStokeContent .commonPage .pageTitle span:nth-of-type(2){
margin-left:0.08333333333333333rem;
}
.TokeStokeContent .pagebox{
display: flex;
margin-left:2.5rem;
box-sizing: border-box;
}
.TokeStokeContent .pagebox .productImg{
width:1.6666666666666667rem;
height:1.6666666666666667rem;
border:2px solid #e5e5e5;
}
.TokeStokeContent .pagebox .productDetail{
margin-left:0.3333333333333333rem;
}
.TokeStokeContent .pagebox .productDetail p{
text-align: left;
margin-top:0.3rem;
}
.TokeStokeContent .pagebox .productDetail p:nth-of-type(1){
margin-top:0.11666666666666667rem;
}
.TokeStokeContent .pagebox .productDetail p:nth-of-type(2) span:nth-of-type(2){
margin-left:0.125rem;
}
.TokeStokeContent .pagebox .productDetail p span:nth-of-type(1){
margin-right:0.125rem;
}
.TokeStokeContent .commonPage .productNum{
width:auto;
margin-top:0.8333333333333334rem;
}
.TokeStokeContent .commonPage .productNum p{
text-align: left;
padding-left:4.5rem;
box-sizing: border-box;
}
.TokeStokeContent .commonPage .productNum p span:nth-of-type(2),.commonPage .productNum p span:nth-of-type(4){
width:0.6666666666666666rem;
height:0.6666666666666666rem;
border:2px solid #e5e5e5;
border-radius: 0.08333333333333333rem;
display: inline-block;
line-height: 0.6666666666666666rem;
text-align: center;
font-weight: 800;
}
.TokeStokeContent .commonPage .productNum p span:nth-of-type(2){
margin-left:0.08333333333333333rem;
}
.TokeStokeContent .commonPage .productNum p span:nth-of-type(3){
font-weight: 600;
padding:0.16666666666666666rem 0.275rem;
}
.TokeStokeContent .commonPage .buttonComponent{
margin-left:5rem;
}
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