Commit 9183969f by timzaak

add vconsole,remove fetch patch

parent 112c57b2
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import * as actionTypes from '../actiontype/ScanBarCode'; import * as actionTypes from '../actiontype/ScanBarCode';
import actionTypes_error from '../actiontype/error' import actionTypes_error from '../actiontype/error'
let domain = ENV.domain; let domain = ENV.domain;
...@@ -102,4 +102,4 @@ function throwError(data) { ...@@ -102,4 +102,4 @@ function throwError(data) {
type:actionTypes_error.ADDERRORINFO, type:actionTypes_error.ADDERRORINFO,
errMsg:data errMsg:data
} }
} }
\ No newline at end of file
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import tokeActionType from '../actiontype/TokeStokeContainer' import tokeActionType from '../actiontype/TokeStokeContainer'
import {getTaskList} from './common' import {getTaskList} from './common'
let domain = ENV.domain; let domain = ENV.domain;
...@@ -42,4 +42,4 @@ const checkQuantity = (data)=>{ ...@@ -42,4 +42,4 @@ const checkQuantity = (data)=>{
} }
} }
export {checkProductQuantity} export {checkProductQuantity}
\ No newline at end of file
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import {saveCommonInfo} from './common' import {saveCommonInfo} from './common'
import barcodeActionType from '../actiontype/barcodeCommon' import barcodeActionType from '../actiontype/barcodeCommon'
import replenishAction from './replenish' import replenishAction from './replenish'
...@@ -78,7 +78,7 @@ const getBarCodeProductInfo = (data)=>{ ...@@ -78,7 +78,7 @@ const getBarCodeProductInfo = (data)=>{
} }
} }
} }
}).catch(e=>{ }).catch(e=>{
UTILPATH.myLogger.error(`getBarCodeProductInfo error ${e}`); UTILPATH.myLogger.error(`getBarCodeProductInfo error ${e}`);
dispatch(getBarCodeProductInfo(data)); dispatch(getBarCodeProductInfo(data));
...@@ -101,4 +101,4 @@ const saveStatus = (data)=>{ ...@@ -101,4 +101,4 @@ const saveStatus = (data)=>{
} }
} }
export {getBarCodeProductInfo,saveProductInfo} export {getBarCodeProductInfo,saveProductInfo}
\ No newline at end of file
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import {getTaskList} from "./common"; import {getTaskList} from "./common";
import breakageActionType from '../actiontype/breakageContainer' import breakageActionType from '../actiontype/breakageContainer'
let domain = ENV.domain; let domain = ENV.domain;
...@@ -68,4 +68,4 @@ const getSubmitStatus = (data)=>{ ...@@ -68,4 +68,4 @@ const getSubmitStatus = (data)=>{
data data
} }
} }
export {submitBreakageProduct,hasNoSku} export {submitBreakageProduct,hasNoSku}
\ No newline at end of file
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import {logout, getTaskList, saveCommonInfo,emptyStoreInfo} from "./common"; import {logout, getTaskList, saveCommonInfo,emptyStoreInfo} from "./common";
import {emit} from "../util/event"; import {emit} from "../util/event";
let domain = ENV.domain; let domain = ENV.domain;
...@@ -20,7 +20,7 @@ const willCloseDoor=(data,flag=false)=>{ ...@@ -20,7 +20,7 @@ const willCloseDoor=(data,flag=false)=>{
if(flag){ if(flag){
//回收箱完成 //回收箱完成
dispatch(getTaskList(data)) dispatch(getTaskList(data))
} }
}; };
let fail = (err)=>{ let fail = (err)=>{
...@@ -37,23 +37,23 @@ const willCloseDoor=(data,flag=false)=>{ ...@@ -37,23 +37,23 @@ const willCloseDoor=(data,flag=false)=>{
}, },
body:JSON.stringify(bodyData) body:JSON.stringify(bodyData)
}).then((response)=>{ }).then((response)=>{
if(response.status==200&&response){ if(response.status==200&&response){
response.json() response.json()
}else{ }else{
var error = new Error(response.statusText) var error = new Error(response.statusText)
error.response = response error.response = response
throw error throw error
} }
}).catch(()=>{ }).catch(()=>{
alert('网络状态不好,请稍后重试') alert('网络状态不好,请稍后重试')
}) })
return success(result) return success(result)
} catch (err) { } catch (err) {
return fail(err) return fail(err)
} }
} }
...@@ -134,4 +134,4 @@ const askForNextTask = (taskId)=>{ ...@@ -134,4 +134,4 @@ const askForNextTask = (taskId)=>{
}) })
} }
} }
export {willCloseDoor,closeDoorSuccess} export {willCloseDoor,closeDoorSuccess}
\ No newline at end of file
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionType from '../actiontype/common' import actionType from '../actiontype/common'
import {addErrorInfo} from './uploadError' import {addErrorInfo} from './uploadError'
import {emit} from "../util/event"; import {emit} from "../util/event";
......
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import actionType from '../actiontype/getIp' import actionType from '../actiontype/getIp'
let domain = 'http://192.168.10.100:8088'; let domain = 'http://192.168.10.100:8088';
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionTypes from '../actiontype/store' import actionTypes from '../actiontype/store'
import {saveHeaderInfo} from './initHeader' import {saveHeaderInfo} from './initHeader'
import {emit} from "../util/event"; import {emit} from "../util/event";
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionTypes from '../actiontype/trouble' import actionTypes from '../actiontype/trouble'
import userActionTypes from "../actiontype/user"; import userActionTypes from "../actiontype/user";
import {saveHeaderInfo} from './initHeader' import {saveHeaderInfo} from './initHeader'
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import * as actionTypes from '../actiontype/otherQuestion'; import * as actionTypes from '../actiontype/otherQuestion';
const domain = ENV.domain; const domain = ENV.domain;
//有服务器交互的actions //有服务器交互的actions
...@@ -168,4 +168,4 @@ function overStepSuccess(data) { ...@@ -168,4 +168,4 @@ function overStepSuccess(data) {
type:actionTypes.OVER_STEP_SUCCESS, type:actionTypes.OVER_STEP_SUCCESS,
data data
} }
} }
\ No newline at end of file
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionTypes from '../actiontype/refreshImg' import actionTypes from '../actiontype/refreshImg'
const domain = ENV.domain; const domain = ENV.domain;
const refreshImg = (data)=>{ const refreshImg = (data)=>{
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionType from '../actiontype/replenish' import actionType from '../actiontype/replenish'
import {getTaskList} from "./common"; import {getTaskList} from "./common";
import {saveProductInfo} from "./barcodeCommon"; import {saveProductInfo} from "./barcodeCommon";
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import * as actionTypes from '../actiontype/reportDamage'; import * as actionTypes from '../actiontype/reportDamage';
import actionTypes_error from "../actiontype/error"; import actionTypes_error from "../actiontype/error";
let domain = ENV.domain; let domain = ENV.domain;
...@@ -72,4 +72,4 @@ function throwError(data) { ...@@ -72,4 +72,4 @@ function throwError(data) {
type:actionTypes_error.ADDERRORINFO, type:actionTypes_error.ADDERRORINFO,
errMsg:data errMsg:data
} }
} }
\ No newline at end of file
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
import actionType from '../actiontype/error' import actionType from '../actiontype/error'
import {getTaskList} from './common'; import {getTaskList} from './common';
import {saveProductInfo} from './barcodeCommon' import {saveProductInfo} from './barcodeCommon'
......
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
import actionTypes from '../actiontype/user' import actionTypes from '../actiontype/user'
import {saveHeaderInfo} from './initHeader' import {saveHeaderInfo} from './initHeader'
import {addErrorInfo} from './uploadError' import {addErrorInfo} from './uploadError'
......
...@@ -110,6 +110,7 @@ export default class ReplenishSkuPage extends React.Component{ ...@@ -110,6 +110,7 @@ export default class ReplenishSkuPage extends React.Component{
//确认扫描完毕 //确认扫描完毕
scanOver(){ scanOver(){
let props = this.props; let props = this.props;
console.log(`btnClock value: ${this.state.btnClock}`)
if(!this.state.btnClock){ if(!this.state.btnClock){
this.setState({ this.setState({
btnClock : true btnClock : true
......
...@@ -3,7 +3,7 @@ import HeaderComponent from '../../components/CommonComponent/HeaderComponent/He ...@@ -3,7 +3,7 @@ import HeaderComponent from '../../components/CommonComponent/HeaderComponent/He
import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent' import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
import {sendMsg} from "../../util/socket"; import {sendMsg} from "../../util/socket";
import fetch from 'isomorphic-fetch' //import fetch from 'isomorphic-fetch'
require('./index.css'); require('./index.css');
let domain = ENV.domain; let domain = ENV.domain;
export default class HomePageContainer extends React.Component{ export default class HomePageContainer extends React.Component{
......
import VConsole from 'vconsole'
import React from 'react'; import React from 'react';
import ReactDom from 'react-dom'; import ReactDom from 'react-dom';
import {createStore , applyMiddleware} from 'redux'; import {createStore , applyMiddleware} from 'redux';
...@@ -7,6 +8,7 @@ import { createLogger } from 'redux-logger' ...@@ -7,6 +8,7 @@ import { createLogger } from 'redux-logger'
import thunkMiddleware from 'redux-thunk'; import thunkMiddleware from 'redux-thunk';
require('./index.css'); require('./index.css');
import PageContainer from './containers/PageContainer/PageContainer'; import PageContainer from './containers/PageContainer/PageContainer';
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
// import axios from 'axios' // import axios from 'axios'
// React.Component.prototype.axios=axios // React.Component.prototype.axios=axios
...@@ -42,4 +44,7 @@ let store = activateVendor(); ...@@ -42,4 +44,7 @@ let store = activateVendor();
// UTILPATH.socket.stopServer(); // UTILPATH.socket.stopServer();
// UTILPATH.socket.getTestIp(203); // UTILPATH.socket.getTestIp(203);
renderPage(store); renderPage(store);
\ No newline at end of file
new VConsole()
import fetch from 'isomorphic-fetch'; //import fetch from 'isomorphic-fetch';
let domain = ""; let domain = "";
...@@ -55,4 +55,4 @@ myLogger.error = function () { ...@@ -55,4 +55,4 @@ myLogger.error = function () {
} }
}; };
module.exports = myLogger; module.exports = myLogger;
\ No newline at end of file
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
"react": "^16.4.1", "react": "^16.4.1",
"react-dom": "^16.4.1", "react-dom": "^16.4.1",
"react-redux": "^5.0.7", "react-redux": "^5.0.7",
"redux": "^4.0.0" "redux": "^4.0.0",
"vconsole": "^3.15.1"
}, },
"homepage": "./" "homepage": "./"
} }
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