Skip to content

J
jinfa-admin
Commit 4b07fdc4 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

chore: 修改会员相关常量相关

parent 7c8da20e
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 104 deletions
src/constants/const/member.ts 0 → 100644
View file @ 4b07fdc4
/*
* @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]: '渠道个人会员',
};
\ No newline at end of file
src/constants/index.ts
View file @ 4b07fdc4
......@@ -129,57 +129,106 @@ 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_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_REGISTERED]: '申请注册',
[MEMBER_INNER_STATUS_UNCOMMITTED]: '待提交审核',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: '待一级审核',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: '待二级审核',
[MEMBER_INNER_STATUS_FAILED]: '审核不通过',
[MEMBER_INNER_STATUS_SUCCESS]: '审核通过',
[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_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_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_UNCOMMITTED]: '待提交',
[MEMBER_OUTER_STATUS_UNREVIEWED]: '待审核',
[MEMBER_OUTER_STATUS_FAILED]: '审核不通过',
[MEMBER_OUTER_STATUS_SUCCESS]: '审核通过',
[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]: '会员变更审核不通过',
};
// 会员申请来源
......
src/pages/member/components/BasicInfo/index.tsx
View file @ 4b07fdc4
......@@ -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 @ 4b07fdc4
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
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_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_OUTER_STATUS_UNCOMMITTED,
MEMBER_OUTER_STATUS_UNREVIEWED,
MEMBER_OUTER_STATUS_FAILED,
MEMBER_OUTER_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,
} from '@/constants';
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
} from '@/constants/const/member';
export const STATUS_COLOR_MAP = {
0: '#669EDE',
......@@ -35,36 +36,36 @@ export const MEMBER_STATUS_TAG_MAP = {
// 会员内部状态 StatusTag map
export const MEMBER_INNER_STATUS_TYPE = {
[MEMBER_INNER_STATUS_REGISTERED]: 'default',
[MEMBER_INNER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: 'warnning',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: 'warnning',
[MEMBER_INNER_STATUS_FAILED]: 'danger',
[MEMBER_INNER_STATUS_SUCCESS]: 'success',
[MEMBER_INNER_STATUS_TO_BE_COMMIT]: 'default',
[MEMBER_INNER_STATUS_COMMIT_NOT_PASSED]: 'primary',
[MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1]: 'warnning',
[MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2]: 'warnning',
[MEMBER_INNER_STATUS_VERIFY_NOT_PASSED]: '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_FAILED]: '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_PASSED]: '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_UNCOMMITTED]: '#669EDE',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400',
[MEMBER_INNER_STATUS_FAILED]: '#EF6260',
[MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E',
[MEMBER_INNER_STATUS_TO_BE_COMMIT]: '#606266',
[MEMBER_INNER_STATUS_COMMIT_NOT_PASSED]: '#669EDE',
[MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP1]: '#FFC400',
[MEMBER_INNER_STATUS_TO_BE_VERIFY_STEP2]: '#FFC400',
[MEMBER_INNER_STATUS_VERIFY_NOT_PASSED]: '#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_FAILED]: '#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_PASSED]: '#EF6260',
[MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED]: '#41CC9E',
};
\ No newline at end of file
src/pages/member/memberMaintain/frozen.tsx
View file @ 4b07fdc4
......@@ -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 @ 4b07fdc4
......@@ -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,16 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import { PublicApi } from '@/services/api';
import moment from 'moment';
import {
MEMBER_STATUS_NORMAL,
MEMBER_INNER_STATUS_SUCCESS,
MEMBER_OUTER_STATUS_SUCCESS,
MEMBER_INNER_STATUS_UNCOMMITTED,
MEMBER_INNER_STATUS_FAILED,
MEMBER_INNER_STATUS_VERIFY_PASSED,
MEMBER_OUTER_STATUS_PLATFORM_VERIFY_PASSED,
MEMBER_INNER_STATUS_VERIFY_NOT_PASSED,
MEMBER_INNER_STATUS_TO_BE_COMMIT,
MEMBER_SOURCE_PLATFORM,
} from '@/constants';
import { importSchema, auditModalSchema } from './schema';
import {
MEMBER_STATUS_NORMAL,
} from '@/constants/const/member';
import { importSchema } from './schema';
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
......@@ -184,8 +182,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 +195,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/memberPrConfirm/components/DetailInfo/index.tsx
View file @ 4b07fdc4
......@@ -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,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 = createAsyncFormActions();
......@@ -399,7 +398,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 @ 4b07fdc4
import React, { useState, useEffect, useRef } 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';
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_FAILED,
disabled: record.innerStatus !== MEMBER_INNER_STATUS_TO_CONFIRMD,
}),
};
......
src/pages/member/memberUpgradeRule/index.tsx
View file @ 4b07fdc4
......@@ -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';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment