From 499ed1f979e22b9bd6e49b9ff61d8be7603864f0 Mon Sep 17 00:00:00 2001 From: zsqtony <450952271@qq.com> Date: Fri, 27 Jun 2025 17:15:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .umirc.ts | 2 +- src/common/components/layout/AvatarProps.tsx | 16 +- src/common/components/layout/Tasks.tsx | 106 ---------- src/gen/Enums.ts | 7 + src/pages/agents/index.tsx | 65 ------ src/pages/agents/modals/Create.tsx | 54 ----- src/pages/agents/modals/Update.tsx | 55 ----- src/pages/bosses/index.tsx | 65 ------ src/pages/bosses/modals/Create.tsx | 54 ----- src/pages/bosses/modals/Update.tsx | 55 ----- src/pages/factories/index.tsx | 55 ----- src/pages/factories/modals/Create.tsx | 43 ---- src/pages/factories/modals/Update.tsx | 44 ---- src/pages/loan_companies/index.tsx | 75 ------- src/pages/loan_companies/modals/Create.tsx | 66 ------ src/pages/loan_companies/modals/Update.tsx | 67 ------ src/pages/loan_daily_details/index.tsx | 104 ---------- src/pages/loans/index.tsx | 193 ------------------ src/pages/loans/modals/Create.tsx | 90 -------- src/pages/markets/index.tsx | 60 ------ src/pages/markets/modals/Create.tsx | 48 ----- src/pages/markets/modals/Update.tsx | 49 ----- src/pages/merchants/index.tsx | 136 ------------ src/pages/merchants/modals/Create.tsx | 47 ----- src/pages/merchants/modals/CreateCounters.tsx | 88 -------- src/pages/merchants/modals/Update.tsx | 48 ----- src/pages/merchants/modals/UpdateCounters.tsx | 89 -------- src/pages/org_users/index.tsx | 71 ------- src/pages/org_users/modals/Create.tsx | 57 ------ src/pages/org_users/modals/Update.tsx | 55 ----- src/pages/pay_orders/index.tsx | 75 ------- src/pages/platforms/index.tsx | 61 ------ src/pages/platforms/modals/Create.tsx | 49 ----- src/pages/platforms/modals/Update.tsx | 50 ----- src/pages/system/admins/index.tsx | 4 +- src/pages/system/admins/modals/Create.tsx | 4 +- src/pages/system/admins/modals/Update.tsx | 4 +- src/pages/system/sys_permissions/index.tsx | 12 +- .../system/sys_permissions/modals/Create.tsx | 4 +- .../system/sys_permissions/modals/Update.tsx | 4 +- src/pages/system/sys_roles/index.tsx | 4 +- src/pages/system/sys_roles/modals/Create.tsx | 4 +- .../sys_roles/modals/EditPermissions.tsx | 22 +- src/pages/system/sys_roles/modals/Update.tsx | 4 +- 44 files changed, 44 insertions(+), 2221 deletions(-) delete mode 100644 src/common/components/layout/Tasks.tsx delete mode 100644 src/pages/agents/index.tsx delete mode 100644 src/pages/agents/modals/Create.tsx delete mode 100644 src/pages/agents/modals/Update.tsx delete mode 100644 src/pages/bosses/index.tsx delete mode 100644 src/pages/bosses/modals/Create.tsx delete mode 100644 src/pages/bosses/modals/Update.tsx delete mode 100644 src/pages/factories/index.tsx delete mode 100644 src/pages/factories/modals/Create.tsx delete mode 100644 src/pages/factories/modals/Update.tsx delete mode 100644 src/pages/loan_companies/index.tsx delete mode 100644 src/pages/loan_companies/modals/Create.tsx delete mode 100644 src/pages/loan_companies/modals/Update.tsx delete mode 100644 src/pages/loan_daily_details/index.tsx delete mode 100644 src/pages/loans/index.tsx delete mode 100644 src/pages/loans/modals/Create.tsx delete mode 100644 src/pages/markets/index.tsx delete mode 100644 src/pages/markets/modals/Create.tsx delete mode 100644 src/pages/markets/modals/Update.tsx delete mode 100644 src/pages/merchants/index.tsx delete mode 100644 src/pages/merchants/modals/Create.tsx delete mode 100644 src/pages/merchants/modals/CreateCounters.tsx delete mode 100644 src/pages/merchants/modals/Update.tsx delete mode 100644 src/pages/merchants/modals/UpdateCounters.tsx delete mode 100644 src/pages/org_users/index.tsx delete mode 100644 src/pages/org_users/modals/Create.tsx delete mode 100644 src/pages/org_users/modals/Update.tsx delete mode 100644 src/pages/pay_orders/index.tsx delete mode 100644 src/pages/platforms/index.tsx delete mode 100644 src/pages/platforms/modals/Create.tsx delete mode 100644 src/pages/platforms/modals/Update.tsx diff --git a/.umirc.ts b/.umirc.ts index 62acff9..18cf97e 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -14,7 +14,7 @@ export default defineConfig({ }, proxy: { '/api/': { - target: 'http://0.0.0.0:8000', + target: 'http://yt:8003', // target: 'https://loanos-test.nchl.net/', changeOrigin: true, pathRewrite: { '^': '' }, diff --git a/src/common/components/layout/AvatarProps.tsx b/src/common/components/layout/AvatarProps.tsx index cfd4d0f..5c5d5d6 100644 --- a/src/common/components/layout/AvatarProps.tsx +++ b/src/common/components/layout/AvatarProps.tsx @@ -7,11 +7,10 @@ import { UserOutlined, } from '@ant-design/icons'; import { history } from '@umijs/max'; -import { Avatar, Drawer, Dropdown, MenuProps, Space } from 'antd'; +import { Avatar, Dropdown, MenuProps, Space } from 'antd'; import { useState } from 'react'; import { stateActions } from '../../libs/valtio/actions'; import ChangePassword from './ChangePassword'; -import MyTasks from './Tasks'; export default function AvatarProps({ user }: { user: any }) { const [open, setOpen] = useState(false); @@ -41,7 +40,7 @@ export default function AvatarProps({ user }: { user: any }) { label: ( { - Apis.Auth.Logout().then(() => { + Apis.Common.Auth.Logout().then(() => { stateActions.setLogout(); history.push('/login'); }); @@ -78,17 +77,6 @@ export default function AvatarProps({ user }: { user: any }) { - - - ); } diff --git a/src/common/components/layout/Tasks.tsx b/src/common/components/layout/Tasks.tsx deleted file mode 100644 index ba0a289..0000000 --- a/src/common/components/layout/Tasks.tsx +++ /dev/null @@ -1,106 +0,0 @@ -import { MyButtons, renderTextHelper } from '@/common'; -import { Apis } from '@/gen/Apis'; -import { SysTasksStatusEnum } from '@/gen/Enums'; -import { UndoOutlined } from '@ant-design/icons'; -import { Card, Descriptions, Pagination, Space } from 'antd'; -import { useEffect, useState } from 'react'; - -export default function Tasks(props: any) { - const [option, setOption] = useState({}); - const getList = (page: number) => { - Apis.SysTasks.List({ perPage: 10, page: page }) - .then((res) => { - setOption(res); - }) - .catch(() => false); - }; - - useEffect(() => { - if (props?.item) { - getList(1); - } - }, [props?.item]); - - return ( - <> - - {!option?.data?.length ? ( -
- 暂无任务数据 -
- ) : ( - '' - )} - {option?.data?.map((res: any) => { - return ( - - - Apis.SysTasks.Delete({ - id: res.id, - }).then(() => getList(1)) - } - /> - } - size="middle" - onClick={() => getList(1)} - /> - - } - style={{ width: '100%' }} - > - - - {res?.start_at || '-'} - - - {res?.success_count || '-'} - - - {res?.fail_count || '-'} - - - - - - {res?.end_at || '-'} - - - {res?.error_message || '-'} - - - - {res?.is_error_stop ? '失败后暂停' : '失败后续集执行'} - {res?.is_error_rollback ? '失败后全部回滚' : '失败后不回滚'} - - - - - ); - })} -
- { - getList(page); - }} - /> -
- - - ); -} diff --git a/src/gen/Enums.ts b/src/gen/Enums.ts index a5405c4..3f09c06 100644 --- a/src/gen/Enums.ts +++ b/src/gen/Enums.ts @@ -73,3 +73,10 @@ export const SysModuleEnum= { 'Customer': {"text":"客户","color":"#d4b106","value":"Customer"}, }; +// SysPermissionsTypeEnum +export const SysPermissionsTypeEnum= { + 'Directory': {"text":"目录","color":"#6d7e14","value":"Directory"}, + 'Page': {"text":"页面","color":"#4d9a13","value":"Page"}, + 'Button': {"text":"按钮","color":"#97224f","value":"Button"}, +}; + diff --git a/src/pages/agents/index.tsx b/src/pages/agents/index.tsx deleted file mode 100644 index 6afce9c..0000000 --- a/src/pages/agents/index.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '代理商' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Agents.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '简称', - dataIndex: 'name', - }, - { - title: '全称', - dataIndex: 'full_name', - }, - { - dataIndex: 'address', - title: '地址', - }, - { - dataIndex: 'contact', - title: '联系人', - }, - { - dataIndex: 'phone', - title: '联系电话', - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Agents.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/agents/modals/Create.tsx b/src/pages/agents/modals/Create.tsx deleted file mode 100644 index c438498..0000000 --- a/src/pages/agents/modals/Create.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Agents.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/agents/modals/Update.tsx b/src/pages/agents/modals/Update.tsx deleted file mode 100644 index bbc6c86..0000000 --- a/src/pages/agents/modals/Update.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Agents.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/bosses/index.tsx b/src/pages/bosses/index.tsx deleted file mode 100644 index 4df0d54..0000000 --- a/src/pages/bosses/index.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '超市老板' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Bosses.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '简称', - dataIndex: 'name', - }, - { - title: '全称', - dataIndex: 'full_name', - }, - { - dataIndex: 'address', - title: '地址', - }, - { - dataIndex: 'contact', - title: '联系人', - }, - { - dataIndex: 'phone', - title: '联系电话', - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Bosses.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/bosses/modals/Create.tsx b/src/pages/bosses/modals/Create.tsx deleted file mode 100644 index b9a2c79..0000000 --- a/src/pages/bosses/modals/Create.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Bosses.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/bosses/modals/Update.tsx b/src/pages/bosses/modals/Update.tsx deleted file mode 100644 index 32d3de9..0000000 --- a/src/pages/bosses/modals/Update.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Bosses.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/factories/index.tsx b/src/pages/factories/index.tsx deleted file mode 100644 index e08e471..0000000 --- a/src/pages/factories/index.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '下游厂家' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Factories.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '厂家名称', - dataIndex: 'name', - }, - { - title: '下游公钥', - dataIndex: 'public_key', - }, - MyColumns.CreatedAt(), - MyColumns.UpdatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Factories.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/factories/modals/Create.tsx b/src/pages/factories/modals/Create.tsx deleted file mode 100644 index c92d7fc..0000000 --- a/src/pages/factories/modals/Create.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Factories.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '厂家名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '下游公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/factories/modals/Update.tsx b/src/pages/factories/modals/Update.tsx deleted file mode 100644 index e7a9c75..0000000 --- a/src/pages/factories/modals/Update.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Factories.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '厂家名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '下游公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/loan_companies/index.tsx b/src/pages/loan_companies/index.tsx deleted file mode 100644 index 57eabba..0000000 --- a/src/pages/loan_companies/index.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { LoanCompaniesTypeEnum } from '@/gen/Enums'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '资金方' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.LoanCompanies.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '类型', - dataIndex: 'type', - valueEnum: LoanCompaniesTypeEnum, - }, - { - title: '简称', - dataIndex: 'name', - }, - { - title: '全称', - dataIndex: 'full_name', - }, - { - title: '上游商户号', - dataIndex: 'up_merchant_no', - }, - { - dataIndex: 'address', - title: '地址', - }, - { - dataIndex: 'contact', - title: '联系人', - }, - { - dataIndex: 'phone', - title: '联系电话', - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.LoanCompanies.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/loan_companies/modals/Create.tsx b/src/pages/loan_companies/modals/Create.tsx deleted file mode 100644 index 6b6000a..0000000 --- a/src/pages/loan_companies/modals/Create.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyColumns, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { LoanCompaniesTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.LoanCompanies.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - MyColumns.EnumTag({ - key: 'type', - title: '类型', - valueEnum: LoanCompaniesTypeEnum, - }), - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'up_merchant_no', - title: '上游商户号', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/loan_companies/modals/Update.tsx b/src/pages/loan_companies/modals/Update.tsx deleted file mode 100644 index 0ca4400..0000000 --- a/src/pages/loan_companies/modals/Update.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyColumns, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { LoanCompaniesTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.LoanCompanies.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - MyColumns.EnumTag({ - key: 'type', - title: '类型', - valueEnum: LoanCompaniesTypeEnum, - }), - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'up_merchant_no', - title: '上游商户号', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'address', - title: '地址', - }, - { - key: 'contact', - title: '联系人', - }, - { - key: 'phone', - title: '联系电话', - }, - ]} - /> - ); -} diff --git a/src/pages/loan_daily_details/index.tsx b/src/pages/loan_daily_details/index.tsx deleted file mode 100644 index 1c4b213..0000000 --- a/src/pages/loan_daily_details/index.tsx +++ /dev/null @@ -1,104 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { LoansOrderStatusEnum } from '@/gen/Enums'; -import { ProTable } from '@ant-design/pro-components'; -import { useState } from 'react'; - -export default function Index({ title = '还款记录' }) { - const [query, setQuery] = useState(); - - return ( - - - MyProTableProps.request( - params, - sort, - Apis.LoanDailyDetails.List, - setQuery, - ) - } - toolBarRender={() => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '所属商户', - dataIndex: 'merchants_name', - search: false, - }, - Selects.Merchants({ - hideInTable: true, - }), - { - title: '所属资金方', - dataIndex: 'loan_companies_name', - search: false, - }, - Selects.LoanCompany({ - hideInTable: true, - }), - MyColumns.EnumTag({ - title: '订单状态', - dataIndex: 'order_status', - valueEnum: LoansOrderStatusEnum, - }), - { - title: '日期', - dataIndex: 'date', - }, - { - title: '应还-本金', - dataIndex: 'due_principal', - search: false, - valueType: 'money', - }, - { - title: '应还-利息', - dataIndex: 'due_interest', - search: false, - valueType: 'money', - }, - { - title: '应还-递延本金', - dataIndex: 'due_deferred_principal', - search: false, - valueType: 'money', - }, - { - title: '应还-总金额', - dataIndex: 'due_total_amount', - search: false, - valueType: 'money', - }, - { - title: '已还-总金额', - dataIndex: 'paid_total_amount', - search: false, - valueType: 'money', - }, - { - title: '未还-总金额', - dataIndex: 'remaining_total_amount', - search: false, - valueType: 'money', - }, - // MyColumns.CreatedAt(), - ]} - /> - - ); -} diff --git a/src/pages/loans/index.tsx b/src/pages/loans/index.tsx deleted file mode 100644 index 495261c..0000000 --- a/src/pages/loans/index.tsx +++ /dev/null @@ -1,193 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { LoansOrderStatusEnum, LoansTypeEnum } from '@/gen/Enums'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; - -export default function Index({ title = '贷款订单' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Loans.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '所属商户', - dataIndex: ['merchant', 'name'], - search: false, - }, - { - title: '所属资金方', - dataIndex: ['loan_company', 'name'], - search: false, - }, - { - title: '名称', - dataIndex: 'name', - }, - MyColumns.EnumTag({ - title: '类型', - dataIndex: 'type', - valueEnum: LoansTypeEnum, - }), - MyColumns.EnumTag({ - title: '订单状态', - dataIndex: 'order_status', - valueEnum: LoansOrderStatusEnum, - }), - { - title: '贷款天数', - dataIndex: 'loan_days', - search: false, - }, - { - title: '开始时间', - dataIndex: 'started_at', - search: false, - }, - { - title: '结束时间', - dataIndex: 'ended_at', - search: false, - }, - { - title: '总应还', - search: false, - children: [ - { - title: '本金', - dataIndex: 'total_due_principal', - search: false, - valueType: 'money', - }, - { - title: '利息', - dataIndex: 'total_due_interest', - search: false, - valueType: 'money', - }, - { - title: '总金额', - dataIndex: 'total_due_amount', - search: false, - valueType: 'money', - }, - ], - }, - { - title: '每日应还', - search: false, - children: [ - { - title: '本金', - dataIndex: 'daily_due_principal', - search: false, - valueType: 'money', - }, - { - title: '利息', - dataIndex: 'daily_due_interest', - search: false, - valueType: 'money', - }, - { - title: '总金额', - dataIndex: 'daily_due_amount', - search: false, - valueType: 'money', - }, - ], - }, - - { - title: '已还', - search: false, - children: [ - { - title: '天数', - dataIndex: 'repaid_days', - search: false, - }, - { - title: '本金', - dataIndex: 'repaid_total_principal', - search: false, - valueType: 'money', - }, - { - title: '利息', - dataIndex: 'repaid_total_interest', - search: false, - valueType: 'money', - }, - { - title: '总金额', - dataIndex: 'repaid_total_amount', - search: false, - valueType: 'money', - }, - ], - }, - { - title: '剩余应还', - search: false, - children: [ - { - title: '天数', - dataIndex: 'remaining_due_days', - search: false, - }, - - { - title: '本金', - dataIndex: 'remaining_due_principal', - search: false, - valueType: 'money', - }, - - { - title: '利息', - dataIndex: 'remaining_due_interest', - search: false, - valueType: 'money', - }, - - { - title: '总金额', - dataIndex: 'remaining_due_amount', - search: false, - valueType: 'money', - }, - ], - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - Apis.Loans.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/loans/modals/Create.tsx b/src/pages/loans/modals/Create.tsx deleted file mode 100644 index 9a0dc3a..0000000 --- a/src/pages/loans/modals/Create.tsx +++ /dev/null @@ -1,90 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyFormItems, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { LoansTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { Form, message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - const [form] = Form.useForm(); - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - width="600px" - wrapperCol={{ span: 24 }} - trigger={} - onFinish={async (values) => - Apis.Loans.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - form={form} - onOpenChange={(open: boolean) => { - if (open) { - form.setFieldsValue({ repayment_date: 21, loan_terms: 3 }); - } - }} - columns={[ - Selects.Merchants({ - colProps: { span: 24 }, - required: true, - }), - Selects.LoanCompany({ - colProps: { span: 24 }, - required: true, - }), - { - title: '名称', - key: 'name', - formItemProps: { ...rulesHelper.text }, - }, - MyFormItems.EnumRadio({ - title: '算法类型', - key: 'type', - valueEnum: LoansTypeEnum, - formItemProps: { ...rulesHelper.text }, - }), - { - title: '贷款天数', - key: 'loan_days', - colProps: { span: 12 }, - formItemProps: { ...rulesHelper.number }, - width: '100%', - }, - { - title: '还款起始日', - key: 'started_at', - valueType: 'date', - colProps: { span: 12 }, - formItemProps: { ...rulesHelper.number }, - width: '100%', - }, - MyFormItems.Money({ - title: '总应还-本金', - key: 'total_due_principal', - colProps: { span: 12 }, - formItemProps: { ...rulesHelper.number }, - width: '100%', - }), - MyFormItems.Money({ - title: '总应还-利息', - key: 'total_due_interest', - colProps: { span: 12 }, - formItemProps: { ...rulesHelper.number }, - width: '100%', - }), - ]} - /> - ); -} diff --git a/src/pages/markets/index.tsx b/src/pages/markets/index.tsx deleted file mode 100644 index eff96da..0000000 --- a/src/pages/markets/index.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '上游市场' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Markets.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '市场名称', - dataIndex: 'name', - }, - { - title: '市场编号', - dataIndex: 'market_no', - }, - { - title: '上游公钥', - dataIndex: 'public_key', - search: false, - }, - MyColumns.UpdatedAt(), - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Markets.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/markets/modals/Create.tsx b/src/pages/markets/modals/Create.tsx deleted file mode 100644 index 1946228..0000000 --- a/src/pages/markets/modals/Create.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Markets.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '市场名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'market_no', - title: '市场编号', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '上游公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/markets/modals/Update.tsx b/src/pages/markets/modals/Update.tsx deleted file mode 100644 index 60f1ee6..0000000 --- a/src/pages/markets/modals/Update.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Markets.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '市场名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'market_no', - title: '市场编号', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '上游公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/merchants/index.tsx b/src/pages/merchants/index.tsx deleted file mode 100644 index b69921d..0000000 --- a/src/pages/merchants/index.tsx +++ /dev/null @@ -1,136 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import CreateCounters from './modals/CreateCounters'; -import Update from './modals/Update'; -import UpdateCounters from './modals/UpdateCounters'; - -export default function Index({ title = '商户' }) { - const ExpandedRowRender = (e: any) => { - const columns = [ - { title: 'id', dataIndex: 'id' }, - { title: '上游', dataIndex: ['market', 'name'] }, - { title: '名称', dataIndex: 'name' }, - { title: '上游商家编号', dataIndex: 'up_merchant_no' }, - { title: '平台商户号', dataIndex: 'plat_merchant_no' }, - { title: '平台柜台号', dataIndex: 'plat_counter_no' }, - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.MerchantCounters.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]; - return ( - - MyProTableProps.request( - { ...params, merchants_id: e?.id }, - sort, - Apis.MerchantCounters.List, - ) - } - toolBarRender={(action) => [ - , - ]} - headerTitle="柜台信息" - search={false} - /> - ); - }; - - return ( - - - MyProTableProps.request(params, sort, Apis.Merchants.List) - } - toolBarRender={(action) => [ - , - ]} - expandable={{ - expandedRowRender: ExpandedRowRender, - }} - columns={[ - MyColumns.ID(), - Selects.Agents({ dataIndex: 'agents_name' }), - Selects.Bosses({ dataIndex: 'bosses_name' }), - Selects.Factories({ dataIndex: 'factories_name' }), - Selects.Platforms({ dataIndex: 'platforms_name' }), - // { - // title: '代理', - // dataIndex: 'agents_name', - // search: false, - // }, - // { - // title: '厂家', - // dataIndex: 'factories_name', - // search: false, - // }, - // { - // title: '平台', - // dataIndex: 'platforms_name', - // search: false, - // }, - // { - // title: '老板', - // dataIndex: 'bosses_name', - // search: false, - // }, - { - title: '简称', - dataIndex: 'name', - }, - { - title: '全称', - dataIndex: 'full_name', - }, - { - title: '平台商户号', - dataIndex: 'plat_merchant_no', - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Merchants.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/merchants/modals/Create.tsx b/src/pages/merchants/modals/Create.tsx deleted file mode 100644 index 1ae65f9..0000000 --- a/src/pages/merchants/modals/Create.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Merchants.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - Selects.Agents({ required: true }), - Selects.Bosses({ required: true }), - Selects.Factories({ required: true }), - Selects.Platforms({ required: true }), - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/merchants/modals/CreateCounters.tsx b/src/pages/merchants/modals/CreateCounters.tsx deleted file mode 100644 index 78d97af..0000000 --- a/src/pages/merchants/modals/CreateCounters.tsx +++ /dev/null @@ -1,88 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyFormItems, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { CommissionTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function CreateCounters(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="800px" - trigger={} - onFinish={async (values) => - Apis.MerchantCounters.Store({ ...props?.item, ...values }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - Selects.Markets({ required: true }), - { - key: 'name', - title: '名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'up_merchant_no', - title: '上游商家编号', - formItemProps: { ...rulesHelper.text }, - }, - { - valueType: 'formList', - dataIndex: 'commissions', - title: '分佣配置', - formItemProps: { ...rulesHelper.array }, - fieldProps: { - copyIconProps: false, - }, - columns: [ - { - valueType: 'group', - colProps: { span: 24 }, - columns: [ - { - key: 'seq', - colProps: { span: 3 }, - title: '序号', - width: '100%', - formItemProps: { ...rulesHelper.text }, - }, - MyFormItems.EnumSelect({ - key: 'type', - title: '类型', - colProps: { span: 4 }, - valueEnum: CommissionTypeEnum, - required: true, - formItemProps: { ...rulesHelper.text }, - }), - { - key: 'merchant_no', - colProps: { span: 9 }, - title: '商户编号', - }, - { - key: 'percent', - colProps: { span: 8 }, - title: '分佣比例%(0为自动计算)', - }, - ], - }, - ], - }, - ]} - /> - ); -} diff --git a/src/pages/merchants/modals/Update.tsx b/src/pages/merchants/modals/Update.tsx deleted file mode 100644 index a5e3b79..0000000 --- a/src/pages/merchants/modals/Update.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Merchants.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - Selects.Agents({ required: true }), - Selects.Bosses({ required: true }), - Selects.Factories({ required: true }), - Selects.Platforms({ required: true }), - { - key: 'name', - title: '简称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'full_name', - title: '全称', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/merchants/modals/UpdateCounters.tsx b/src/pages/merchants/modals/UpdateCounters.tsx deleted file mode 100644 index b8e618e..0000000 --- a/src/pages/merchants/modals/UpdateCounters.tsx +++ /dev/null @@ -1,89 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyFormItems, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { CommissionTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function UpdateCounters(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="800px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.MerchantCounters.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - Selects.Markets({ required: true }), - { - key: 'name', - title: '名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'up_merchant_no', - title: '上游商家编号', - formItemProps: { ...rulesHelper.text }, - }, - { - valueType: 'formList', - dataIndex: 'commissions', - title: '分佣配置', - formItemProps: { ...rulesHelper.array }, - fieldProps: { - copyIconProps: false, - }, - columns: [ - { - valueType: 'group', - colProps: { span: 24 }, - columns: [ - { - key: 'seq', - colProps: { span: 3 }, - title: '序号', - width: '100%', - formItemProps: { ...rulesHelper.text }, - }, - MyFormItems.EnumSelect({ - key: 'type', - title: '类型', - colProps: { span: 4 }, - valueEnum: CommissionTypeEnum, - required: true, - formItemProps: { ...rulesHelper.text }, - }), - { - key: 'merchant_no', - colProps: { span: 9 }, - title: '商户编号', - }, - { - key: 'percent', - colProps: { span: 8 }, - title: '分佣比例%(0为自动计算)', - }, - ], - }, - ], - }, - ]} - /> - ); -} diff --git a/src/pages/org_users/index.tsx b/src/pages/org_users/index.tsx deleted file mode 100644 index 1a35b8f..0000000 --- a/src/pages/org_users/index.tsx +++ /dev/null @@ -1,71 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; -import { OrgUsersTypeEnum } from '@/gen/Enums'; - -export default function Index({ title = '账号管理' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.OrgUsers.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - MyColumns.EnumTag({ - title: '类型', - dataIndex: 'type', - valueEnum: OrgUsersTypeEnum, - }), - { - title: '机构名称', - dataIndex: ['org', 'name'], - key: 'org_name' - }, - { - title: '账号', - dataIndex: 'username', - }, - { - title: 'last_login_ip', - dataIndex: 'last_login_ip', - search: false, - }, - { - title: 'last_login_at', - dataIndex: 'last_login_at', - search: false, - }, - MyColumns.UpdatedAt(), - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.OrgUsers.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/org_users/modals/Create.tsx b/src/pages/org_users/modals/Create.tsx deleted file mode 100644 index 185647c..0000000 --- a/src/pages/org_users/modals/Create.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyColumns, - MyFormItems, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { OrgUsersTypeEnum } from '@/gen/Enums'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.OrgUsers.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - MyFormItems.EnumRadio({ - key: 'type', - title: '类型', - valueEnum: OrgUsersTypeEnum - }), - { - key: 'org_name', - title: '主体名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'username', - title: '用户名', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'password', - title: '密码', - valueType: 'password', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/org_users/modals/Update.tsx b/src/pages/org_users/modals/Update.tsx deleted file mode 100644 index 9949ed1..0000000 --- a/src/pages/org_users/modals/Update.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Selects } from '@/components/Selects'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.OrgUsers.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'type', - title: '类型', - readonly: true, - }, - { - key: ['org','name'], - title: '机构名称', - readonly: true, - }, - { - key: 'username', - title: '用户名', - readonly: true, - }, - { - key: 'password', - title: '密码', - valueType: 'password', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/pay_orders/index.tsx b/src/pages/pay_orders/index.tsx deleted file mode 100644 index 107d6f0..0000000 --- a/src/pages/pay_orders/index.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import { MyColumns, MyPageContainer, MyProTableProps } from '@/common'; -import { Apis } from '@/gen/Apis'; -import { PayOrderStatusEnum, PayOrdersTypeEnum } from '@/gen/Enums'; -import { ProTable } from '@ant-design/pro-components'; - -export default function Index({ title = '支付明细' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.PayOrders.List) - } - columns={[ - { - title: '交易时间', - search: false, - dataIndex: 'up_order_at', - }, - { - title: '交易时间范围', - key: 'up_order_at_range', - valueType: 'dateRange', - hideInTable: true, - }, - { - title: '商户', - dataIndex: 'merchant_name', - }, - MyColumns.EnumTag({ - title: '交易类型', - dataIndex: 'type', - valueEnum: PayOrdersTypeEnum, - }), - { - title: '下单金额', - dataIndex: 'amount_order', - }, - MyColumns.EnumTag({ - title: '订单状态', - dataIndex: 'order_status', - valueEnum: PayOrderStatusEnum, - }), - { - title: '平台商户号', - dataIndex: 'plat_merchant_no', - search: false, - }, - { - title: '平台柜台号', - dataIndex: 'plat_counter_no', - search: false, - }, - { - title: '上游商家编号', - dataIndex: 'up_merchant_no', - search: false, - }, - { - title: '下游订单号', - dataIndex: 'down_order_no', - }, - { - title: '上游订单号', - dataIndex: 'up_order_no', - }, - { - title: '上游流水号', - dataIndex: 'up_tx_no', - }, - ]} - /> - - ); -} diff --git a/src/pages/platforms/index.tsx b/src/pages/platforms/index.tsx deleted file mode 100644 index a3d5ebe..0000000 --- a/src/pages/platforms/index.tsx +++ /dev/null @@ -1,61 +0,0 @@ -import { - MyButtons, - MyColumns, - MyPageContainer, - MyProTableProps, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { ProTable } from '@ant-design/pro-components'; -import { Space } from 'antd'; -import Create from './modals/Create'; -import Update from './modals/Update'; - -export default function Index({ title = '平台' }) { - return ( - - - MyProTableProps.request(params, sort, Apis.Platforms.List) - } - toolBarRender={(action) => [ - , - ]} - columns={[ - MyColumns.ID(), - { - title: '平台名称', - dataIndex: 'name', - }, - { - title: '平台私钥', - dataIndex: 'private_key', - search: false, - }, - { - title: '平台公钥', - dataIndex: 'public_key', - search: false, - }, - MyColumns.UpdatedAt(), - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - Apis.Platforms.Delete({ id: item.id }).then(() => - action?.reload(), - ) - } - /> - - ), - }), - ]} - /> - - ); -} diff --git a/src/pages/platforms/modals/Create.tsx b/src/pages/platforms/modals/Create.tsx deleted file mode 100644 index 611fcb5..0000000 --- a/src/pages/platforms/modals/Create.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Create(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`添加${props.title}`} - wrapperCol={{ span: 24 }} - width="500px" - trigger={} - onFinish={async (values) => - Apis.Platforms.Store(values) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '平台名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'private_key', - title: '平台私钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '平台公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/platforms/modals/Update.tsx b/src/pages/platforms/modals/Update.tsx deleted file mode 100644 index c3c0dc1..0000000 --- a/src/pages/platforms/modals/Update.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import { - MyBetaModalFormProps, - MyButtons, - MyModalFormProps, - rulesHelper, -} from '@/common'; -import { Apis } from '@/gen/Apis'; -import { BetaSchemaForm } from '@ant-design/pro-components'; -import { message } from 'antd'; - -export default function Update(props: MyBetaModalFormProps) { - return ( - - {...MyModalFormProps.props} - title={`编辑${props.title}`} - trigger={} - wrapperCol={{ span: 24 }} - width="500px" - request={() => Promise.resolve(props.item)} - onFinish={async (values) => - Apis.Platforms.Update({ ...values, id: props.item?.id ?? 0 }) - .then(() => { - props.reload?.(); - message.success(props.title + '成功'); - return true; - }) - .catch(() => false) - } - columns={[ - { - key: 'name', - title: '平台名称', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'private_key', - title: '平台私钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - { - key: 'public_key', - title: '平台公钥', - valueType: 'textarea', - formItemProps: { ...rulesHelper.text }, - }, - ]} - /> - ); -} diff --git a/src/pages/system/admins/index.tsx b/src/pages/system/admins/index.tsx index 934a822..db6108e 100644 --- a/src/pages/system/admins/index.tsx +++ b/src/pages/system/admins/index.tsx @@ -18,7 +18,7 @@ export default function Index({ title = '管理员' }) { {...MyProTableProps.props} search={false} request={async (params, sort) => - MyProTableProps.request(params, sort, Apis.Admins.List) + MyProTableProps.request(params, sort, Apis.Common.Admins.List) } toolBarRender={(action) => [ , @@ -53,7 +53,7 @@ export default function Index({ title = '管理员' }) { - Apis.Admins.Delete({ id: item.id }).then(() => + Apis.Common.Admins.Delete({ id: item.id }).then(() => action?.reload(), ) } diff --git a/src/pages/system/admins/modals/Create.tsx b/src/pages/system/admins/modals/Create.tsx index 724a664..97ee470 100644 --- a/src/pages/system/admins/modals/Create.tsx +++ b/src/pages/system/admins/modals/Create.tsx @@ -11,14 +11,14 @@ import { message } from 'antd'; export default function Create(props: MyBetaModalFormProps) { return ( - + {...MyModalFormProps.props} title={`添加${props.title}`} wrapperCol={{ span: 24 }} width="500px" trigger={} onFinish={async (values) => - Apis.Admins.Store(values) + Apis.Common.Admins.Store(values) .then(() => { props.reload?.(); message.success(props.title + '成功'); diff --git a/src/pages/system/admins/modals/Update.tsx b/src/pages/system/admins/modals/Update.tsx index b4ba93f..4eb8591 100644 --- a/src/pages/system/admins/modals/Update.tsx +++ b/src/pages/system/admins/modals/Update.tsx @@ -6,7 +6,7 @@ import { message } from 'antd'; export default function Update(props: MyBetaModalFormProps) { return ( - + {...MyModalFormProps.props} title={`编辑${props.title}`} trigger={} @@ -19,7 +19,7 @@ export default function Update(props: MyBetaModalFormProps) { }) } onFinish={async (values) => - Apis.Admins.Update({ ...values, id: props.item?.id ?? 0 }) + Apis.Common.Admins.Update({ ...values, id: props.item?.id ?? 0 }) .then(() => { props.reload?.(); message.success(props.title + '成功'); diff --git a/src/pages/system/sys_permissions/index.tsx b/src/pages/system/sys_permissions/index.tsx index 01de8e0..a3ec3eb 100644 --- a/src/pages/system/sys_permissions/index.tsx +++ b/src/pages/system/sys_permissions/index.tsx @@ -20,7 +20,9 @@ export default function Index({ title = '功能' }) { const [guardName, setGuardName] = useState('Admin'); const getData = async () => { - let data = await Apis.SysPermissions.List({ guard_name: guardName }); + let data = await Apis.Permission.SysPermissions.List({ + guard_name: guardName, + }); setData(data.data); }; @@ -93,7 +95,7 @@ export default function Index({ title = '功能' }) { icon={} disabled={!item.parent_id} onClick={() => { - Apis.SysPermissions.Move({ + Apis.Permission.SysPermissions.Move({ id: item.id, type: 'up', }).then(() => { @@ -106,7 +108,7 @@ export default function Index({ title = '功能' }) { icon={} disabled={!item.parent_id} onClick={() => { - Apis.SysPermissions.Move({ + Apis.Permission.SysPermissions.Move({ id: item.id, type: 'down', }).then(() => { @@ -134,8 +136,8 @@ export default function Index({ title = '功能' }) { /> - Apis.SysPermissions.Delete({ id: item.id }).then(() => - getData(), + Apis.Permission.SysPermissions.Delete({ id: item.id }).then( + () => getData(), ) } /> diff --git a/src/pages/system/sys_permissions/modals/Create.tsx b/src/pages/system/sys_permissions/modals/Create.tsx index 00b8eab..dd5318e 100644 --- a/src/pages/system/sys_permissions/modals/Create.tsx +++ b/src/pages/system/sys_permissions/modals/Create.tsx @@ -19,7 +19,7 @@ export default function Create( ) { const [form] = Form.useForm(); return ( - + {...MyModalFormProps.props} title={`添加${props.title}`} form={form} @@ -29,7 +29,7 @@ export default function Create( } onFinish={async (values) => { - return Apis.SysPermissions.Store({ + return Apis.Permission.SysPermissions.Store({ ...values, guard_name: props.guardName, }) diff --git a/src/pages/system/sys_permissions/modals/Update.tsx b/src/pages/system/sys_permissions/modals/Update.tsx index 99f1a0d..8b9bc61 100644 --- a/src/pages/system/sys_permissions/modals/Update.tsx +++ b/src/pages/system/sys_permissions/modals/Update.tsx @@ -17,14 +17,14 @@ export default function Update( const [form] = Form.useForm(); return ( - + {...MyModalFormProps.props} title={`编辑${props.title}`} form={form} wrapperCol={{ span: 24 }} width="600px" onFinish={async (values) => { - return Apis.SysPermissions.Update({ + return Apis.Permission.SysPermissions.Update({ ...values, guard_name: props.guardName, id: props.item?.id, diff --git a/src/pages/system/sys_roles/index.tsx b/src/pages/system/sys_roles/index.tsx index 3f1c76b..7dc3f86 100644 --- a/src/pages/system/sys_roles/index.tsx +++ b/src/pages/system/sys_roles/index.tsx @@ -18,7 +18,7 @@ export default function Index({ title = '角色' }) { {...MyProTableProps.props} search={false} request={async (params, sort) => - MyProTableProps.request(params, sort, Apis.SysRoles.List) + MyProTableProps.request(params, sort, Apis.Permission.SysRoles.List) } toolBarRender={(action) => [ , @@ -51,7 +51,7 @@ export default function Index({ title = '角色' }) { - Apis.SysRoles.Delete({ id: item.id }).then(() => + Apis.Permission.SysRoles.Delete({ id: item.id }).then(() => action?.reload(), ) } diff --git a/src/pages/system/sys_roles/modals/Create.tsx b/src/pages/system/sys_roles/modals/Create.tsx index 8c8c8b4..c30a38e 100644 --- a/src/pages/system/sys_roles/modals/Create.tsx +++ b/src/pages/system/sys_roles/modals/Create.tsx @@ -11,14 +11,14 @@ import { message } from 'antd'; export default function Create(props: MyBetaModalFormProps) { return ( - + {...MyModalFormProps.props} title={`添加${props.title}`} wrapperCol={{ span: 24 }} width="500px" trigger={} onFinish={async (values) => - Apis.SysRoles.Store(values) + Apis.Permission.SysRoles.Store(values) .then(() => { props.reload?.(); message.success(props.title + '成功'); diff --git a/src/pages/system/sys_roles/modals/EditPermissions.tsx b/src/pages/system/sys_roles/modals/EditPermissions.tsx index 8e9489c..7bfcb47 100644 --- a/src/pages/system/sys_roles/modals/EditPermissions.tsx +++ b/src/pages/system/sys_roles/modals/EditPermissions.tsx @@ -11,24 +11,24 @@ import { message } from 'antd'; export default function EditPermissions(props: MyBetaModalFormProps) { return ( - + {...MyModalFormProps.props} title={props.title} wrapperCol={{ span: 24 }} width="600px" trigger={} request={() => - Apis.SysRoles.GetPermissions({ id: props?.item?.id ?? 0 }).then( - (res) => { - return { - id: props?.item?.id, - permissions_ids: res.data?.permissions_ids, - }; - }, - ) + Apis.Permission.SysRoles.GetPermissions({ + id: props?.item?.id ?? 0, + }).then((res) => { + return { + id: props?.item?.id, + permissions_ids: res.data?.permissions_ids, + }; + }) } onFinish={async (values) => { - return Apis.SysRoles.SetPermissions({ + return Apis.Permission.SysRoles.SetPermissions({ ...values, id: props.item?.id ?? 0, }) @@ -45,7 +45,7 @@ export default function EditPermissions(props: MyBetaModalFormProps) { title: '选择权限', ...rulesHelper.array, renderFormItem: () => ( - + ), }, ]} diff --git a/src/pages/system/sys_roles/modals/Update.tsx b/src/pages/system/sys_roles/modals/Update.tsx index 97cb8de..2661286 100644 --- a/src/pages/system/sys_roles/modals/Update.tsx +++ b/src/pages/system/sys_roles/modals/Update.tsx @@ -11,7 +11,7 @@ import { message } from 'antd'; export default function Update(props: MyBetaModalFormProps) { return ( - + {...MyModalFormProps.props} title={`编辑${props.title}`} wrapperCol={{ span: 24 }} @@ -19,7 +19,7 @@ export default function Update(props: MyBetaModalFormProps) { trigger={} request={async () => props.item} onFinish={async (values) => { - return Apis.SysRoles.Update({ + return Apis.Permission.SysRoles.Update({ ...values, id: props.item?.id ?? 0, })