config/config.ts

@@ -8,12 +8,13 @@ import routes from './routes';
 const { REACT_APP_ENV = 'dev' } = process.env;
 
 // 定义可能的环境类型
-type Env = 'dev' | 'prod';
+type Env = 'dev' | 'prod' | 'lvy';
 
 // 定义 API URL 配置
 const API_URL: Record<Env, string> = {
-  dev: 'http://localhost: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

@@ -86,6 +86,7 @@ const ExchangeHistory: React.FC = () => {
         待兑换未审核: { text: '待兑换未审核', status: 'Warning' },
         待兑换已审核: { text: '待兑换已审核', status: 'Processing' },
         已兑换: { text: '已兑换', status: 'Success' },
+        拒绝: { text: '拒绝', status: 'error' },
       },
     },
     {
@@ -94,17 +95,32 @@ const ExchangeHistory: React.FC = () => {
       valueType: 'option',
       render: (_, record) => (
         <Space>
-          <Popconfirm
-            key="changeStatus"
-            title="确认更改状态"
-            description="您确定要更改这条兑换记录的状态吗？"
-            onConfirm={() => handleChangeStatus(record)}
-            okText="确定"
-            cancelText="取消"
-          >
-            <a>更改状态</a>
-          </Popconfirm>
-          <Popconfirm
+          {(record.status === '待兑换未审核' || record.status === '待兑换已审核') && (
+            <Popconfirm
+              key="changeStatus"
+              title="通过"
+              description="您确定要更改这条兑换记录的状态吗？"
+              onConfirm={() => handleChangeStatus(record)}
+              okText="确定"
+              cancelText="取消"
+            >
+              <a>通过</a>
+            </Popconfirm>
+          )}
+          {(record.status === '待兑换未审核' || record.status === '待兑换已审核') && (
+            <Popconfirm
+
+              key="rejectStatus"
+              title="拒绝"
+              description="您确定要更改这条兑换记录的状态吗？"
+              onConfirm={() => handleRejectStatus(record)}
+              okText="确定"
+              cancelText="取消"
+            >
+              <a>拒绝</a>
+            </Popconfirm>
+          )}
+          {/* <Popconfirm
             key="delete"
             title="确认删除"
             description="您确定要删除这条兑换记录吗？"
@@ -113,7 +129,7 @@ const ExchangeHistory: React.FC = () => {
             cancelText="取消"
           >
             <a>删除</a>
-          </Popconfirm>
+          </Popconfirm> */}
         </Space>
       ),
     },
@@ -139,6 +155,15 @@ const ExchangeHistory: React.FC = () => {
     }
   };
 
+  const handleRejectStatus = async (record: API.ExchangeHistoryItem) => {
+    let newStatus = '拒绝'
+    const res = await updateExchangeHistory(record._id, { status: newStatus });
+    if (res.success) {
+      message.success('兑换记录状态已成功更新');
+      actionRef.current?.reload();
+    }
+  };
+
   const handleDelete = async (record: API.ActivityItem) => {
     const res = await deleteExchangeHistory(record._id);
     if (res.success) {

src/pages/Match/Basketball/UpdateForm.tsx

@@ -128,19 +128,20 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
       <ProFormDigit width="md" name="awayTeamScore" label="客队得分" />
 
       {/* 篮球特有字段 */}
-      <ProFormDigit width="md" name={['basketball', 'spread', 'points']} label="让分值" />
+      <ProFormDigit width="md" name={['basketball', 'spread', 'points']} label="预测让分值" disabled/>
 
       <ProFormSelect
         width="md"
         name={['basketball', 'spread', 'favorite']}
-        label="让分方"
+        label="预测让分方"
         valueEnum={{
           home: '主队',
           away: '客队',
         }}
+        disabled
       />
 
-      <ProFormDigit width="md" name={['basketball', 'totalPoints', 'value']} label="总分线" />
+      <ProFormDigit width="md" name={['basketball', 'totalPoints', 'value']} label="预测总得分" disabled/>
 
       {/* <ProFormSelect
         width="md"
@@ -175,18 +176,21 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
         width="md"
         name={['basketball', 'pointRewards', 'whoWillWin']}
         label="胜负预测积分"
+        disabled
       />
 
       <ProFormDigit
         width="md"
         name={['basketball', 'pointRewards', 'spread']}
         label="让分预测积分"
+        disabled
       />
 
       <ProFormDigit
         width="md"
         name={['basketball', 'pointRewards', 'totalPoints']}
         label="总分预测积分"
+        disabled
       />
 
       <ProFormSelect

src/pages/Match/Basketball/index.tsx

@@ -85,6 +85,11 @@ const BasketballMatch: React.FC = () => {
       },
     },
     {
+      title: '参与人数',
+      dataIndex: 'canyuNumber',
+      valueType: 'digit',
+    },
+    {
       title: '主队得分',
       dataIndex: 'homeTeamScore',
       valueType: 'digit',
@@ -577,36 +582,71 @@ const BasketballMatch: React.FC = () => {
 
         <ProFormText width="md" name="league" label="联赛" />
 
-        <ProFormDigit width="md" name={['basketball', 'spread', 'points']} label="让分值" />
+        <ProFormDigit width="md" name={['basketball', 'spread', 'points']} label="预测让分值"
+          rules={[
+            {
+              required: true,
+              message: '预测让分值是必填项',
+            },
+          ]} />
 
         <ProFormSelect
           width="md"
           name={['basketball', 'spread', 'favorite']}
-          label="让分方"
+          label="预测让分方"
           valueEnum={{
             home: '主队',
             away: '客队',
           }}
+          rules={[
+            {
+              required: true,
+              message: '预测让分方是必填项',
+            },
+          ]}
         />
 
-        <ProFormDigit width="md" name={['basketball', 'totalPoints', 'value']} label="总分线" />
+        <ProFormDigit width="md" name={['basketball', 'totalPoints', 'value']} label="预测总得分" rules={[
+          {
+            required: true,
+            message: '预测总得分是必填项',
+          },
+        ]} />
 
         <ProFormDigit
           width="md"
           name={['basketball', 'pointRewards', 'whoWillWin']}
           label="总分预测积分"
+          rules={[
+            {
+              required: true,
+              message: '总分预测积分是必填项',
+            },
+          ]}
         />
 
         <ProFormDigit
           width="md"
           name={['basketball', 'pointRewards', 'spread']}
           label="让分预测积分"
+          rules={[
+            {
+              required: true,
+              message: '让分预测积分是必填项',
+            },
+          ]}
         />
 
         <ProFormDigit
           width="md"
           name={['basketball', 'pointRewards', 'totalPoints']}
           label="总分预测积分"
+          rules={[
+            {
+              required: true,
+              message: '总分预测积分是必填项',
+            },
+          ]}
         />
         <ProFormSelect
           rules={[

src/pages/Match/Football/UpdateForm.tsx

@@ -142,21 +142,25 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           away: '客队',
           no_goal: '无进球',
         }}
+        
       />
       <ProFormDigit
         width="md"
         name={['football', 'pointRewards', 'whoWillWin']}
         label="胜负预测积分"
+        disabled
       />
       <ProFormDigit
         width="md"
         name={['football', 'pointRewards', 'firstTeamToScore']}
         label="首进球预测积分"
+        disabled
       />
       <ProFormDigit
         width="md"
         name={['football', 'pointRewards', 'totalGoals']}
         label="总进球预测积分"
+        disabled
       />
       <ProFormSelect
         rules={[

src/pages/Match/Football/index.tsx

@@ -85,6 +85,11 @@ const FootballMatch: React.FC = () => {
       },
     },
     {
+      title: '参与人数',
+      dataIndex: 'canyuNumber',
+      valueType: 'digit',
+    },
+    {
       title: '主队得分',
       dataIndex: 'homeTeamScore',
       valueType: 'digit',
@@ -586,18 +591,36 @@ const FootballMatch: React.FC = () => {
           width="md"
           name={['football', 'pointRewards', 'whoWillWin']}
           label="胜负预测积分"
+          rules={[
+            {
+              required: true,
+              message: '胜负预测积分是必填项',
+            },
+          ]}
         />
 
         <ProFormDigit
           width="md"
           name={['football', 'pointRewards', 'firstTeamToScore']}
           label="首进球预测积分"
+          rules={[
+            {
+              required: true,
+              message: '首进球预测积分是必填项',
+            },
+          ]}
         />
 
         <ProFormDigit
           width="md"
           name={['football', 'pointRewards', 'totalGoals']}
           label="总进球预测积分"
+          rules={[
+            {
+              required: true,
+              message: '总进球预测积分是必填项',
+            },
+          ]}
         />
         <ProFormSelect
           rules={[

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/Points/index.tsx

@@ -28,7 +28,6 @@ const PointHistoryList: React.FC = () => {
         );
       },
     },
-
     {
       title: '变更原因',
       dataIndex: 'reason',
@@ -40,24 +39,18 @@ const PointHistoryList: React.FC = () => {
       valueType: 'dateTime',
     },
     {
-      title: '操作',
-      dataIndex: 'option',
-      valueType: 'option',
-      render: (_, record) => [
-        <Popconfirm
-          key="delete"
-          title="确认删除"
-          description="您确定要删除这条积分历史记录吗？"
-          onConfirm={() => handleDelete(record)}
-          okText="确定"
-          cancelText="取消"
-        >
-          <a>删除</a>
-        </Popconfirm>,
-      ],
+      title: '变更时间开始',
+      dataIndex: 'startExchangeTime',
+      valueType: 'dateTime',
+      hideInTable: true,
     },
+    {
+      title: '变更时间结束',
+      dataIndex: 'endExchangeTime',
+      valueType: 'dateTime',
+      hideInTable: true,
+    }
   ];
-
   const handleDelete = async (record: API.PointHistoryItem) => {
     const res = await deletePointHistory(record._id);
     if (res.success) {

src/pages/Prediction/index.tsx

@@ -16,8 +16,13 @@ const PredictionList: React.FC = () => {
       valueType: 'text',
     },
     {
-      title: '比赛',
-      dataIndex: 'matchInfo',
+      title: '主队',
+      dataIndex: 'homeTeam',
+      valueType: 'text',
+    },
+    {
+      title: '客队',
+      dataIndex: 'awayTeam',
       valueType: 'text',
     },
     {

src/pages/User/index.tsx

@@ -77,6 +77,7 @@ const UserList: React.FC = () => {
       title: '积分',
       dataIndex: 'points',
       valueType: 'digit',
+      sorter: true,
     },
     {
       title: '密保问题',
@@ -92,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: '操作',
@@ -175,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 || {}),
   });
@@ -294,9 +296,6 @@ export async function register(body: API.LoginParams, options?: { [key: string]:
 
 // 修改积分历史
 export async function updateUserPoints(userId: string, points: number, reason: string) {
-  console.log('发送积分更新请求，用户ID:', userId);
-  console.log('积分变更:', points);
-  console.log('变更原因:', reason);
 
   return request<API.PointHistoryResponse>(`${API_URL}/api/point-history`, {
     method: 'POST',
@@ -547,8 +546,7 @@ export async function createExchangeHistory(options?: { [key: string]: any }) {
 }
 
 export async function updateExchangeHistory(id: string, options?: { [key: string]: any }) {
-  console.log('Sending update request for exchange history id:', id);
-  console.log('Update data:', options);
+
   return request<API.ExchangeHistoryList>(`${API_URL}/api/exchange-history`, {
     method: 'PUT',
     headers: {
@@ -562,7 +560,7 @@ export async function updateExchangeHistory(id: string, options?: { [key: string
 }
 
 export async function deleteExchangeHistory(id: string) {
-  console.log('Sending delete request for exchange history id:', id);
+
   return request<{ success: boolean }>(`${API_URL}/api/exchange-history?id=${id}`, {
     method: 'DELETE',
     headers: {
@@ -570,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;
+  };
 }