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
cce4480f
Commit
cce4480f
authored
Mar 17, 2020
by
姜雷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加请求参数字段
parent
25a0bf16
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
pay.ts
src/api/Order/pay.ts
+3
-1
connect.tsx
src/pages/connect/connect.tsx
+3
-2
No files found.
src/api/Order/pay.ts
View file @
cce4480f
...
...
@@ -24,6 +24,8 @@ type Params = {
areaName
:
string
;
// 区域名称
duration
?:
number
;
};
type
ResponseData
=
{
outTradeNo
:
string
;
...
...
@@ -33,7 +35,7 @@ type ResponseData = {
// 微信小程序端支付信息
};
export
const
getPayOrder
=
(
entity
:
Params
,
entity
:
Params
):
Promise
<
ResponseDataEntity
<
ResponseData
>>
=>
baseFetch
({
url
:
'/smapro/prepay/order/wx/apply/pay'
,
...
...
src/pages/connect/connect.tsx
View file @
cce4480f
...
...
@@ -765,13 +765,11 @@ class Connect extends Component {
const
{
payId
,
deviceDone
,
sockedDone
}
=
this
.
state
;
if
(
payId
)
{
if
(
device
.
isOnlyBluetooth
&&
device
.
isOnlyBluetooth
===
1
)
{
if
(
this
.
checkIsShower
())
{
console
.
log
(
deviceDone
,
sockedDone
);
if
(
!
deviceDone
||
!
sockedDone
)
{
return
this
.
showerPayHandle
();
}
}
}
let
entity
=
{
equipmentNum
:
device
.
originCode
,
equipmentPos
:
device
.
position
,
...
...
@@ -782,6 +780,9 @@ class Connect extends Component {
areaId
:
device
.
areaId
,
areaName
:
device
.
areaName
,
};
if
(
device
.
rates
[
0
])
{
entity
.
duration
=
device
.
rates
[
0
].
duration
;
}
if
(
phoneData
)
{
entity
=
{
...
entity
,
...
phoneData
};
}
...
...
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