diff --git a/.env b/.env index bb9ab9e..0e43446 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ SKIP_PREFLIGHT_CHECK=true -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 +REACT_APP_BASE_URL=https://matontrading.com +REACT_APP_ORIGIN_URL=https://matontrading.com \ No newline at end of file diff --git a/env-temp b/env-temp index 2ae76de..f967e93 100644 --- a/env-temp +++ b/env-temp @@ -1,8 +1,9 @@ +# Prod SKIP_PREFLIGHT_CHECK=true REACT_APP_BASE_URL=https://matontrading.com REACT_APP_ORIGIN_URL=https://matontrading.com -# Prod +# dev SKIP_PREFLIGHT_CHECK=true REACT_APP_BASE_URL=http://203.161.61.234:8082 REACT_APP_ORIGIN_URL=http://162.254.37.253:8086 diff --git a/src/api/index.ts b/src/api/index.ts index 3e0599e..0f765db 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -62,6 +62,9 @@ export default { set_userWalletBalance(body: object) { return $axios.post('/admin/userBalance', body) }, + set_userPrincipalBalance(body: object) { + return $axios.post('/admin/userFund', body) + }, set_loginPwd(body: object) { return $axios.post('/admin/userPassword', body) }, diff --git a/src/pages/account-review/index.tsx b/src/pages/account-review/index.tsx index 72ff0d3..68d36f3 100644 --- a/src/pages/account-review/index.tsx +++ b/src/pages/account-review/index.tsx @@ -61,6 +61,11 @@ const AccountReview = () => { ref={tableRef} apiFun={api.get_accountReviewList} columns={columns} + searchConfigList={[{ + key: 'search', + name: 'search', + slot: + }]} /> { apiFun={api.get_assetsList} columns={columns} ref={tableRef} + searchConfigList={[{ + key: 'search', + name: 'search', + slot: + }]} /> { @@ -43,6 +44,11 @@ const EscrowList = () => { + }]} /> ) diff --git a/src/pages/assets-manage/profit-list.tsx b/src/pages/assets-manage/profit-list.tsx index 5310428..4cc48fb 100644 --- a/src/pages/assets-manage/profit-list.tsx +++ b/src/pages/assets-manage/profit-list.tsx @@ -1,5 +1,6 @@ import api from "@/api" import MyTable from "@/components/MyTable" +import { Input } from "antd" import React from "react" const ProfitList = () => { @@ -37,6 +38,11 @@ const ProfitList = () => { + }]} /> ) diff --git a/src/pages/manage/deposit.tsx b/src/pages/manage/deposit.tsx index b5aa16e..d1bd19e 100644 --- a/src/pages/manage/deposit.tsx +++ b/src/pages/manage/deposit.tsx @@ -1,6 +1,7 @@ import api from "@/api" import MyTable from "@/components/MyTable" import { getTime } from "@/utils" +import { Input } from "antd" import React from "react" const DepositManage = () => { @@ -32,6 +33,11 @@ const DepositManage = () => { + }]} /> ) diff --git a/src/pages/manage/withdraw.tsx b/src/pages/manage/withdraw.tsx index 8c2dbf6..326adb8 100644 --- a/src/pages/manage/withdraw.tsx +++ b/src/pages/manage/withdraw.tsx @@ -1,6 +1,7 @@ import api from "@/api" import MyTable from "@/components/MyTable" import { getTime } from "@/utils" +import { Input } from "antd" import React from "react" const WithdrawManage = () => { @@ -29,6 +30,11 @@ const WithdrawManage = () => { + }]} /> ) diff --git a/src/pages/system-log/emailLog.tsx b/src/pages/system-log/emailLog.tsx index 7a0ff17..82d2022 100644 --- a/src/pages/system-log/emailLog.tsx +++ b/src/pages/system-log/emailLog.tsx @@ -1,5 +1,6 @@ import api from "@/api" import MyTable from "@/components/MyTable" +import { Input } from "antd"; import React from "react" const EmailLog = () => { @@ -48,6 +49,11 @@ const EmailLog = () => { + }]} /> ) diff --git a/src/pages/system-log/operationLog.tsx b/src/pages/system-log/operationLog.tsx index 831f520..217c244 100644 --- a/src/pages/system-log/operationLog.tsx +++ b/src/pages/system-log/operationLog.tsx @@ -1,5 +1,6 @@ import api from "@/api" import MyTable from "@/components/MyTable" +import { Input } from "antd"; import React from "react" const OperationLog = () => { @@ -33,6 +34,11 @@ const OperationLog = () => { + }]} /> ) diff --git a/src/pages/system-log/walletLog.tsx b/src/pages/system-log/walletLog.tsx index 838f8d1..5a4fc32 100644 --- a/src/pages/system-log/walletLog.tsx +++ b/src/pages/system-log/walletLog.tsx @@ -1,5 +1,6 @@ import api from "@/api" import MyTable from "@/components/MyTable" +import { Input } from "antd" import React, { useRef } from "react" const WalletLog = () => { @@ -49,6 +50,11 @@ const WalletLog = () => { ref={tableRef} apiFun={api.get_walletRecord} columns={columns} + searchConfigList={[{ + key: 'search', + name: 'search', + slot: + }]} /> ) diff --git a/src/pages/vip-manage/proxy-list.tsx b/src/pages/vip-manage/proxy-list.tsx index 5b2c851..181e3a4 100644 --- a/src/pages/vip-manage/proxy-list.tsx +++ b/src/pages/vip-manage/proxy-list.tsx @@ -74,6 +74,13 @@ const ProxyList = () => { { label: "邮箱通知", name: "email_flag", initialValue: true, valuePropName: "checked", component: } ] }, + assets: { + onFinish: (values) => onFinish(values, api.set_userPrincipalBalance, '修改成功'), + items: [ + { label: "当前本金", component: }, + { label: "加减金额", name: "balance", rules: [{ required: true, message: '请输入加减金额' }] }, + ] + }, lv: { onFinish: (values) => onFinish(values, api.set_lv, '设置成功'), items: [ @@ -235,6 +242,7 @@ const ProxyList = () => { > setPath(e.target.value)}> 钱包余额 + 资金设置 设置级别 重置登录密码 重置交易密码