Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wenHuaBu_adminServer
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
node_server
wenHuaBu_adminServer
Commits
0378b37f
Commit
0378b37f
authored
Dec 14, 2024
by
chenjinjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
e1f67b22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
homePage.ts
src/biz/member/homePage.ts
+6
-4
member.ts
src/biz/member/member.ts
+2
-1
No files found.
src/biz/member/homePage.ts
View file @
0378b37f
...
@@ -330,14 +330,15 @@ export async function getCertificateType({userId}) {
...
@@ -330,14 +330,15 @@ export async function getCertificateType({userId}) {
//判断是否审批通过
//判断是否审批通过
if
(
userInfo
.
beforeChange
)
{
if
(
userInfo
.
beforeChange
)
{
if
(
userInfo
.
changeApplyType
==
CHANGEAPPLYTYPE
.
通过
)
{
if
(
userInfo
.
changeApplyType
==
CHANGEAPPLYTYPE
.
通过
)
{
if
(
userInfo
.
memberLevel
==
MEMBERLEVEL
.
理事会员
||
userInfo
.
certificateType
==
MEMBERLEVEL
.
常务理事会员
)
certificate
=
true
if
(
userInfo
.
memberLevel
==
MEMBERLEVEL
.
理事会员
||
userInfo
.
memberLevel
==
MEMBERLEVEL
.
常务理事会员
)
certificate
=
true
if
(
certificate
)
{
if
(
certificate
)
{
cefaInfo
=
{
cefaInfo
=
{
memberLevel
:
changeEnumValue
(
MEMBERLEVEL
,
userInfo
.
memberLevel
),
memberLevel
:
changeEnumValue
(
MEMBERLEVEL
,
userInfo
.
memberLevel
),
name
:
userInfo
.
name
,
name
:
userInfo
.
name
,
unitName
:
userInfo
.
unitName
,
unitName
:
userInfo
.
unitName
,
applyApplicationTime
:
moment
(
userInfo
.
applyApplicationTime
).
format
(
"YYYY年MM月DD日"
)
applyApplicationTime
:
""
}
}
if
(
userInfo
.
applyApplicationTime
)
cefaInfo
.
applyApplicationTime
=
moment
(
userInfo
.
applyApplicationTime
).
format
(
"YYYY年MM月DD日"
)
msg
=
``
;
msg
=
``
;
}
}
}
else
if
(
userInfo
.
changeApplyType
==
CHANGEAPPLYTYPE
.
注册信息待补充
)
{
}
else
if
(
userInfo
.
changeApplyType
==
CHANGEAPPLYTYPE
.
注册信息待补充
)
{
...
@@ -346,7 +347,7 @@ export async function getCertificateType({userId}) {
...
@@ -346,7 +347,7 @@ export async function getCertificateType({userId}) {
msg
=
`会员理事审核中,无法下载证明函`
;
msg
=
`会员理事审核中,无法下载证明函`
;
}
}
}
else
{
}
else
{
if
(
userInfo
.
memberLevel
==
MEMBERLEVEL
.
理事会员
||
userInfo
.
certificateType
==
MEMBERLEVEL
.
常务理事会员
)
certificate
=
true
if
(
userInfo
.
memberLevel
==
MEMBERLEVEL
.
理事会员
||
userInfo
.
memberLevel
==
MEMBERLEVEL
.
常务理事会员
)
certificate
=
true
if
(
certificate
)
{
if
(
certificate
)
{
let
name
=
""
;
let
name
=
""
;
if
(
userInfo
.
memberType
==
MEMBERTYPE
.
个人会员
)
name
=
userInfo
.
name
;
if
(
userInfo
.
memberType
==
MEMBERTYPE
.
个人会员
)
name
=
userInfo
.
name
;
...
@@ -354,8 +355,9 @@ export async function getCertificateType({userId}) {
...
@@ -354,8 +355,9 @@ export async function getCertificateType({userId}) {
cefaInfo
=
{
cefaInfo
=
{
memberLevel
:
changeEnumValue
(
MEMBERLEVEL
,
userInfo
.
memberLevel
),
memberLevel
:
changeEnumValue
(
MEMBERLEVEL
,
userInfo
.
memberLevel
),
name
,
name
,
applyApplicationTime
:
moment
(
userInfo
.
applyApplicationTime
).
format
(
"YYYY年MM月DD日"
)
applyApplicationTime
:
""
}
}
if
(
userInfo
.
applyApplicationTime
)
cefaInfo
.
applyApplicationTime
=
moment
(
userInfo
.
applyApplicationTime
).
format
(
"YYYY年MM月DD日"
)
msg
=
``
;
msg
=
``
;
}
}
}
}
...
...
src/biz/member/member.ts
View file @
0378b37f
...
@@ -245,7 +245,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
...
@@ -245,7 +245,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
userRegisterState
:
USERREGISTERSTATE
.
通过
,
userRegisterState
:
USERREGISTERSTATE
.
通过
,
isBlackUser
:
STATE
.
否
isBlackUser
:
STATE
.
否
};
};
if
(
name
)
selectParam
.
name
=
name
;
if
(
name
)
selectParam
.
name
=
{
"$regex"
:
name
};
if
(
documentId
)
selectParam
.
documentId
=
documentId
;
if
(
documentId
)
selectParam
.
documentId
=
documentId
;
if
(
phone
)
selectParam
.
phone
=
phone
;
if
(
phone
)
selectParam
.
phone
=
phone
;
if
(
mail
)
selectParam
.
mail
=
mail
;
if
(
mail
)
selectParam
.
mail
=
mail
;
...
...
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