Skip to content

M
max_android_panel
Commit 1fb80874 by yaxiLiuu
Options

†fixed confilct code â€

parents d1c16cdb 354f8e97
Showing with 448 additions and 3 deletions
client/actions/ScanBarCodeContainer.js 0 → 100644
import fetch from 'isomorphic-fetch';
import * as actionTypes from '../actiontype/ScanBarCodeContainer';
const domain = 'http://test.mjitech.com';
const fakeJsonData = {
}
export function scanBarCodeGetProductInfo(postData) {
return (dispatch) => {
let url = String(domain+'/web/scanning_sku_barcode_for_add_loss_task');
fetch(url,{
credentials : 'include',
method : 'POST',
mode : 'cors',
body : JSON.stringify(postData)
}).then((response) => response.json())
.then(
(json)=>{
if(json.is_succ){
}else{
}
}
).catch(e=>dispatch(console.log("出现错误"))
)
}
}
function initSuccess(data) {
return {
type: actionTypes.INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS,
data
}
}
\ No newline at end of file
client/actiontype/ScanBarCodeContainer.js 0 → 100644
const INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS = 'INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS'
module.exports = {INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS}
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'
class PageContainer extends React.Component {
......@@ -18,7 +20,7 @@ class PageContainer extends React.Component {
}
componentWillReceiveProps(nextProps){
}
componentWillUnmount() {
componentWillUnmount(){
}
render() {
......
client/containers/ScanBarCodeContainer/ScanBarCodeContaienr.jsx 0 → 100644
'use strict';
import React from 'react';
import { connect } from 'react-redux';
import { scanBarCodeGetProductInfo } from '../../actions/ScanBarCodeContainer'
require('./index.css');
class ScanBarCodeContainer extends React.Component{
constructor(props) {
super(props);
const {state, dispatch} = this.props;
console.log(state);
console.log(props);
this.state = {
"barCodeValue":'',
"canChangeBtnColor":false,
"showProductInfo":true
}
}
componentWillMount() {
}
componentDidMount(){
}
componentDidUpdate() {
}
componentWillReceiveProps(nextProps){
}
componentWillUnmount() {
}
handleInputBarCode(evnet){
console.log("onchange");
let barCodeValue = evnet.target.value;
this.setState({
barCodeValue :barCodeValue
},()=>{})
}
handleSubmitClick(){
const {state,dispatch} = this.props;
let postData = {};
postData.warehouseId = Number("123456");
postData.taskId = Number("123456");
postData.sellOrderId = Number("123456");
postData.skuBarcode = String(this.state.barCodeValue);
dispatch(scanBarCodeGetProductInfo(postData));
}
handleInputBarCode(){
console.log("dfdf")
this.setState({
canChangeBtnColor:true
})
}
handleOnclick(){
this.setState({
showProductInfo:true
})
}
render() {
return (
<div className={"scanBarCodeContainer"}>
{/*<div className={"header"}></div>*/}
<div className={"container"}>
<div className={"inputContaienr"}>
<input onFocus={()=>{this.handleInputBarCode.bind(this)()}} placeholder={"点击输入条形码 "} className={"barcodeValueInput"} type="text"/>
<button className={this.state.canChangeBtnColor?"submitBtn btnFous":"submitBtn"}>确定</button>
</div>
{
this.state.showProductInfo?(
<div className={"productContainer clearfix"}>
<div className={"baseInfo clearfix"}>
<img className={"productImg"} src={ require('./img/lol.gif')} alt=""/>
<div className={"skuInfo"}>
<p className={"barcode"}>9038383832</p>
<p className={"skuNumnber"}>SKU00001</p>
<p className={"productName"}>可口可乐</p>
<p className={"net"}>250ml</p>
</div>
</div>
<div className={"locationInfo clearfix"}>
<div className={"infoTitle"}>商品位置</div>
<ul className={"detailContainer clearfix"}>
<li>机械手平台</li>
<li className={"checkLi"}>出货传送区</li>
<li>轨道</li>
</ul>
</div>
<div className={"statusInfo"}>
<div className={"infoTitle"}>商品状态</div>
<ul className={"detailContainer clearfix"}>
<li className={"checkLi"}>包装完整</li>
<li>包装损坏</li>
</ul>
</div>
<div className={"uploadContainer clearfix"}>
<div className={"uploadImgRight"}>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
<div className={"imgItem"}>
<img src= { require('./img/lol.gif')}alt=""/>
<span className={"closeBtn"}>×</span>
</div>
</div>
<div className={"operationLeft"}>
<div className={"imgItem"}>
<img src={UTILPATH.localImg.plusIcon} alt=""/>
</div>
<div className={"imgItem"}>
<img src={UTILPATH.localImg.refreshIcon} alt=""/>
</div>
</div>
</div>
<div className={"btnContainer"}>
<button className={"submitEditBtn"}>提交</button>
</div>
</div>
):""
}
</div>
</div>
)
}
}
function select(store) {
return Object.assign({}, {state: store})
}
export default connect(select)(ScanBarCodeContainer)
\ No newline at end of file
client/containers/ScanBarCodeContainer/index.css 0 → 100644
.scanBarCodeContainer{
position: relative;
}
.scanBarCodeContainer .header{
height: 98px;
background-color: #34343e;
width: 100%;
}
.scanBarCodeContainer .container{
height: 856px;
background-color:darkmagenta;
padding-left: 600px;
padding-top: 197px;
padding-right: 75px ;
box-sizing: border-box;
}
.scanBarCodeContainer .container .inputContaienr{}
.scanBarCodeContainer .container .inputContaienr{}
.scanBarCodeContainer .container .inputContaienr .barcodeValueInput {
box-sizing: border-box;
height: 82px;
border: 1px solid #f2f2f2;
background-color: #e5e5e5;
color: #333333;
border-radius: 4px;
line-height: 57px;
font-size: 30px;
width: 430px;
line-height: 57px;
padding: 26px 0 26px 52px;
}
.scanBarCodeContainer .container .inputContaienr input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
/* WebKit browsers */
color: #999999;
}
.scanBarCodeContainer .container .inputContaienr input:-moz-placeholder, textarea:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: #999999;
}
.scanBarCodeContainer .container .inputContaienr input::-moz-placeholder, textarea::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #999999;
}
input:-ms-input-placeholder, textarea:-ms-input-placeholder {
/* Internet Explorer 10+ */
color: #999999;
}
.scanBarCodeContainer .container .inputContaienr .submitBtn{
margin-left: 20px;
background-color: #c5c5c5;
width: 270px;
height: 80px ;
border-radius: 4px;
font-size: 32px;
line-height: 88px;
color: #ffffff;
border: none;
vertical-align:sub;
}
.scanBarCodeContainer .btnFous{
color: #ffffff !important;
background-color: #ff785b !important;
}
.scanBarCodeContainer .productInfoContainer{}
.scanBarCodeContainer .productInfoContainer{}
/*商品弹窗样式start*/
.scanBarCodeContainer .productContainer {
position: absolute;
left: 367px;
top: 35px;
background-color: #fff;
}
.scanBarCodeContainer .productContainer{
box-sizing: border-box;
padding: 50px 75px 50px 110px;
}
.scanBarCodeContainer .productContainer .baseInfo .productImg{
height: 200px;
width: 200px;
display: inline-block;
border: 1px solid #f2f2f2;
float: left;
}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo{
float: left;
width: 200px;
margin-left: 30px;
}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo p{
margin-top: 8px;
font-size: 32px;
line-height: 44px;
color: #333333;
}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo .barcode{
}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo .skuNumnber{}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo .productName{
font-weight: bolder;
}
.scanBarCodeContainer .productContainer .baseInfo .skuInfo .net{
color: #999999;
font-size: 24px;
}
.scanBarCodeContainer .productContainer .locationInfo{
margin-top: 24px;
}
.scanBarCodeContainer .locationInfo,.statusInfo{
/* width: 855px;*/
}
.scanBarCodeContainer .productContainer .infoTitle{
display: inline-block;
color: #333333;
font-size: 30px;
float: left;
line-height: 49.8px;
padding: 25px 0;
margin-right: 80px;
}
.scanBarCodeContainer .productContainer .detailContainer{
overflow: auto;
width: 870px;
}
.scanBarCodeContainer .productContainer .detailContainer li{
box-sizing: border-box;
float: left;
height: 80px;
width: 260px;
text-align: center;
line-height: 80px;
border: 1px solid #f2f2f2;
border-radius: 10px;
color: #333333;
margin: 20px 15px;
font-size: 30px;
}
.scanBarCodeContainer .productContainer .detailContainer .checkLi{
border: 1px solid #26ce61;
}
/*.productContainer .locationInfo .infoTitle{}
.productContainer .locationInfo .detailContainer{}
.productContainer .locationInfo .detailContainer li{}
.productContainer .statusInfo .statusInfo{ }
.productContainer .statusInfo .infoTitle{ }
.productContainer .statusInfo .detailContainer{ }
.productContainer .btnContainer .submitEditBtn{}*/
.scanBarCodeContainer .productContainer .btnContainer{
margin-top: 40px ;
text-align: center;
}
.scanBarCodeContainer .btnContainer .submitEditBtn{
width: 260px;
text-align: center;
height: 80px;
line-height: 80px;
background-color: #c5c5c5;
color: #ffffff;
border: none;
margin: 0 auto;
border-radius: 10px;
font-size: 32px;
}
.scanBarCodeContainer .btnContainer .selectBtn{
background-color: #ff785b;
color: #ffffff;
}
.scanBarCodeContainer .productContainer .uploadContainer{
margin-top: 25px;
}
.scanBarCodeContainer .productContainer .uploadContainer .uploadImgRight{
float: left;
display: inline-block;
}
.scanBarCodeContainer .productContainer .uploadContainer .imgItem{
width: 90px;
height: 90px;
display: inline-block;
box-sizing: border-box;
border-radius: 10px;
border: 1px solid #f2f2f2;
margin-right: 30px;
position: relative;
}
/*.productContainer .uploadContainer .imgItem:nth-last-child(1){
margin-right: 0;
}*/
.scanBarCodeContainer .productContainer .uploadContainer .imgItem img{
width: 90px;
height: 90px;
}
.scanBarCodeContainer .productContainer .uploadContainer .imgItem .closeBtn{
width: 32px;
height: 32px;
display: inline-block;
border-radius: 50%;
background-color: #fe785b;
font-weight: 500;
color: #ffffff;
font-size: 26px;
line-height: 27px;
text-align: center;
position: absolute;
top: -16px;
right: -16px
}
.scanBarCodeContainer .productContainer .uploadContainer .uploadImgRight{}
.scanBarCodeContainer .productContainer .uploadContainer .operationLeft{
float: right;
display: inline-block;
}
.scanBarCodeContainer .productContainer .uploadContainer .operationLeft .imgItem{
border: none;
}
\ No newline at end of file
client/reducers/index.js
import { combineReducers } from 'redux'
import trouble from './trouble'
import scanBarCodeContainer from './scanBarCodeContainer'
export default combineReducers({
trouble
trouble,
scanBarCodeContainer
})
client/reducers/scanBarCodeContainer.js 0 → 100644
import * as actionTypes from '../actiontype/ScanBarCodeContainer';
function initSuccess(state,data) {
let newInfo = Object.assign({},state,data);
return newInfo;
}
export default function(state={}, action) {
switch (action.type) {
case actionTypes.INIT_SCANBARCODEGETPRODUCTINFO_SUCCESS:
return initSuccess(state,action.data)
default:
return state;
}
}
\ No newline at end of file
client/util/image.js
import headlogo from '../image/header-logo.png';
import defaultImg from '../image/default.png';
import addIcon from '../image/addIcon.png';
import refreshIcon from '../image/refresh.png';
import plusIcon from '../image/plusIcon.png';
const localHost = 'http://localhost:7788';
const devHost = 'http://test.mjitech.com';
......@@ -74,6 +76,6 @@ const handleImgLoad = (ref)=>{
return style;
}
const localImg = {headlogo,defaultImg,addIcon}
const localImg = {headlogo,defaultImg,addIcon,refreshIcon,plusIcon}
module.exports = {localHost,devHost,masterHost,getPic,handleImgError,handleImgLoad,localImg};
\ No newline at end of file
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