Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bh_face_counter
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
黄天晨
bh_face_counter
Commits
1f738fc1
Commit
1f738fc1
authored
Sep 11, 2020
by
zeven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复支付宝刷脸支付
parent
4afa48be
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
android
android
+1
-1
call_blue.gif
src/assets/call_blue.gif
+0
-0
CounterMixins.js
src/pages/CounterMixins.js
+2
-0
FacePage.js
src/pages/FacePage.js
+7
-2
No files found.
android
@
427becfc
Subproject commit
f5d21a876424a9e6b5c618be639dd0e15dae96d0
Subproject commit
427becfc173d5110f7704f82f366d544b77cf51a
src/assets/call_blue.gif
0 → 100644
View file @
1f738fc1
119 KB
src/pages/CounterMixins.js
View file @
1f738fc1
...
@@ -265,6 +265,7 @@ const CounterMixins = ComposeComponent => {
...
@@ -265,6 +265,7 @@ const CounterMixins = ComposeComponent => {
};
};
successPay
=
()
=>
{
successPay
=
()
=>
{
Toast
.
hide
();
const
msg
=
'付款成功,祝您生活愉快~'
;
const
msg
=
'付款成功,祝您生活愉快~'
;
this
.
props
.
dispatch
({
this
.
props
.
dispatch
({
// 购物完成步骤
// 购物完成步骤
...
@@ -525,6 +526,7 @@ const CounterMixins = ComposeComponent => {
...
@@ -525,6 +526,7 @@ const CounterMixins = ComposeComponent => {
if
(
this
.
barcodeBusy
)
{
if
(
this
.
barcodeBusy
)
{
return
true
;
return
true
;
}
}
Toast
.
loading
(
'正在付款,请稍后~'
);
const
isWxpay
=
code
.
toString
().
match
(
/1
[
0-5
]\d{16}
/
);
const
isWxpay
=
code
.
toString
().
match
(
/1
[
0-5
]\d{16}
/
);
const
isAlipay
=
const
isAlipay
=
fToken
||
code
.
toString
().
match
(
/^
(
2
[
5-9
]
|30
)\d{14,22}
$/
);
fToken
||
code
.
toString
().
match
(
/^
(
2
[
5-9
]
|30
)\d{14,22}
$/
);
...
...
src/pages/FacePage.js
View file @
1f738fc1
...
@@ -386,7 +386,8 @@ class FacePage extends Component {
...
@@ -386,7 +386,8 @@ class FacePage extends Component {
if
(
this
.
state
.
faceType
===
'alipay'
)
{
if
(
this
.
state
.
faceType
===
'alipay'
)
{
styles
.
header
=
{...
styles
.
header
,
backgroundColor
:
'#1b7dc7'
};
styles
.
header
=
{...
styles
.
header
,
backgroundColor
:
'#1b7dc7'
};
styles
.
btnCome
=
{...
styles
.
btnCome
,
backgroundColor
:
'#1b7dc7'
};
styles
.
btnCome
=
{...
styles
.
btnCome
,
backgroundColor
:
'#1b7dc7'
};
// styles.footer = {...styles.footer, backgroundColor: '#1b7dc7'};
styles
.
footer
=
{...
styles
.
footer
,
backgroundColor
:
'#1b7dc7'
};
styles
.
onCall
=
{...
styles
.
onCall
,
backgroundColor
:
'#1b7dc7'
};
}
}
return
(
return
(
<
View
style
=
{
styles
.
content
}
>
<
View
style
=
{
styles
.
content
}
>
...
@@ -509,7 +510,11 @@ class FacePage extends Component {
...
@@ -509,7 +510,11 @@ class FacePage extends Component {
<
Touch
onPress
=
{
this
.
onCall
}
style
=
{
styles
.
footer
}
feedback
=
{
false
}
>
<
Touch
onPress
=
{
this
.
onCall
}
style
=
{
styles
.
footer
}
feedback
=
{
false
}
>
<
View
style
=
{
styles
.
call
}
>
<
View
style
=
{
styles
.
call
}
>
<
Image
<
Image
source
=
{
require
(
'../assets/call.gif'
)}
source
=
{
this
.
state
.
faceType
===
'wxpay'
?
require
(
'../assets/call.gif'
)
:
require
(
'../assets/call_blue.gif'
)
}
style
=
{
styles
.
callGif
}
style
=
{
styles
.
callGif
}
/
>
/
>
<
Text
style
=
{
styles
.
callText
}
>
呼叫客服
<
/Text
>
<
Text
style
=
{
styles
.
callText
}
>
呼叫客服
<
/Text
>
...
...
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