Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
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
linweijiong
jinfa-platform
Commits
e6bb5ed2
Commit
e6bb5ed2
authored
Aug 30, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
f870f5f3
15792e00
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Phone.tsx
src/components/NiceForm/components/Phone.tsx
+3
-1
memberDetail.tsx
src/pages/authConfig/memberSystem/memberDetail.tsx
+1
-1
No files found.
src/components/NiceForm/components/Phone.tsx
View file @
e6bb5ed2
...
...
@@ -38,7 +38,7 @@ const Phone = (props) => {
useEffect
(()
=>
{
godEvent
.
on
(
'SHOW_PHONE_VALIDATE'
,
(
payload
)
=>
{
if
(
isActive
)
{
if
(
!
isActive
)
{
// 验证码在loading的时候 不能再次触发
return
;
}
...
...
@@ -103,6 +103,7 @@ const Phone = (props) => {
const
handleCheckSuccess
=
(
reset
)
=>
{
setTimeout
(()
=>
{
setIsShowValidate
(
false
)
handleStartSms
()
instanceRef
.
current
.
canIUseSms
=
true
},
1000
)
}
...
...
@@ -124,6 +125,7 @@ const Phone = (props) => {
visible=
{
isShowValidate
}
mask
centered
destroyOnClose
footer=
{
null
}
onCancel=
{
()
=>
setIsShowValidate
(
false
)
}
>
...
...
src/pages/authConfig/memberSystem/memberDetail.tsx
View file @
e6bb5ed2
...
...
@@ -243,7 +243,7 @@ const MemberDetail: React.FC<{}> = () => {
const
publicParams
=
{
...
values
,
hasImAuth
:
values
.
hasImAuth
?
1
:
0
,
imFlag
:
!!
values
.
imFlag
,
auth
:
treeCheckIds
.
map
(
v
=>
({
menuId
:
v
,
// @todo 暂时写死为空
...
...
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