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
3dc4f9c7
Commit
3dc4f9c7
authored
Sep 20, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
amount
parent
9eba5082
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
21 deletions
+11
-21
plus.js
src/component/plus/plus.js
+2
-7
cart.js
src/pages/cart/cart.js
+3
-2
order.js
src/pages/order/order.js
+3
-6
orderDetail.js
src/pages/orderDetail/orderDetail.js
+3
-6
No files found.
src/component/plus/plus.js
View file @
3dc4f9c7
...
...
@@ -138,17 +138,12 @@ Component({
const
{
result
,
data
}
=
res
&&
res
.
data
||
res
&&
res
.
result
if
(
result
==
0
)
{
console
.
log
(
'data'
,
data
)
let
amount
=
data
.
amount
||
0
wx
.
requestPayment
(
Object
.
assign
({
success
(
res
)
{
wx
.
hideLoading
()
// wx.showToast({
// title: '支付成功',
// icon: 'none',
// mask: true
// })
// 支付成功页面
console
.
log
(
res
)
wxService
.
router
(
'/subPackage/page/pages/paymentStatus/paymentStatus?status=S'
)
wxService
.
router
(
`/subPackage/page/pages/paymentStatus/paymentStatus?status=S&amount=
${
amount
}
`
)
},
fail
(
res
)
{
wx
.
hideLoading
()
...
...
src/pages/cart/cart.js
View file @
3dc4f9c7
...
...
@@ -267,7 +267,8 @@ wxService.page({
const
{
result
,
data
}
=
res
&&
res
.
data
||
res
&&
res
.
result
if
(
result
==
0
)
{
delete
data
.
appId
console
.
log
(
'data'
,
data
)
console
.
log
(
'dddd'
,
data
.
amount
)
let
amount
=
data
.
amount
||
0
wx
.
requestPayment
(
Object
.
assign
({
success
(
res
)
{
wx
.
hideLoading
()
...
...
@@ -277,7 +278,7 @@ wxService.page({
// mask: true
// })
// 支付成功页面
wxService
.
router
(
'/subPackage/page/pages/paymentStatus/paymentStatus?status=S'
)
wxService
.
router
(
`/subPackage/page/pages/paymentStatus/paymentStatus?status=S&amount=
${
amount
}
`
)
},
fail
(
res
)
{
wx
.
hideLoading
()
...
...
src/pages/order/order.js
View file @
3dc4f9c7
...
...
@@ -144,17 +144,14 @@ if(currentIndex == 5){
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
({
success
(
res
)
{
wx
.
hideLoading
()
// wx.showToast({
// title: '支付成功',
// icon: 'none',
// mask: true
// })
// 支付成功页面
wxService
.
router
(
'/subPackage/page/pages/paymentStatus/paymentStatus?status=S'
)
wxService
.
router
(
`/subPackage/page/pages/paymentStatus/paymentStatus?status=S&amount=
${
amount
}
`
)
},
fail
(
res
)
{
wx
.
hideLoading
()
...
...
src/pages/orderDetail/orderDetail.js
View file @
3dc4f9c7
...
...
@@ -95,17 +95,14 @@ wxService.page({
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
({
success
(
res
)
{
wx
.
hideLoading
()
// wx.showToast({
// title: '支付成功',
// icon: 'none',
// mask: true
// })
// 支付成功页面
wxService
.
router
(
'/subPackage/page/pages/paymentStatus/paymentStatus?status=S'
)
wxService
.
router
(
`/subPackage/page/pages/paymentStatus/paymentStatus?status=S&amount=
${
amount
}
`
)
},
fail
(
res
)
{
wx
.
hideLoading
()
...
...
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