diff --git a/.env b/.env
index 0e43446..bb9ab9e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
SKIP_PREFLIGHT_CHECK=true
-REACT_APP_BASE_URL=https://matontrading.com
-REACT_APP_ORIGIN_URL=https://matontrading.com
\ No newline at end of file
+REACT_APP_BASE_URL=http://203.161.61.234:8082
+REACT_APP_ORIGIN_URL=http://162.254.37.253:8086
\ No newline at end of file
diff --git a/src/pages/assets-manage/assets-list.tsx b/src/pages/assets-manage/assets-list.tsx
index 91a034e..c42526a 100644
--- a/src/pages/assets-manage/assets-list.tsx
+++ b/src/pages/assets-manage/assets-list.tsx
@@ -1,8 +1,8 @@
import api from "@/api"
import MyTable from "@/components/MyTable"
-import { getTime } from "@/utils"
+import { exprotExcel, getTime } from "@/utils"
import { EditOutlined } from "@ant-design/icons"
-import { Button, Form, Input, Modal, Switch, notification } from "antd"
+import { Button, Form, Input, Modal, Select, Switch, notification } from "antd"
import React, { useEffect, useRef, useState } from "react"
const AssetsList = () => {
@@ -92,17 +92,36 @@ const AssetsList = () => {
}
}
+ const options = [
+ { "value": 0, "label": "全部" },
+ { "value": 1, "label": "现金钱包->资产账户" },
+ { "value": 2, "label": "会员转账" },
+ { "value": 3, "label": "资产账户->现金钱包" },
+ ]
+
return (
+
+
+ }
searchConfigList={[{
key: 'search',
name: 'search',
slot:
- }]}
+ },
+ {
+ key: 'type',
+ name: 'type',
+ initialValue: 0,
+ slot:
+ }
+ ]}
/>
{
@@ -33,6 +33,11 @@ const DepositManage = () => {
+
+
+ }
searchConfigList={[{
key: 'search',
name: 'search',
diff --git a/src/pages/manage/withdraw.tsx b/src/pages/manage/withdraw.tsx
index 326adb8..b795595 100644
--- a/src/pages/manage/withdraw.tsx
+++ b/src/pages/manage/withdraw.tsx
@@ -1,7 +1,7 @@
import api from "@/api"
import MyTable from "@/components/MyTable"
-import { getTime } from "@/utils"
-import { Input } from "antd"
+import { exprotExcel, getTime } from "@/utils"
+import { Button, Input } from "antd"
import React from "react"
const WithdrawManage = () => {
@@ -30,6 +30,11 @@ const WithdrawManage = () => {
+
+
+ }
searchConfigList={[{
key: 'search',
name: 'search',
diff --git a/src/pages/review/withdraw.tsx b/src/pages/review/withdraw.tsx
index 9d01229..9241781 100644
--- a/src/pages/review/withdraw.tsx
+++ b/src/pages/review/withdraw.tsx
@@ -34,6 +34,7 @@ const WithdrawReview = () => {
{ "dataIndex": "address", "title": "钱包地址" },
{ "dataIndex": "amount", "title": "取款金额" },
{ "dataIndex": "time", "title": "时间", render: (time) => ({getTime(time * 1000)}
) },
+ { "dataIndex": "name", "title": "姓名" },
{ "dataIndex": "email", "title": "用户" },
{ "dataIndex": "fee", "title": "取款手续费" },
{ "dataIndex": "order", "title": "订单号" },
diff --git a/src/pages/system-log/walletLog.tsx b/src/pages/system-log/walletLog.tsx
index d03ecf9..1b3576e 100644
--- a/src/pages/system-log/walletLog.tsx
+++ b/src/pages/system-log/walletLog.tsx
@@ -1,6 +1,6 @@
import api from "@/api"
import MyTable from "@/components/MyTable"
-import { Input } from "antd"
+import { Input, Select } from "antd"
import React, { useRef } from "react"
const WalletLog = () => {
@@ -48,6 +48,22 @@ const WalletLog = () => {
},
];
+ const options = [
+ { "value": 0, "label": "全部" },
+ { "value": 1, "label": "现金钱包->资产账户" },
+ { "value": 2, "label": "会员转账" },
+ { "value": 3, "label": "资产账户->现金钱包" },
+ { "value": 4, "label": "交易利润" },
+ { "value": 5, "label": "利润结算" },
+ { "value": 6, "label": "盈利分红" },
+ { "value": 7, "label": "交易佣金" },
+ { "value": 8, "label": "星级奖励" },
+ { "value": 9, "label": "超级奖励" },
+ { "value": 10, "label": "存款" },
+ { "value": 11, "label": "取款" },
+ { "value": 12, "label": "admin" },
+ { "value": 13, "label": "admin-加减资金" },
+ ]
return (
@@ -59,6 +75,11 @@ const WalletLog = () => {
key: 'search',
name: 'search',
slot:
+ }, {
+ key: 'type',
+ name: 'type',
+ initialValue: 0,
+ slot:
}]}
/>
diff --git a/src/pages/vip-manage/proxy-list.tsx b/src/pages/vip-manage/proxy-list.tsx
index bd817b4..a0468db 100644
--- a/src/pages/vip-manage/proxy-list.tsx
+++ b/src/pages/vip-manage/proxy-list.tsx
@@ -4,6 +4,7 @@ import MyTable from "@/components/MyTable";
import { DeleteFilled, EditOutlined, RightCircleFilled, SolutionOutlined, StopTwoTone } from "@ant-design/icons";
import { Button, Form, Input, Modal, Popconfirm, Radio, Select, Switch, message, notification } from "antd";
import { getBaseUrl, getOriginUrl } from "@/utils/axios";
+import { exprotExcel } from "@/utils";
const ProxyList = () => {
const [modal, setModal] = useState(false);
@@ -233,6 +234,7 @@ const ProxyList = () => {
columns={columns}
ref={tableRef}
header={
+
}
/>
diff --git a/src/utils/index.ts b/src/utils/index.ts
index f024041..0ca8cfa 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,7 @@
import { notification } from 'antd';
import './axios'
+import { store } from '@/store';
+import { log } from 'console';
export const splitAddress = (address: string, index?: number) => {
try {
@@ -46,4 +48,29 @@ export function copy(value: string) {
notification.success({
message: '复制成功'
})
+}
+
+/**
+ * @description 导出excel
+ * @param type 1.代理列表 2.资金明细 3.转账存款列表 4.会员取款列表
+ */
+
+export const exprotExcel = async (type: 1 | 2 | 3 | 4) => {
+ const urls = [
+ 'admin/userExcel',
+ 'admin/assetsExcel',
+ 'admin/depositExcel',
+ 'admin/withdrawExcel'
+ ]
+ const { token = '' } = store.getState().storeData.userInfo || {}
+ const base_url = `${process.env.REACT_APP_BASE_URL}/api/v1/${urls[type - 1]}`;
+ const res = await fetch(base_url, {
+ headers: {
+ Token: token
+ },
+ method: 'get',
+ })
+ const blob = await res.blob()
+ const url = window.URL.createObjectURL(blob)
+ window.open(url)
}
\ No newline at end of file