改动头部组件

client/containers/HomePageContainer/HomePageContainer.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
 import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
+import common from '../../reducers/common';
 require('./index.css');
 require('./index.css');
 
 
 export default class HomePageContainer extends React.Component{
 export default class HomePageContainer extends React.Component{
@@ -23,7 +24,7 @@ export default class HomePageContainer extends React.Component{
 
 
     render(){
     render(){
         let props = this.props;
         let props = this.props;
-        let {userInfo,storeInfo} = props;
+        let {userInfo,storeInfo,headerInfo} = props;
         let buttonStyle={background:'#ff775c',margin:"0 auto",marginTop:'77px'};
         let buttonStyle={background:'#ff775c',margin:"0 auto",marginTop:'77px'};
         let classInfo={
         let classInfo={
             colorInfo:'colfff',
             colorInfo:'colfff',
@@ -35,6 +36,7 @@ export default class HomePageContainer extends React.Component{
                     showHeader={CONFIG.headerStatus[1]}
                     showHeader={CONFIG.headerStatus[1]}
                     userinfo={userInfo}
                     userinfo={userInfo}
                     storeInfo={storeInfo}
                     storeInfo={storeInfo}
+                    headerInfo={headerInfo}
                 />
                 />
                 <div className={"homeContainer"} >
                 <div className={"homeContainer"} >
                     <img className={"homeIcon"}  src={UTILPATH.localImg.homePage} alt=""/>
                     <img className={"homeIcon"}  src={UTILPATH.localImg.homePage} alt=""/>

client/containers/PageContainer/PageContainer.jsx

@@ -59,7 +59,7 @@ class PageContainer extends React.Component {
     constructor(props) {
     constructor(props) {
         super(props);
         super(props);
         this.state = {
         this.state = {
-            showPage : showPage[10],
+            showPage : showPage[13],
             lastPage : '',
             lastPage : '',
             page : null,
             page : null,
             popupInfo : defaultPopupInfo,
             popupInfo : defaultPopupInfo,
@@ -541,7 +541,7 @@ class PageContainer extends React.Component {
                 break;
                 break;
             /*以下是二期页面 start*/
             /*以下是二期页面 start*/
             case showPage[13]:
             case showPage[13]:
-                pages = <HomePage startTask={()=>{dispatch(getTaskInfo(state.commonInfo))}} />;
+                pages = <HomePage headerInfo={state.commonInfo} startTask={()=>{dispatch(getTaskInfo(state.commonInfo))}} />;
                 break;
                 break;
             case showPage[6]:
             case showPage[6]:
                 pages = <TakeStokeContainer headerInfo = {state.commonInfo}/>;
                 pages = <TakeStokeContainer headerInfo = {state.commonInfo}/>;