Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
phobos-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
phobos-ui
Commits
491299f7
Commit
491299f7
authored
Nov 08, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(pay.service): 微信支付完善
parent
670a96f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
pay.service.js
src/service/pay.service.js
+3
-2
index.vue
src/views/pay/index.vue
+1
-1
No files found.
src/service/pay.service.js
View file @
491299f7
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* @Description: 支付微信h5, jsapi, 第三方收银台,跳转)
* @Description: 支付微信h5, jsapi, 第三方收银台,跳转)
* @Date: 2020-07-28 15:03:52
* @Date: 2020-07-28 15:03:52
* @LastEditors: gzw
* @LastEditors: gzw
* @LastEditTime: 2021-
08-11 10:33:50
* @LastEditTime: 2021-
11-08 16:19:15
*/
*/
import
qs
from
'
qs
'
;
import
qs
from
'
qs
'
;
...
@@ -65,8 +65,9 @@ function payByWeixinH5(info) {
...
@@ -65,8 +65,9 @@ function payByWeixinH5(info) {
info
.
params
.
vccToken
=
vccToken
;
info
.
params
.
vccToken
=
vccToken
;
info
.
params
.
orderNo
=
orderNo
;
info
.
params
.
orderNo
=
orderNo
;
info
.
params
.
isWx
=
true
;
info
.
params
.
isWx
=
true
;
const
redirectUrl
=
localStorage
.
get
(
'
redirectUrl
'
)
||
window
.
location
.
origin
;
const
currentPath
=
encodeURIComponent
(
const
currentPath
=
encodeURIComponent
(
window
.
location
.
origin
+
redirectUrl
+
// eslint-disable-next-line prettier/prettier
// eslint-disable-next-line prettier/prettier
'
/payWaiting
'
+
'
/payWaiting
'
+
qs
.
stringify
(
info
.
params
,
{
encode
:
true
,
addQueryPrefix
:
true
})
qs
.
stringify
(
info
.
params
,
{
encode
:
true
,
addQueryPrefix
:
true
})
...
...
src/views/pay/index.vue
View file @
491299f7
...
@@ -227,7 +227,7 @@ export default {
...
@@ -227,7 +227,7 @@ export default {
this
.
getQuery
();
this
.
getQuery
();
this
.
setIsOrder
();
this
.
setIsOrder
();
if
(
this
.
$route
.
query
.
redirectUrl
)
{
if
(
this
.
$route
.
query
.
redirectUrl
)
{
localStorage
.
set
(
'
redirectUrl
'
,
this
.
redirectUrl
);
localStorage
.
set
(
'
redirectUrl
'
,
this
.
$route
.
query
.
redirectUrl
);
this
.
redirectUrl
=
this
.
$route
.
query
.
redirectUrl
;
this
.
redirectUrl
=
this
.
$route
.
query
.
redirectUrl
;
}
else
{
}
else
{
this
.
redirectUrl
=
localStorage
.
get
(
'
redirectUrl
'
);
this
.
redirectUrl
=
localStorage
.
get
(
'
redirectUrl
'
);
...
...
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