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
e39eeb62
Commit
e39eeb62
authored
Jul 18, 2019
by
姜雷
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
parents
a3d481e3
cd2078f8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
pay.tsx
src/pages/pay/pay.tsx
+4
-2
device.ts
src/store/rootReducers/device.ts
+2
-1
Device.ts
src/types/Device/Device.ts
+6
-1
No files found.
src/pages/pay/pay.tsx
View file @
e39eeb62
...
@@ -3,7 +3,7 @@ import { ComponentClass } from 'react';
...
@@ -3,7 +3,7 @@ import { ComponentClass } from 'react';
import
{
View
,
Text
,
Button
}
from
'@tarojs/components'
;
import
{
View
,
Text
,
Button
}
from
'@tarojs/components'
;
import
{
getPayOrder
}
from
'../../api/Order/pay'
;
import
{
getPayOrder
}
from
'../../api/Order/pay'
;
import
{
connect
}
from
'@tarojs/redux'
;
import
{
connect
}
from
'@tarojs/redux'
;
import
{
Device
}
from
'../../types/Device/Device'
;
import
{
Device
,
DeviceRefundMode
}
from
'../../types/Device/Device'
;
import
PrepayConfig
from
'../../types/Order/Order'
;
import
PrepayConfig
from
'../../types/Order/Order'
;
import
{
Customer
}
from
'../../types/Customer/Customer'
;
import
{
Customer
}
from
'../../types/Customer/Customer'
;
import
AES
from
'crypto-js/aes'
;
import
AES
from
'crypto-js/aes'
;
...
@@ -833,7 +833,9 @@ class Pay extends Component {
...
@@ -833,7 +833,9 @@ class Pay extends Component {
</
View
>
</
View
>
</
View
>
</
View
>
<
View
className=
'Pay-tip'
>
<
View
className=
'Pay-tip'
>
温馨提示:如本次预付款未全部使用,系统将在使用结束后半小时内自动退还剩余金额,请留意查收!
{
device
.
refundMode
===
DeviceRefundMode
.
notRefund
?
'温馨提示:设备成功开启后,未使用金额将不会退换!'
:
'温馨提示:如本次预付款未全部使用,系统将在使用结束后半小时内自动退还剩余金额,请留意查收!'
}
</
View
>
</
View
>
<
View
className=
'Pay-money'
>
<
View
className=
'Pay-money'
>
{
prepayConfig
&&
{
prepayConfig
&&
...
...
src/store/rootReducers/device.ts
View file @
e39eeb62
import
Action
from
'../../types/Store/Actions'
;
import
Action
from
'../../types/Store/Actions'
;
import
{
Device
}
from
'../../types/Device/Device'
;
import
{
Device
,
DeviceRefundMode
}
from
'../../types/Device/Device'
;
export
type
DeviceState
=
StoreState
<
Device
>
;
export
type
DeviceState
=
StoreState
<
Device
>
;
export
const
INITIAL_STATE
=
{
export
const
INITIAL_STATE
=
{
refundMode
:
DeviceRefundMode
.
needRefund
,
originCode
:
''
,
originCode
:
''
,
code
:
''
,
code
:
''
,
isCurrentUserUsed
:
0
,
isCurrentUserUsed
:
0
,
...
...
src/types/Device/Device.ts
View file @
e39eeb62
export
enum
DeviceRefundMode
{
needRefund
=
1
,
notRefund
=
2
,
}
export
type
Rate
=
{
export
type
Rate
=
{
mark
:
string
;
mark
:
string
;
name
:
string
;
name
:
string
;
};
};
export
type
Device
=
{
export
type
Device
=
{
originCode
:
string
,
refundMode
:
DeviceRefundMode
;
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