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
a475898a
Commit
a475898a
authored
Jun 07, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 对接 入库协议 相关
parent
5fd3a53d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
27 deletions
+49
-27
index.less
...erQuery/applyMember/components/ComingAgreement/index.less
+7
-0
index.tsx
...berQuery/applyMember/components/ComingAgreement/index.tsx
+11
-2
index.tsx
src/pages/member/memberQuery/applyMember/index.tsx
+31
-18
index.tsx
src/pages/member/memberQuery/index.tsx
+0
-7
No files found.
src/pages/member/memberQuery/applyMember/components/ComingAgreement/index.less
View file @
a475898a
@import '~antd/es/style/themes/default.less';
.agreement {
padding: @padding-lg @padding-md;
background-color: #FFFFFF;
}
\ No newline at end of file
src/pages/member/memberQuery/applyMember/components/ComingAgreement/index.tsx
View file @
a475898a
...
...
@@ -6,10 +6,19 @@
* @Description: 入库协议
*/
import
React
from
'react'
;
import
styles
from
'./index.less'
;
const
ComingAgreement
:
React
.
FC
=
()
=>
{
interface
IProps
{
/**
* 协议
*/
richText
:
string
,
}
const
ComingAgreement
:
React
.
FC
<
IProps
>
=
(
props
:
IProps
)
=>
{
const
{
richText
}
=
props
;
return
(
<
div
>
这里是入库协议
</
div
>
<
div
className=
{
styles
.
agreement
}
dangerouslySetInnerHTML=
{
{
__html
:
richText
}
}
/
>
);
};
...
...
src/pages/member/memberQuery/applyMember/index.tsx
View file @
a475898a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-26 16:52:48
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-07 1
2:01:36
* @LastEditTime: 2021-06-07 1
4:12:47
* @Description: 申请会员
*/
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
...
...
@@ -82,6 +82,8 @@ const MemberQueryApplyMember: React.FC = () => {
const
[
unsaved
,
setUnsaved
]
=
useState
(
false
);
const
[
depositInfo
,
setDepositInfo
]
=
useState
<
GroupItem
[]
>
([]);
const
[
loading
,
setLoading
]
=
useState
(
false
);
const
[
agreement
,
setAgreement
]
=
useState
(
''
);
const
[
agreementLoading
,
setAgreementLoading
]
=
useState
(
false
);
const
stepRef
=
useRef
(
!
validateId
?
0
:
1
);
...
...
@@ -99,17 +101,6 @@ const MemberQueryApplyMember: React.FC = () => {
},
1000
);
};
useEffect
(()
=>
{
if
(
!
validateId
)
{
countDown
();
}
return
()
=>
{
if
(
timer
)
{
clearTimeout
(
timer
);
}
}
},
[]);
// 新增操作
// 根据上级会员id 角色id 获取入库资料相关
const
getDepositInfo
=
async
()
=>
{
...
...
@@ -143,9 +134,31 @@ const MemberQueryApplyMember: React.FC = () => {
setLoading
(
false
);
};
// 获取入库协议
const
getDepositAgreement
=
async
()
=>
{
setAgreementLoading
(
true
);
const
res
=
await
PublicApi
.
getManageContentNoticeFindAllByColumnType
({
columnType
:
`
${
3
}
`
,
});
if
(
res
.
code
===
1000
)
{
setAgreement
(
res
.
data
&&
res
.
data
.
length
?
res
.
data
[
0
].
content
:
''
);
}
setAgreementLoading
(
false
);
countDown
();
};
useEffect
(()
=>
{
return
()
=>
{
if
(
timer
)
{
clearTimeout
(
timer
);
}
}
},
[]);
useEffect
(()
=>
{
getDepositInfo
();
getDepositInfoByValidateId
();
getDepositAgreement
();
},
[]);
const
handleSubmit
=
(
values
:
ValueType
)
=>
{
...
...
@@ -202,7 +215,7 @@ const MemberQueryApplyMember: React.FC = () => {
};
return
(
<
Spin
spinning=
{
loading
}
>
<
Spin
spinning=
{
loading
||
agreementLoading
}
>
<
PageHeaderWrapper
style=
{
{
padding
:
24
,
...
...
@@ -246,11 +259,11 @@ const MemberQueryApplyMember: React.FC = () => {
)
:
null
}
{
currenStep
===
2
?
(
<>
<
Button
{
/*
<Button
onClick={() => {}}
>
保存为草稿
</
Button
>
</Button>
*/
}
<
Button
onClick=
{
()
=>
{
formActions
.
dispatch
(
'onStepPrevious'
,
{})
...
...
@@ -271,11 +284,11 @@ const MemberQueryApplyMember: React.FC = () => {
)
:
null
}
{
currenStep
===
3
?
(
<>
<
Button
{
/*
<Button
onClick={() => {}}
>
保存为草稿
</
Button
>
</Button>
*/
}
<
Button
onClick=
{
()
=>
{
formActions
.
dispatch
(
'onStepPrevious'
,
{})
...
...
@@ -311,7 +324,7 @@ const MemberQueryApplyMember: React.FC = () => {
}
}
expressionScope=
{
{
currenStep
,
ComingAgreement
:
<
ComingAgreement
/>,
ComingAgreement
:
<
ComingAgreement
richText=
{
agreement
}
/>,
RegisterInfo
:
<
RegisterInfo
upperMemberId=
{
upperMemberId
}
upperRoleId=
{
upperRoleId
}
/>,
SubmitSuccess
:
<
SubmitSuccess
/>,
}
}
...
...
src/pages/member/memberQuery/index.tsx
View file @
a475898a
...
...
@@ -18,15 +18,8 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
EyePreview
from
'@/components/EyePreview'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
MEMBER_LEVEL_TYPE_PLATFORM
,
MEMBER_LEVEL_TYPE_MERCHANT
,
MEMBER_LEVEL_TYPE_CHANNEL
,
MEMBER_OUTER_STATUS_FAILED
,
}
from
'@/constants/member'
;
import
useSpliceArray
from
'@/hooks/useSpliceArray'
;
import
{
querySchema
}
from
'./schema'
;
import
{
coverColFiltersItem
}
from
'../utils'
;
import
{
MEMBER_OUTER_STATUS_BADGE_COLOR
,
}
from
'../constant'
;
...
...
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