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
6cca1416
Commit
6cca1416
authored
Jan 07, 2019
by
Zhang Xin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善代码
parent
22f5ab91
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
13 deletions
+7
-13
client/actions/barcodeCommon.js
+1
-1
client/actions/chooseTaskContainer.js
+3
-3
client/containers/HomePageContainer/HomePageContainer.jsx
+2
-2
client/containers/PageContainer/PageContainer.jsx
+1
-7
No files found.
client/actions/barcodeCommon.js
View file @
6cca1416
...
@@ -15,7 +15,7 @@ const getBarCodeProductInfo = (data)=>{
...
@@ -15,7 +15,7 @@ const getBarCodeProductInfo = (data)=>{
let
url
=
`
${
domain
}
machine_pad/barcode/
${
storeId
}
/
${
taskId
}
/
${
area
}
/
${
currentTaskType
}
/
${
barcode
}
`
let
url
=
`
${
domain
}
machine_pad/barcode/
${
storeId
}
/
${
taskId
}
/
${
area
}
/
${
currentTaskType
}
/
${
barcode
}
`
return
(
dispatch
)
=>
{
return
(
dispatch
)
=>
{
fetch
(
url
,{
fetch
(
url
,{
//
credentials : 'include',
credentials
:
'include'
,
method
:
'GET'
,
method
:
'GET'
,
mode
:
'cors'
mode
:
'cors'
}).
then
((
response
)
=>
response
.
json
())
}).
then
((
response
)
=>
response
.
json
())
...
...
client/actions/chooseTaskContainer.js
View file @
6cca1416
...
@@ -11,7 +11,7 @@ const willCloseDoor=(data)=>{
...
@@ -11,7 +11,7 @@ const willCloseDoor=(data)=>{
let
bodyData
=
{
area
,
storeId
:
machineId
,
taskId
,
userId
,
taskType
:
currentTaskType
}
let
bodyData
=
{
area
,
storeId
:
machineId
,
taskId
,
userId
,
taskType
:
currentTaskType
}
return
(
dispatch
)
=>
{
return
(
dispatch
)
=>
{
fetch
(
url
,{
fetch
(
url
,{
//
credentials : 'include',
credentials
:
'include'
,
method
:
'POST'
,
method
:
'POST'
,
mode
:
'cors'
,
mode
:
'cors'
,
headers
:{
headers
:{
...
@@ -21,7 +21,7 @@ const willCloseDoor=(data)=>{
...
@@ -21,7 +21,7 @@ const willCloseDoor=(data)=>{
body
:
JSON
.
stringify
(
bodyData
)
body
:
JSON
.
stringify
(
bodyData
)
}).
then
((
response
)
=>
response
.
json
())
}).
then
((
response
)
=>
response
.
json
())
.
then
((
json
)
=>
{
.
then
((
json
)
=>
{
dispatch
(
closeDoorSuccess
(
data
));
//
dispatch(closeDoorSuccess(data));
})
})
}
}
}
}
...
@@ -36,7 +36,7 @@ const closeDoorSuccess=(data)=>{
...
@@ -36,7 +36,7 @@ const closeDoorSuccess=(data)=>{
let
url
=
domain
+
'machine_pad/update_door_status.action'
let
url
=
domain
+
'machine_pad/update_door_status.action'
return
(
dispatch
)
=>
{
return
(
dispatch
)
=>
{
fetch
(
url
,{
fetch
(
url
,{
//
credentials : 'include',
credentials
:
'include'
,
method
:
'POST'
,
method
:
'POST'
,
mode
:
'cors'
,
mode
:
'cors'
,
headers
:{
headers
:{
...
...
client/containers/HomePageContainer/HomePageContainer.jsx
View file @
6cca1416
...
@@ -39,8 +39,8 @@ export default class HomePageContainer extends React.Component{
...
@@ -39,8 +39,8 @@ export default class HomePageContainer extends React.Component{
logout
(){
logout
(){
this
.
props
.
willCloseDoor
();
this
.
props
.
willCloseDoor
();
let
msg
=
{
type
:
'WILL_CLOSEDOOR'
};
//
let msg={type:'WILL_CLOSEDOOR'};
sendMsg
(
JSON
.
stringify
(
msg
))
//
sendMsg(JSON.stringify(msg))
this
.
props
.
tempLogout
()
this
.
props
.
tempLogout
()
}
}
...
...
client/containers/PageContainer/PageContainer.jsx
View file @
6cca1416
...
@@ -536,13 +536,7 @@ class PageContainer extends React.Component {
...
@@ -536,13 +536,7 @@ class PageContainer extends React.Component {
//二期临时退出
//二期临时退出
tempLogout
(){
tempLogout
(){
let
{
dispatch
,
state
}
=
this
.
props
;
this
.
handleCloseDoor
()
let
{
commonInfo
=
{}}
=
state
;
dispatch
(
willCloseDoor
(
commonInfo
));
this
.
hidePopup
();
// this.setState({
// showPage : showPage[initPage],
// });
}
}
/**
/**
...
...
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