diff --git a/src/pages/Work/List/index.tsx b/src/pages/Work/List/index.tsx
index 0ad4609..9b0df54 100644
--- a/src/pages/Work/List/index.tsx
+++ b/src/pages/Work/List/index.tsx
@@ -7,6 +7,7 @@ import RoutePath from '@/routes/routePath';
import { queryWorkList, deleteWork } from '@/services/work';
import { fetchTableData } from '@/utils/table';
import TimeText from '@/components/Typography/TimeText';
+import WorkSelectModal from '@/widget/Work/WorkSelectModal';
const WorkList = () => {
const tableRef = useRef
();
@@ -74,23 +75,28 @@ const WorkList = () => {
},
];
return (
- {
- history.push(RoutePath.WORK.EDIT);
+
+
{
+ history.push(RoutePath.WORK.EDIT);
+ },
},
- },
- ]}
- request={async (params) => {
- return fetchTableData(queryWorkList, params);
- }}
- />
+ ]}
+ request={async (params) => {
+ return fetchTableData(queryWorkList, params);
+ }}
+ />
+
+
);
};
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 81dd357..986575d 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -16,39 +16,33 @@ export default [
routes: [
{
path: RoutePath.ETH,
- redirect: RoutePath.ADDRESS.LIST,
+ redirect: RoutePath.ETH_ADDRESS.LIST,
hideInMenu: true,
},
{
name: 'ETH地址管理',
- path: RoutePath.ADDRESS.LIST,
- component: './Work/List',
+ path: RoutePath.ETH_ADDRESS.LIST,
+ component: './Eth/Address/List',
},
{
name: 'ETH地址详情',
- path: RoutePath.ADDRESS.EDIT,
+ path: RoutePath.ETH_ADDRESS.EDIT,
hideInMenu: true,
- component: './Work/Edit',
+ component: './Eth/Address/Edit',
},
{
name: 'ETH充值记录',
- path: RoutePath.RECORD.LIST,
- component: './Work/List',
- },
- {
- name: 'ETH充值详情',
- path: RoutePath.RECORD.EDIT,
- hideInMenu: true,
- component: './Work/Edit',
+ path: RoutePath.ETH_RECORD.LIST,
+ component: './Eth/Record/List',
},
{
name: 'ETH币种管理',
- path: RoutePath.CURRENCY.LIST,
+ path: RoutePath.ETH_CURRENCY.LIST,
component: './Work/List',
},
{
name: 'ETH币种详情',
- path: RoutePath.CURRENCY.EDIT,
+ path: RoutePath.ETH_CURRENCY.EDIT,
hideInMenu: true,
component: './Work/Edit',
},
@@ -79,7 +73,7 @@ export default [
},
{
path: '/',
- redirect: RoutePath.WORK.LIST,
+ redirect: RoutePath.ETH_ADDRESS.LIST,
},
{
diff --git a/src/routes/routePath.ts b/src/routes/routePath.ts
index 6a53c47..1594520 100644
--- a/src/routes/routePath.ts
+++ b/src/routes/routePath.ts
@@ -3,15 +3,14 @@ const ETH = '/eth';
const RoutePath = {
LOGIN: '/login',
ETH: ETH,
- ADDRESS: {
+ ETH_ADDRESS: {
LIST: `${ETH}/address`,
EDIT: `${ETH}/address/edit`,
},
- RECORD: {
+ ETH_RECORD: {
LIST: `${ETH}/record`,
- EDIT: `${ETH}/record/edit`,
},
- CURRENCY: {
+ ETH_CURRENCY: {
LIST: `${ETH}/currency`,
EDIT: `${ETH}/currency/edit`,
},
diff --git a/src/services/eth.ts b/src/services/eth.ts
new file mode 100644
index 0000000..d794879
--- /dev/null
+++ b/src/services/eth.ts
@@ -0,0 +1,25 @@
+import request from '@/utils/request';
+
+export const queryAddressList = (data) => {
+ return request.request({
+ url: '/admin/api/v1/address/get',
+ method: 'post',
+ data,
+ });
+};
+
+export const AddAddress = (data) => {
+ return request.request({
+ url: '/admin/api/v1/address/mask',
+ method: 'post',
+ data,
+ });
+};
+
+export const queryRecordList = (data) => {
+ return request.request({
+ url: '/admin/api/v1/records/get',
+ method: 'post',
+ data,
+ });
+};
diff --git a/src/utils/table.ts b/src/utils/table.ts
index d02e49a..47bb6fc 100644
--- a/src/utils/table.ts
+++ b/src/utils/table.ts
@@ -9,8 +9,7 @@ export const fetchTableData = async (
delete params.current;
delete params.pageSize;
const res = (await fetch(params)) || {};
- const data = res.data;
-
+ const data = res;
data?.forEach((n: any) => {
for (const key in formatObj) {
n[key] = n[formatObj[key]];
--
2.40.1
From 10614bdb9b1904bd136e7db35cb82f56d7934526 Mon Sep 17 00:00:00 2001
From: zzy <>
Date: Mon, 20 Jun 2022 16:27:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA=E5=BC=B9=E7=AA=97=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Eth/Address/Edit/AddAddressModal.tsx | 37 +++++++------------
src/pages/Eth/Address/List/index.tsx | 37 +++++++++++--------
2 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/src/pages/Eth/Address/Edit/AddAddressModal.tsx b/src/pages/Eth/Address/Edit/AddAddressModal.tsx
index 4476c3b..219d053 100644
--- a/src/pages/Eth/Address/Edit/AddAddressModal.tsx
+++ b/src/pages/Eth/Address/Edit/AddAddressModal.tsx
@@ -1,47 +1,36 @@
-import React, { useState } from 'react';
+// 选择作品弹窗
+import React, { useRef } from 'react';
import { createForm } from '@formily/core';
import { createSchemaField } from '@formily/react';
import Modal, { ModalProps } from '@/components/Modal';
-import { message } from 'antd';
-
-import { Form, FormItem, Input, Submit } from '@formily/antd';
-import { AddAddress } from '@/services/eth';
-import { initWeb3, walletSign } from '../../../../utils/web3';
-import { values } from 'lodash';
+import { Form, FormItem, Input } from '@formily/antd';
interface AddAddressModalPropsType extends ModalProps {
onOk: (val: any) => void;
+ onCancel: () => void;
}
const SchemaField = createSchemaField({
components: {
FormItem,
Input,
- Submit,
},
});
const form = createForm({});
-const AddAddressModal = (onOk, { ...rest }: AddAddressModalPropsType) => {
+const AddAddressModal = ({ onOk, onCancel, ...rest }: AddAddressModalPropsType) => {
const handleOk = () => {
- const val = form.getState();
- console.log('val = ', val);
- onOk && onOk(val);
- // try {
- // await initWeb3();
- // const signInfo = await walletSign();
- // val.key = signInfo.raw;
- // val.sign = signInfo.sign;
- // val.coinType = 'eth';
- // val.num = parseInt(val.num);
- // const params = { ...val };
- // await AddAddress(params);
- // message.success('操作成功');
- // } catch (e) {}
+ const formState = form.getFormState();
+ onOk(formState.values);
};
+
+ const handleCancel = () => {
+ onCancel();
+ };
+
return (
-
+