Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
max_android_panel
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xin
max_android_panel
Commits
9183969f
Commit
9183969f
authored
a year ago
by
timzaak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add vconsole,remove fetch patch
parent
112c57b2
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
41 additions
and
43 deletions
+41
-43
client/actions/ScanBarCode.js
+2
-3
client/actions/TokeStokeContainer.js
+2
-3
client/actions/barcodeCommon.js
+3
-4
client/actions/breakaegContainer.js
+2
-3
client/actions/chooseTaskContainer.js
+8
-9
client/actions/common.js
+1
-1
client/actions/getIp.js
+1
-1
client/actions/getStore.js
+1
-1
client/actions/getTroubles.js
+1
-1
client/actions/otherQuestion.js
+2
-3
client/actions/refreshImg.js
+1
-1
client/actions/replenish.js
+1
-1
client/actions/reportDamageList.js
+2
-3
client/actions/uploadError.js
+1
-1
client/actions/userinfo.js
+1
-1
client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx
+1
-0
client/containers/HomePageContainer/HomePageContainer.jsx
+1
-1
client/index.js
+6
-2
client/util/logger.js
+2
-3
package.json
+2
-1
No files found.
client/actions/ScanBarCode.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
*
as
actionTypes
from
'../actiontype/ScanBarCode'
;
import
actionTypes_error
from
'../actiontype/error'
let
domain
=
ENV
.
domain
;
...
...
@@ -102,4 +102,4 @@ function throwError(data) {
type
:
actionTypes_error
.
ADDERRORINFO
,
errMsg
:
data
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
client/actions/TokeStokeContainer.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
tokeActionType
from
'../actiontype/TokeStokeContainer'
import
{
getTaskList
}
from
'./common'
let
domain
=
ENV
.
domain
;
...
...
@@ -42,4 +42,4 @@ const checkQuantity = (data)=>{
}
}
export
{
checkProductQuantity
}
\ No newline at end of file
export
{
checkProductQuantity
}
This diff is collapsed.
Click to expand it.
client/actions/barcodeCommon.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
{
saveCommonInfo
}
from
'./common'
import
barcodeActionType
from
'../actiontype/barcodeCommon'
import
replenishAction
from
'./replenish'
...
...
@@ -78,7 +78,7 @@ const getBarCodeProductInfo = (data)=>{
}
}
}
}).
catch
(
e
=>
{
UTILPATH
.
myLogger
.
error
(
`getBarCodeProductInfo error
${
e
}
`
);
dispatch
(
getBarCodeProductInfo
(
data
));
...
...
@@ -101,4 +101,4 @@ const saveStatus = (data)=>{
}
}
export
{
getBarCodeProductInfo
,
saveProductInfo
}
\ No newline at end of file
export
{
getBarCodeProductInfo
,
saveProductInfo
}
This diff is collapsed.
Click to expand it.
client/actions/breakaegContainer.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
{
getTaskList
}
from
"./common"
;
import
breakageActionType
from
'../actiontype/breakageContainer'
let
domain
=
ENV
.
domain
;
...
...
@@ -68,4 +68,4 @@ const getSubmitStatus = (data)=>{
data
}
}
export
{
submitBreakageProduct
,
hasNoSku
}
\ No newline at end of file
export
{
submitBreakageProduct
,
hasNoSku
}
This diff is collapsed.
Click to expand it.
client/actions/chooseTaskContainer.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
{
logout
,
getTaskList
,
saveCommonInfo
,
emptyStoreInfo
}
from
"./common"
;
import
{
emit
}
from
"../util/event"
;
let
domain
=
ENV
.
domain
;
...
...
@@ -20,7 +20,7 @@ const willCloseDoor=(data,flag=false)=>{
if
(
flag
){
//回收箱完成
dispatch
(
getTaskList
(
data
))
}
};
let
fail
=
(
err
)
=>
{
...
...
@@ -37,23 +37,23 @@ const willCloseDoor=(data,flag=false)=>{
},
body
:
JSON
.
stringify
(
bodyData
)
}).
then
((
response
)
=>
{
if
(
response
.
status
==
200
&&
response
){
response
.
json
()
}
else
{
var
error
=
new
Error
(
response
.
statusText
)
error
.
response
=
response
throw
error
}
}).
catch
(()
=>
{
alert
(
'网络状态不好,请稍后重试'
)
})
return
success
(
result
)
}
catch
(
err
)
{
return
fail
(
err
)
}
}
...
...
@@ -134,4 +134,4 @@ const askForNextTask = (taskId)=>{
})
}
}
export
{
willCloseDoor
,
closeDoorSuccess
}
\ No newline at end of file
export
{
willCloseDoor
,
closeDoorSuccess
}
This diff is collapsed.
Click to expand it.
client/actions/common.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionType
from
'../actiontype/common'
import
{
addErrorInfo
}
from
'./uploadError'
import
{
emit
}
from
"../util/event"
;
...
...
This diff is collapsed.
Click to expand it.
client/actions/getIp.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
actionType
from
'../actiontype/getIp'
let
domain
=
'http://192.168.10.100:8088'
;
...
...
This diff is collapsed.
Click to expand it.
client/actions/getStore.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionTypes
from
'../actiontype/store'
import
{
saveHeaderInfo
}
from
'./initHeader'
import
{
emit
}
from
"../util/event"
;
...
...
This diff is collapsed.
Click to expand it.
client/actions/getTroubles.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionTypes
from
'../actiontype/trouble'
import
userActionTypes
from
"../actiontype/user"
;
import
{
saveHeaderInfo
}
from
'./initHeader'
...
...
This diff is collapsed.
Click to expand it.
client/actions/otherQuestion.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
*
as
actionTypes
from
'../actiontype/otherQuestion'
;
const
domain
=
ENV
.
domain
;
//有服务器交互的actions
...
...
@@ -168,4 +168,4 @@ function overStepSuccess(data) {
type
:
actionTypes
.
OVER_STEP_SUCCESS
,
data
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
client/actions/refreshImg.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionTypes
from
'../actiontype/refreshImg'
const
domain
=
ENV
.
domain
;
const
refreshImg
=
(
data
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
client/actions/replenish.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionType
from
'../actiontype/replenish'
import
{
getTaskList
}
from
"./common"
;
import
{
saveProductInfo
}
from
"./barcodeCommon"
;
...
...
This diff is collapsed.
Click to expand it.
client/actions/reportDamageList.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
*
as
actionTypes
from
'../actiontype/reportDamage'
;
import
actionTypes_error
from
"../actiontype/error"
;
let
domain
=
ENV
.
domain
;
...
...
@@ -72,4 +72,4 @@ function throwError(data) {
type
:
actionTypes_error
.
ADDERRORINFO
,
errMsg
:
data
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
client/actions/uploadError.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
import
actionType
from
'../actiontype/error'
import
{
getTaskList
}
from
'./common'
;
import
{
saveProductInfo
}
from
'./barcodeCommon'
...
...
This diff is collapsed.
Click to expand it.
client/actions/userinfo.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
import
actionTypes
from
'../actiontype/user'
import
{
saveHeaderInfo
}
from
'./initHeader'
import
{
addErrorInfo
}
from
'./uploadError'
...
...
This diff is collapsed.
Click to expand it.
client/components/ReplenishComponent/ReplenishSkuPage/ReplenishSkuPage.jsx
View file @
9183969f
...
...
@@ -110,6 +110,7 @@ export default class ReplenishSkuPage extends React.Component{
//确认扫描完毕
scanOver
(){
let
props
=
this
.
props
;
console
.
log
(
`btnClock value:
${
this
.
state
.
btnClock
}
`
)
if
(
!
this
.
state
.
btnClock
){
this
.
setState
({
btnClock
:
true
...
...
This diff is collapsed.
Click to expand it.
client/containers/HomePageContainer/HomePageContainer.jsx
View file @
9183969f
...
...
@@ -3,7 +3,7 @@ import HeaderComponent from '../../components/CommonComponent/HeaderComponent/He
import
Button
from
'../../components/CommonComponent/ButtonComponent/ButtonComponent'
import
PopModel
from
'../../components/CommonComponent/PopupComponent/PopupChildComponent'
import
{
sendMsg
}
from
"../../util/socket"
;
import
fetch
from
'isomorphic-fetch'
//
import fetch from 'isomorphic-fetch'
require
(
'./index.css'
);
let
domain
=
ENV
.
domain
;
export
default
class
HomePageContainer
extends
React
.
Component
{
...
...
This diff is collapsed.
Click to expand it.
client/index.js
View file @
9183969f
import
VConsole
from
'vconsole'
import
React
from
'react'
;
import
ReactDom
from
'react-dom'
;
import
{
createStore
,
applyMiddleware
}
from
'redux'
;
...
...
@@ -7,6 +8,7 @@ import { createLogger } from 'redux-logger'
import
thunkMiddleware
from
'redux-thunk'
;
require
(
'./index.css'
);
import
PageContainer
from
'./containers/PageContainer/PageContainer'
;
const
env
=
process
.
env
.
NODE_ENV
;
// import axios from 'axios'
// React.Component.prototype.axios=axios
...
...
@@ -42,4 +44,7 @@ let store = activateVendor();
// UTILPATH.socket.stopServer();
// UTILPATH.socket.getTestIp(203);
renderPage
(
store
);
\ No newline at end of file
renderPage
(
store
);
new
VConsole
()
This diff is collapsed.
Click to expand it.
client/util/logger.js
View file @
9183969f
import
fetch
from
'isomorphic-fetch'
;
//
import fetch from 'isomorphic-fetch';
let
domain
=
""
;
...
...
@@ -55,4 +55,4 @@ myLogger.error = function () {
}
};
module
.
exports
=
myLogger
;
\ No newline at end of file
module
.
exports
=
myLogger
;
This diff is collapsed.
Click to expand it.
package.json
View file @
9183969f
...
...
@@ -51,7 +51,8 @@
"
react
"
:
"^16.4.1"
,
"
react-dom
"
:
"^16.4.1"
,
"
react-redux
"
:
"^5.0.7"
,
"
redux
"
:
"^4.0.0"
"
redux
"
:
"^4.0.0"
,
"
vconsole
"
:
"^3.15.1"
},
"homepage"
:
"./"
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment