add homepage

client/actions/common.js

@@ -5,8 +5,27 @@ import actionTypes from "../actiontype/user";
 const domain = ENV.domain;
 const domain = ENV.domain;
 //获取工单
 //获取工单
 const getTaskInfo = (data)=>{
 const getTaskInfo = (data)=>{
-    let {employeeId,storeId} = data;
+    // let {employeeId,storeId} = data;
+    console.log('获取工单信息')
+    // let test='http://192.168.10.128:8080/'
+    // // let url = `${test}web/flat/ready${storeId}/${employeeId}`
+    // let url=`${test}/flat/ready/1/2`;
     return(dispatch)=>{
     return(dispatch)=>{
+        fetch('http://192.168.10.128:8080/web/flat/ready/1/14',{
+            credentials : 'include',
+            method : 'GET',
+            mode : 'cors',
+            headers: { 'Content-Type': 'application/json' },
+            body:{}
+        }).then((response)=>response.json())
+            .then(json=>{
+                console.log(json)
+                // let storeInfo = Object.assign({},{id:storeId});
+                // if(json.meta.success && json.data.warehouse){
+                //     storeInfo = Object.assign({},storeInfo,json.data.warehouse)
+                // }
+                // dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
+            }).catch(e=>{console.error(e)})
 
 
     }
     }
 };
 };
@@ -23,11 +42,11 @@ const getStoreInfo = (storeId)=>{
             body: JSON.stringify(bodyData)
             body: JSON.stringify(bodyData)
         }).then((response)=>response.json())
         }).then((response)=>response.json())
             .then(json=>{
             .then(json=>{
-                let storeInfo = Object.assign({},{id:storeId});
-                if(json.meta.success && json.data.warehouse){
-                    storeInfo = Object.assign({},storeInfo,json.data.warehouse)
-                }
-                dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
+                // let storeInfo = Object.assign({},{id:storeId});
+                // if(json.meta.success && json.data.warehouse){
+                //     storeInfo = Object.assign({},storeInfo,json.data.warehouse)
+                // }
+                // dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
             }).catch(e=>{console.error(e)})
             }).catch(e=>{console.error(e)})
 
 
 
 

client/containers/BreakageContainer/BreakageConatiner.jsx

@@ -8,7 +8,10 @@ class BreakageContainer extends React.Component {
 
 
     render(){
     render(){
          return (
          return (
-             <div className={"BreakageContainer"}></div>
+             <div className={"BreakageContainer"}>
+             
+             
+             </div>
          ) 
          ) 
     }
     }
 }
 }

client/containers/HomePageContainer/HomePageContainer.jsx

 import React from 'react';
 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 {getTaskInfo} from '../../actions/common'
 require('./index.css');
 require('./index.css');
 
 
 export default class HomePageContainer extends React.Component{
 export default class HomePageContainer extends React.Component{
@@ -23,6 +25,11 @@ export default class HomePageContainer extends React.Component{
     render(){
     render(){
         let props = this.props;
         let props = this.props;
         let {userInfo,storeInfo} = props;
         let {userInfo,storeInfo} = props;
+        let buttonStyle={background:'#ff775c',margin:"0 auto",marginTop:'77px'};
+        let classInfo={
+            colorInfo:'colfff',
+            fontInfo :'font30'
+        }
         return(
         return(
             <div>
             <div>
                 <HeaderComponent
                 <HeaderComponent
@@ -30,9 +37,11 @@ export default class HomePageContainer extends React.Component{
                     userinfo={userInfo}
                     userinfo={userInfo}
                     storeInfo={storeInfo}
                     storeInfo={storeInfo}
                 />
                 />
-                <div className={"homeContainer"}>
-                    <img className={"homeIcon"} src={UTILPATH.localImg.defaultImg} alt=""/>
-                    <div className={"homeText font40"}>感谢您辛勤工作，祝您今天顺利！</div>
+                <div className={"homeContainer"} style={{marginTop:'80px'}}>
+                    <img className={"homeIcon"} src={UTILPATH.localImg.homePage} alt=""/>
+                    <div className={'homeWelcom font30 clo333'} style={{lineHeight:"42px",marginTop:'50px'}}>欢迎来到<span className="homeArea font50 colff775c" style={{padding:'0 8px'}}>A</span>区</div>
+                    <div className={"homeText font50"} style={{fontWeight:'800',marginTop:'20px'}}>下午好, 你辛苦了！</div>
+                    <Button text={'开始工作'} classInfo={classInfo} style={buttonStyle} option={getTaskInfo} />
                 </div>
                 </div>
             </div>
             </div>
 
 

client/css/color.css

@@ -24,7 +24,9 @@
 .colf00{
 .colf00{
     color: #ff0000!important;
     color: #ff0000!important;
 }
 }
-
+.colff775c{
+    color: #ff775c!important;
+}
 .border-green{
 .border-green{
     border-color: #26ce61!important;
     border-color: #26ce61!important;
 }
 }

client/util/image.js

@@ -8,7 +8,7 @@ import breakImg from '../image/breakImg.png';
 import plusIcon_disabled from '../image/plusIcon_disabled.png';
 import plusIcon_disabled from '../image/plusIcon_disabled.png';
 import refresh_disabled from '../image/refresh_disabled.png';
 import refresh_disabled from '../image/refresh_disabled.png';
 import overPassIcon from '../image/overPassIcon.png'
 import overPassIcon from '../image/overPassIcon.png'
-
+import homePage from '../image/homepage.png'
 
 
 const localHost = 'http://localhost:7788';
 const localHost = 'http://localhost:7788';
 const devHost = 'http://test.mjitech.com';
 const devHost = 'http://test.mjitech.com';
@@ -82,6 +82,6 @@ const handleImgLoad = (ref)=>{
     return style;
     return style;
 }
 }
 
 
-const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon,breakImg,refresh_disabled,plusIcon_disabled,overPassIcon}
+const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon,clockIcon,breakImg,refresh_disabled,plusIcon_disabled,overPassIcon,homePage}
 
 
 module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg};
 module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg};
\ No newline at end of file