Commit 20fdddaf by sunchao

ipad pro首页适配&薪资单两位小数

parent 43a1be15
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" /> --> <!-- <hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" /> -->
<div class="hotProduct"> <div class="hotProduct">
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
......
...@@ -274,14 +274,12 @@ ul,ol{ ...@@ -274,14 +274,12 @@ ul,ol{
} }
.tool_wrapper{ .tool_wrapper{
margin-bottom: 10px;
.tool_item{ .tool_item{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-wrap: wrap; flex-wrap: wrap;
background: #fff; background: #fff;
// box-shadow:0 0px 2.5px #eceaea;
// border-radius: 6px;
margin-bottom: 10px;
padding: 7px 0px 0px 10px; padding: 7px 0px 0px 10px;
h3{ h3{
...@@ -307,6 +305,11 @@ ul,ol{ ...@@ -307,6 +305,11 @@ ul,ol{
// font-size: 26px; // font-size: 26px;
// } // }
} }
@media (min-width: 768px) {
.content_item{
height: 90px;
}
}
} }
} }
} }
...@@ -314,8 +317,12 @@ ul,ol{ ...@@ -314,8 +317,12 @@ ul,ol{
.tool_content{ .tool_content{
padding-bottom: 10px; padding-bottom: 10px;
} }
@media (min-width: 768px) {
.tool_content{
padding-bottom: 5px;
}
}
} }
.hotProduct{ .hotProduct{
margin: 10px auto; margin: 10px auto;
background: #fff; background: #fff;
......
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
</div> </div>
<div class="line"> <div class="line">
<span>应发佣金</span> <span>应发佣金</span>
<div class="price">¥{{payScaleItem.monDtlAmount | number: "1.0-2"}}</div> <div class="price">¥{{payScaleItem.monDtlAmount | number: "1.2-2"}}</div>
</div> </div>
<div class="line"> <div class="line">
<span>扣除税</span> <span>扣除税</span>
<div class="price">¥{{(payScaleItem.monDtlAmount-payScaleItem.monDtlRAmount) | number: "1.0-2"}}</div> <div class="price">¥{{(payScaleItem.monDtlAmount-payScaleItem.monDtlRAmount) | number: "1.2-2"}}</div>
</div> </div>
<div class="line"> <div class="line">
<span>实发佣金</span> <span>实发佣金</span>
<div class="price">¥{{payScaleItem.monDtlRAmount | number: "1.0-2"}}</div> <div class="price">¥{{payScaleItem.monDtlRAmount | number: "1.2-2"}}</div>
</div> </div>
<div class="line"> <div class="line">
<div></div> <div></div>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="addBtn" *ngIf="editFlag" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100'}" [routerLink]="['/addtask']"> <div class="addBtn" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100'}" [routerLink]="['/addtask']">
<i class="iconfont icon-jiahao" (click)="removeTaskInfo()"></i> <i class="iconfont icon-jiahao" (click)="removeTaskInfo()"></i>
</div> </div>
</div> </div>
......
...@@ -152,6 +152,20 @@ ul,ol{ ...@@ -152,6 +152,20 @@ ul,ol{
font-size: 30px; font-size: 30px;
} }
} }
@media (min-width: 768px) {
.addBtn {
bottom: 8%;
right: 11%;
}
}
@media (min-width: 1024px){
.addBtn {
left: 70%;
bottom: 30%;
}
}
} }
} }
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