fix bugs

client/actions/index.js

 import actiontypes from '../actiontype/index';
 import mock from '../mock/index'
+let domain = ENV.domain;
+
+
 const initStart = () => {
     return {
         type : actiontypes.INITSTART,

client/containers/PageContainer/PageContainer.jsx

 'use strict';
 import React from 'react'
 import { connect }  from 'react-redux';
-
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
 
+const showPage = {
+    1 : 'Trouble',
+    2 : 'Scan'
+}
 
 class PageContainer extends React.Component {
     constructor(props) {
         super(props);
         // UTILPATH.socket.getIp();
+        this.state = {
+            showPage : showPage[2],
+            page : null
+        };
+        this.getPages = this.getPages.bind(this);
     }
     componentWillMount() {
+        let pages = this.getPages();
+        this.setState({
+            page : pages
+        })
     }
     componentDidMount(){
     }
@@ -23,12 +35,24 @@ class PageContainer extends React.Component {
     componentWillUnmount(){
     }
 
+    getPages(){
+        let pages = null;
+        switch (this.state.showPage){
+            case showPage[1]:
+                pages = <TroubleContainer />;
+                break;
+            case showPage[2]:
+                pages = <ScanBarCodeContainer />;
+                break;
+        }
+        return pages;
+    }
+
     render() {
-        console.log(this.state);
         return (
             <div>
                 <HeaderComponent />
-                <TroubleContainer />
+                {this.state.page}
             </div>
         )
     }

client/containers/TroubleContainer/TroubleContainer.jsx

@@ -9,9 +9,12 @@ export default class TroubleContainer extends   React.Component{
         return <div className={"troubleContainer"}>
             <div className={"troubleText font32"}><span className={"colff7860"}>*</span>必填项</div>
             <div className={"troubleBox"}>
-                <div className={"troubleItem"}>
-                    <div className={"itemText"}>故障问题1：故障ID-00001</div>
-                    <div className={"itemWrongInfo"}>2:3 左侧动作故障，取货动作出错</div>
+                <div className={"troubleItemComponent"}>
+                    <div className={"itemText font32"}>故障问题1：故障ID-00001</div>
+                    <div className={"itemWrongInfo font24 col999"}>
+                        <p>2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错</p>
+
+                    </div>
                     <div className={"jugdeQuestion"}>
                         <span>*</span>是否有此问题
                         <span>是</span>

client/containers/TroubleContainer/index.css

@@ -10,11 +10,24 @@
 .troubleBox{
     margin-top: 20px;
 }
-.troubleItem{
+.troubleItemComponent{
     width: 1396px;
     height: 608px;
     border: 1px solid #e5e5e5;
     background-color: #ffffff;
     border-radius: 20px;
     overflow: hidden;
+    padding: 42px 45px 0 45px;
+}
+.troubleItemComponent .itemText{
+    font-weight: bold;
+}
+.troubleItemComponent .itemWrongInfo{
+    height: 86px;
+    position: relative;
+}
+.troubleItemComponent .itemWrongInfo>p{
+    line-height: 32px;
+    top: 50%;
+    transform: translateY(-50%);
 }
\ No newline at end of file

client/css/color.css

@@ -17,4 +17,7 @@
 }
 .col333{
     color: #333333!important;
+}
+.col999{
+    color: #999999!important;
 }
\ No newline at end of file

client/index.js

@@ -18,7 +18,6 @@ function activateVendor() {
         )
     )
 }
-
 function renderPage(store) {
     ReactDom.render(
         <Provider store={store}>

webpack.config.js

@@ -82,12 +82,12 @@ let envConfig = {
             }), //分割共有模块和代码模块
             new webpack.optimize.AggressiveMergingPlugin(),
             new webpack.DefinePlugin({
-                'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development') }
+                'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'production') }
             }),
             new webpack.ProvidePlugin({
-                ENV: __dirname + '/client/env/' + (process.env.NODE_ENV || 'development'),
+                ENV: __dirname + '/client/env/production',
                 UTILPATH:__dirname+'/client/util/util',
-                CONFIG:__dirname+'/client/config/index'
+                CONFIG:__dirname+'/client/config/index',
             }),
             new webpack.NoEmitOnErrorsPlugin(), //配置了NoErrorsPlugin插件，用来跳过编译时出错的代码并记录，使编译后运行时的包不会发生错误
         ]
@@ -108,9 +108,9 @@ let envConfig = {
                 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development') }
             }),
             new webpack.ProvidePlugin({
-                ENV: __dirname + '/client/env/' + (process.env.NODE_ENV || 'development'),
+                ENV: __dirname + '/client/env/development',
                 UTILPATH:__dirname+'/client/util/util',
-                CONFIG:__dirname+'/client/config/index'
+                CONFIG:__dirname+'/client/config/index',
             }),
             new webpack.LoaderOptionsPlugin({
                 options: {