Skip to content

M
max_android_panel
Commit 36f2dc27 by yaxiLiuu
Options

fixed conflict â€

parents 51142f08 7571411d
Showing with 60 additions and 14 deletions
client/actions/index.js
import actiontypes from '../actiontype/index'; import actiontypes from '../actiontype/index';
import mock from '../mock/index' import mock from '../mock/index'
let domain = ENV.domain;
const initStart = () => { const initStart = () => {
return { return {
type : actiontypes.INITSTART, type : actiontypes.INITSTART,
......
client/containers/PageContainer/PageContainer.jsx
'use strict'; 'use strict';
import React from 'react' import React from 'react'
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent' import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
import TroubleContainer from '../TroubleContainer/TroubleContainer' import TroubleContainer from '../TroubleContainer/TroubleContainer'
import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr' import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
import ReportDamagesListContainer from '../ReportDamagesListContainer/ReportDamagesListContainer' import ReportDamagesListContainer from '../ReportDamagesListContainer/ReportDamagesListContainer'
const showPage = {
1 : 'Trouble',
2 : 'Scan'
}
class PageContainer extends React.Component { class PageContainer extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
// UTILPATH.socket.getIp(); // UTILPATH.socket.getIp();
this.state = {
showPage : showPage[2],
page : null
};
this.getPages = this.getPages.bind(this);
} }
componentWillMount() { componentWillMount() {
let pages = this.getPages();
this.setState({
page : pages
})
} }
componentDidMount(){ componentDidMount(){
} }
...@@ -24,13 +36,24 @@ class PageContainer extends React.Component { ...@@ -24,13 +36,24 @@ class PageContainer extends React.Component {
componentWillUnmount(){ componentWillUnmount(){
} }
getPages(){
let pages = null;
switch (this.state.showPage){
case showPage[1]:
pages = <TroubleContainer />;
break;
case showPage[2]:
pages = <ScanBarCodeContainer />;
break;
}
return pages;
}
render() { render() {
console.log(this.state);
return ( return (
<div> <div>
<HeaderComponent /> <HeaderComponent />
{/* <TroubleContainer />*/} {this.state.page}
<ReportDamagesListContainer />
</div> </div>
) )
} }
......
client/containers/TroubleContainer/TroubleContainer.jsx
...@@ -9,9 +9,12 @@ export default class TroubleContainer extends React.Component{ ...@@ -9,9 +9,12 @@ export default class TroubleContainer extends React.Component{
return <div className={"troubleContainer"}> return <div className={"troubleContainer"}>
<div className={"troubleText font32"}><span className={"colff7860"}>*</span>必填项</div> <div className={"troubleText font32"}><span className={"colff7860"}>*</span>必填项</div>
<div className={"troubleBox"}> <div className={"troubleBox"}>
<div className={"troubleItem"}> <div className={"troubleItemComponent"}>
<div className={"itemText"}>故障问题1：故障ID-00001</div> <div className={"itemText font32"}>故障问题1：故障ID-00001</div>
<div className={"itemWrongInfo"}>2:3 左侧动作故障，取货动作出错</div> <div className={"itemWrongInfo font24 col999"}>
<p>2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错2:3 左侧动作故障，取货动作出错</p>
</div>
<div className={"jugdeQuestion"}> <div className={"jugdeQuestion"}>
<span>*</span>是否有此问题 <span>*</span>是否有此问题
<span>是</span> <span>是</span>
......
client/containers/TroubleContainer/index.css
...@@ -10,11 +10,24 @@ ...@@ -10,11 +10,24 @@
.troubleBox{ .troubleBox{
margin-top: 20px; margin-top: 20px;
} }
.troubleItem{ .troubleItemComponent{
width: 1396px; width: 1396px;
height: 608px; height: 608px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
background-color: #ffffff; background-color: #ffffff;
border-radius: 20px; border-radius: 20px;
overflow: hidden; 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 @@ ...@@ -17,4 +17,7 @@
} }
.col333{ .col333{
color: #333333!important; color: #333333!important;
}
.col999{
color: #999999!important;
} }
\ No newline at end of file
client/index.js
...@@ -18,7 +18,6 @@ function activateVendor() { ...@@ -18,7 +18,6 @@ function activateVendor() {
) )
) )
} }
function renderPage(store) { function renderPage(store) {
ReactDom.render( ReactDom.render(
<Provider store={store}> <Provider store={store}>
......
webpack.config.js
...@@ -82,12 +82,12 @@ let envConfig = { ...@@ -82,12 +82,12 @@ let envConfig = {
}), //分割共有模块和代码模块 }), //分割共有模块和代码模块
new webpack.optimize.AggressiveMergingPlugin(), new webpack.optimize.AggressiveMergingPlugin(),
new webpack.DefinePlugin({ 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({ new webpack.ProvidePlugin({
ENV: __dirname + '/client/env/' + (process.env.NODE_ENV || 'development'), ENV: __dirname + '/client/env/production',
UTILPATH:__dirname+'/client/util/util', UTILPATH:__dirname+'/client/util/util',
CONFIG:__dirname+'/client/config/index' CONFIG:__dirname+'/client/config/index',
}), }),
new webpack.NoEmitOnErrorsPlugin(), //配置了NoErrorsPlugin插件，用来跳过编译时出错的代码并记录，使编译后运行时的包不会发生错误 new webpack.NoEmitOnErrorsPlugin(), //配置了NoErrorsPlugin插件，用来跳过编译时出错的代码并记录，使编译后运行时的包不会发生错误
] ]
...@@ -108,9 +108,9 @@ let envConfig = { ...@@ -108,9 +108,9 @@ let envConfig = {
'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development') } 'process.env': { NODE_ENV: JSON.stringify(process.env.NODE_ENV || 'development') }
}), }),
new webpack.ProvidePlugin({ new webpack.ProvidePlugin({
ENV: __dirname + '/client/env/' + (process.env.NODE_ENV || 'development'), ENV: __dirname + '/client/env/development',
UTILPATH:__dirname+'/client/util/util', UTILPATH:__dirname+'/client/util/util',
CONFIG:__dirname+'/client/config/index' CONFIG:__dirname+'/client/config/index',
}), }),
new webpack.LoaderOptionsPlugin({ new webpack.LoaderOptionsPlugin({
options: { options: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment