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
7b8b5cd0
Commit
7b8b5cd0
authored
Sep 19, 2018
by
wujiabao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改 barcodeCommon
parent
52496141
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
8 deletions
+28
-8
client/actions/barcodeCommon.js
+2
-2
client/actions/common.js
+0
-2
client/actiontype/barcodeCommon.js
+5
-0
client/containers/PageContainer/PageContainer.jsx
+2
-2
client/reducers/barcodeCommon.js
+17
-0
client/reducers/index.js
+2
-2
No files found.
client/actions/
BreakageContainer
.js
→
client/actions/
barcodeCommon
.js
View file @
7b8b5cd0
import
fetch
from
'isomorphic-fetch'
import
fetch
from
'isomorphic-fetch'
import
getTaskList
from
'./common'
import
getTaskList
from
'./common'
import
b
reakActionType
from
'../actiontype/breakageContainer
'
import
b
arcodeActionType
from
'../actiontype/barcodeCommon
'
// const changeStatus = (data)=>{
// const changeStatus = (data)=>{
...
@@ -48,7 +48,7 @@ const getProductInfo = (data)=>{
...
@@ -48,7 +48,7 @@ const getProductInfo = (data)=>{
}
}
const
saveProductInfo
=
(
data
)
=>
{
const
saveProductInfo
=
(
data
)
=>
{
return
{
return
{
type
:
b
reak
ActionType
.
GETPRODUCTINFO
,
type
:
b
arcode
ActionType
.
GETPRODUCTINFO
,
data
data
}
}
}
}
...
...
client/actions/common.js
View file @
7b8b5cd0
...
@@ -2,8 +2,6 @@ import fetch from 'isomorphic-fetch';
...
@@ -2,8 +2,6 @@ import fetch from 'isomorphic-fetch';
import
actionType
from
'../actiontype/common'
import
actionType
from
'../actiontype/common'
import
{
addErrorInfo
}
from
'./uploadError'
import
{
addErrorInfo
}
from
'./uploadError'
const
domain
=
ENV
.
domain
;
const
domain
=
ENV
.
domain
;
//获取工单
let
myHeaders
=
new
Headers
({
let
myHeaders
=
new
Headers
({
// 'Access-Control-Allow-Origin': '*',
// 'Access-Control-Allow-Origin': '*',
...
...
client/actiontype/barcodeCommon.js
0 → 100644
View file @
7b8b5cd0
const
breakActionType
=
{
GETPRODUCTINFO
:
'GETPRODUCTINFO'
}
export
default
breakActionType
\ No newline at end of file
client/containers/PageContainer/PageContainer.jsx
View file @
7b8b5cd0
...
@@ -27,7 +27,7 @@ import TakeStokeContainer from '../TakeStokeContainer/TakeStokeContainer'
...
@@ -27,7 +27,7 @@ import TakeStokeContainer from '../TakeStokeContainer/TakeStokeContainer'
import
BreakageContainer
from
'../BreakageContainer/BreakageConatiner'
import
BreakageContainer
from
'../BreakageContainer/BreakageConatiner'
import
RecoveryPage
from
'../RecoveryContainer/RecoveryContainer'
import
RecoveryPage
from
'../RecoveryContainer/RecoveryContainer'
import
ReplenishContainer
from
'../ReplenishContainer/ReplenishContainer'
import
ReplenishContainer
from
'../ReplenishContainer/ReplenishContainer'
import
{
getProductInfo
}
from
'../../actions/
BreakageContainer
'
import
{
getProductInfo
}
from
'../../actions/
barcodeCommon
'
import
{
getTaskInfo
,
getTaskList
}
from
'../../actions/common'
import
{
getTaskInfo
,
getTaskList
}
from
'../../actions/common'
/*二期引用 end*/
/*二期引用 end*/
...
@@ -57,7 +57,7 @@ class PageContainer extends React.Component {
...
@@ -57,7 +57,7 @@ class PageContainer extends React.Component {
constructor
(
props
)
{
constructor
(
props
)
{
super
(
props
);
super
(
props
);
this
.
state
=
{
this
.
state
=
{
showPage
:
showPage
[
11
],
showPage
:
showPage
[
5
],
lastPage
:
''
,
lastPage
:
''
,
page
:
null
,
page
:
null
,
popupInfo
:
defaultPopupInfo
,
popupInfo
:
defaultPopupInfo
,
...
...
client/reducers/barcodeCommon.js
0 → 100644
View file @
7b8b5cd0
import
barcodeActionType
from
'../actiontype/barcodeCommon'
//扫码商品的信息
const
saveProductInfo
=
(
data
,
content
)
=>
{
console
.
log
(
content
,
'这是吴加宝打印的数据'
)
return
Object
.
assign
({},
data
,{
product
:
content
})
}
export
default
function
(
state
=
{},
action
)
{
switch
(
action
.
type
)
{
case
barcodeActionType
.
GETPRODUCTINFO
:
return
saveProductInfo
(
state
,
action
.
data
);
default
:
return
state
;
}
}
\ No newline at end of file
client/reducers/index.js
View file @
7b8b5cd0
...
@@ -9,7 +9,7 @@ import headerInfo from './initHeader' //获取头部信息
...
@@ -9,7 +9,7 @@ import headerInfo from './initHeader' //获取头部信息
import
reportDamageList
from
'./reportDamge'
//一期商铺报损
import
reportDamageList
from
'./reportDamge'
//一期商铺报损
import
errMsg
from
'./error'
//上报异常
import
errMsg
from
'./error'
//上报异常
import
commonInfo
from
'./common'
//上报异常
import
commonInfo
from
'./common'
//上报异常
import
b
reakageContainer
from
'./breakageContainer
'
import
b
arcodeCommon
from
'./barcodeCommon
'
export
default
combineReducers
({
export
default
combineReducers
({
troubleList
,
troubleList
,
storeInfo
,
storeInfo
,
...
@@ -21,7 +21,7 @@ export default combineReducers({
...
@@ -21,7 +21,7 @@ export default combineReducers({
reportDamageList
,
reportDamageList
,
errMsg
,
errMsg
,
commonInfo
,
commonInfo
,
b
reakageContainer
b
arcodeCommon
})
})
...
...
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