Skip to content

M
max_android_panel
Commit 8e5d63d4 by Zhang Xin
Options

fix css & UI

parent e7b6300a
Showing with 31 additions and 18 deletions
client/components/CommonComponent/HeaderComponent/index.css
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
} }
.headerComponent .homeHeader .rightContent .userinfo { .headerComponent .homeHeader .rightContent .userinfo {
line-height: 40px; line-height: 1.3;
} }
.otherHeader { .otherHeader {
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
} }
.headerComponent .homeHeader .rightContent .userinfo { .headerComponent .homeHeader .rightContent .userinfo {
line-height: 0.3333333333333333rem; line-height: 1.3;
} }
.otherHeader { .otherHeader {
......
client/components/RecoveryComponent/RecoveryFirstPage/index.css
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
.recoveryFirstPage .tips { .recoveryFirstPage .tips {
margin-top: 30px; margin-top: 30px;
color: #5c66ff; color: #ff775c;
text-decoration: underline;
} }
.recoveryFirstPageBtn { .recoveryFirstPageBtn {
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
.recoveryFirstPage .tips { .recoveryFirstPage .tips {
margin-top: 0.25rem; margin-top: 0.25rem;
color: #5c66ff; color: #ff775c;
text-decoration: underline;
} }
.recoveryFirstPageBtn { .recoveryFirstPageBtn {
......
client/components/ReplenishComponent/ReplenishScanPage/ReplenishScanPage.jsx
...@@ -129,10 +129,10 @@ export default class ReplenishScanPage extends React.Component{ ...@@ -129,10 +129,10 @@ export default class ReplenishScanPage extends React.Component{
transform: 'translateY(20%)', transform: 'translateY(20%)',
position: 'relative' position: 'relative'
}; };
return <div className={"otherHeader replenishScanQrcodeHeader font32 clearfix colfff "}> return <div className={"otherHeader replenishScanQrcodeHeader font32 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 title"}>任务目标：将{taskInfo.area || ""}区补货箱中的货品扫码后放到货架上</span>
<Button btnContainer={"barcodeInputBarcode font32 backff775c colfff"} key={"barcodeInputBarcode"} style={btnStyle} text={"扫描结束"} option={this.handleScanOver}/> <span className={"replenishScanQrcodeHeaderBtn colfff"}>扫描结束？</span>
</div> </div>
} }
......
client/containers/ReplenishContainer/index.css
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
text-align: center; text-align: center;
position: relative; position: relative;
line-height: 98px; line-height: 98px;
display: flex;
justify-content: center;
} }
.replenishScanQrcodeHeader .icon{ .replenishScanQrcodeHeader .icon{
...@@ -37,13 +39,13 @@ ...@@ -37,13 +39,13 @@
} }
.replenishSkuInfo .skuInfo .skuImg{ .replenishSkuInfo .skuInfo .skuImg{
width: 200px; width: 200px;
height: 260px; height: 200px;
position: relative; position: relative;
text-align: center; text-align: center;
} }
.replenishSkuInfo .skuInfo .areaImg{ .replenishSkuInfo .skuInfo .areaImg{
width: 200px; width: 200px;
height: 260px; height: 200px;
position: relative; position: relative;
margin: 0 60px 0 60px; margin: 0 60px 0 60px;
text-align: center; text-align: center;
...@@ -52,7 +54,7 @@ ...@@ -52,7 +54,7 @@
.replenishSkuInfo .skuInfo .skuImgText{ .replenishSkuInfo .skuInfo .skuImgText{
position: absolute; position: absolute;
white-space: nowrap; white-space: nowrap;
bottom: 0; bottom: -60px;
width: 100%; width: 100%;
} }
...@@ -71,7 +73,7 @@ ...@@ -71,7 +73,7 @@
flex: 1; flex: 1;
} }
.replenishSkuInfo .skuInfo .skuPos ul>li{ .replenishSkuInfo .skuInfo .skuPos ul>li{
padding-left: 36%; padding-left: 24%;
position: relative; position: relative;
min-height: 60px; min-height: 60px;
} }
...@@ -101,8 +103,20 @@ ...@@ -101,8 +103,20 @@
text-align: center; text-align: center;
position: relative; position: relative;
line-height: 0.8166666666666667rem; line-height: 0.8166666666666667rem;
display: flex;
justify-content: center;
} }
.replenishScanQrcodeHeader .icon{ .replenishScanQrcodeHeader .icon{
width: 10%;
text-align: left;
}
.replenishScanQrcodeHeader .title{
width: 80%;
text-align: center;
}
.replenishScanQrcodeHeader .replenishScanQrcodeHeaderBtn{
width: 10%;
text-align: right;
} }
.replenishSkuInfo{ .replenishSkuInfo{
width: 80%; width: 80%;
...@@ -122,13 +136,13 @@ ...@@ -122,13 +136,13 @@
} }
.replenishSkuInfo .skuInfo .skuImg{ .replenishSkuInfo .skuInfo .skuImg{
width: 1.6666666666666667rem; width: 1.6666666666666667rem;
height: 2.1666666666666665rem; height: 1.6666666666666667rem;
position: relative; position: relative;
text-align: center; text-align: center;
} }
.replenishSkuInfo .skuInfo .areaImg{ .replenishSkuInfo .skuInfo .areaImg{
width: 1.6666666666666667rem; width: 1.6666666666666667rem;
height: 2.1666666666666665rem; height: 1.6666666666666667rem;
position: relative; position: relative;
margin: 0 0.5rem 0 0.5rem; margin: 0 0.5rem 0 0.5rem;
text-align: center; text-align: center;
...@@ -136,7 +150,7 @@ ...@@ -136,7 +150,7 @@
.replenishSkuInfo .skuInfo .skuImgText{ .replenishSkuInfo .skuInfo .skuImgText{
position: absolute; position: absolute;
white-space: nowrap; white-space: nowrap;
bottom: 0; bottom: -0.5rem;
width: 100%; width: 100%;
} }
.replenishSkuInfo .skuInfo img{ .replenishSkuInfo .skuInfo img{
...@@ -152,7 +166,7 @@ ...@@ -152,7 +166,7 @@
flex: 1; flex: 1;
} }
.replenishSkuInfo .skuInfo .skuPos ul>li{ .replenishSkuInfo .skuInfo .skuPos ul>li{
padding-left: 36%; padding-left: 24%;
position: relative; position: relative;
min-height: 0.5rem; min-height: 0.5rem;
} }
......
client/css/font.css
...@@ -3,7 +3,7 @@ body { ...@@ -3,7 +3,7 @@ body {
--font2: 2; --font2: 2;
--font3: 3; --font3: 3;
--font10: 10; --font10: 10;
--base: 0.571875 --base: 0.416
/*--base : 1*/ /*--base : 1*/
} }
......
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