Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wx-school-app-public
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
姜雷
wx-school-app-public
Commits
0fcb8bb3
Commit
0fcb8bb3
authored
Jun 05, 2019
by
姜雷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付接口设备编码传入原始设备编码
parent
fa876401
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
2 deletions
+6
-2
index.tsx
src/pages/index/index.tsx
+1
-0
pay.tsx
src/pages/pay/pay.tsx
+1
-1
scanEnter.tsx
src/pages/scanEnter/scanEnter.tsx
+1
-0
device.ts
src/store/rootReducers/device.ts
+2
-1
Device.ts
src/types/Device/Device.ts
+1
-0
No files found.
src/pages/index/index.tsx
View file @
0fcb8bb3
...
@@ -179,6 +179,7 @@ class Index extends Component {
...
@@ -179,6 +179,7 @@ class Index extends Component {
}
}
if
(
deviceInfoResponse
)
{
if
(
deviceInfoResponse
)
{
updateDeviceData
(
deviceInfoResponse
);
updateDeviceData
(
deviceInfoResponse
);
updateDeviceData
({
originCode
:
equipmentNum
});
}
else
{
}
else
{
resetDeviceData
();
resetDeviceData
();
}
}
...
...
src/pages/pay/pay.tsx
View file @
0fcb8bb3
...
@@ -61,7 +61,7 @@ class Pay extends Component {
...
@@ -61,7 +61,7 @@ class Pay extends Component {
const
{
payId
}
=
this
.
state
;
const
{
payId
}
=
this
.
state
;
if
(
payId
)
{
if
(
payId
)
{
getPayOrder
({
getPayOrder
({
equipmentNum
:
device
.
c
ode
,
equipmentNum
:
device
.
originC
ode
,
equipmentPos
:
device
.
position
,
equipmentPos
:
device
.
position
,
payType
:
'2'
,
payType
:
'2'
,
serviceId
:
device
.
serviceId
,
serviceId
:
device
.
serviceId
,
...
...
src/pages/scanEnter/scanEnter.tsx
View file @
0fcb8bb3
...
@@ -162,6 +162,7 @@ class ScanEnter extends Component {
...
@@ -162,6 +162,7 @@ class ScanEnter extends Component {
}
}
if
(
deviceInfoResponse
)
{
if
(
deviceInfoResponse
)
{
updateDeviceData
(
deviceInfoResponse
);
updateDeviceData
(
deviceInfoResponse
);
updateDeviceData
({
originCode
:
equipmentNum
});
}
else
{
}
else
{
resetDeviceData
();
resetDeviceData
();
}
}
...
...
src/store/rootReducers/device.ts
View file @
0fcb8bb3
import
Action
from
'../../types/Store/Actions'
;
import
Action
from
'../../types/Store/Actions'
;
import
{
Device
}
from
'../../
/
types/Device/Device'
;
import
{
Device
}
from
'../../types/Device/Device'
;
export
type
DeviceState
=
StoreState
<
Device
>
;
export
type
DeviceState
=
StoreState
<
Device
>
;
export
const
INITIAL_STATE
=
{
export
const
INITIAL_STATE
=
{
originCode
:
''
,
code
:
''
,
code
:
''
,
isCurrentUserUsed
:
0
,
isCurrentUserUsed
:
0
,
isOnline
:
0
,
isOnline
:
0
,
...
...
src/types/Device/Device.ts
View file @
0fcb8bb3
...
@@ -3,6 +3,7 @@ export type Rate = {
...
@@ -3,6 +3,7 @@ export type Rate = {
name
:
string
;
name
:
string
;
};
};
export
type
Device
=
{
export
type
Device
=
{
originCode
:
string
,
code
:
string
;
code
:
string
;
isCurrentUserUsed
:
number
;
isCurrentUserUsed
:
number
;
isOnline
:
number
;
isOnline
:
number
;
...
...
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