Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
max_android_panel
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
Zhang Xin
max_android_panel
Commits
32bed8a5
Commit
32bed8a5
authored
Sep 12, 2018
by
Zhang Xin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finist recovery first page
parent
3d7e1e37
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
71 additions
and
24 deletions
+71
-24
client/components/CommonComponent/ButtonComponent/ButtonComponent.jsx
+4
-1
client/components/CommonComponent/ButtonComponent/index.css
+17
-18
client/components/CommonComponent/HeaderComponent/index.css
+3
-1
client/components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage.jsx
+23
-0
client/components/RecoveryComponent/RecoveryFirstPage/index.css
+13
-0
client/containers/RecoveryContainer/RecoveryContainer.jsx
+11
-4
No files found.
client/components/CommonComponent/ButtonComponent/ButtonComponent.jsx
View file @
32bed8a5
...
@@ -8,8 +8,11 @@ export default class ButtonComponent extends React.Component{
...
@@ -8,8 +8,11 @@ export default class ButtonComponent extends React.Component{
render
(){
render
(){
let
props
=
this
.
props
;
let
props
=
this
.
props
;
let
classInfo
=
props
.
classInfo
&&
props
.
classInfo
.
className
?
props
.
classInfo
.
className
:
''
;
let
colorClass
=
props
.
classInfo
&&
props
.
classInfo
.
colorInfo
?
props
.
classInfo
.
colorInfo
:
"col333"
;
let
fontClass
=
props
.
classInfo
&&
props
.
classInfo
.
fontInfo
?
props
.
classInfo
.
fontInfo
:
"font32"
;
return
(
return
(
<
div
className=
{
"buttonComponent font32 col333"
}
style=
{
props
.
style
}
onClick=
{
()
=>
props
.
option
()
}
>
<
div
className=
{
`buttonComponent ${fontClass} ${colorClass} ${classInfo}`
}
style=
{
props
.
style
}
onClick=
{
()
=>
props
.
option
()
}
>
{
props
.
text
}
{
props
.
text
}
</
div
>
</
div
>
)
)
...
...
client/components/CommonComponent/ButtonComponent/index.css
View file @
32bed8a5
/*.buttonComponent{*/
/*width: 413px;*/
/*height: 80px;*/
/*border: 2px solid #e5e5e5;*/
/*background-color: #ffffff;*/
/*line-height: 80px;*/
/*text-align: center;*/
/*!*display: inline-block;*!*/
/*border-radius: 10px;*/
/*}*/
.buttonComponent
{
.buttonComponent
{
width
:
3.441666666666667rem
;
width
:
413px
;
height
:
0.6666666666666666rem
;
height
:
80px
;
border
:
2px
solid
#e5e5e5
;
border
:
2px
solid
#e5e5e5
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
line-height
:
0.6666666666666666rem
;
line-height
:
80px
;
text-align
:
center
;
text-align
:
center
;
/*display: inline-block;
border-radius
:
10px
;
*/
border-radius
:
0.08333333333333333rem
;
}
}
/*.buttonComponent{*/
/*width: 3.441666666666667rem;*/
/*height: 0.6666666666666666rem;*/
/*border: 2px solid #e5e5e5;*/
/*background-color: #ffffff;*/
/*line-height: 0.6666666666666666rem;*/
/*text-align: center;*/
/*!*display: inline-block;*/
/**!*/
/*border-radius: 0.08333333333333333rem;*/
/*}*/
client/components/CommonComponent/HeaderComponent/index.css
View file @
32bed8a5
...
@@ -67,7 +67,9 @@
...
@@ -67,7 +67,9 @@
.headerComponent
.homeHeader
.rightContent
.userinfos
{
.headerComponent
.homeHeader
.rightContent
.userinfos
{
display
:
flex
;
display
:
flex
;
height
:
72px
;
height
:
72px
;
margin-top
:
5%
;
position
:
relative
;
top
:
50%
;
transform
:
translateY
(
-50%
);
align-items
:
center
;
align-items
:
center
;
}
}
.headerComponent
.homeHeader
.rightContent
.userheadImg
{
.headerComponent
.homeHeader
.rightContent
.userheadImg
{
...
...
client/components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage.jsx
0 → 100644
View file @
32bed8a5
import
React
from
'react'
;
import
Button
from
'../../CommonComponent/ButtonComponent/ButtonComponent'
require
(
'./index.css'
)
export
default
class
RecoveryFirstPage
extends
React
.
Component
{
constructor
(
props
){
super
(
props
);
}
render
(){
let
style
=
{
'width'
:
"410px"
,
"background"
:
"#ff7860"
,
"display"
:
"inline-block"
}
let
classInfo
=
{
colorInfo
:
"colfff"
,
className
:
''
}
return
(
<
div
className=
{
"recoveryFirstPage"
}
>
<
div
className=
{
"text font40 col333"
}
>
请将A区回收箱进行整体更换
</
div
>
<
Button
key=
{
"RecoveryFirstPageBtn"
}
classInfo=
{
classInfo
}
style=
{
style
}
text=
{
'我已替换完成,下一步'
}
option=
{
this
.
hideError
}
/>
<
div
className=
{
"tips font24"
}
>
点击查看回收箱位置照片
</
div
>
</
div
>
)
}
}
client/components/RecoveryComponent/RecoveryFirstPage/index.css
0 → 100644
View file @
32bed8a5
.recoveryFirstPage
{
text-align
:
center
;
padding-top
:
240px
;
}
.recoveryFirstPage
.text
{
margin-bottom
:
180px
;
}
.recoveryFirstPage
.tips
{
margin-top
:
30px
;
color
:
#5c66ff
;
text-decoration
:
underline
;
}
\ No newline at end of file
client/containers/RecoveryContainer/RecoveryContainer.jsx
View file @
32bed8a5
import
React
from
'react'
;
import
React
from
'react'
;
import
Header
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
;
import
Header
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
;
import
LeftContainer
from
'../LeftContainer/LeftContainer'
;
import
LeftContainer
from
'../LeftContainer/LeftContainer'
;
import
RightContainer
from
'../RightContainer/RightContainer'
import
RightContainer
from
'../RightContainer/RightContainer'
;
import
RecovertyFirstPage
from
'../../components/RecoveryComponent/RecoveryFirstPage/RecoveryFirstPage'
export
default
class
RecoveryContainer
extends
React
.
Component
{
export
default
class
RecoveryContainer
extends
React
.
Component
{
constructor
(
props
){
constructor
(
props
){
super
(
props
);
super
(
props
);
this
.
getFirstPage
=
this
.
getFirstPage
.
bind
(
this
);
}
getFirstPage
(){
return
(
<
RecovertyFirstPage
/>
)
}
}
render
(){
render
(){
let
dom
=
this
.
getFirstPage
();
return
(
return
(
<
div
className=
{
"recoveryContainer page"
}
>
<
div
className=
{
"recoveryContainer page"
}
>
<
Header
/>
<
Header
/>
<
LeftContainer
/>
<
LeftContainer
/>
<
RightContainer
>
<
RightContainer
>
{
{
<
div
className=
{
"recoveryContent"
}
>
dom
</
div
>
}
}
</
RightContainer
>
</
RightContainer
>
</
div
>
</
div
>
...
...
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