Merge commit '7b50d3c6' into dev

# Conflicts: # package.json

Merge commit '7b50d3c6' into dev
# Conflicts: # package.json
46ecad88 · 刘珅 · aa2a707a · 7b50d3c6 · 46ecad88 · 46ecad88
Commit 46ecad88 authored May 08, 2019 by 刘珅
12 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ static
 .idea
 package-lock.json
 .map
+.vscode
--- a/client/actions/common.js
+++ b/client/actions/common.js
@@ -87,10 +87,12 @@ const getTaskList = (data={},callback=null)=>{
        let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.employeeId}`;
        UTILPATH.myLogger.info("getTaskList url ",url);
        return (dispatch)=>{
-            if(!userInfo.id){
+            if(!storeInfo.id){
-                dispatch(addErrorInfo('没有获取用户信息'))
+                dispatch(addErrorInfo('没有门店信息，请耐心等待，看右上角是否有门店信息，如还没有，请重启APP'))
+            }else if(!userInfo.id){
+                dispatch(addErrorInfo('没有用户信息，请重启APP，等有门店信息了，重新扫描开门码'))
            }else if(!taskInfo.area){
-                dispatch(addErrorInfo('没有获取区域信息'))
+                dispatch(addErrorInfo('没有区域信息，请重启APP，等有门店信息了，重新扫描开门码'))
            }else {
                fetch(url,{
                    credentials : 'include',

--- a/client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
+++ b/client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
@@ -60,8 +60,15 @@ export default class HeaderComponent extends React.Component{
                },this.countbackTime)
            }
        })
+        if(this.isShowVersionAndPort()){
+           this.props.changePages(CONFIG.showPage[8888])
+        }
    }
+    //判断是否显示版本号和端口号页面
+    isShowVersionAndPort () {
+        return true
+    }
    getHomeHeader(){
        let headerInfo = this.props.headerInfo;
        let {storeInfo,userInfo,taskInfo} = headerInfo;

--- a/client/config/index.js
+++ b/client/config/index.js
@@ -2,5 +2,6 @@ import swiperContainers from './swiperContainer'
 import showPage from './showPage'
 import socketType from './socketType'
 import taskErrorType from './taskErrorType'
+import machineInfo from './machineInfo'
-module.exports = {swiperContainers,...showPage,socketType,taskErrorType}
+module.exports = {swiperContainers,...showPage,socketType,taskErrorType , machineInfo }
\ No newline at end of file
--- a/client/config/machineInfo.js
+++ b/client/config/machineInfo.js
+// {}
+const requestInfo = {
+    domainPort : '7788',
+    domainIp : '192.168.10.'
+}
+module.exports = requestInfo;
\ No newline at end of file
--- a/client/config/showPage.js
+++ b/client/config/showPage.js
@@ -18,6 +18,7 @@ const showPage = {
    14 : 'Question', //二期问题反馈页面
    141 : 'Question1', //二期问题反馈页面
    15 : 'BoxRecoverySkus', //二期回收箱回收
+    8888 : 'MachineInfo'
 };
 const taskSchedule = { //任务进度序列号，后台给
    1: showPage[5],

--- a/client/containers/HomePageContainer/HomePageContainer.jsx
+++ b/client/containers/HomePageContainer/HomePageContainer.jsx
@@ -107,6 +107,7 @@ export default class HomePageContainer extends React.Component{
                    showHeader={CONFIG.headerStatus[1]}
                    headerInfo={headerInfo}
                    showLogoutPopup={this.showLogoutPopup}
+                    changePages = {this.props.changePages}
                />
                {
                    props.closeDoor ? <div className={"homeContainer"} >

--- a/client/containers/MachineInfo/MachineInfo.jsx
+++ b/client/containers/MachineInfo/MachineInfo.jsx
+import React from 'react';
+import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
+import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent';
+export default class MachineInfo extends React.Component {
+    constructor(props){
+        super(props);
+        this.state = {
+        }
+    }
+    render(){
+        let props = this.props;
+        let {headerInfo , changePages} = props;
+        return(
+            <div>
+                <HeaderComponent
+                    showHeader={CONFIG.headerStatus[1]}
+                    headerInfo={headerInfo}
+                />
+                <div className="machineInfo" style={{textAlign:'center', marginTop:'3rem'}}>
+                   <p>当前版本号 {CURVERSION}</p>
+                   <p>当前端口号 {CONFIG.machineInfo.domainPort} </p>
+                   <Button text={'首页'} btnContainer={'colfff font30'} style={{background:'#ff7860',marginLeft:'50%',transform:' translate(-50%)',marginTop:'.5rem'}} option={()=>changePages(CONFIG.showPage[13])} />
+                </div>
+            </div>
+        )
+    }
+}
\ No newline at end of file
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -42,6 +42,7 @@ import AllClassify from '../AllClassifyContainer/AllClassifyContainer'
 import {willCloseDoor,closeDoorSuccess} from '../../actions/chooseTaskContainer'
 import {sendMsg} from '../../util/socket'
 import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
+import MachineInfo from '../MachineInfo/MachineInfo'
 /*二期引用 end*/
 import {on,remove} from '../../util/event';
@@ -1094,6 +1095,12 @@ class PageContainer extends React.Component {
                    willCloseDoor={async ()=>{return await dispatch(willCloseDoor(commonInfo,true))}}
                />;
                break;
+            case showPage[8888] :
+                 pages = <MachineInfo
+                    headerInfo = {commonInfo}
+                    changePages={(data)=>this.changePages(data)}
+                 />
+                 break;
            case showPage[11]:
                pages = <ReplenishContainer
                    headerInfo = {commonInfo}

--- a/client/util/logger.js
+++ b/client/util/logger.js
@@ -2,7 +2,7 @@ import fetch from 'isomorphic-fetch';
 let domain = "http://192.168.10.63:7780";
-const domainPort = "7788";
+const domainPort = CONFIG.machineInfo.domainPort;
 const myHeaders = new Headers({
    // 'Access-Control-Allow-Origin': '*',
    // 'Content-Type': 'text/plain;charset=UTF-8',

--- a/client/util/socket.js
+++ b/client/util/socket.js
 import {emit, on , remove} from './event'
 import myLogger from './logger'
-let domainIp = '192.168.10.';
+let domainIp = CONFIG.machineInfo.domainIp;
-const domainPort = "7788";
+const domainPort = CONFIG.machineInfo.domainPort;
 const socket = {};

--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
    "clean": "rm -rf static/*",
-    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.1 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0",
+    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.3 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0",
-    "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.1 --progress --color",
+    "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.3 --progress --color",
    "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
  },
  "author": "",