系统管理功能完善

config/proxy.ts

@@ -9,9 +9,9 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/admin/': {
+    '/tbg/api/v1': {
       // 要代理的地址
-      target: '',
+      target: 'http://192.168.1.226:9999',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,

src/components/RightContent/AvatarDropdown.tsx

@@ -1,5 +1,5 @@
-import React, { useCallback } from 'react';
+import React, { useState, useCallback } from 'react';
-import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
+import { LogoutOutlined, SettingOutlined, UserOutlined, EditOutlined } from '@ant-design/icons';
 import { Avatar, Menu, Spin } from 'antd';
 import { history } from 'umi';
 import { stringify } from 'querystring';
@@ -8,6 +8,7 @@ import styles from './index.less';
 import type { MenuInfo } from 'rc-menu/lib/interface';
 import RoutePath from '@/routes/routePath';
 import { CACHE_TOKEN } from '@/constants/cacheKey';
+import ModifyPasswordModal from '@/pages/Login/components/modifyPasswordModal';
 
 export type GlobalHeaderRightProps = {
   menu?: boolean;
@@ -32,8 +33,18 @@ const loginOut = async () => {
 };
 
 const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
+  const [isModalVisible, setIsModalVisible] = useState(false);
+
+  const modifyPassword = async () => {
+    setIsModalVisible(true);
+  };
+
   const onMenuClick = useCallback((event: MenuInfo) => {
     const { key } = event;
+    if (key === 'modify') {
+      modifyPassword();
+      return;
+    }
     if (key === 'logout') {
       loginOut();
       return;
@@ -77,7 +88,10 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
         </Menu.Item>
       )}
       {menu && <Menu.Divider />}
-
+      <Menu.Item key="modify">
+        <EditOutlined />
+        修改密码
+      </Menu.Item>
       <Menu.Item key="logout">
         <LogoutOutlined />
         退出登录
@@ -85,12 +99,24 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
     </Menu>
   );
   return (
-    <HeaderDropdown overlay={menuHeaderDropdown}>
+    <div>
-      <span className={`${styles.action} ${styles.account}`}>
+      <HeaderDropdown overlay={menuHeaderDropdown}>
-        <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
+        <span className={`${styles.action} ${styles.account}`}>
-        <span className={`${styles.name} anticon`}>{currentUser.name}</span>
+          <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
-      </span>
+          <span className={`${styles.name} anticon`}>{currentUser.name}</span>
-    </HeaderDropdown>
+        </span>
+      </HeaderDropdown>
+      <ModifyPasswordModal
+        visible={isModalVisible}
+        onCancel={function () {
+          setIsModalVisible(false);
+        }}
+        onOk={function () {
+          console.log('onOk');
+          setIsModalVisible(false);
+        }}
+      />
+    </div>
   );
 };
 

src/pages/Login/components/modifyPasswordModal.tsx

@@ -0,0 +1,65 @@
+// 创建弹窗
+import React, { useRef } from 'react';
+import { createForm } from '@formily/core';
+import { createSchemaField } from '@formily/react';
+import Modal, { ModalProps } from '@/components/Modal';
+import { Form, FormItem, Input, Select } from '@formily/antd';
+import { modifyPassword } from '@/services/login';
+
+interface ModifyPasswordModalPropsType extends ModalProps {
+  onCancel: () => void;
+  onOk: () => void;
+}
+
+const SchemaField = createSchemaField({
+  components: {
+    FormItem,
+    Input,
+    Select,
+  },
+});
+
+const form = createForm({});
+
+const ModifyPasswordModal = ({ onOk, onCancel, ...rest }: ModifyPasswordModalPropsType) => {
+  const handleOk = async () => {
+    onOk();
+    const formState = form.getFormState();
+    await modifyPassword(formState.values);
+  };
+
+  const handleCancel = () => {
+    onCancel();
+  };
+
+  return (
+    <Modal title="修改密码" onOk={handleOk} onCancel={handleCancel} width={800} {...rest}>
+      <Form form={form} labelCol={4} wrapperCol={18}>
+        <SchemaField>
+          <SchemaField.String
+            name="password"
+            title="旧密码"
+            required
+            x-decorator="FormItem"
+            x-component="Input"
+            x-component-props={{
+              placeholder: '请输入旧密码',
+            }}
+          />
+          <SchemaField.String
+            name="new_password"
+            title="新密码"
+            required
+            x-decorator="FormItem"
+            x-component="Input"
+            x-component-props={{
+              placeholder: '请输入新密码',
+            }}
+          />
+        </SchemaField>
+      </Form>
+    </Modal>
+  );
+};
+
+export default ModifyPasswordModal;

src/pages/Recharge/Address/List/components/addAddressModal.tsx

@@ -1,4 +1,4 @@
-// 创建收款地址弹窗
+// 创建弹窗
 import React, { useRef } from 'react';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';

src/pages/Recharge/Address/List/components/editAddressModal.tsx

@@ -1,4 +1,4 @@
-// 修改收款地址弹窗
+// 修改弹窗
 import React, { useRef, useEffect } from 'react';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';

src/pages/Recharge/CoinType/List/components/editCoinTypeModal.tsx

@@ -1,4 +1,4 @@
-// 修改收款地址弹窗
+// 修改弹窗
 import React, { useRef, useEffect } from 'react';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';

src/pages/Recharge/Record/List/index.tsx

@@ -59,30 +59,28 @@ const RecordList = () => {
     },
   ];
   return (
-    <div>
+    <Table
-      <Table
+      columns={columns}
-        columns={columns}
+      rowKey="id"
-        rowKey="id"
+      actionRef={tableRef}
-        actionRef={tableRef}
+      request={async (params) => {
-        request={async (params) => {
+        if ((params.time ?? '') !== '') {
-          if ((params.time ?? '') !== '') {
+          params.start_time = params.time[0];
-            params.start_time = params.time[0];
+          params.end_time = params.time[1];
-            params.end_time = params.time[1];
+        }
+        const res = await fetchTableData(getRecordList, params);
+        for (const key in res.data) {
+          if (Object.prototype.hasOwnProperty.call(res.data, key)) {
+            const element = res.data[key];
+            element.price = getBalanceAmount(
+              new BigNumber(element.price),
+              element.decimals,
+            ).toNumber();
           }
-          const res = await fetchTableData(getRecordList, params);
+        }
-          for (const key in res.data) {
+        return res;
-            if (Object.prototype.hasOwnProperty.call(res.data, key)) {
+      }}
-              const element = res.data[key];
+    />
-              element.price = getBalanceAmount(
-                new BigNumber(element.price),
-                element.decimals,
-              ).toNumber();
-            }
-          }
-          return res;
-        }}
-      />
-    </div>
   );
 };
 

src/pages/System/Account/List/index.tsx

@@ -4,9 +4,18 @@ import { getAccountList, deleteUser } from '@/services/System/accountManage';
 import { fetchTableData } from '@/utils/table';
 import DeleteButton from '@/components/Table/DeleteButton';
 import { Switch } from 'antd';
+import AddAccountModal from '../components/addAccountModal';
 
 const AccountManageList = () => {
-  const handleEdit = (row: any) => {};
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const [isEditModal, setIsEditModal] = useState(false);
+  const [modalData, setModalData] = useState({});
+
+  const handleEdit = (row: any) => {
+    setModalData(row);
+    setIsEditModal(true);
+    setIsModalVisible(true);
+  };
 
   const handleDelete = async (name: any) => {
     await deleteUser({ name: name });
@@ -63,7 +72,9 @@ const AccountManageList = () => {
         toolBarActions={[
           {
             type: 'add',
-            onConfirm: () => {},
+            onConfirm: () => {
+              setIsModalVisible(true);
+            },
           },
         ]}
         actionRef={tableRef}
@@ -72,6 +83,17 @@ const AccountManageList = () => {
           return res;
         }}
       />
+      <AddAccountModal
+        visible={isModalVisible}
+        isEdit={isEditModal}
+        editModalData={modalData}
+        onCancel={function () {
+          setIsModalVisible(false);
+        }}
+        onOk={async function (): Promise<void> {
+          setIsModalVisible(false);
+        }}
+      />
     </div>
   );
 };

src/pages/System/Account/components/addAccountModal.tsx

@@ -0,0 +1,81 @@
+// 创建弹窗
+import React, { useRef, useEffect } from 'react';
+import { createForm } from '@formily/core';
+import { createSchemaField } from '@formily/react';
+import Modal, { ModalProps } from '@/components/Modal';
+import { Form, FormItem, Input, Select } from '@formily/antd';
+import { addUser } from '@/services/System/accountManage';
+
+interface AddUserModalPropsType extends ModalProps {
+  isEdit: boolean;
+  editModalData: any;
+  onCancel: () => void;
+  onOk: () => void;
+}
+
+const SchemaField = createSchemaField({
+  components: {
+    FormItem,
+    Input,
+    Select,
+  },
+});
+
+const form = createForm({});
+
+const AddUserModal = ({ onOk, onCancel, editModalData, ...rest }: AddUserModalPropsType) => {
+  useEffect(() => {
+    form.setInitialValues(editModalData);
+  });
+
+  const handleOk = async () => {
+    onOk();
+    const formState = form.getFormState();
+    await addUser(formState.values);
+  };
+
+  const handleCancel = () => {
+    onCancel();
+  };
+
+  return (
+    <Modal title="添加管理账号" onOk={handleOk} onCancel={handleCancel} width={800} {...rest}>
+      <Form form={form} labelCol={4} wrapperCol={18}>
+        <SchemaField>
+          <SchemaField.String
+            name="name"
+            title="账号名"
+            required
+            x-decorator="FormItem"
+            x-component="Input"
+            x-component-props={{
+              placeholder: '请输入账号名',
+            }}
+          />
+          <SchemaField.String
+            name="password"
+            title="密码"
+            required
+            x-decorator="FormItem"
+            x-component="Input"
+            x-component-props={{
+              placeholder: '请输入密码',
+            }}
+          />
+          <SchemaField.String
+            name="role"
+            title="角色"
+            required
+            x-decorator="FormItem"
+            x-component="Select"
+            x-component-props={{
+              placeholder: '请选择角色',
+            }}
+          />
+        </SchemaField>
+      </Form>
+    </Modal>
+  );
+};
+
+export default AddUserModal;

src/pages/User/List/index.tsx

@@ -25,23 +25,21 @@ const UserManageList = () => {
     },
   ];
   return (
-    <div>
+    <Table
-      <Table
+      columns={columns}
-        columns={columns}
+      rowKey="id"
-        rowKey="id"
+      toolBarActions={[
-        toolBarActions={[
+        {
-          {
+          type: 'add',
-            type: 'add',
+          onConfirm: () => {},
-            onConfirm: () => {},
+        },
-          },
+      ]}
-        ]}
+      actionRef={tableRef}
-        actionRef={tableRef}
+      request={async (params) => {
-        request={async (params) => {
+        const res = await fetchTableData(getUserList, params);
-          const res = await fetchTableData(getUserList, params);
+        return res;
-          return res;
+      }}
-        }}
+    />
-      />
-    </div>
   );
 };
 

src/services/Recharge/address.ts

@@ -9,7 +9,7 @@ import request from '@/utils/request';
  */
 export const getAddressList = (params) => {
   return request.request({
-    url: '/api/v1/address/get',
+    url: '/address/get',
     method: 'get',
     params,
   });
@@ -24,7 +24,7 @@ export const getAddressList = (params) => {
  */
 export const createAddress = (data) => {
   return request.request({
-    url: '/api/v1/address/make',
+    url: '/address/make',
     method: 'post',
     data,
   });
@@ -38,7 +38,7 @@ export const createAddress = (data) => {
  */
 export const deleteAddress = (data) => {
   return request.request({
-    url: '/api/v1/address/del',
+    url: '/address/del',
     method: 'post',
     data,
   });
@@ -54,7 +54,7 @@ export const deleteAddress = (data) => {
  */
 export const modifyAddress = (data) => {
   return request.request({
-    url: '/api/v1/address/del',
+    url: '/address/del',
     method: 'post',
     data,
   });

src/services/Recharge/coinType.ts

@@ -12,7 +12,7 @@ import request from '@/utils/request';
  */
 export const getCoinTypeList = (params) => {
   return request.request({
-    url: '/api/v1/token/get',
+    url: '/token/get',
     method: 'get',
     params,
   });
@@ -29,7 +29,7 @@ export const getCoinTypeList = (params) => {
  */
 export const addCoinType = (data) => {
   return request.request({
-    url: '/api/v1/token/make',
+    url: '/token/make',
     method: 'post',
     data,
   });
@@ -46,7 +46,7 @@ export const addCoinType = (data) => {
  */
 export const modifyCoinType = (data) => {
   return request.request({
-    url: '/api/v1/token/chg',
+    url: '/token/chg',
     method: 'post',
     data,
   });

src/services/Recharge/record.ts

@@ -13,7 +13,7 @@ import request from '@/utils/request';
  */
 export const getRecordList = (data) => {
   return request.request({
-    url: '/tgb/api/v1/recharge/record',
+    url: '/recharge/record',
     method: 'post',
     data,
   });

src/services/Recharge/withdraw.ts

@@ -13,7 +13,7 @@ import request from '@/utils/request';
  */
 export const getWithdrawList = (params) => {
   return request.request({
-    url: '/tgb/api/v1/withdrawal/get',
+    url: '/withdrawal/get',
     method: 'get',
     params,
   });
@@ -27,7 +27,7 @@ export const getWithdrawList = (params) => {
  */
 export const solveWithdraw = (params) => {
   return request.request({
-    url: '/tgb/api/v1/withdrawal/solve',
+    url: '/withdrawal/solve',
     method: 'get',
     params,
   });

src/services/System/accountManage.ts

@@ -7,12 +7,28 @@ import request from '@/utils/request';
  */
 export const getAccountList = (params) => {
   return request.request({
-    url: '/tgb/api/v1/user/get',
+    url: '/user/get',
     method: 'get',
     params,
   });
 };
 
+/**
+ * 添加后台用户
+ * @param {object} data
+ *  name  账号名称
+ *  password  密码
+ *  role  权限角色
+ * @returns {array} data
+ */
+export const addUser = (data) => {
+  return request.request({
+    url: '/user/create',
+    method: 'post',
+    data,
+  });
+};
+
 /**
  * 删除后台用户
  * @param {object} data
@@ -21,7 +37,7 @@ export const getAccountList = (params) => {
  */
 export const deleteUser = (data) => {
   return request.request({
-    url: '/tgb/api/v1/user/get',
+    url: '/user/get',
     method: 'post',
     data,
   });

src/services/System/role.ts

@@ -9,7 +9,7 @@ import request from '@/utils/request';
  */
 export const getRoleList = (params) => {
   return request.request({
-    url: '/tgb/api/v1/user/role',
+    url: '/user/role',
     method: 'get',
     params,
   });
@@ -23,7 +23,7 @@ export const getRoleList = (params) => {
  */
 export const deleteRole = (data) => {
   return request.request({
-    url: '/tgb/api/v1/user/role/delete',
+    url: '/user/role/delete',
     method: 'post',
     data,
   });

src/services/User/user.ts

@@ -9,7 +9,7 @@ import request from '@/utils/request';
  */
 export const getUserList = (params) => {
   return request.request({
-    url: '/tgb/api/v1/account/get',
+    url: '/account/get',
     method: 'get',
     params,
   });

src/services/login.ts

@@ -2,7 +2,22 @@ import request from '@/utils/request';
 
 export const login = (data) => {
   return request.request({
-    url: '/tbg/api/v1/admin/login',
+    url: '/admin/login',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 修改用户密码
+ * @param data
+ *  password  用户旧密码
+ *  new_password  用户新密码
+ * @returns
+ */
+export const modifyPassword = (data) => {
+  return request.request({
+    url: '/admin/update',
     method: 'post',
     data,
   });

src/utils/request.ts

@@ -6,13 +6,13 @@ import { CACHE_TOKEN } from '@/constants/cacheKey';
 
 // create an axios instance
 const request = axios.create({
-  baseURL: '', //
+  baseURL: '/tbg/api/v1', //
   timeout: 10000, // request timeout
 });
 // request interceptor
 request.interceptors.request.use(
   (memo: any) => {
-    memo.headers.token = localStorage.getItem(CACHE_TOKEN);
+    memo.headers.Authorization = localStorage.getItem(CACHE_TOKEN);
     return memo;
   },
   (error) => {
@@ -24,7 +24,7 @@ request.interceptors.response.use(
   (response) => {
     const res: any = response.data;
     if (res.code !== 200) {
-      if (res.code === 401) {
+      if (res.code === 401 || res.code === 10001) {
         notification.error({
           message: '错误信息',
           description: '登录失效',