提交

config/config.ts

@@ -12,7 +12,7 @@ type Env = 'dev' | 'prod' | 'lvy';
 
 // 定义 API URL 配置
 const API_URL: Record<Env, string> = {
-  dev: 'http://10.20.15.16:3000',
+  dev: 'http://127.0.0.1:3000',
   prod: 'https://1919com.com',
   lvy: 'https://www.lvyin20.tv',
 };

config/routes.ts

@@ -87,6 +87,12 @@ export default [
       },
     ],
   },
+  // {
+  //   name: '推单管理',
+  //   locale: false,
+  //   path: '/PushOrder',
+  //   component: './PushOrder',
+  // },
   {
     path: '/user',
     layout: false,

src/pages/ExchangeHistory/index.tsx

@@ -110,7 +110,7 @@ const ExchangeHistory: React.FC = () => {
           {(record.status === '待兑换未审核' || record.status === '待兑换已审核') && (
             <Popconfirm
 
-              key="changeStatus"
+              key="rejectStatus"
               title="拒绝"
               description="您确定要更改这条兑换记录的状态吗？"
               onConfirm={() => handleRejectStatus(record)}

src/pages/Match/Basketball/index.tsx

@@ -85,6 +85,11 @@ const BasketballMatch: React.FC = () => {
       },
     },
     {
+      title: '参与人数',
+      dataIndex: 'canyuNumber',
+      valueType: 'digit',
+    },
+    {
       title: '主队得分',
       dataIndex: 'homeTeamScore',
       valueType: 'digit',

src/pages/Match/Football/index.tsx

@@ -85,6 +85,11 @@ const FootballMatch: React.FC = () => {
       },
     },
     {
+      title: '参与人数',
+      dataIndex: 'canyuNumber',
+      valueType: 'digit',
+    },
+    {
       title: '主队得分',
       dataIndex: 'homeTeamScore',
       valueType: 'digit',

src/pages/NewActivities/index.tsx

@@ -46,7 +46,7 @@ const ActivityManagement: React.FC = () => {
 
   const [iconUrl, setIconUrl] = useState<string>('');
 
-  console.log('currentActivity', currentActivity);
+  // console.log('currentActivity', currentActivity);
 
   const columns: ProColumns<API.NewActivityItem>[] = [
     {
@@ -240,14 +240,14 @@ const ActivityManagement: React.FC = () => {
             name: 'file',
             listType: 'picture-card',
           }}
-          // onChange={(info) => {
-          //   const { status } = info.file;
-          //   if (status === 'done') {
-          //     message.success('图标上传成功');
-          //   } else if (status === 'error') {
-          //     message.error('图标上传失败');
-          //   }
-          // }}
+        // onChange={(info) => {
+        //   const { status } = info.file;
+        //   if (status === 'done') {
+        //     message.success('图标上传成功');
+        //   } else if (status === 'error') {
+        //     message.error('图标上传失败');
+        //   }
+        // }}
         />
         <ProFormDigit name="order" label="排序" min={0} initialValue={0} />
         <ProFormSwitch name="isActive" label="是否激活" initialValue={true} />

src/pages/User/index.tsx

@@ -77,7 +77,7 @@ const UserList: React.FC = () => {
       title: '积分',
       dataIndex: 'points',
       valueType: 'digit',
-      sorter: (a, b) => a.points - b.points,
+      sorter: true,
     },
     {
       title: '密保问题',
@@ -93,11 +93,25 @@ const UserList: React.FC = () => {
       title: '创建时间',
       dataIndex: 'createdAt',
       valueType: 'dateTime',
+      sorter: true,
     },
     {
       title: '最后登录时间',
       dataIndex: 'lastLoginAt',
       valueType: 'dateTime',
+      sorter: true,
+    },
+    {
+      title: '登录IP',
+      dataIndex: 'loginIp',
+      valueType: 'text',
+
+    },
+    {
+      title: '最后登录地址',
+      dataIndex: 'lastLoginAddress',
+      valueType: 'text',
+
     },
     {
       title: '操作',
@@ -176,7 +190,9 @@ const UserList: React.FC = () => {
             <DeleteOutlined /> 一键清空
           </Button>,
         ]}
-        request={getUsers}
+        request={async (params, sort, filter) => {
+          return getUsers(params, sort)
+        }}
         columns={columns}
         pagination={{
           showSizeChanger: true,

src/services/api.ts

@@ -201,12 +201,14 @@ export async function getUsers(
     current?: number;
     pageSize?: number;
   },
+  sort?: any,
   options?: { [key: string]: any },
 ) {
   return request<API.UserList>(`${API_URL}/api/user`, {
     method: 'GET',
     params: {
       ...params,
+      sort
     },
     ...(options || {}),
   });
@@ -566,3 +568,54 @@ export async function deleteExchangeHistory(id: string) {
     },
   });
 }
+
+
+
+// 推单管理
+export async function getPushOrderRecord(
+  params: {
+    current?: number;
+    pageSize?: number;
+  },
+  options?: { [key: string]: any },
+) {
+  return request<API.PushOrderItemList>(`${API_URL}/api/pushOrder`, {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+export async function createPushOrder(options: { [key: string]: any }) {
+
+  return request<API.PushOrderItemList>(`${API_URL}/api/pushOrder`, {
+    method: 'POST',
+    data: options,
+  });
+}
+
+export async function updatePushOrder(id: string, options?: { [key: string]: any }) {
+
+  return request<API.PushOrderItemList>(`${API_URL}/api/pushOrder`, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: JSON.stringify({
+      id,
+      ...(options || {}),
+    }),
+  });
+}
+
+export async function deletePushOrder(id: string) {
+
+  return request<{ success: boolean }>(`${API_URL}/api/pushOrder?id=${id}`, {
+    method: 'DELETE',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}

src/services/typings.d.ts

@@ -267,4 +267,19 @@ declare namespace API {
     total: number;
     success: boolean;
   };
+
+
+  type PushOrderItem = {
+    _id: string;
+    title: string;
+    content: string;
+    sort: number;
+  };
+  type PushOrderItemList = {
+    data: PushOrderItem[];
+    total: number;
+    message: string;
+    success: boolean;
+    error: string;
+  };
 }