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
27624016
Commit
27624016
authored
Sep 12, 2018
by
Zhang Xin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善首页,增加二期首页页面
parent
4b1e1389
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
108 additions
and
4 deletions
+108
-4
client/config/showPage.js
+1
-0
client/containers/HomePageContainer/HomePageContainer.jsx
+48
-0
client/containers/HomePageContainer/index.css
+37
-0
client/containers/PageContainer/PageContainer.jsx
+22
-4
No files found.
client/config/showPage.js
View file @
27624016
...
@@ -12,6 +12,7 @@ const showPage = {
...
@@ -12,6 +12,7 @@ const showPage = {
10
:
'RecoverySkus'
,
//二期回收
10
:
'RecoverySkus'
,
//二期回收
11
:
'Replenishment'
,
//二期补货
11
:
'Replenishment'
,
//二期补货
12
:
'Feedback'
,
//二期问题反馈和关门
12
:
'Feedback'
,
//二期问题反馈和关门
13
:
'HomePage'
//二期首页
};
};
const
taskSchedule
=
{
//任务进度序列号,后台给
const
taskSchedule
=
{
//任务进度序列号,后台给
1
:
showPage
[
5
],
1
:
showPage
[
5
],
...
...
client/containers/HomePageContainer/HomePageContainer.jsx
0 → 100644
View file @
27624016
import
React
from
'react'
;
import
Clock
from
'../../components/CommonComponent/ClockComponent/ClockComponent'
import
HeaderComponent
from
'../../components/CommonComponent/HeaderComponent/HeaderComponent'
require
(
'./index.css'
);
export
default
class
HomePageContainer
extends
React
.
Component
{
constructor
(
props
){
super
(
props
);
this
.
state
=
{
}
}
componentWillMount
(){
}
componentWillReceiveProps
(
nextProps
){
}
render
(){
let
props
=
this
.
props
;
let
{
userInfo
,
storeInfo
}
=
props
;
return
(
<
div
>
<
HeaderComponent
showHeader=
{
CONFIG
.
headerStatus
[
1
]
}
userinfo=
{
userInfo
}
storeInfo=
{
storeInfo
}
/>
<
div
className=
{
"homeContainer"
}
>
<
img
className=
{
"homeIcon"
}
src=
{
UTILPATH
.
localImg
.
defaultImg
}
alt=
""
/>
<
div
className=
{
"homeText font40"
}
>
感谢您辛勤工作,祝您今天顺利!
</
div
>
</
div
>
</
div
>
)
}
}
HomePageContainer
.
propTypes
=
{
};
HomePageContainer
.
defaultProps
=
{
}
\ No newline at end of file
client/containers/HomePageContainer/index.css
0 → 100644
View file @
27624016
/*.homeContainer{*/
/*text-align: center;*/
/*position: relative;*/
/*}*/
/*.homeContainer .homeIcon{*/
/*margin: 134px 0 40px 0;*/
/*}*/
/*.homeContainer .homeText{*/
/*}*/
/*.homeContainer .closeDoorContent{*/
/*margin-top: 140px;*/
/*}*/
/*.homeContainer .closeDoorContent .closeDoorText{*/
/*margin-bottom: 20px;*/
/*line-height: 40px;*/
/*}*/
.homeContainer
{
text-align
:
center
;
position
:
relative
;
}
.homeContainer
.homeIcon
{
height
:
1.65833rem
;
margin
:
1.1166666666666667rem
0
0.3333333333333333rem
0
;
}
.homeContainer
.homeText
{
}
.homeContainer
.closeDoorContent
{
margin-top
:
1.1666666666666667rem
;
}
.homeContainer
.closeDoorContent
.closeDoorText
{
margin-bottom
:
0.16666666666666666rem
;
line-height
:
0.3333333333333333rem
;
}
client/containers/PageContainer/PageContainer.jsx
View file @
27624016
...
@@ -21,6 +21,10 @@ import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
...
@@ -21,6 +21,10 @@ import ChooseTaskContainer from '../ChooseTaskContainer/ChooseTaskContainer'
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
;
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
;
import
Clock
from
'../../components/CommonComponent/ClockComponent/ClockComponent'
;
import
Clock
from
'../../components/CommonComponent/ClockComponent/ClockComponent'
;
/*二期引用 start*/
import
HomePage
from
'../HomeContainer/HomeContainer'
/*二期引用 end*/
import
{
on
,
remove
}
from
'../../util/event'
;
import
{
on
,
remove
}
from
'../../util/event'
;
require
(
'./index.css'
);
require
(
'./index.css'
);
...
@@ -37,7 +41,7 @@ const defaultPopupInfo = {
...
@@ -37,7 +41,7 @@ const defaultPopupInfo = {
popupButtons
:
[],
// 默认弹窗的按钮
popupButtons
:
[],
// 默认弹窗的按钮
classNames
:
''
//自定义类名
classNames
:
''
//自定义类名
};
};
const
initPage
=
7
;
const
initPage
=
13
;
const
errorType
=
{
const
errorType
=
{
1
:
1
,
//屏幕超时操作
1
:
1
,
//屏幕超时操作
...
@@ -79,6 +83,10 @@ class PageContainer extends React.Component {
...
@@ -79,6 +83,10 @@ class PageContainer extends React.Component {
this
.
hideError
=
this
.
hideError
.
bind
(
this
);
//隐藏错误信息
this
.
hideError
=
this
.
hideError
.
bind
(
this
);
//隐藏错误信息
this
.
getPageStyle
=
this
.
getPageStyle
.
bind
(
this
);
//
this
.
getPageStyle
=
this
.
getPageStyle
.
bind
(
this
);
//
this
.
uploadErrs
=
this
.
uploadErrs
.
bind
(
this
);
//
this
.
uploadErrs
=
this
.
uploadErrs
.
bind
(
this
);
//
/*以下是二期方法 start*/
this
.
showHomePage
=
this
.
showHomePage
.
bind
(
this
);
//二期显示首页
/*以下是二期方法 end*/
this
.
maxCountBackTime
=
300
;
this
.
maxCountBackTime
=
300
;
this
.
count
=
1000
;
this
.
count
=
1000
;
...
@@ -178,6 +186,7 @@ class PageContainer extends React.Component {
...
@@ -178,6 +186,7 @@ class PageContainer extends React.Component {
let
isNotOneTask
=
userinfo
.
type
&&
userinfo
.
type
!==
nowUserInfo
.
type
;
let
isNotOneTask
=
userinfo
.
type
&&
userinfo
.
type
!==
nowUserInfo
.
type
;
if
(
isNotOneUser
&&
isNotOneTask
){
if
(
isNotOneUser
&&
isNotOneTask
){
//不是同一个用户,并且不是同一个任务
this
.
dealPageByType
(
userinfo
.
type
);
this
.
dealPageByType
(
userinfo
.
type
);
}
}
if
(
state
.
errMsg
.
errMsg
){
if
(
state
.
errMsg
.
errMsg
){
...
@@ -223,9 +232,6 @@ class PageContainer extends React.Component {
...
@@ -223,9 +232,6 @@ class PageContainer extends React.Component {
});
});
}
}
changePages
(
page
){
changePages
(
page
){
console
.
log
(
"changePages : "
,
page
);
console
.
log
(
"changePages : "
,
page
);
this
.
setState
({
this
.
setState
({
...
@@ -406,6 +412,12 @@ class PageContainer extends React.Component {
...
@@ -406,6 +412,12 @@ class PageContainer extends React.Component {
})
})
}
}
showHomePage
(){
this
.
setState
({
showPage
:
showPage
[
13
]
});
}
getPages
(){
getPages
(){
let
pages
=
null
;
let
pages
=
null
;
...
@@ -500,6 +512,12 @@ class PageContainer extends React.Component {
...
@@ -500,6 +512,12 @@ class PageContainer extends React.Component {
hidePopup=
{
()
=>
this
.
hidePopup
()
}
hidePopup=
{
()
=>
this
.
hidePopup
()
}
/>
;
/>
;
break;
break;
/*以下是二期页面 start*/
case showPage[13]:
pages =
<
HomePage
/>
;
break;
/*以下是二期页面 end*/
}
}
return pages;
return pages;
}
}
...
...
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