修理homepage

d451c87e · wujiabao · ed8505a8 · d451c87e · d451c87e · d451c87e
Commit d451c87e authored Sep 13, 2018 by wujiabao
6 changed files
--- a/client/actions/common.js
+++ b/client/actions/common.js
@@ -6,25 +6,25 @@ const domain = ENV.domain;
 //获取工单
 const getTaskInfo = (data)=>{
    // let {employeeId,storeId} = data;
+    console.log(data)
    console.log('获取工单信息')
-    // let test='http://192.168.10.128:8080/'
+    let test='http://192.168.10.128:8080/'
    // // let url = `${test}web/flat/ready${storeId}/${employeeId}`
-    // let url=`${test}/flat/ready/1/2`;
+    let url=`${test}web/flat/ready/1/2`;
    return(dispatch)=>{
-        fetch('http://192.168.10.128:8080/web/flat/ready/1/14',{
+        fetch(url,{
            credentials : 'include',
            method : 'GET',
            mode : 'cors',
            headers: { 'Content-Type': 'application/json' },
-            body:{}
        }).then((response)=>response.json())
            .then(json=>{
-                console.log(json)
+                let taskInfo=Object.assign({})
-                // let storeInfo = Object.assign({},{id:storeId});
+                if(json.meta.success && json.data){
-                // if(json.meta.success && json.data.warehouse){
+                    taskInfo = Object.assign({},json.data)
-                //     storeInfo = Object.assign({},storeInfo,json.data.warehouse)
+                }
-                // }
+                console.log(taskInfo)
-                // dispatch(saveCommonInfo(Object.assign({},{storeInfo})))
+                dispatch(startalljob(Object.assign({},taskInfo)))
            }).catch(e=>{console.error(e)})
    }
@@ -126,7 +126,12 @@ const saveCommonInfo = (data)=>{
        data
    }
 };
+const startalljob=(data)=>{
+    return {
+        type: actionType.STARTALLJOB,
+        data
+    }
+}
 const logout = ()=>{
    let data = Object.assign({},{userInfo:{},taskInfo:{}});
    return {
@@ -135,4 +140,4 @@ const logout = ()=>{
    }
 }
-export {getStoreInfo,getTaskInfo,getInfoByBarcode,saveCommonInfo,getUserinfo,logout}
+export {getStoreInfo,getTaskInfo,getInfoByBarcode,saveCommonInfo,getUserinfo,logout,startalljob}
--- a/client/actiontype/common.js
+++ b/client/actiontype/common.js
@@ -3,5 +3,6 @@ const actionTypes = {
    EMPTYBARCODEINFO : 'EMPTYBARCODEINFO',
    SAVECOMMONINFO : 'SAVECOMMONINFO',
    EMPTYCOMMONINFO : 'EMPTYCOMMONINFO',
+    STARTALLJOB     : 'STARTALLJOB'
 }
 export default actionTypes
\ No newline at end of file
--- a/client/containers/HomePageContainer/HomePageContainer.jsx
+++ b/client/containers/HomePageContainer/HomePageContainer.jsx
@@ -2,7 +2,6 @@ import React from 'react';
 import Clock from '../../components/CommonComponent/ClockComponent/ClockComponent'
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
-import {getTaskInfo} from '../../actions/common'
 require('./index.css');
 export default class HomePageContainer extends React.Component{
@@ -37,11 +36,11 @@ export default class HomePageContainer extends React.Component{
                    userinfo={userInfo}
                    storeInfo={storeInfo}
                />
-                <div className={"homeContainer"} style={{marginTop:'80px'}}>
+                <div className={"homeContainer"} >
                    <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={'homeWelcom font30 clo333'} style={{marginTop:'50px'}}>欢迎来到<span className="homeArea font50 colff775c" style={{padding:'0 8px'}}>A</span>区</div>
-                    <div className={"homeText font50"} style={{fontWeight:'800',marginTop:'20px'}}>下午好, 你辛苦了！</div>
+                    <div className={"homeText font42"} style={{fontWeight:'800',marginTop:'20px'}}>下午好, 你辛苦了！</div>
-                    <Button text={'开始工作'} classInfo={classInfo} style={buttonStyle} option={getTaskInfo} />
+                    <Button text={'开始工作'} classInfo={classInfo} style={buttonStyle} option={props.startTask} />
                </div>
            </div>

--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -9,6 +9,7 @@ import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitPr
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
 import {getRefreshImg,deleteImg,emptyImg} from "../../actions/refreshImg"
 import {uploadError,addErrorInfo} from '../../actions/uploadError'
+import {getTaskInfo} from '../../actions/common'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
@@ -447,6 +448,7 @@ class PageContainer extends React.Component {
    getPages(){
        let pages = null;
        let{state,dispatch} = this.props;
+        console.log(state);
        switch (this.state.showPage){
            case showPage[1]:
                pages = <TroubleContainer
@@ -539,7 +541,7 @@ class PageContainer extends React.Component {
                break;
            /*以下是二期页面 start*/
            case showPage[13]:
-                pages = <HomePage />;
+                pages = <HomePage startTask={()=>{dispatch(getTaskInfo(state.commonInfo))}} />;
                break;
            case showPage[6]:
                pages = <TakeStokeContainer />;

--- a/client/css/font.css
+++ b/client/css/font.css
@@ -20,6 +20,7 @@ body{
 @value font30: 30px;
 @value font32: 32px;
 @value font40: 40px;
+@value font42: 42px;
 @value font44: 44px;
 @value font50: 50px;
 @value font58: 58px;
@@ -138,6 +139,17 @@ body{
 [data-dpr="3"] .font40 {
    font-size: calc(var(--font3) * font40 * var(--base)) !important;
 }
+.font42 {
+    font-size:  calc(font40 * var(--base)) !important;
+}
+[data-dpr="2"] .font42 {
+    font-size: calc(var(--font2) * font42 * var(--base)) !important;
+}
+[data-dpr="3"] .font42 {
+    font-size: calc(var(--font3) * font42 * var(--base)) !important;
+}
 .font44 {
    font-size:  calc(font44 * var(--base)) !important;
 }

--- a/client/reducers/common.js
+++ b/client/reducers/common.js
@@ -22,13 +22,17 @@ const saveCommonInfo = (state,data)=>{
 const emptyCommInfo = (state,data)=>{
    return Object.assign({},state,data)
 }
+const startalljob= (state,data)=>{
+    return Object.assign({},state,data)
+}
 export default function(state={}, action) {
    switch (action.type) {
        case actionTypes.SAVECOMMONINFO:
            return saveCommonInfo(state,action.data);
        case actionTypes.EMPTYCOMMONINFO:
            return emptyCommInfo(state);
+        case actionTypes.STARTALLJOB   :
+            return startalljob(state);
        default:
            return state;
    }