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
3641f176
Commit
3641f176
authored
Jul 20, 2021
by
FE-安焕焕
👣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付未登录的问题和优惠券展示问题
parent
1b3c469f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
order.api.js
src/api/order.api.js
+0
-1
encrypt.js
src/service/encrypt.js
+0
-1
pay.js
src/service/pay.js
+0
-2
STATIC_DATA.js
src/views/pay/STATIC_DATA.js
+1
-1
PayCardItem.vue
src/views/pay/components/PayCardItem.vue
+10
-2
SmsModal.vue
src/views/pay/components/SmsModal.vue
+0
-1
index.vue
src/views/pay/index.vue
+1
-4
No files found.
src/api/order.api.js
View file @
3641f176
...
...
@@ -23,7 +23,6 @@ export default {
},
// 订单创建
orderCreate
(
data
)
{
console
.
log
(
data
);
return
http
.
post
(
`
${
talosHost
}
/api/kdsp/order-info/e/vmSubmit`
,
encryption
(
data
));
}
};
src/service/encrypt.js
View file @
3641f176
...
...
@@ -39,7 +39,6 @@ export function encryption(data = '') {
* @return {String} 加密后的数据16进制
*/
export
async
function
encryptByDESModeEBC
(
message
)
{
console
.
log
(
message
);
const
[{
payPwdSalt
}]
=
await
desSalt
();
var
keyHex
=
CryptoJS
.
enc
.
Utf8
.
parse
(
payPwdSalt
);
var
encrypted
=
CryptoJS
.
DES
.
encrypt
(
message
,
keyHex
,
{
...
...
src/service/pay.js
View file @
3641f176
...
...
@@ -20,7 +20,6 @@ function payByWeixinJsapi(info = {}, callback) {
function
onBridgeReady
()
{
// eslint-disable-next-line no-undef
WeixinJSBridge
.
invoke
(
'
getBrandWCPayRequest
'
,
info
,
function
(
res
)
{
console
.
log
(
res
);
if
(
res
.
err_msg
==
'
get_brand_wcpay_request:ok
'
)
{
// 使用以上方式判断前端返回,微信团队郑重提示:
//res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。
...
...
@@ -84,7 +83,6 @@ function payByWeixinH5(info) {
*/
function
payByALIH5
(
info
)
{
if
(
!
info
.
url
)
return
;
console
.
log
(
'
ali:
'
,
info
.
url
);
const
aliWrap
=
document
.
createElement
(
'
div
'
);
aliWrap
.
id
=
'
ALIWEB_WRAP
'
;
aliWrap
.
setAttribute
(
'
id
'
,
'
ALIWEB_WRAP
'
);
...
...
src/views/pay/STATIC_DATA.js
View file @
3641f176
...
...
@@ -9,7 +9,7 @@ const payTypeE = [
'
PD_YXMMAEC_UserClickCashierSelectWechatPay
'
];
const
codeArr
=
[
'
4034
'
,
'
4035
'
,
'
4036
'
,
'
3005
'
,
'
6049
'
];
const
codeArr
=
[
'
4034
'
,
'
4035
'
,
'
4036
'
,
'
3005
'
,
'
6049
'
,
'
401
'
];
// (4034, "密码错误"),
// (4035, "密码重试超限,无法验证"),
// (4036, "验证码错误");
...
...
src/views/pay/components/PayCardItem.vue
View file @
3641f176
...
...
@@ -23,7 +23,12 @@
:class=
"
{ disable: couponDisabled }"
@click.stop="openCouponModal"
>
{{
couponInfo
.
name
||
'
未选择优惠券
'
}}
<span
v-if=
"couponInfo.pickupId"
>
{{
`满${couponInfo.limitAmount
}
减${couponInfo.faceValue
}
元`
}}
<
/span
>
<
span
v
-
else
>
未选择优惠券
<
/span
>
<
cr
-
icon
type
=
"
arrow
"
class
=
"
selectArrow
"
size
=
"
15px
"
/>
<
/div
>
<
/div
>
...
...
@@ -71,7 +76,10 @@ export default {
this
.
pay
.
changePayType
(
payType
,
mergePayPretreatmentInfo
);
}
,
openCouponModal
()
{
if
(
this
.
couponDisabled
)
return
;
if
(
this
.
couponDisabled
)
{
this
.
$toast
(
'
优惠券不可更改
'
);
return
;
}
this
.
pay
.
openCouponModal
(
this
.
pay
.
orderNo
);
}
}
...
...
src/views/pay/components/SmsModal.vue
View file @
3641f176
...
...
@@ -50,7 +50,6 @@ export default {
computed
:
{},
watch
:
{
value
:
function
(
val
)
{
console
.
log
(
val
);
if
(
val
)
{
this
.
sendSms
(
1
);
}
...
...
src/views/pay/index.vue
View file @
3641f176
...
...
@@ -102,7 +102,6 @@ import {
codeArr
,
payTypeE
,
CREDIT_PAY
,
WECHAT_PAY
,
PAY_SUCCESS
,
creditStatus
,
IS_THIRD_PAY
,
...
...
@@ -114,7 +113,6 @@ import {
ACCOUNT_APPLY_FAIL
,
creditPayStatusType
,
ACCOUNT_APPLY_SUCCESS
,
ACCOUNT_APPLY_AUDIT_FAIL
,
SMS_VERIFICATION_CODE_PAY
,
//短信验证码
FACE_VERIFICATION_CODE_PAY
}
from
'
./STATIC_DATA
'
;
...
...
@@ -233,7 +231,6 @@ export default {
this
.
selectedCoupon
=
displayInfo
.
payCouponInfo
.
optimalPayCoupon
;
this
.
selectedCoupon
.
id
=
this
.
selectedCoupon
.
pickupId
;
this
.
showCoupon
=
displayInfo
.
payCouponInfo
.
optimalType
===
3
;
console
.
log
(
this
.
selectedCoupon
,
'
selectedCoupon
'
);
}
this
.
payContractInfo
=
displayInfo
.
payContractInfo
||
{};
for
(
const
p
of
payMethods
)
{
...
...
@@ -429,7 +426,7 @@ export default {
this
.
payResult
(
'
Fail
'
,
error
.
message
);
return
;
}
//
error?.message && this.$toast(error?.message);
error
?.
message
&&
this
.
$toast
(
error
?.
message
);
this
.
error
=
error
?.
message
;
this
.
retrieve
();
return
;
...
...
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