Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-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
cauchy-ui
Commits
bd9a36bb
Commit
bd9a36bb
authored
Dec 07, 2021
by
张子雨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(pay):修复收银台线上bug
parent
53d6db37
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
5 deletions
+42
-5
pay.api.js
src/api/pay.api.js
+3
-3
index.vue
src/views/orderDetail/index.vue
+16
-0
index.vue
src/views/orderList/index.vue
+16
-0
STATIC_DATA.js
src/views/pay/STATIC_DATA.js
+3
-1
index.vue
src/views/pay/index.vue
+4
-1
No files found.
src/api/pay.api.js
View file @
bd9a36bb
...
@@ -8,7 +8,7 @@ const queryPayInfo = function(data) {
...
@@ -8,7 +8,7 @@ const queryPayInfo = function(data) {
};
};
const
prepay
=
async
function
(
data
)
{
const
prepay
=
async
function
(
data
)
{
const
scDeviceId
=
await
saDeviceId
();
const
scDeviceId
=
await
saDeviceId
();
return
request
.
post
(
`
${
talosHost
}
/open/checkout/prepay`
,
data
,
{
return
request
.
post
(
`
${
talosHost
}
/open/checkout/
v2/
prepay`
,
data
,
{
customHeader
:
{
customHeader
:
{
scDeviceId
scDeviceId
},
},
...
@@ -18,7 +18,7 @@ const prepay = async function(data) {
...
@@ -18,7 +18,7 @@ const prepay = async function(data) {
const
pay
=
async
function
(
data
)
{
const
pay
=
async
function
(
data
)
{
const
scDeviceId
=
await
saDeviceId
();
const
scDeviceId
=
await
saDeviceId
();
return
request
.
post
(
`
${
talosHost
}
/open/checkout/pay`
,
data
,
{
return
request
.
post
(
`
${
talosHost
}
/open/checkout/
v2/
pay`
,
data
,
{
customHeader
:
{
customHeader
:
{
scDeviceId
scDeviceId
},
},
...
@@ -27,7 +27,7 @@ const pay = async function(data) {
...
@@ -27,7 +27,7 @@ const pay = async function(data) {
};
};
const
queryPayStatus
=
function
(
data
)
{
const
queryPayStatus
=
function
(
data
)
{
return
request
.
post
(
`
${
talosHost
}
/open/checkout/pay_status/query`
,
data
);
return
request
.
post
(
`
${
talosHost
}
/open/checkout/
v2/
pay_status/query`
,
data
);
};
};
const
sendSms
=
function
(
data
)
{
const
sendSms
=
function
(
data
)
{
...
...
src/views/orderDetail/index.vue
View file @
bd9a36bb
...
@@ -194,6 +194,14 @@ export default {
...
@@ -194,6 +194,14 @@ export default {
'
https://kdspstatic.91xr.cn/kdsp/mine/service/customer-service/customer-service-prod2.html
'
;
'
https://kdspstatic.91xr.cn/kdsp/mine/service/customer-service/customer-service-prod2.html
'
;
},
},
openCancelPopup
()
{
openCancelPopup
()
{
if
(
this
.
orderInfo
.
orderStatusInfo
.
paymentInProgress
)
{
this
.
$dialog
({
message
:
'
订单支付处理中,请稍后再试
'
,
confirmButtonText
:
'
知道了
'
,
showCancelButton
:
false
});
return
;
}
this
.
$dialog
({
this
.
$dialog
({
title
:
'
取消订单
'
,
title
:
'
取消订单
'
,
message
:
'
您真的要取消吗?
'
,
message
:
'
您真的要取消吗?
'
,
...
@@ -217,6 +225,14 @@ export default {
...
@@ -217,6 +225,14 @@ export default {
}
}
},
},
toPay
()
{
toPay
()
{
if
(
this
.
orderInfo
.
orderStatusInfo
.
paymentInProgress
)
{
this
.
$dialog
({
message
:
'
支付中,请勿重复支付
'
,
confirmButtonText
:
'
知道了
'
,
showCancelButton
:
false
});
return
;
}
this
.
$router
.
push
({
path
:
'
/pay
'
,
query
:
{
orderNo
:
this
.
orderNo
}
});
this
.
$router
.
push
({
path
:
'
/pay
'
,
query
:
{
orderNo
:
this
.
orderNo
}
});
},
},
toGoods
()
{
toGoods
()
{
...
...
src/views/orderList/index.vue
View file @
bd9a36bb
...
@@ -109,6 +109,14 @@ export default {
...
@@ -109,6 +109,14 @@ export default {
},
},
toPay
()
{
toPay
()
{
if
(
this
.
currentOrder
.
paymentInProgress
)
{
this
.
$dialog
({
message
:
'
支付中,请勿重复支付
'
,
confirmButtonText
:
'
知道了
'
,
showCancelButton
:
false
});
return
;
}
this
.
$router
.
push
({
path
:
'
/pay
'
,
query
:
{
orderNo
:
this
.
currentOrder
.
orderNo
}
});
this
.
$router
.
push
({
path
:
'
/pay
'
,
query
:
{
orderNo
:
this
.
currentOrder
.
orderNo
}
});
},
},
toGoods
()
{
toGoods
()
{
...
@@ -123,6 +131,14 @@ export default {
...
@@ -123,6 +131,14 @@ export default {
this
.
$set
(
this
.
navList
[
this
.
currentTab
],
key
,
val
);
this
.
$set
(
this
.
navList
[
this
.
currentTab
],
key
,
val
);
},
},
orderCancelPopup
()
{
orderCancelPopup
()
{
if
(
this
.
currentOrder
.
paymentInProgress
)
{
this
.
$dialog
({
message
:
'
订单支付处理中,请稍后再试
'
,
confirmButtonText
:
'
知道了
'
,
showCancelButton
:
false
});
return
;
}
this
.
$dialog
({
this
.
$dialog
({
title
:
'
取消订单
'
,
title
:
'
取消订单
'
,
message
:
'
您真的要取消吗?
'
,
message
:
'
您真的要取消吗?
'
,
...
...
src/views/pay/STATIC_DATA.js
View file @
bd9a36bb
...
@@ -48,6 +48,7 @@ const IS_CREDIT_PAY = method =>
...
@@ -48,6 +48,7 @@ const IS_CREDIT_PAY = method =>
const
PAYMENT_CODE_PAY
=
1
;
// 支付密码
const
PAYMENT_CODE_PAY
=
1
;
// 支付密码
const
SMS_VERIFICATION_CODE_PAY
=
2
;
//短信验证码
const
SMS_VERIFICATION_CODE_PAY
=
2
;
//短信验证码
const
FACE_VERIFICATION_CODE_PAY
=
4
;
//人脸验证
const
FACE_VERIFICATION_CODE_PAY
=
4
;
//人脸验证
const
CENTER_CODE_PAY
=
5
;
//支付中
const
PAY_SUCCESS
=
3
;
// 支付成功
const
PAY_SUCCESS
=
3
;
// 支付成功
const
PAY_PAYING
=
2
;
//支付中
const
PAY_PAYING
=
2
;
//支付中
...
@@ -161,5 +162,6 @@ export {
...
@@ -161,5 +162,6 @@ export {
ACCOUNT_APPLY_AUDITING
,
ACCOUNT_APPLY_AUDITING
,
ACCOUNT_APPLY_AUDIT_FAIL
,
ACCOUNT_APPLY_AUDIT_FAIL
,
SMS_VERIFICATION_CODE_PAY
,
SMS_VERIFICATION_CODE_PAY
,
FACE_VERIFICATION_CODE_PAY
FACE_VERIFICATION_CODE_PAY
,
CENTER_CODE_PAY
};
};
src/views/pay/index.vue
View file @
bd9a36bb
...
@@ -117,7 +117,8 @@ import {
...
@@ -117,7 +117,8 @@ import {
creditPayStatusType
,
creditPayStatusType
,
ACCOUNT_APPLY_SUCCESS
,
ACCOUNT_APPLY_SUCCESS
,
SMS_VERIFICATION_CODE_PAY
,
//短信验证码
SMS_VERIFICATION_CODE_PAY
,
//短信验证码
FACE_VERIFICATION_CODE_PAY
FACE_VERIFICATION_CODE_PAY
,
CENTER_CODE_PAY
}
from
'
./STATIC_DATA
'
;
}
from
'
./STATIC_DATA
'
;
import
{
import
{
pay
,
pay
,
...
@@ -504,6 +505,8 @@ export default {
...
@@ -504,6 +505,8 @@ export default {
});
});
this
.
close
();
this
.
close
();
this
.
goOcr
();
this
.
goOcr
();
}
else
if
(
creditPayStatus
===
CENTER_CODE_PAY
)
{
this
.
payResult
(
'
Waiting
'
);
}
}
},
},
payResult
(
type
,
error
)
{
payResult
(
type
,
error
)
{
...
...
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