Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
7e2b9e16
Commit
7e2b9e16
authored
Sep 25, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
详情页支付url
parent
5bbb8e87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
orderDetail.js
src/pages/orderDetail/orderDetail.js
+7
-3
No files found.
src/pages/orderDetail/orderDetail.js
View file @
7e2b9e16
...
...
@@ -17,6 +17,7 @@ wxService.page({
min
:
'00'
,
sec
:
'00'
,
ms
:
'0'
,
mergedAmount
:
0
},
/**
...
...
@@ -62,7 +63,8 @@ wxService.page({
// 订单倒计时 超多两小时 刷新当前页
// 本地时间 - 创建时间 > 2小时 刷新当前页
this
.
setData
({
detail
:
data
detail
:
data
,
mergedAmount
:
data
.
mergedAmount
||
0
},
()
=>
{
this
.
initCountDown
(
data
.
countDownOrderTime
,
data
.
createOrderTime
,
data
.
localNowTime
)
})
...
...
@@ -169,11 +171,13 @@ wxService.page({
title
:
'加载中'
,
mask
:
true
})
wxService
.
post
(
`/sale/trade/buyer/wxprepay/
${
id
}
`
).
then
(
res
=>
{
const
{
mergedAmount
}
=
this
.
data
let
url
=
mergedAmount
?
`/sale/payment/merged/buyer/wxprepay/
${
id
}
`
:
`/sale/trade/buyer/wxprepay/
${
id
}
`
wxService
.
post
(
`
${
url
}
`
).
then
(
res
=>
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
console
.
log
(
'dddd'
,
data
.
amount
)
let
amount
=
data
.
amount
||
0
wx
.
hideLoading
()
wx
.
requestPayment
(
Object
.
assign
({
...
...
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