Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mongo-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
mongo-ui
Commits
1b321f9d
Commit
1b321f9d
authored
Sep 02, 2020
by
郝聪敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/fix_openid' into 'master'
fix:openid获取方式修改 See merge request
!203
parents
bcb6e95b
940c33be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
http.js
src/service/http.js
+5
-1
detailPay.mixin.js
src/views/Goods/Detail/modules/detailPay.mixin.js
+3
-4
No files found.
src/service/http.js
View file @
1b321f9d
...
@@ -92,7 +92,11 @@ axios.interceptors.response.use(
...
@@ -92,7 +92,11 @@ axios.interceptors.response.use(
// 后端返回异常信息时提出警告
// 后端返回异常信息时提出警告
if
(
response
.
data
.
code
&&
response
.
data
.
msg
)
notifyType
=
"
warning
"
;
if
(
response
.
data
.
code
&&
response
.
data
.
msg
)
notifyType
=
"
warning
"
;
Notify
({
type
:
notifyType
,
message
:
response
.
data
.
msg
||
"
后端服务异常
"
});
Notify
({
type
:
notifyType
,
message
:
response
.
data
.
msg
||
"
后端服务异常
"
,
duration
:
notifyType
===
"
warning
"
?
6000
:
3000
});
return
Promise
.
reject
(
response
.
data
);
return
Promise
.
reject
(
response
.
data
);
},
},
async
err
=>
{
async
err
=>
{
...
...
src/views/Goods/Detail/modules/detailPay.mixin.js
View file @
1b321f9d
...
@@ -13,7 +13,6 @@ export default {
...
@@ -13,7 +13,6 @@ export default {
return
{
return
{
subFormData
:
{},
// 组装好的数据
subFormData
:
{},
// 组装好的数据
orderInfo
:
{},
orderInfo
:
{},
openId
:
localStorage
.
get
(
"
openId
"
),
tradeType
:
""
,
tradeType
:
""
,
payTimer
:
null
,
payTimer
:
null
,
isPayWait
:
false
isPayWait
:
false
...
@@ -41,7 +40,7 @@ export default {
...
@@ -41,7 +40,7 @@ export default {
},
},
async
goPay
()
{
async
goPay
()
{
this
.
setIsLoading
(
false
);
this
.
setIsLoading
(
false
);
const
{
tradeType
,
orderInfo
,
openId
}
=
this
;
const
{
tradeType
,
orderInfo
}
=
this
;
const
{
payOrderNo
,
payType
}
=
orderInfo
;
const
{
payOrderNo
,
payType
}
=
orderInfo
;
if
(
!
payOrderNo
)
{
if
(
!
payOrderNo
)
{
this
.
$toast
(
"
请先生成订单
"
);
this
.
$toast
(
"
请先生成订单
"
);
...
@@ -52,8 +51,8 @@ export default {
...
@@ -52,8 +51,8 @@ export default {
payOrderType
:
payType
,
payOrderType
:
payType
,
tradeType
tradeType
};
};
if
(
openId
&&
tradeType
===
"
JSAPI
"
)
{
if
(
localStorage
.
get
(
"
openId
"
)
&&
tradeType
===
"
JSAPI
"
)
{
params
.
openId
=
openId
;
params
.
openId
=
localStorage
.
get
(
"
openId
"
)
;
}
}
this
.
isPayWait
=
true
;
this
.
isPayWait
=
true
;
const
res
=
await
placeOrder
.
pay
(
params
);
const
res
=
await
placeOrder
.
pay
(
params
);
...
...
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