Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
ydLife
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sweet Zhang
ydLife
Commits
20fdddaf
Commit
20fdddaf
authored
Oct 23, 2020
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipad pro首页适配&薪资单两位小数
parent
43a1be15
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
8 deletions
+30
-8
src/app/my/my-center-home/my-center-home.component.html
+1
-0
src/app/my/my-center-home/my-center-home.component.scss
+11
-4
src/app/my/salary/salary.component.html
+3
-3
src/app/my/todo-list/todo-list.component.html
+1
-1
src/app/my/todo-list/todo-list.component.scss
+14
-0
No files found.
src/app/my/my-center-home/my-center-home.component.html
View file @
20fdddaf
...
...
@@ -125,6 +125,7 @@
</div>
</div>
</div>
<!-- <hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" /> -->
<div
class=
"hotProduct"
>
<div
style=
"margin-bottom: 10px;"
>
...
...
src/app/my/my-center-home/my-center-home.component.scss
View file @
20fdddaf
...
...
@@ -274,14 +274,12 @@ ul,ol{
}
.tool_wrapper
{
margin-bottom
:
10px
;
.tool_item
{
display
:
flex
;
flex-direction
:
column
;
flex-wrap
:
wrap
;
background
:
#fff
;
// box-shadow:0 0px 2.5px #eceaea;
// border-radius: 6px;
margin-bottom
:
10px
;
padding
:
7px
0px
0px
10px
;
h3
{
...
...
@@ -307,6 +305,11 @@ ul,ol{
// font-size: 26px;
// }
}
@media
(
min-width
:
768px
)
{
.content_item
{
height
:
90px
;
}
}
}
}
}
...
...
@@ -314,8 +317,12 @@ ul,ol{
.tool_content
{
padding-bottom
:
10px
;
}
@media
(
min-width
:
768px
)
{
.tool_content
{
padding-bottom
:
5px
;
}
}
}
.hotProduct
{
margin
:
10px
auto
;
background
:
#fff
;
...
...
src/app/my/salary/salary.component.html
View file @
20fdddaf
...
...
@@ -12,15 +12,15 @@
</div>
<div
class=
"line"
>
<span>
应发佣金
</span>
<div
class=
"price"
>
¥{{payScaleItem.monDtlAmount | number: "1.
0
-2"}}
</div>
<div
class=
"price"
>
¥{{payScaleItem.monDtlAmount | number: "1.
2
-2"}}
</div>
</div>
<div
class=
"line"
>
<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
class=
"line"
>
<span>
实发佣金
</span>
<div
class=
"price"
>
¥{{payScaleItem.monDtlRAmount | number: "1.
0
-2"}}
</div>
<div
class=
"price"
>
¥{{payScaleItem.monDtlRAmount | number: "1.
2
-2"}}
</div>
</div>
<div
class=
"line"
>
<div></div>
...
...
src/app/my/todo-list/todo-list.component.html
View file @
20fdddaf
...
...
@@ -74,7 +74,7 @@
</ul>
</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>
</div>
</div>
...
...
src/app/my/todo-list/todo-list.component.scss
View file @
20fdddaf
...
...
@@ -152,6 +152,20 @@ ul,ol{
font-size
:
30px
;
}
}
@media
(
min-width
:
768px
)
{
.addBtn
{
bottom
:
8%
;
right
:
11%
;
}
}
@media
(
min-width
:
1024px
){
.addBtn
{
left
:
70%
;
bottom
:
30%
;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment