Commit 4dc43321 authored by XieZhiXiong's avatar XieZhiXiong

调整会员能力相关路由

parent a03f8377
......@@ -4,6 +4,7 @@
* @Date: 2020-07-10 16:16:37
* @Last Modified by: ghua
* @Last Modified time: 2020-09-29 14:35:34
* @Description: 渠道能力路由相关
*/
const ShopRoute = {
......
......@@ -4,6 +4,7 @@
* @Date: 2020-07-10 16:15:28
* @Last Modified by: ghua
* @Last Modified time: 2020-07-10 16:15:28
* @Description: 会员能力路由相关
*/
const MemberRoute = {
......@@ -12,182 +13,219 @@ const MemberRoute = {
key: 'memberAbility',
icon: 'smile',
routes: [
// 会员管理
{
path: '/memberCenter/memberAbility/manage',
name: 'memberManage',
key: 'memberManage',
routes: [
// 会员导入
{
path: '/memberCenter/memberAbility/manage/import',
name: 'memberImport',
component: '@/pages/member/memberImport/index',
},
},
// 会员导入-新增
{
path: '/memberCenter/memberAbility/manage/importDetail',
name: 'importDetail',
path: '/memberCenter/memberAbility/manage/import/add',
name: 'addMember',
hideInMenu: true,
component: '@/pages/member/memberImport/importDetail',
},
component: '@/pages/member/memberImport/addMember',
},
// 会员导入-编辑
{
path: '/memberCenter/memberAbility/manage/addMember',
name: 'addMember',
path: '/memberCenter/memberAbility/manage/import/edit',
name: 'editMember',
hideInMenu: true,
component: '@/pages/member/memberImport/addMember',
},
},
// 会员导入-详情
{
path: '/memberCenter/memberAbility/manage/import/detail',
name: 'memberImportDetail',
hideInMenu: true,
component: '@/pages/member/memberImport/importDetail',
},
// 会员维护
{
path: '/memberCenter/memberAbility/manage/maintain',
name: 'memberMaintain',
component: '@/pages/member/memberMaintain/index',
},
},
// 会员维护-详情
{
path: '/memberCenter/memberAbility/manage/maintainDetail',
path: '/memberCenter/memberAbility/manage/maintain/detail',
name: 'maintainDetail',
hideInMenu: true,
component: '@/pages/member/memberMaintain/detailed',
routes: [
routes: [
// 会员维护-详情-基础信息
{
path: '/memberCenter/memberAbility/manage/maintainDetail/basicInfo',
path: '/memberCenter/memberAbility/manage/maintain/detail/basicInfo',
name: 'basicInfo',
component: '@/pages/member/memberMaintain/detailed/basicInfo',
hideInMenu: true,
},
},
// 会员维护-详情-等级信息
{
path: '/memberCenter/memberAbility/manage/maintainDetail/levelInfo',
path: '/memberCenter/memberAbility/manage/maintain/detail/levelInfo',
name: 'levelInfo',
component: '@/pages/member/memberMaintain/detailed/levelInfo',
hideInMenu: true,
},
},
// 会员维护-详情-权益信息
{
path: '/memberCenter/memberAbility/manage/maintainDetail/equityInfo',
path: '/memberCenter/memberAbility/manage/maintain/detail/equityInfo',
name: 'equityInfo',
component: '@/pages/member/memberMaintain/detailed/equityInfo',
hideInMenu: true,
},
},
// 会员维护-详情-诚信信息
{
path: '/memberCenter/memberAbility/manage/maintainDetail/sincerityInfo',
path: '/memberCenter/memberAbility/manage/maintain/detail/sincerityInfo',
name: 'sincerityInfo',
component: '@/pages/member/memberMaintain/detailed/sincerityInfo',
hideInMenu: true,
},
],
},
},
// 会员维护-冻结
{
path: '/memberCenter/memberAbility/manage/frozen',
path: '/memberCenter/memberAbility/manage/maintain/frozen',
name: 'maintainFrozen',
hideInMenu: true,
component: '@/pages/member/memberMaintain/frozen',
},
},
// 待提交审核
{
path: '/memberCenter/memberAbility/manage/memberPrSubmit',
name: 'memberPrSubmit',
component: '@/pages/member/memberPrSubmit/index'
},
},
// 待提交审核-详情
{
path: '/memberCenter/memberAbility/manage/auditPrSubmit',
name: 'auditPrSubmit',
path: '/memberCenter/memberAbility/manage/memberPrSubmit/detail',
name: 'memberPrSubmitDetail',
hideInMenu: true,
component: '@/pages/member/memberPrSubmit/auditPrSubmit'
},
},
// 待审核(一级)
{
path: '/memberCenter/memberAbility/manage/memberPr1',
name: 'memberPr1',
component: '@/pages/member/memberPr1/index'
},
},
// 待审核(一级)-详情
{
path: '/memberCenter/memberAbility/manage/auditPr1',
name: 'auditPr1',
path: '/memberCenter/memberAbility/manage/memberPr1/detail',
name: 'memberPr1Detail',
hideInMenu: true,
component: '@/pages/member/memberPr1/auditPr1'
},
// 待审核(二级)
{
path: '/memberCenter/memberAbility/manage/memberPr2',
name: 'memberPr2',
component: '@/pages/member/memberPr2/index'
},
},
// 待审核(二级)-详情
{
path: '/memberCenter/memberAbility/manage/auditPr2',
name: 'auditPr2',
path: '/memberCenter/memberAbility/manage/memberPr2/detail',
name: 'memberPr2Detail',
hideInMenu: true,
component: '@/pages/member/memberPr2/auditPr2'
},
},
// 待确认审核
{
path: '/memberCenter/memberAbility/manage/memberPrConfirm',
name: 'memberPrConfirm',
component: '@/pages/member/memberPrConfirm/index'
},
},
// 待确认审核-详情
{
path: '/memberCenter/memberAbility/manage/auditPrComfirm',
name: 'auditPrComfirm',
path: '/memberCenter/memberAbility/manage/memberPrConfirm/detail',
name: 'memberPrConfirmDetail',
hideInMenu: true,
component: '@/pages/member/memberPrConfirm/auditPrComfirm'
},
},
// 会员升级规则
{
path: '/memberCenter/memberAbility/manage/upgradeRule',
name: 'memberUpgradeRule',
component: '@/pages/member/memberUpgradeRule/index',
},
},
// 会员等级
{
path: '/memberCenter/memberAbility/manage/level',
name: 'memberLevel',
component: '@/pages/member/memberLevel/index'
},
},
// 会员等级-设置
{
path: '/memberCenter/memberAbility/manage/level/addEquity',
name: 'addEquity',
path: '/memberCenter/memberAbility/manage/level/edit',
name: 'editMemberLevel',
hideInMenu: true,
component: '@/pages/member/memberLevel/addEquity',
},
]
},
},
// 会员信息查询
{
path: '/memberCenter/memberAbility/query',
name: 'memberQuery',
component: '@/pages/member/memberQuery/index',
},
},
// 会员信息查询-详情
{
path: '/memberCenter/memberAbility/query/detailed',
name: 'memberQueryDetailed',
path: '/memberCenter/memberAbility/query/detail',
name: 'memberQueryDetail',
component: '@/pages/member/memberQuery/detailed',
hideInMenu: true,
routes: [
// 会员信息查询-详情-基本信息
{
path: '/memberCenter/memberAbility/query/detailed/basicInfo',
path: '/memberCenter/memberAbility/query/detail/basicInfo',
name: 'basicInfo',
key: 'basicInfo',
component: '@/pages/member/memberQuery/detailed/basicInfo',
hideInMenu: true,
},
},
// 会员信息查询-详情-等级信息
{
path: '/memberCenter/memberAbility/query/detailed/levelInfo',
path: '/memberCenter/memberAbility/query/detail/levelInfo',
name: 'levelInfo',
key: 'levelInfo',
component: '@/pages/member/memberQuery/detailed/levelInfo',
hideInMenu: true,
},
},
// 会员信息查询-详情-权益信息
{
path: '/memberCenter/memberAbility/query/detailed/equityInfo',
path: '/memberCenter/memberAbility/query/detail/equityInfo',
name: 'equityInfo',
key: 'equityInfo',
component: '@/pages/member/memberQuery/detailed/equityInfo',
hideInMenu: true,
},
},
// 会员信息查询-详情-诚信信息
{
path: '/memberCenter/memberAbility/query/detailed/sincerityInfo',
path: '/memberCenter/memberAbility/query/detail/sincerityInfo',
name: 'sincerityInfo',
key: 'sincerityInfo',
component: '@/pages/member/memberQuery/detailed/sincerityInfo',
hideInMenu: true,
},
],
},
},
// 会员信息变更
{
path: '/memberCenter/memberAbility/update',
path: '/memberCenter/memberAbility/query/update',
name: 'memberUpdate',
hideInMenu: true,
component: '@/pages/member/memberQuery/update',
},
},
// 新增会员角色
{
path: '/memberCenter/memberAbility/addSubRole',
path: '/memberCenter/memberAbility/query/addSubRole',
name: 'addSubRole',
hideInMenu: true,
component: '@/pages/member/memberQuery/addSubRole',
......
......@@ -4,6 +4,7 @@
* @Date: 2020-07-10 16:16:37
* @Last Modified by: ghua
* @Last Modified time: 2020-09-29 14:36:01
* @Description: 店铺能力路由相关
*/
const ShopRoute = {
......
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-13 14:08:50
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-13 20:15:11
* @LastEditTime: 2020-10-14 10:06:45
*/
export default {
......@@ -82,20 +82,21 @@ export default {
'menu.memberAbility.memberManage': '会员管理',
'menu.memberAbility.memberManage.memberImport': '会员导入',
'menu.memberAbility.memberManage.addMember': '新增会员',
'menu.memberAbility.memberManage.importDetail': '会员导入详情',
'menu.memberAbility.memberManage.editMember': '编辑会员',
'menu.memberAbility.memberManage.memberImportDetail': '会员导入详情',
'menu.memberAbility.memberManage.memberMaintain': '会员维护',
'menu.memberAbility.memberManage.maintianDetail': '会员详情',
'menu.memberAbility.memberManage.memberPrSubmit': '待提交审核',
'menu.memberAbility.memberManage.auditPrSubmit': '待提交审核详情',
'menu.memberAbility.memberManage.memberPrSubmitDetail': '待提交审核详情',
'menu.memberAbility.memberManage.memberPr1': '待审核(一级)',
'menu.memberAbility.memberManage.auditPr2': '待审核详情(一级)',
'menu.memberAbility.memberManage.memberPr1Detail': '待审核详情(一级)',
'menu.memberAbility.memberManage.memberPr2': '待审核(二级)',
'menu.memberAbility.memberManage.auditPr1': '待审核详情(二级)',
'menu.memberAbility.memberManage.memberPr2Detail': '待审核详情(二级)',
'menu.memberAbility.memberManage.memberPrConfirm': '待确认审核',
'menu.memberAbility.memberManage.auditPrComfirm': '待确认审核详情',
'menu.memberAbility.memberManage.memberPrConfirmDetail': '待确认审核详情',
'menu.memberAbility.memberManage.memberUpgradeRule': '会员升级规则',
'menu.memberAbility.memberManage.memberLevel': '会员等级',
'menu.memberAbility.memberManage.addEquity': '会员权益设置',
'menu.memberAbility.memberManage.editMemberLevel': '会员权益设置',
'menu.memberAbility.memberManage.maintainDetail': '会员详情',
'menu.memberAbility.memberManage.maintainDetail.basicInfo': '会员基本信息',
'menu.memberAbility.memberManage.maintainDetail.levelInfo': '会员等级信息',
......@@ -103,11 +104,11 @@ export default {
'menu.memberAbility.memberManage.maintainDetail.sincerityInfo': '诚信信息',
'menu.memberAbility.memberManage.maintainFrozen': '会员冻结与解除',
'menu.memberAbility.memberQuery': '会员信息查询',
'menu.memberAbility.memberQueryDetailed': '会员信息详情',
'menu.memberAbility.memberQueryDetailed.basicInfo': '会员基本信息',
'menu.memberAbility.memberQueryDetailed.levelInfo': '会员等级信息',
'menu.memberAbility.memberQueryDetailed.equityInfo': '权益信息',
'menu.memberAbility.memberQueryDetailed.sincerityInfo': '诚信信息',
'menu.memberAbility.memberQueryDetail': '会员信息详情',
'menu.memberAbility.memberQueryDetail.basicInfo': '会员基本信息',
'menu.memberAbility.memberQueryDetail.levelInfo': '会员等级信息',
'menu.memberAbility.memberQueryDetail.equityInfo': '权益信息',
'menu.memberAbility.memberQueryDetail.sincerityInfo': '诚信信息',
'menu.memberAbility.memberUpdate': '变更会员信息',
'menu.memberAbility.addSubRole': '新增会员角色',
......
......@@ -108,7 +108,7 @@ const MemberMaintain: React.FC<[]> = () => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/importDetail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
url={`/memberCenter/memberAbility/manage/import/detail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
>
{text}
</EyePreview>
......@@ -189,7 +189,7 @@ const MemberMaintain: React.FC<[]> = () => {
<Button
type="link"
onClick={() =>
history.push(`/memberCenter/memberAbility/manage/addMember?id=${record.memberId}&validateId=${record.validateId}`)
history.push(`/memberCenter/memberAbility/manage/import/edit?id=${record.memberId}&validateId=${record.validateId}`)
}
>
编辑
......@@ -281,7 +281,7 @@ const MemberMaintain: React.FC<[]> = () => {
<Button
type="primary"
onClick={() =>
history.push(`/memberCenter/memberAbility/manage/addMember`)
history.push(`/memberCenter/memberAbility/manage/import/add`)
}
>
<PlusOutlined />
......
......@@ -49,7 +49,7 @@ const MemberLevel: React.FC<[]> = () => {
key: 'levelTag',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/level/addEquity?id=${record.id}&preview=1`}
url={`/memberCenter/memberAbility/manage/level/edit?id=${record.id}&preview=1`}
>
{text}
</EyePreview>
......@@ -105,7 +105,7 @@ const MemberLevel: React.FC<[]> = () => {
<Button
type="link"
onClick={() =>
history.push(`/memberCenter/memberAbility/manage/level/addEquity?id=${record.id}`)
history.push(`/memberCenter/memberAbility/manage/level/edit?id=${record.id}`)
}
>
设置
......
......@@ -72,7 +72,7 @@ const MemberMaintain: React.FC<[]> = () => {
render: (text, record) => (
<>
<EyePreview
url={`/memberCenter/memberAbility/manage/maintainDetail?id=${record.memberId}&validateId=${record.validateId}`}
url={`/memberCenter/memberAbility/manage/maintain/detail?id=${record.memberId}&validateId=${record.validateId}`}
>
{text}
</EyePreview>
......@@ -150,7 +150,7 @@ const MemberMaintain: React.FC<[]> = () => {
record.innerStatus === MEMBER_INNER_STATUS_SUCCESS &&
record.outerStatus === MEMBER_OUTER_STATUS_SUCCESS
) && (
<Link to={`/memberCenter/memberAbility/manage/frozen?id=${record.memberId}&validateId=${record.validateId}`}>
<Link to={`/memberCenter/memberAbility/manage/maintain/frozen?id=${record.memberId}&validateId=${record.validateId}`}>
<Button
type="link"
>
......
......@@ -31,7 +31,7 @@ const MemberPr1: React.FC<{}> = props => {
const [selectedList, setSelectList] = useState<any>([]);
const handleJumpAudit = record => {
history.push(`/memberCenter/memberAbility/manage/auditPr1?id=${record.memberId}&validateId=${record.validateId}`);
history.push(`/memberCenter/memberAbility/manage/memberPr1/detail?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
......@@ -46,7 +46,7 @@ const MemberPr1: React.FC<{}> = props => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/auditPr1?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
url={`/memberCenter/memberAbility/manage/memberPr1/detail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
>
{text}
</EyePreview>
......
......@@ -31,7 +31,7 @@ const MemberPr2: React.FC<{}> = props => {
const [selectedList, setSelectList] = useState<any>([]);
const handleJumpAudit = record => {
history.push(`/memberCenter/memberAbility/manage/auditPr2?id=${record.memberId}&validateId=${record.validateId}`);
history.push(`/memberCenter/memberAbility/manage/memberPr2/detail?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
......@@ -46,7 +46,7 @@ const MemberPr2: React.FC<{}> = props => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/auditPr2?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
url={`/memberCenter/memberAbility/manage/memberPr2/detail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
>
{text}
</EyePreview>
......
......@@ -32,7 +32,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
const [selectedList, setSelectList] = useState<any>([]);
const handleJumpAudit = record => {
history.push(`/memberCenter/memberAbility/manage/auditPrComfirm?id=${record.memberId}&validateId=${record.validateId}`);
history.push(`/memberCenter/memberAbility/manage/memberPrConfirm/detail?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
......@@ -47,7 +47,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/auditPrComfirm?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
url={`/memberCenter/memberAbility/manage/memberPrConfirm/detail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
>
{text}
</EyePreview>
......
......@@ -31,7 +31,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
const [selectedList, setSelectList] = useState<any>([]);
const handleJumpAudit = record => {
history.push(`/memberCenter/memberAbility/manage/auditPrSubmit?id=${record.memberId}&validateId=${record.validateId}`);
history.push(`/memberCenter/memberAbility/manage/memberPrSubmit/detail?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
......@@ -46,7 +46,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
align: 'center',
render: (text: any, record: any) => (
<EyePreview
url={`/memberCenter/memberAbility/manage/auditPrSubmit?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
url={`/memberCenter/memberAbility/manage/memberPrSubmit/detail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
>
{text}
</EyePreview>
......
......@@ -53,7 +53,7 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
useEffect(() => {
// 手动重定向到基础信息页,防止查询字符串被弄掉
history.replace(`/memberCenter/memberAbility/query/detailed/basicInfo?id=${id}&validateId=${validateId}`);
history.replace(`/memberCenter/memberAbility/query/detail/basicInfo?id=${id}&validateId=${validateId}`);
getBasicInfo();
}, []);
......
......@@ -59,7 +59,7 @@ const MemberQuery: React.FC<{}> = () => {
};
const handleJumpUpdate = record => {
history.push(`/memberCenter/memberAbility/update?id=${record.memberId}&validateId=${record.validateId}`);
history.push(`/memberCenter/memberAbility/query/update?id=${record.memberId}&validateId=${record.validateId}`);
};
// 再次申请
......@@ -86,7 +86,7 @@ const MemberQuery: React.FC<{}> = () => {
align: 'center',
render: (text, record) => (
<EyePreview
url={`/memberCenter/memberAbility/query/detailed?id=${record.memberId}&validateId=${record.validateId}`}
url={`/memberCenter/memberAbility/query/detail?id=${record.memberId}&validateId=${record.validateId}`}
>
{text}
</EyePreview>
......@@ -211,7 +211,7 @@ const MemberQuery: React.FC<{}> = () => {
const handleSubmit = values => {
history.push({
pathname: `/memberCenter/memberAbility/addSubRole`,
pathname: `/memberCenter/memberAbility/query/addSubRole`,
query: {
...values,
},
......
......@@ -149,7 +149,7 @@ const PaySetting: React.FC<{}> = () => {
}
const tableColumns: ColumnType<any>[] = [
{ dataIndex: 'code', title: '参数代码', align: 'center' },
{ dataIndex: 'value', align: 'center', title: '参数值', render: (_, record) => <EyePreview url={`/memberCenter/memberAbility/manage/addMember?id=${record.memberId}&preview=1`}>{_}</EyePreview> },
{ dataIndex: 'value', align: 'center', title: '参数值' },
{ dataIndex: 'describe', title: '参数描述', align: 'center' },
{
dataIndex: 'ctl', title: '操作', align: 'center', render: (_, record, index) =>
......
......@@ -181,7 +181,7 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
const tableColumns = [
{ dataIndex: 'memberId', title: 'ID', align: 'center' },
{ dataIndex: 'name', align: 'center', title: '会员名称', render: (_, record) => <EyePreview url={`/memberCenter/memberAbility/manage/addMember?id=${record.memberId}&preview=1`}>{_}</EyePreview> },
{ dataIndex: 'name', align: 'center', title: '会员名称' },
{ dataIndex: 'memberTypeName', title: '会员类型', align: 'center' },
{ dataIndex: 'ctl', title: '操作', align: 'center', render: (_, record) => <Button type='link' onClick={() => handleDeleteTable(record.id)}>删除</Button> }
]
......
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