Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
413848b8
Commit
413848b8
authored
Jun 21, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into dev-srm
parents
aea3cd42
1e72da33
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
216 additions
and
140 deletions
+216
-140
member.ts
src/constants/const/member.ts
+157
-0
index.ts
src/constants/index.ts
+0
-71
index.tsx
src/pages/member/components/BasicInfo/index.tsx
+1
-1
constant.tsx
src/pages/member/constant.tsx
+34
-33
index.tsx
src/pages/member/memberLevel/components/DetailInfo/index.tsx
+2
-4
frozen.tsx
src/pages/member/memberMaintain/frozen.tsx
+1
-1
index.tsx
src/pages/member/memberMaintain/index.tsx
+14
-15
index.tsx
src/pages/member/memberPr1/components/DetailInfo/index.tsx
+0
-1
index.tsx
src/pages/member/memberPr2/components/DetailInfo/index.tsx
+0
-1
index.tsx
...es/member/memberPrConfirm/components/DetailInfo/index.tsx
+3
-6
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+3
-3
index.tsx
...ges/member/memberPrSubmit/components/DetailInfo/index.tsx
+0
-3
index.tsx
src/pages/member/memberUpgradeRule/index.tsx
+1
-1
No files found.
src/constants/const/member.ts
0 → 100644
View file @
413848b8
/*
* @Author: XieZhiXiong
* @Date: 2021-06-21 14:06:08
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-21 14:16:19
* @Description: 会员能力相关常量
*/
// ********************* 会员规则类型 ********************
export
const
VIP_RULE_TRANSACTION
=
1
;
// 交易
export
const
VIP_RULE_LOGIN
=
2
;
// 登录
export
const
VIP_RULE_COMMENT
=
3
;
// 评论
// ********************* 会员状态 ********************
export
const
MEMBER_STATUS_NORMAL
=
1
;
// 正常的
export
const
MEMBER_STATUS_FROZEN
=
2
;
// 冻结的
export
const
MEMBER_STATUS
=
{
[
MEMBER_STATUS_NORMAL
]:
'正常'
,
[
MEMBER_STATUS_FROZEN
]:
'冻结'
,
};
// ********************* 会员类型 ********************
export
const
MEMBER_TYPE_CORPORATE
=
1
;
// 企业会员
export
const
MEMBER_TYPE_INDIVIDUAL
=
2
;
// 个人会员
export
const
MEMBER_TYPE_CHANNEL_CORPORATE
=
3
;
// 渠道企业会员
export
const
MEMBER_TYPE_CHANNEL_INDIVIDUAL
=
4
;
// 渠道个人会员
export
const
MEMBER_TYPE
=
{
[
MEMBER_TYPE_CORPORATE
]:
'企业会员'
,
[
MEMBER_TYPE_INDIVIDUAL
]:
'个人会员'
,
[
MEMBER_TYPE_CHANNEL_CORPORATE
]:
'渠道企业会员'
,
[
MEMBER_TYPE_CHANNEL_INDIVIDUAL
]:
'渠道个人会员'
,
};
// ********************* 会员申请来源 ********************
export
const
MEMBER_SOURCE_WEB_ENTERPRISE
=
1
;
// Web企业商城
export
const
MEMBER_SOURCE_H5_ENTERPRISE
=
2
;
// H5企业商城
export
const
MEMBER_SOURCE_WEB_CHANNEL
=
3
;
// Web渠道商城
export
const
MEMBER_SOURCE_H5_CHANNEL
=
4
;
// H5渠道商城
export
const
MEMBER_SOURCE_PLATFORM
=
5
;
// 平台代录入
export
const
MEMBER_SOURCE_MERCHANTS
=
6
;
// 商户代录入
export
const
MEMBER_SOURCE_CHANNEL
=
7
;
// 渠道代录入
export
const
MEMBER_SOURCE
=
{
[
MEMBER_SOURCE_WEB_ENTERPRISE
]:
'Web企业商城'
,
[
MEMBER_SOURCE_H5_ENTERPRISE
]:
'H5企业商城'
,
[
MEMBER_SOURCE_WEB_CHANNEL
]:
'Web渠道商城'
,
[
MEMBER_SOURCE_H5_CHANNEL
]:
'H5渠道商城'
,
[
MEMBER_SOURCE_PLATFORM
]:
'平台代录入'
,
[
MEMBER_SOURCE_MERCHANTS
]:
'商户代录入'
,
[
MEMBER_SOURCE_CHANNEL
]:
'渠道代录入'
,
};
// ********************* 会员内部状态(平台) ********************
/**
* 待提交平台审核
*/
export
const
MEMBER_INNER_STATUS_TO_BE_COMMIT
=
1
;
/**
* 提交审核不通过
*/
export
const
MEMBER_INNER_STATUS_COMMIT_NOT_PASSED
=
2
;
/**
* 待平台审核(一级)
*/
export
const
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1
=
3
;
/**
* 审核会员不通过(一级)
*/
export
const
MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED
=
4
;
/**
* 待平台审核(二级)
*/
export
const
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2
=
5
;
/**
* 审核会员不通过(二级)
*/
export
const
MEMBER_INNER_STATUS_VERIFY_STEP2_NOT_PASSED
=
6
;
/**
* 待确认会员
*/
export
const
MEMBER_INNER_STATUS_TO_CONFIRMD
=
7
;
/**
* 平台审核不通过
*/
export
const
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED
=
8
;
/**
* 审核通过
*/
export
const
MEMBER_INNER_STATUS_VERIFY_PASSED
=
9
;
export
const
MEMBER_INNER_STATUS
=
{
[
MEMBER_INNER_STATUS_TO_BE_COMMIT
]:
'待提交平台审核'
,
[
MEMBER_INNER_STATUS_COMMIT_NOT_PASSED
]:
'提交审核不通过'
,
[
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1
]:
'待平台审核(一级)'
,
[
MEMBER_INNER_STATUS_VERIFY_STEP1_NOT_PASSED
]:
'待平台审核(一级)'
,
[
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2
]:
'待平台审核(二级)'
,
[
MEMBER_INNER_STATUS_VERIFY_STEP2_NOT_PASSED
]:
'审核会员不通过(二级)'
,
[
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED
]:
'审核不通过'
,
[
MEMBER_INNER_STATUS_VERIFY_PASSED
]:
'审核通过'
,
};
// ********************* 会员外部状态 ********************
/**
* 待提交审核
*/
export
const
MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY
=
1
;
/**
* 待平台审核
*/
export
const
MEMBER_OUTER_STATUS_PLATFORM_VERIFYING
=
2
;
/**
* 审核通过
*/
export
const
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED
=
3
;
/**
* 审核不通过
*/
export
const
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED
=
4
;
/**
* 待审核会员入库
*/
export
const
MEMBER_OUTER_STATUS_DEPOSITING
=
5
;
/**
* 入库审核通过
*/
export
const
MEMBER_OUTER_STATUS_DEPOSITORY_PASSED
=
6
;
/**
* 入库审核不通过
*/
export
const
MEMBER_OUTER_STATUS_DEPOSITORY_NOT_PASSED
=
7
;
/**
* 待审核会员变更
*/
export
const
MEMBER_OUTER_STATUS_MODIFYING
=
8
;
/**
* 会员变更审核通过
*/
export
const
MEMBER_OUTER_STATUS_MODIFY_PASSED
=
9
;
/**
* 会员变更审核不通过
*/
export
const
MEMBER_OUTER_STATUS_MODIFY_NOT_PASSED
=
10
;
export
const
MEMBER_OUTER_STATUS
=
{
[
MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY
]:
'待提交审核'
,
[
MEMBER_OUTER_STATUS_PLATFORM_VERIFYING
]:
'待平台审核'
,
[
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED
]:
'审核通过'
,
[
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED
]:
'审核不通过'
,
[
MEMBER_OUTER_STATUS_DEPOSITING
]:
'待审核会员入库'
,
[
MEMBER_OUTER_STATUS_DEPOSITORY_PASSED
]:
'入库审核通过'
,
[
MEMBER_OUTER_STATUS_DEPOSITORY_NOT_PASSED
]:
'入库审核不通过'
,
[
MEMBER_OUTER_STATUS_MODIFYING
]:
'待审核会员变更'
,
[
MEMBER_OUTER_STATUS_MODIFY_PASSED
]:
'会员变更审核通过'
,
[
MEMBER_OUTER_STATUS_MODIFY_NOT_PASSED
]:
'会员变更审核不通过'
,
};
\ No newline at end of file
src/constants/index.ts
View file @
413848b8
...
...
@@ -129,77 +129,6 @@ export const STATUS_ENUM = [
// 1是阿里云oss服务器, 2是本地文件服务器
export
const
UPLOAD_TYPE
=
1
// 会员规则类型
export
const
VIP_RULE_TRANSACTION
=
1
;
// 交易
export
const
VIP_RULE_LOGIN
=
2
;
// 登录
export
const
VIP_RULE_COMMENT
=
3
;
// 评论
// 会员状态
export
const
MEMBER_STATUS_NORMAL
=
1
;
// 正常的
export
const
MEMBER_STATUS_FROZEN
=
2
;
// 冻结的
export
const
MEMBER_STATUS
=
{
[
MEMBER_STATUS_NORMAL
]:
'正常'
,
[
MEMBER_STATUS_FROZEN
]:
'冻结'
,
};
// 会员类型
export
const
MEMBER_TYPE_CORPORATE
=
1
;
// 企业会员
export
const
MEMBER_TYPE_INDIVIDUAL
=
2
;
// 个人会员
export
const
MEMBER_TYPE_CHANNEL_CORPORATE
=
3
;
// 渠道企业会员
export
const
MEMBER_TYPE_CHANNEL_INDIVIDUAL
=
4
;
// 渠道个人会员
export
const
MEMBER_TYPE
=
{
[
MEMBER_TYPE_CORPORATE
]:
'企业会员'
,
[
MEMBER_TYPE_INDIVIDUAL
]:
'个人会员'
,
[
MEMBER_TYPE_CHANNEL_CORPORATE
]:
'渠道企业会员'
,
[
MEMBER_TYPE_CHANNEL_INDIVIDUAL
]:
'渠道个人会员'
,
};
// 会员内部状态
export
const
MEMBER_INNER_STATUS_REGISTERED
=
0
;
// 申请注册(已注册)
export
const
MEMBER_INNER_STATUS_UNCOMMITTED
=
1
;
// 待提交审核
export
const
MEMBER_INNER_STATUS_UNREVIEWED_1
=
2
;
// 待一级审核
export
const
MEMBER_INNER_STATUS_UNREVIEWED_2
=
3
;
// 待二级审核
export
const
MEMBER_INNER_STATUS_FAILED
=
4
;
// 审核不通过
export
const
MEMBER_INNER_STATUS_SUCCESS
=
5
;
// 审核通过
export
const
MEMBER_INNER_STATUS
=
{
[
MEMBER_INNER_STATUS_REGISTERED
]:
'申请注册'
,
[
MEMBER_INNER_STATUS_UNCOMMITTED
]:
'待提交审核'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_1
]:
'待一级审核'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_2
]:
'待二级审核'
,
[
MEMBER_INNER_STATUS_FAILED
]:
'审核不通过'
,
[
MEMBER_INNER_STATUS_SUCCESS
]:
'审核通过'
,
};
// 会员外部状态
export
const
MEMBER_OUTER_STATUS_UNCOMMITTED
=
0
;
// 待提交审核
export
const
MEMBER_OUTER_STATUS_UNREVIEWED
=
1
;
// 待审核
export
const
MEMBER_OUTER_STATUS_FAILED
=
2
;
// 审核不通过
export
const
MEMBER_OUTER_STATUS_SUCCESS
=
3
;
// 审核通过
export
const
MEMBER_OUTER_STATUS
=
{
[
MEMBER_OUTER_STATUS_UNCOMMITTED
]:
'待提交'
,
[
MEMBER_OUTER_STATUS_UNREVIEWED
]:
'待审核'
,
[
MEMBER_OUTER_STATUS_FAILED
]:
'审核不通过'
,
[
MEMBER_OUTER_STATUS_SUCCESS
]:
'审核通过'
,
};
// 会员申请来源
export
const
MEMBER_SOURCE_WEB_ENTERPRISE
=
1
;
// Web企业商城
export
const
MEMBER_SOURCE_H5_ENTERPRISE
=
2
;
// H5企业商城
export
const
MEMBER_SOURCE_WEB_CHANNEL
=
3
;
// Web渠道商城
export
const
MEMBER_SOURCE_H5_CHANNEL
=
4
;
// H5渠道商城
export
const
MEMBER_SOURCE_PLATFORM
=
5
;
// 平台代录入
export
const
MEMBER_SOURCE_MERCHANTS
=
6
;
// 商户代录入
export
const
MEMBER_SOURCE_CHANNEL
=
7
;
// 渠道代录入
export
const
MEMBER_source
=
{
[
MEMBER_SOURCE_WEB_ENTERPRISE
]:
'Web企业商城'
,
[
MEMBER_SOURCE_H5_ENTERPRISE
]:
'H5企业商城'
,
[
MEMBER_SOURCE_WEB_CHANNEL
]:
'Web渠道商城'
,
[
MEMBER_SOURCE_H5_CHANNEL
]:
'H5渠道商城'
,
[
MEMBER_SOURCE_PLATFORM
]:
'平台代录入'
,
[
MEMBER_SOURCE_MERCHANTS
]:
'商户代录入'
,
[
MEMBER_SOURCE_CHANNEL
]:
'渠道代录入'
,
};
// 订单类型
export
enum
OrderModalType
{
...
...
src/pages/member/components/BasicInfo/index.tsx
View file @
413848b8
...
...
@@ -8,7 +8,7 @@ import MellowCard from '@/components/MellowCard';
import
{
MEMBER_TYPE_CHANNEL_CORPORATE
,
MEMBER_TYPE_CHANNEL_INDIVIDUAL
,
}
from
'@/constants'
;
}
from
'@/constants
/const/member
'
;
import
PicWrap
from
'../PicWrap'
;
import
FlowRecords
,
{
InnerHistoryItem
,
OuterHistoryItem
}
from
'../FlowRecords'
;
import
styles
from
'./index.less'
;
...
...
src/pages/member/constant.tsx
View file @
413848b8
import
{
MEMBER_STATUS_NORMAL
,
MEMBER_STATUS_FROZEN
,
MEMBER_INNER_STATUS_TO_BE_COMMIT
,
MEMBER_INNER_STATUS_COMMIT_NOT_PASSED
,
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1
,
MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2
,
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED
,
MEMBER_INNER_STATUS_VERIFY_PASSED
,
MEMBER_INNER_STATUS_REGISTERED
,
MEMBER_INNER_STATUS_UNCOMMITTED
,
MEMBER_INNER_STATUS_UNREVIEWED_1
,
MEMBER_INNER_STATUS_UNREVIEWED_2
,
MEMBER_INNER_STATUS_FAILED
,
MEMBER_INNER_STATUS_SUCCESS
,
MEMBER_OUTER_STATUS_TO_PLATFORM_VERIFY
,
MEMBER_OUTER_STATUS_PLATFORM_VERIFYING
,
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_NOT_PASSED
,
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED
,
MEMBER_OUTER_STATUS_UNCOMMITTED
,
MEMBER_OUTER_STATUS_UNREVIEWED
,
MEMBER_OUTER_STATUS_FAILED
,
MEMBER_OUTER_STATUS_SUCCESS
,
}
from
'@/constants'
;
MEMBER_STATUS_NORMAL
,
MEMBER_STATUS_FROZEN
,
}
from
'@/constants/const/member'
;
export
const
STATUS_COLOR_MAP
=
{
0
:
'#669EDE'
,
...
...
@@ -35,36 +35,36 @@ export const MEMBER_STATUS_TAG_MAP = {
// 会员内部状态 StatusTag map
export
const
MEMBER_INNER_STATUS_TYPE
=
{
[
MEMBER_INNER_STATUS_
REGISTERED
]:
'default'
,
[
MEMBER_INNER_STATUS_
UNCOMMITT
ED
]:
'primary'
,
[
MEMBER_INNER_STATUS_
UNREVIEWED_
1
]:
'warnning'
,
[
MEMBER_INNER_STATUS_
UNREVIEWED_
2
]:
'warnning'
,
[
MEMBER_INNER_STATUS_
FAIL
ED
]:
'danger'
,
[
MEMBER_INNER_STATUS_
SUCCESS
]:
'success'
,
[
MEMBER_INNER_STATUS_
TO_BE_COMMIT
]:
'default'
,
[
MEMBER_INNER_STATUS_
COMMIT_NOT_PASS
ED
]:
'primary'
,
[
MEMBER_INNER_STATUS_
TO_BE_VERIFY_STEP
1
]:
'warnning'
,
[
MEMBER_INNER_STATUS_
TO_BE_VERIFY_STEP
2
]:
'warnning'
,
[
MEMBER_INNER_STATUS_
VERIFY_NOT_PASS
ED
]:
'danger'
,
[
MEMBER_INNER_STATUS_
VERIFY_PASSED
]:
'success'
,
};
// 会员外部状态 StatusTag map
export
const
MEMBER_OUTER_STATUS_TYPE
=
{
[
MEMBER_OUTER_STATUS_
UNCOMMITTED
]:
'primary'
,
[
MEMBER_OUTER_STATUS_
UNREVIEWED
]:
'warnning'
,
[
MEMBER_OUTER_STATUS_
FAIL
ED
]:
'danger'
,
[
MEMBER_OUTER_STATUS_
SUCCESS
]:
'success'
,
[
MEMBER_OUTER_STATUS_
TO_PLATFORM_VERIFY
]:
'primary'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFYING
]:
'warnning'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFY_NOT_PASS
ED
]:
'danger'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFY_PASSED
]:
'success'
,
};
// 会员内部状态 Tag badge map
export
const
MEMBER_INNER_STATUS_BADGE_COLOR
=
{
[
MEMBER_INNER_STATUS_
REGISTERED
]:
'#606266'
,
[
MEMBER_INNER_STATUS_
UNCOMMITT
ED
]:
'#669EDE'
,
[
MEMBER_INNER_STATUS_
UNREVIEWED_
1
]:
'#FFC400'
,
[
MEMBER_INNER_STATUS_
UNREVIEWED_
2
]:
'#FFC400'
,
[
MEMBER_INNER_STATUS_
FAIL
ED
]:
'#EF6260'
,
[
MEMBER_INNER_STATUS_
SUCCESS
]:
'#41CC9E'
,
[
MEMBER_INNER_STATUS_
TO_BE_COMMIT
]:
'#606266'
,
[
MEMBER_INNER_STATUS_
COMMIT_NOT_PASS
ED
]:
'#669EDE'
,
[
MEMBER_INNER_STATUS_
TO_BE_VERIFY_STEP
1
]:
'#FFC400'
,
[
MEMBER_INNER_STATUS_
TO_BE_VERIFY_STEP
2
]:
'#FFC400'
,
[
MEMBER_INNER_STATUS_
VERIFY_NOT_PASS
ED
]:
'#EF6260'
,
[
MEMBER_INNER_STATUS_
VERIFY_PASSED
]:
'#41CC9E'
,
};
// 会员外部状态 Tag badge map
export
const
MEMBER_OUTER_STATUS_BADGE_COLOR
=
{
[
MEMBER_OUTER_STATUS_
UNCOMMITTED
]:
'#669EDE'
,
[
MEMBER_OUTER_STATUS_
UNREVIEWED
]:
'#FFC400'
,
[
MEMBER_OUTER_STATUS_
FAIL
ED
]:
'#EF6260'
,
[
MEMBER_OUTER_STATUS_
SUCCESS
]:
'#41CC9E'
,
[
MEMBER_OUTER_STATUS_
TO_PLATFORM_VERIFY
]:
'#669EDE'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFYING
]:
'#FFC400'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFY_NOT_PASS
ED
]:
'#EF6260'
,
[
MEMBER_OUTER_STATUS_
PLATFORM_VERIFY_PASSED
]:
'#41CC9E'
,
};
\ No newline at end of file
src/pages/member/memberLevel/components/DetailInfo/index.tsx
View file @
413848b8
...
...
@@ -2,17 +2,15 @@
* @Author: XieZhiXiong
* @Date: 2021-01-26 17:17:14
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
1-26 17:35:40
* @LastEditTime: 2021-0
6-21 14:23:18
* @Description:
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Button
,
Popconfirm
,
Card
,
Input
,
Slider
,
Spin
,
message
,
PageHeader
,
...
...
@@ -354,7 +352,7 @@ const addEquity: React.FC<DetailInfoProps> = ({
dataSource=
{
levelInfo
?.
rights
}
columns=
{
newColumns
}
loading=
{
false
}
pagination=
{
null
}
pagination=
{
undefined
}
onRow=
{
(
record
):
EditableRowProps
=>
({
onFieldsChange
:
handleFieldsChange
,
})
}
...
...
src/pages/member/memberMaintain/frozen.tsx
View file @
413848b8
...
...
@@ -10,7 +10,7 @@ import { GetMemberMaintenanceDetailBasicResponse } from '@/services/MemberApi';
import
{
MEMBER_STATUS_NORMAL
,
MEMBER_STATUS_FROZEN
,
}
from
'@/constants'
;
}
from
'@/constants
/const/member
'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
auditModalSchema
}
from
'./schema'
;
import
{
...
...
src/pages/member/memberMaintain/index.tsx
View file @
413848b8
...
...
@@ -6,22 +6,18 @@ import {
Button
,
Menu
,
Popconfirm
,
Dropdown
,
Badge
,
Modal
,
message
,
}
from
'antd'
;
import
{
PlusOutlined
,
DeleteOutlined
,
ClockCircleOutlined
,
DownOutlined
,
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
StatusSwitch
from
'@/components/StatusSwitch'
;
import
UploadModal
from
'@/components/UploadModal'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
...
...
@@ -30,14 +26,14 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import
{
PublicApi
}
from
'@/services/api'
;
import
moment
from
'moment'
;
import
{
MEMBER_INNER_STATUS_VERIFY_PASSED
,
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED
,
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED
,
MEMBER_INNER_STATUS_TO_BE_COMMIT
,
MEMBER_STATUS_NORMAL
,
MEMBER_INNER_STATUS_SUCCESS
,
MEMBER_OUTER_STATUS_SUCCESS
,
MEMBER_INNER_STATUS_UNCOMMITTED
,
MEMBER_INNER_STATUS_FAILED
,
MEMBER_SOURCE_PLATFORM
,
}
from
'@/constants'
;
import
{
importSchema
,
auditModalSchema
}
from
'./schema'
;
}
from
'@/constants
/const/member
'
;
import
{
importSchema
}
from
'./schema'
;
import
{
MEMBER_STATUS_TAG_MAP
,
MEMBER_INNER_STATUS_BADGE_COLOR
,
...
...
@@ -184,8 +180,8 @@ const memberMaintain: React.FC<[]> = () => {
render
:
(
text
:
any
,
record
:
any
)
=>
(
<>
{
(
record
.
innerStatus
===
MEMBER_INNER_STATUS_
SUCCESS
&&
record
.
outerStatus
===
MEMBER_OUTER_STATUS_
SUCCESS
record
.
innerStatus
===
MEMBER_INNER_STATUS_
VERIFY_PASSED
&&
record
.
outerStatus
===
MEMBER_OUTER_STATUS_
PLATFORM_VERIFY_PASSED
)
&&
(
<
Link
to=
{
`/memberAbility/manage/maintian/frozen?id=${record.memberId}&validateId=${record.validateId}`
}
>
<
Button
...
...
@@ -197,8 +193,11 @@ const memberMaintain: React.FC<[]> = () => {
)
}
{
/* 平台代录入的会员资料才可以修改、删除 */
}
{
(
record
.
source
===
MEMBER_SOURCE_PLATFORM
&&
record
.
outerStatus
!==
MEMBER_OUTER_STATUS_SUCCESS
record
.
source
===
MEMBER_SOURCE_PLATFORM
&&
(
record
.
innerStatus
===
MEMBER_INNER_STATUS_TO_BE_COMMIT
||
record
.
innerStatus
===
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED
)
)
&&
(
<>
<
Button
...
...
src/pages/member/memberPr1/components/DetailInfo/index.tsx
View file @
413848b8
...
...
@@ -36,7 +36,6 @@ import HeadInfo from '../../../components/HeadInfo';
import
StatusTag
from
'../../../components/StatusTag'
;
import
BasicInfo
from
'../../../components/BasicInfo'
;
import
AuditProcess
from
'../../../components/AuditProcess'
;
import
styles
from
'./index.less'
;
const
treeActions
=
createTreeActions
();
const
modalFormActions
=
createFormActions
();
...
...
src/pages/member/memberPr2/components/DetailInfo/index.tsx
View file @
413848b8
...
...
@@ -36,7 +36,6 @@ import HeadInfo from '../../../components/HeadInfo';
import
StatusTag
from
'../../../components/StatusTag'
;
import
BasicInfo
from
'../../../components/BasicInfo'
;
import
AuditProcess
from
'../../../components/AuditProcess'
;
import
styles
from
'./index.less'
;
const
treeActions
=
createTreeActions
();
const
modalFormActions
=
createFormActions
();
...
...
src/pages/member/memberPrConfirm/components/DetailInfo/index.tsx
View file @
413848b8
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-26 17:06:48
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-
08 15:28:09
* @LastEditTime: 2021-06-
21 14:05:31
* @Description:
*/
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
...
...
@@ -27,7 +27,7 @@ import MellowCard from '@/components/MellowCard';
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createAsyncFormActions
,
FormEffectHooks
,
FormPath
}
from
'@formily/antd'
;
import
{
useTreeTabs
,
FormState
}
from
'@/hooks/useTreeTabs'
;
import
{
MEMBER_INNER_STATUS_SUCCESS
}
from
'@/constants'
;
// import { MEMBER_INNER_STATUS_VERIFY_PASSED
} from '@/constants';
import
{
MEMBER_INNER_STATUS_BADGE_COLOR
,
MEMBER_OUTER_STATUS_TYPE
,
...
...
@@ -37,14 +37,11 @@ import HeadInfo from '../../../components/HeadInfo';
import
StatusTag
from
'../../../components/StatusTag'
;
import
BasicInfo
from
'../../../components/BasicInfo'
;
import
AuditProcess
from
'../../../components/AuditProcess'
;
import
styles
from
'./index.less'
;
const
treeActions
=
createTreeActions
();
const
modalFormActions
=
createAsyncFormActions
();
const
{
onFieldValueChange$
,
onFieldInputChange$
,
onFieldInit$
,
}
=
FormEffectHooks
;
interface
DetailInfoProps
{
...
...
@@ -399,7 +396,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
effects=
{
(
$
,
{
setFieldState
})
=>
{
// onFieldInit$().subscribe(() =>
{
// // 内部状态为 审核通过 才能选择 审核通过选项
// if (infoRef.current.info.innerStatus !== MEMBER_INNER_STATUS_
SUCCESS
)
{
// if (infoRef.current.info.innerStatus !== MEMBER_INNER_STATUS_
VERIFY_PASSED
)
{
// modalFormActions.setFieldState('agree', (state: any) =>
{
// const newEnum =
// state.props.enum.map(
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
413848b8
import
React
,
{
useState
,
use
Effect
,
use
Ref
}
from
'react'
;
import
React
,
{
useState
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
...
...
@@ -12,7 +12,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
moment
from
'moment'
;
import
{
MEMBER_INNER_STATUS_
SUCCESS
,
MEMBER_INNER_STATUS_FAILED
}
from
'@/constants
'
;
import
{
MEMBER_INNER_STATUS_
TO_CONFIRMD
}
from
'@/constants/const/member
'
;
import
{
auditSchema
}
from
'./schema'
;
import
{
MEMBER_STATUS_TAG_MAP
,
...
...
@@ -134,7 +134,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
},
selectedRowKeys
:
selectedRowKeys
,
getCheckboxProps
:
record
=>
({
disabled
:
record
.
innerStatus
===
MEMBER_INNER_STATUS_FAILE
D
,
disabled
:
record
.
innerStatus
!==
MEMBER_INNER_STATUS_TO_CONFIRM
D
,
}),
};
...
...
src/pages/member/memberPrSubmit/components/DetailInfo/index.tsx
View file @
413848b8
...
...
@@ -20,7 +20,6 @@ import {
message
,
}
from
'antd'
;
import
{
FormOutlined
}
from
'@ant-design/icons'
;
import
{
usePageStatus
,
PageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
GetMemberValidateCommitDetailResponse
}
from
'@/services/MemberApi'
;
import
TabTree
,
{
createTreeActions
}
from
'@/components/TabTree'
;
...
...
@@ -30,7 +29,6 @@ import NiceForm from '@/components/NiceForm';
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
useTreeTabs
,
FormState
}
from
'@/hooks/useTreeTabs'
;
import
{
MEMBER_STATUS_TAG_MAP
,
MEMBER_INNER_STATUS_BADGE_COLOR
,
MEMBER_OUTER_STATUS_TYPE
,
}
from
'../../../constant'
;
...
...
@@ -39,7 +37,6 @@ import HeadInfo from '../../../components/HeadInfo';
import
StatusTag
from
'../../../components/StatusTag'
;
import
BasicInfo
from
'../../../components/BasicInfo'
;
import
AuditProcess
from
'../../../components/AuditProcess'
;
import
styles
from
'./index.less'
;
const
treeActions
=
createTreeActions
();
const
modalFormActions
=
createFormActions
();
...
...
src/pages/member/memberUpgradeRule/index.tsx
View file @
413848b8
...
...
@@ -6,7 +6,7 @@ import {
}
from
'antd'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
PATTERN_MAPS
}
from
'@/constants/regExp'
;
import
{
VIP_RULE_TRANSACTION
,
VIP_RULE_LOGIN
,
VIP_RULE_COMMENT
}
from
'@/constants'
;
import
{
VIP_RULE_TRANSACTION
,
VIP_RULE_LOGIN
,
VIP_RULE_COMMENT
}
from
'@/constants
/const/member
'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
ContainerOutlined
}
from
'@ant-design/icons'
;
import
{
EditableCellTable
}
from
'@/components/PolymericTable'
;
...
...
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