diff --git a/config/proxy.ts b/config/proxy.ts index 6244356..36d50fc 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -11,7 +11,7 @@ export default { // localhost:8000/api/** -> https://preview.pro.ant.design/api/** '/tbg/api/v1': { // 要代理的地址 - target: 'http://192.168.88.224:9999', + target: 'http://192.168.2.11:9999', // 配置了这个可以从 http 代理到 https // 依赖 origin 的功能可能需要这个,比如 cookie changeOrigin: true, diff --git a/src/pages/Recharge/CoinType/Components/AddCoinTypeModal.tsx b/src/pages/Recharge/CoinType/Components/AddCoinTypeModal.tsx index 798c15a..8891508 100644 --- a/src/pages/Recharge/CoinType/Components/AddCoinTypeModal.tsx +++ b/src/pages/Recharge/CoinType/Components/AddCoinTypeModal.tsx @@ -35,7 +35,7 @@ const AddCoinTypeModal = ({ onOk, onCancel, ...rest }: AddCoinTypeModalPropsType
{ const columns: ProColumns[] = [ { title: '游戏币名称', - dataIndex: 'bc_name', + dataIndex: 'name', hideInSearch: true, ellipsis: true, }, diff --git a/src/pages/Recharge/Record/List/index.tsx b/src/pages/Recharge/Record/List/index.tsx index 2688bac..64449c3 100644 --- a/src/pages/Recharge/Record/List/index.tsx +++ b/src/pages/Recharge/Record/List/index.tsx @@ -36,7 +36,7 @@ const RecordList = () => { }, { title: '游戏币类型', - dataIndex: 'bc_type', + dataIndex: 'name', width: '10%', hideInSearch: true, }, diff --git a/src/pages/Recharge/Address/Components/AddAddressModal.tsx b/src/pages/Recharge/Wallet/Components/AddWalletModal.tsx similarity index 87% rename from src/pages/Recharge/Address/Components/AddAddressModal.tsx rename to src/pages/Recharge/Wallet/Components/AddWalletModal.tsx index dbd4a9d..c043339 100644 --- a/src/pages/Recharge/Address/Components/AddAddressModal.tsx +++ b/src/pages/Recharge/Wallet/Components/AddWalletModal.tsx @@ -7,7 +7,7 @@ import Modal, { ModalProps } from '@/components/Modal'; import { Form, FormItem, Input, Select } from '@formily/antd'; import { action } from '@formily/reactive'; -interface AddAddressModalPropsType extends ModalProps { +interface AddWalletModalPropsType extends ModalProps { onOk: (val: any) => void; onCancel: () => void; } @@ -36,14 +36,14 @@ const useAsyncDataSource = ( const form = createForm({ effects: () => { // eslint-disable-next-line react-hooks/rules-of-hooks - useAsyncDataSource('bc_name', async (field) => { + useAsyncDataSource('name', async (field) => { const list = await getCoinTypeList({ page: 1, page_size: 10 }); const option = []; for (let index = 0; index < list.items.length; index++) { const element = list.items[index]; const item = { - label: element.bc_name, - value: element.bc_name, + label: element.name, + value: element.name, }; option.push(item); } @@ -52,7 +52,7 @@ const form = createForm({ }, }); -const AddAddressModal = ({ onOk, onCancel, ...rest }: AddAddressModalPropsType) => { +const AddWalletModal = ({ onOk, onCancel, ...rest }: AddWalletModalPropsType) => { const handleOk = () => { const formState = form.getFormState(); onOk(formState.values); @@ -67,7 +67,7 @@ const AddAddressModal = ({ onOk, onCancel, ...rest }: AddAddressModalPropsType) void; onCancel: () => void; @@ -21,12 +21,7 @@ const SchemaField = createSchemaField({ }, }); -const EditAddressModal = ({ - onOk, - onCancel, - editModalData, - ...rest -}: EditAddressModalPropsType) => { +const EditWalletModal = ({ onOk, onCancel, editModalData, ...rest }: EditWalletModalPropsType) => { const useAsyncDataSource = ( pattern: FormPathPattern, service: (field: Field) => Promise<{ label: string; value: any }[]>, @@ -43,14 +38,14 @@ const EditAddressModal = ({ const form = createForm({ effects: () => { // eslint-disable-next-line react-hooks/rules-of-hooks - useAsyncDataSource('bc_name', async (field) => { + useAsyncDataSource('name', async (field) => { const list = await getCoinTypeList({ page: 1, page_size: 10 }); const option = []; for (let index = 0; index < list.items.length; index++) { const element = list.items[index]; const item = { - label: element.bc_name, - value: element.bc_name, + label: element.name, + value: element.name, }; option.push(item); } @@ -84,7 +79,7 @@ const EditAddressModal = ({ x-component="Input" /> { const tableRef = useRef(); @@ -39,7 +39,7 @@ const CollectionAddressList = () => { }, { title: '收款游戏币名称', - dataIndex: 'bc_name', + dataIndex: 'name', hideInSearch: true, ellipsis: true, }, @@ -84,7 +84,7 @@ const CollectionAddressList = () => { return res; }} /> - { tableRef.current?.reload(); }} /> - { await solveWithdraw({ uuid: uuid }); }; - const handlePass = async (row) => {}; - const tableRef = useRef(); const columns: ProColumns[] = [ { @@ -56,20 +54,12 @@ const WithdrawList = () => { render: (_, row) => [ { handleConfirm(row.uuid); }} />, - { - handlePass(row); - }} - > - 通过 - , ], }, ]; diff --git a/src/pages/System/Permissions/List/index.tsx b/src/pages/System/Permissions/List/index.tsx index 0e90276..4bf8b7a 100644 --- a/src/pages/System/Permissions/List/index.tsx +++ b/src/pages/System/Permissions/List/index.tsx @@ -17,7 +17,7 @@ const PermissionsList = () => { }, { title: '收款游戏币类型', - dataIndex: 'bc_type', + dataIndex: 'type', hideInSearch: true, ellipsis: true, }, diff --git a/src/pages/System/SecretKey/index.tsx b/src/pages/System/SecretKey/index.tsx index 95edc1f..d060404 100644 --- a/src/pages/System/SecretKey/index.tsx +++ b/src/pages/System/SecretKey/index.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { Button, Input } from 'antd'; +import { Button, Input, Popconfirm } from 'antd'; import styles from './index.less'; import { createSecretKey, getSecretKey } from '@/services/system/secretKey'; @@ -24,9 +24,12 @@ const SecretKey: React.FC = () => { return (
- + + + +