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: + }, { + key: 'type', + name: 'type', + initialValue: 0, + slot: