test build

client/actions/common.js

@@ -56,7 +56,7 @@ const fetchStoreInfo = (storeId)=>{
             UTILPATH.myLogger.info("getMachineData response ",json);
             UTILPATH.myLogger.info("getMachineData response ",json);
             let storeInfo = Object.assign({},{id:storeId});
             let storeInfo = Object.assign({},{id:storeId});
             let taskInfo = {}
             let taskInfo = {}
-            let userinfo = {}
+            let userInfo = {}
             if(json.meta.success){
             if(json.meta.success){
                 if(!json.data.employeeInfo){
                 if(!json.data.employeeInfo){
                     dispatch(addErrorInfo('这个门店没有开门用户'))
                     dispatch(addErrorInfo('这个门店没有开门用户'))
@@ -73,11 +73,13 @@ const fetchStoreInfo = (storeId)=>{
                     taskInfo = Object.assign({},taskInfo,json.data.taskInfo)
                     taskInfo = Object.assign({},taskInfo,json.data.taskInfo)
                 }
                 }
                 if(json.data.employeeInfo){
                 if(json.data.employeeInfo){
-                    userinfo = Object.assign({},userinfo,json.data.employeeInfo)
+                    userInfo = Object.assign({},userInfo,json.data.employeeInfo)
                 }
                 }
+                userInfo.employeeId = userInfo.id;
                 dispatch(saveCommonInfo(Object.assign({},{storeInfo})));
                 dispatch(saveCommonInfo(Object.assign({},{storeInfo})));
                 dispatch(saveCommonInfo(Object.assign({},{taskInfo})));
                 dispatch(saveCommonInfo(Object.assign({},{taskInfo})));
-                dispatch(saveCommonInfo(Object.assign({},{userinfo})));
+                dispatch(saveCommonInfo(Object.assign({},{userInfo})));
+                console.log('herehere')
                 emit(CONFIG.customEvent.STOREINFOREADY,{});
                 emit(CONFIG.customEvent.STOREINFOREADY,{});
             }
             }
 
 

client/containers/PageContainer/PageContainer.jsx

@@ -777,6 +777,7 @@ class PageContainer extends React.Component {
             storeId = state.storeInfo.storeList[0].id
             storeId = state.storeInfo.storeList[0].id
         }
         }
         dispatch(fetchStoreInfo(storeId));
         dispatch(fetchStoreInfo(storeId));
+        this.hidePopup();
     }
     }
     changeStore(e){
     changeStore(e){
         console.log("change storeid to:", e.target.value);
         console.log("change storeid to:", e.target.value);
@@ -905,6 +906,7 @@ class PageContainer extends React.Component {
     startWork(){
     startWork(){
         const {dispatch,state} = this.props;
         const {dispatch,state} = this.props;
         let {commonInfo={}} = state;
         let {commonInfo={}} = state;
+        console.log(state)
         this.setState({
         this.setState({
             startWork : true
             startWork : true
         },()=>{
         },()=>{