diff --git a/config/proxy.ts b/config/proxy.ts
index c68e6ac..dea0872 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -7,7 +7,7 @@ export default {
     // },
     '/api': {
       // target: 'http://10.242.37.148:18022',//连接天宫的ng
-      target: 'http://10.0.0.14:18012',//连接天宫的ng
+      target: 'http://10.0.0.10:18013',//连接天宫的ng
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
diff --git a/src/dicts/helpManageDict.ts b/src/dicts/helpManageDict.ts
new file mode 100644
index 0000000..8622267
--- /dev/null
+++ b/src/dicts/helpManageDict.ts
@@ -0,0 +1,49 @@
+// 帮助中心字典
+
+// 帮助状态枚举
+export enum HelpStatus {
+  DRAFT = '0',     // 草稿
+  PUBLISHED = '1', // 已发布
+  UNPUBLISHED = '2', // 已下架
+}
+
+// 帮助状态文本映射
+export const HelpStatusText = {
+  [HelpStatus.DRAFT]: '草稿',
+  [HelpStatus.PUBLISHED]: '已发布',
+  [HelpStatus.UNPUBLISHED]: '已下架',
+};
+
+// 帮助状态标签颜色
+export const HelpStatusColor = {
+  [HelpStatus.DRAFT]: 'default',
+  [HelpStatus.PUBLISHED]: 'green',
+  [HelpStatus.UNPUBLISHED]: 'orange',
+};
+
+// 是否置顶枚举
+export enum TopStatus {
+  NO = '0',  // 不置顶
+  YES = '1', // 置顶
+}
+
+// 模态框类型
+export enum ModalType {
+  ADD = 'add',
+  EDIT = 'edit',
+  VIEW = 'view',
+}
+
+// 英文内容设置
+export enum EnglishSetting {
+  NO = 0,  // 不设置英文
+  YES = 1, // 设置英文
+}
+
+// 帮助中心分类选项
+export const categoryOptions = [
+  { value: '注册指南', label: '注册指南' },
+  { value: '投标指南', label: '投标指南' },
+  { value: '常见问题', label: '常见问题' },
+  { value: '联系我们', label: '联系我们' },
+];
diff --git a/src/dicts/noticeManageDict.ts b/src/dicts/noticeManageDict.ts
new file mode 100644
index 0000000..2c59afe
--- /dev/null
+++ b/src/dicts/noticeManageDict.ts
@@ -0,0 +1,41 @@
+// 通知管理字典
+
+// 通知状态枚举
+export enum NoticeStatus {
+  DRAFT = '0',    // 草稿
+  PUBLISHED = '1', // 已发布
+  UNPUBLISHED = '2', // 已下架
+}
+
+// 通知状态文本映射
+export const NoticeStatusText = {
+  [NoticeStatus.DRAFT]: '草稿',
+  [NoticeStatus.PUBLISHED]: '已发布',
+  [NoticeStatus.UNPUBLISHED]: '已下架',
+};
+
+// 通知状态标签颜色
+export const NoticeStatusColor = {
+  [NoticeStatus.DRAFT]: 'default',
+  [NoticeStatus.PUBLISHED]: 'green',
+  [NoticeStatus.UNPUBLISHED]: 'orange',
+};
+
+// 是否置顶枚举
+export enum TopStatus {
+  NO = '0',  // 不置顶
+  YES = '1', // 置顶
+}
+
+// 模态框类型
+export enum ModalType {
+  ADD = 'add',
+  EDIT = 'edit',
+  VIEW = 'view',
+}
+
+// 英文内容设置
+export enum EnglishSetting {
+  NO = 0,  // 不设置英文
+  YES = 1, // 设置英文
+}
diff --git a/src/dicts/policyManageDict.ts b/src/dicts/policyManageDict.ts
new file mode 100644
index 0000000..5d02272
--- /dev/null
+++ b/src/dicts/policyManageDict.ts
@@ -0,0 +1,41 @@
+// 政策法规字典
+
+// 政策状态枚举
+export enum PolicyStatus {
+  DRAFT = '0',    // 草稿
+  PUBLISHED = '1', // 已发布
+  UNPUBLISHED = '2', // 已下架
+}
+
+// 政策状态文本映射
+export const PolicyStatusText = {
+  [PolicyStatus.DRAFT]: '草稿',
+  [PolicyStatus.PUBLISHED]: '已发布',
+  [PolicyStatus.UNPUBLISHED]: '已下架',
+};
+
+// 政策状态标签颜色
+export const PolicyStatusColor = {
+  [PolicyStatus.DRAFT]: 'default',
+  [PolicyStatus.PUBLISHED]: 'green',
+  [PolicyStatus.UNPUBLISHED]: 'orange',
+};
+
+// 是否置顶枚举
+export enum TopStatus {
+  NO = '0',  // 不置顶
+  YES = '1', // 置顶
+}
+
+// 模态框类型
+export enum ModalType {
+  ADD = 'add',
+  EDIT = 'edit',
+  VIEW = 'view',
+}
+
+// 英文内容设置
+export enum EnglishSetting {
+  NO = 0,  // 不设置英文
+  YES = 1, // 设置英文
+}
diff --git a/src/dicts/userQuestionDict.ts b/src/dicts/userQuestionDict.ts
new file mode 100644
index 0000000..92844db
--- /dev/null
+++ b/src/dicts/userQuestionDict.ts
@@ -0,0 +1,74 @@
+// 用户问题管理字典
+
+// 问题回答状态枚举
+export enum AnswerStatus {
+  UNREAD = '0',  // 未阅
+  READ = '1',    // 已阅
+  ANSWERED = '2', // 已回答
+}
+
+// 问题回答状态文本映射
+export const AnswerStatusText = {
+  [AnswerStatus.UNREAD]: '未阅',
+  [AnswerStatus.READ]: '已阅',
+  [AnswerStatus.ANSWERED]: '已回答',
+};
+
+// 问题回答状态标签颜色
+export const AnswerStatusColor = {
+  [AnswerStatus.UNREAD]: 'orange',
+  [AnswerStatus.READ]: 'blue',
+  [AnswerStatus.ANSWERED]: 'green',
+};
+
+// 是否发布枚举
+export enum PublishStatus {
+  NO = 0,  // 未发布
+  YES = 1, // 已发布
+}
+
+// 发布状态文本映射
+export const PublishStatusText = {
+  [PublishStatus.NO]: '未发布',
+  [PublishStatus.YES]: '已发布',
+};
+
+// 发布状态标签颜色
+export const PublishStatusColor = {
+  [PublishStatus.NO]: 'orange',
+  [PublishStatus.YES]: 'green',
+};
+
+// 是否置顶枚举
+export enum TopStatus {
+  NO = 0,  // 不置顶
+  YES = 1, // 置顶
+}
+
+// 置顶状态文本映射
+export const TopStatusText = {
+  [TopStatus.NO]: '未置顶',
+  [TopStatus.YES]: '已置顶',
+};
+
+// 置顶状态标签颜色
+export const TopStatusColor = {
+  [TopStatus.NO]: 'default',
+  [TopStatus.YES]: 'red',
+};
+
+// 模态框类型
+export enum ModalType {
+  VIEW = 'view',   // 查看
+  ANSWER = 'answer', // 回答
+  EDIT = 'edit',   // 编辑
+}
+
+// 问题分类选项
+export const QuestionCategoryOptions = [
+  { value: '招标流程', label: '招标流程' },
+  { value: '投标指南', label: '投标指南' },
+  { value: '注册指南', label: '注册指南' },
+  { value: '系统操作', label: '系统操作' },
+  { value: '其他问题', label: '其他问题' },
+];
diff --git a/src/pages/aboutManage/aboutManage.less b/src/pages/aboutManage/aboutManage.less
index ac5d200..56275a6 100644
--- a/src/pages/aboutManage/aboutManage.less
+++ b/src/pages/aboutManage/aboutManage.less
@@ -32,3 +32,4 @@
     font-weight: 500;
   }
 }
+ 
\ No newline at end of file
diff --git a/src/pages/friendLinkManage/friendLinkCategory.tsx b/src/pages/friendLinkManage/friendLinkCategory.tsx
index 1eae7b8..7c44fe8 100644
--- a/src/pages/friendLinkManage/friendLinkCategory.tsx
+++ b/src/pages/friendLinkManage/friendLinkCategory.tsx
@@ -310,13 +310,13 @@ const FriendLinkCategory: React.FC = () => {
       width: 250,
       render: (_: any, record: CategoryType) => (
         <Space size="middle">
-          <Button type="primary" size="small" onClick={() => handleAddChildCategory(record)}>
+          <Button type="link"  onClick={() => handleAddChildCategory(record)}>
             新增子类
           </Button>
-          <Button type="primary" size="small" onClick={() => handleEditCategory(record)}>
+          <Button type="link"  onClick={() => handleEditCategory(record)}>
             编辑
           </Button>
-          <Button type="primary" danger size="small" onClick={() => handleDeleteCategory(record)}>
+          <Button type="link"  onClick={() => handleDeleteCategory(record)}>
             删除
           </Button>
         </Space>
diff --git a/src/pages/helpManage/HelpManageForm.tsx b/src/pages/helpManage/HelpManageForm.tsx
new file mode 100644
index 0000000..885b340
--- /dev/null
+++ b/src/pages/helpManage/HelpManageForm.tsx
@@ -0,0 +1,218 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Switch, Tabs, message, Button, Select } from 'antd';
+import WangEditor from '@/components/WangEidtor/WangEidtor';
+import { TopStatus, EnglishSetting, categoryOptions } from '@/dicts/helpManageDict';
+import { addHelp, updateHelp, getHelpDetail } from '@/servers/api/help';
+
+const { TabPane } = Tabs;
+const { Option } = Select;
+
+interface HelpManageFormProps {
+  id?: string;
+  isEdit: boolean;
+  onSuccess: () => void;
+}
+
+const HelpManageForm: React.FC<HelpManageFormProps> = ({ id, isEdit, onSuccess }) => {
+  const [form] = Form.useForm();
+  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 获取详情数据
+  useEffect(() => {
+    const fetchHelpDetail = async (helpId: string) => {
+      setLoading(true);
+      try {
+        const response = await getHelpDetail(helpId);
+        if (response && response.success) {
+          const detail = response.data;
+          form.setFieldsValue({
+            isTop: detail.isTop === TopStatus.YES,
+            type: detail.type,
+            titleZh: detail.title,
+            titleEn: detail.titleEn,
+            contentZh: detail.content,
+            contentEn: detail.contentEn,
+            answerContentZh: detail.answerContent,
+            answerContentEn: detail.answerContentNe,
+          });
+        } else {
+          message.error(response.message || '获取详情失败');
+        }
+      } catch (error) {
+        console.error('获取帮助详情失败:', error);
+        message.error('获取详情失败');
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    if (isEdit && id) {
+      fetchHelpDetail(id);
+    }
+  }, [isEdit, id, form]);
+
+  // 处理Tab切换
+  const handleTabChange = (key: string) => {
+    setActiveTabKey(key);
+  };
+
+  // 提交表单
+  const handleSubmit = async () => {
+    setLoading(true);
+    try {
+      // 一次性验证所有表单项
+      try {
+        await form.validateFields();
+      } catch (error: any) {
+        console.log(error);
+        // 如果有验证错误，自动切换到相应Tab
+        if (error.errorFields && error.errorFields.length > 0) {
+          // 获取第一个错误字段
+          const firstError = error.errorFields[0];
+          const fieldName = firstError.name[0];
+
+          // 根据字段名判断应该切换到哪个Tab
+          if (fieldName === 'titleZh' || fieldName === 'contentZh' || fieldName === 'answerContentZh') {
+            setActiveTabKey('zh');
+          } else if (fieldName === 'titleEn' || fieldName === 'contentEn' || fieldName === 'answerContentEn') {
+            setActiveTabKey('en');
+          }
+        }
+
+        throw error;
+      }
+
+      // 获取所有表单值
+      const values = form.getFieldsValue();
+
+      // 转换表单数据为API需要的格式
+      const requestData = {
+        title: values.titleZh,
+        titleEn: values.titleEn || '',
+        content: values.contentZh,
+        contentEn: values.contentEn || '',
+        type: values.type,
+        isTop: values.isTop ? TopStatus.YES : TopStatus.NO,
+        settingEn: values.titleEn && values.contentEn ? EnglishSetting.YES : EnglishSetting.NO,
+        answerContent: values.answerContentZh || '',
+        answerContentNe: values.answerContentEn || '',
+      };
+
+      let response;
+      if (isEdit && id) {
+        response = await updateHelp(id, requestData);
+      } else {
+        response = await addHelp(requestData);
+      }
+
+      if (response && response.success) {
+        message.success(isEdit ? '更新成功' : '添加成功');
+        onSuccess(); // 回调父组件
+      } else {
+        message.error(response.message || (isEdit ? '更新失败' : '添加失败'));
+      }
+    } catch (error: any) {
+      console.error('表单验证或提交失败:', error);
+      // 错误已在前面处理
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div>
+      <Form form={form} layout="vertical" name="helpForm" preserve={false}>
+        <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
+          <Switch />
+        </Form.Item>
+
+        <Form.Item
+          name="type"
+          label="问题类型"
+          rules={[{ required: true, message: '请选择问题类型' }]}
+        >
+          <Select placeholder="请选择问题类型">
+            {categoryOptions.map(option => (
+              <Option key={option.value} value={option.value}>
+                {option.label}
+              </Option>
+            ))}
+          </Select>
+        </Form.Item>
+
+        <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
+          <TabPane tab="中文版" key="zh" forceRender={true}>
+            <Form.Item
+              name="titleZh"
+              label="标题（中文）"
+              rules={[{ required: true, message: '请输入中文标题' }]}
+            >
+              <Input placeholder="请输入中文标题" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentZh"
+              label="内容（中文）"
+              rules={[{ required: true, message: '请输入中文内容' }]}
+            >
+              <WangEditor language="zh-CN" height="250px" placeholder="请输入帮助内容..." />
+            </Form.Item>
+
+            <Form.Item
+              name="answerContentZh"
+              label="回答内容（中文）"
+            >
+              <WangEditor language="zh-CN" height="200px" placeholder="请输入回答内容..." />
+            </Form.Item>
+          </TabPane>
+          <TabPane tab="英文版" key="en" forceRender={true}>
+            <Form.Item
+              name="titleEn"
+              label="标题（英文）"
+              rules={[{ required: true, message: 'Please enter title in English' }]}
+            >
+              <Input placeholder="Please enter title in English" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentEn"
+              label="内容（英文）"
+              rules={[{ required: true, message: 'Please enter content in English' }]}
+            >
+              <WangEditor
+                language="en"
+                height="250px"
+                placeholder="Please enter help content..."
+              />
+            </Form.Item>
+
+            <Form.Item
+              name="answerContentEn"
+              label="回答内容（英文）"
+            >
+              <WangEditor
+                language="en"
+                height="200px"
+                placeholder="Please enter answer content..."
+              />
+            </Form.Item>
+          </TabPane>
+        </Tabs>
+      </Form>
+      <div style={{ textAlign: 'right', marginTop: '20px' }}>
+        <Button onClick={() => onSuccess()}>取消</Button>
+        <Button
+          type="primary"
+          loading={loading}
+          onClick={handleSubmit}
+          style={{ marginLeft: '8px' }}
+        >
+          提交
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+export default HelpManageForm;
diff --git a/src/pages/helpManage/HelpManageInfo.tsx b/src/pages/helpManage/HelpManageInfo.tsx
new file mode 100644
index 0000000..ed005c7
--- /dev/null
+++ b/src/pages/helpManage/HelpManageInfo.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { Descriptions, Divider, Card, Tag } from 'antd';
+import { HelpStatus, HelpStatusText, HelpStatusColor } from '@/dicts/helpManageDict';
+
+interface HelpManageInfoProps {
+  data: API.HelpRecord | null;
+}
+
+// 获取状态标签
+const getStatusTag = (status: string) => {
+  const statusKey = status as keyof typeof HelpStatusText;
+  const color = HelpStatusColor[statusKey] || 'default';
+  const text = HelpStatusText[statusKey] || '未知';
+  return <Tag color={color}>{text}</Tag>;
+};
+
+const HelpManageInfo: React.FC<HelpManageInfoProps> = ({ data }) => {
+  if (!data) return null;
+
+  return (
+    <div className="help-detail-view">
+      <Descriptions bordered column={2} size="small">
+        <Descriptions.Item label="标题" span={2}>
+          {data.title}
+        </Descriptions.Item>
+        {data.titleEn && (
+          <Descriptions.Item label="英文标题" span={2}>
+            {data.titleEn}
+          </Descriptions.Item>
+        )}
+        <Descriptions.Item label="问题类型">
+          {data.type}
+        </Descriptions.Item>
+        <Descriptions.Item label="是否置顶">{data.isTop === '1' ? '是' : '否'}</Descriptions.Item>
+        <Descriptions.Item label="状态">{getStatusTag(data.status)}</Descriptions.Item>
+        <Descriptions.Item label="创建人">{data.createBy}</Descriptions.Item>
+        <Descriptions.Item label="创建时间">{data.createTime}</Descriptions.Item>
+        {data.updateTime && (
+          <Descriptions.Item label="更新时间" span={2}>
+            {data.updateTime}
+          </Descriptions.Item>
+        )}
+      </Descriptions>
+
+      <Divider orientation="left">问题内容（中文）</Divider>
+      <Card size="small" bordered={false} className="content-card">
+        <div className="help-content" dangerouslySetInnerHTML={{ __html: data.content }} />
+      </Card>
+
+      {data.contentEn && (
+        <>
+          <Divider orientation="left">问题内容（英文）</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="help-content" dangerouslySetInnerHTML={{ __html: data.contentEn }} />
+          </Card>
+        </>
+      )}
+
+      {data.answerContent && (
+        <>
+          <Divider orientation="left">回答内容（中文）</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="help-content" dangerouslySetInnerHTML={{ __html: data.answerContent }} />
+          </Card>
+        </>
+      )}
+
+      {data.answerContentNe && (
+        <>
+          <Divider orientation="left">回答内容（英文）</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="help-content" dangerouslySetInnerHTML={{ __html: data.answerContentNe }} />
+          </Card>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default HelpManageInfo;
diff --git a/src/pages/helpManage/helpManage.less b/src/pages/helpManage/helpManage.less
index 40a8938..01fc169 100644
--- a/src/pages/helpManage/helpManage.less
+++ b/src/pages/helpManage/helpManage.less
@@ -61,3 +61,4 @@
     }
   }
 }
+ 
\ No newline at end of file
diff --git a/src/pages/helpManage/helpManage.tsx b/src/pages/helpManage/helpManage.tsx
index 0d1a095..11135f9 100644
--- a/src/pages/helpManage/helpManage.tsx
+++ b/src/pages/helpManage/helpManage.tsx
@@ -1,20 +1,28 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'umi';
-import { Button, Table, Modal, message, Input, Select, Form, Tooltip, Switch, Tag, Tabs } from 'antd';
+import { Button, Table, Modal, message, Input, Select, Form, Tooltip, Tag } from 'antd';
 import {
   PlusOutlined,
   DeleteOutlined,
   ExclamationCircleOutlined,
   SearchOutlined,
+  EyeOutlined,
 } from '@ant-design/icons';
 import './helpManage.less';
-// 引入封装的WangEditor组件
-import WangEditor from '@/components/WangEidtor/WangEidtor';
 // 引入API
-import { getHelpList, addHelp, updateHelp, deleteHelp, batchDeleteHelp, updateHelpStatus, updateHelpTopStatus } from '@/servers/api/help';
+import { getHelpList, deleteHelp, batchDeleteHelp, updateHelpStatus, updateHelpTopStatus, getHelpDetail } from '@/servers/api/help';
+// 引入字典和组件
+import {
+  HelpStatus,
+  HelpStatusText,
+  HelpStatusColor,
+  TopStatus,
+  categoryOptions
+} from '@/dicts/helpManageDict';
+import HelpManageForm from './HelpManageForm';
+import HelpManageInfo from './HelpManageInfo';
 
 const { Option } = Select;
-const { TabPane } = Tabs;
 const { confirm } = Modal;
 
 // 帮助中心条目类型定义
@@ -22,6 +30,12 @@ interface HelpItemType extends API.HelpRecord {
   key: string;
 }
 
+interface SearchParams {
+  title?: string;
+  type?: string;
+  status?: string;
+}
+
 const HelpManage: React.FC = () => {
   const intl = useIntl();
   const [loading, setLoading] = useState<boolean>(false);
@@ -30,9 +44,9 @@ const HelpManage: React.FC = () => {
   const [form] = Form.useForm();
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [isEdit, setIsEdit] = useState<boolean>(false);
+  const [isViewMode, setIsViewMode] = useState<boolean>(false);
   const [currentId, setCurrentId] = useState<string>('');
-  const [modalForm] = Form.useForm();
-  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
+  const [viewData, setViewData] = useState<API.HelpRecord | null>(null);
   const [pagination, setPagination] = useState({
     current: 1,
     pageSize: 10,
@@ -41,14 +55,19 @@ const HelpManage: React.FC = () => {
     showQuickJumper: true,
     showTotal: (total: number) => `共 ${total} 条记录`,
   });
-  const [searchParams, setSearchParams] = useState<API.HelpSearchParams>({});
+  const [searchParams, setSearchParams] = useState<SearchParams>({});
 
   // 获取帮助中心列表数据
-  const fetchHelpList = (current: number = 1, pageSize: number = 10) => {
+  const fetchHelpList = (current: number = 1, pageSize: number = 10, params: SearchParams = searchParams) => {
+    // 更新搜索参数状态
+    if (params !== searchParams) {
+      setSearchParams(params);
+    }
+
     setLoading(true);
     // 调用API
     getHelpList({
-      ...searchParams,
+      ...params,
       pageNo: current,
       pageSize,
     })
@@ -80,52 +99,61 @@ const HelpManage: React.FC = () => {
 
   // 首次加载时获取数据
   useEffect(() => {
-    fetchHelpList();
+    fetchHelpList(1, pagination.pageSize, {});
   }, []);
 
   // 处理搜索
-  const handleSearch = (values: any) => {
-    setSearchParams(values);
-    fetchHelpList(1, pagination.pageSize);
+  const handleSearch = (values: SearchParams) => {
+    fetchHelpList(1, pagination.pageSize, values);
   };
 
   // 处理添加
   const handleAdd = () => {
     setIsEdit(false);
+    setIsViewMode(false);
     setCurrentId('');
-    modalForm.resetFields();
+    setViewData(null);
     setModalVisible(true);
-    setActiveTabKey('zh');
+  };
+
+  // 处理查看
+  const handleView = async (record: HelpItemType) => {
+    setCurrentId(record.id);
+    setIsViewMode(true);
+
+    try {
+      const response = await getHelpDetail(record.id);
+      if (response && response.success) {
+        // 设置查看详情数据
+        setViewData(response.data);
+        setModalVisible(true);
+      } else {
+        message.error(response.message || '获取详情失败');
+      }
+    } catch (error) {
+      console.error('获取帮助详情失败:', error);
+      message.error('获取详情失败');
+    }
   };
 
   // 处理编辑
   const handleEdit = (record: HelpItemType) => {
     // 检查是否为已发布状态
-    if (record.status === '1') {
+    if (record.status === HelpStatus.PUBLISHED) {
       message.warning('已发布的帮助不能编辑');
       return;
     }
 
     setIsEdit(true);
+    setIsViewMode(false);
     setCurrentId(record.id);
     setModalVisible(true);
-    setActiveTabKey('zh');
-
-    // 填充表单数据
-    modalForm.setFieldsValue({
-      isTop: record.isTop === '1',
-      type: record.type,
-      titleZh: record.title,
-      titleEn: record.titleEn || '',
-      contentZh: record.content,
-      contentEn: record.contentEn || '',
-    });
   };
 
   // 处理删除
   const showDeleteConfirm = (record: HelpItemType) => {
     // 检查是否为已发布状态
-    if (record.status === '1') {
+    if (record.status === HelpStatus.PUBLISHED) {
       message.warning('已发布的帮助不能删除');
       return;
     }
@@ -141,11 +169,13 @@ const HelpManage: React.FC = () => {
       onOk: async () => {
         try {
           // 调用删除API
-          await deleteHelp(record.id);
-          // 更新本地数据
-          const newData = helpData.filter(item => item.id !== record.id);
-          setHelpData(newData);
-          message.success('删除成功');
+          const response = await deleteHelp(record.id);
+          if (response && response.success) {
+            message.success('删除成功');
+            fetchHelpList(pagination.current, pagination.pageSize, searchParams);
+          } else {
+            message.error(response.message || '删除失败');
+          }
         } catch (error) {
           console.error('删除帮助失败:', error);
           message.error('删除失败');
@@ -156,64 +186,77 @@ const HelpManage: React.FC = () => {
 
   // 处理发布/下架
   const handlePublishStatus = async (record: HelpItemType) => {
-    // 状态: 0-草稿，1-已发布
-    const isPublished = record.status === '1';
+    const isPublished = record.status === HelpStatus.PUBLISHED;
     const actionText = isPublished ? '下架' : '发布';
-    const newStatus = isPublished ? '0' : '1';
+    const newStatus = isPublished ? HelpStatus.UNPUBLISHED : HelpStatus.PUBLISHED;
 
-    try {
-      // 调用API更新状态
-      await updateHelpStatus(record.id, newStatus);
-      // 更新本地数据
-      const newData = helpData.map(item =>
-        item.id === record.id ? { ...item, status: newStatus } : item
-      );
-      setHelpData(newData);
-      message.success(`${actionText}成功`);
-    } catch (error) {
-      console.error(`${actionText}失败:`, error);
-      message.error(`${actionText}失败`);
-    }
+    confirm({
+      title: `确定要${actionText}该帮助吗?`,
+      icon: <ExclamationCircleOutlined />,
+      content: `标题: ${record.title}`,
+      okText: '确定',
+      cancelText: '取消',
+      maskClosable: false,
+      onOk: async () => {
+        try {
+          // 调用API更新状态
+          const response = await updateHelpStatus(record.id, newStatus);
+          if (response && response.success) {
+            message.success(`${actionText}成功`);
+            fetchHelpList(pagination.current, pagination.pageSize, searchParams);
+          } else {
+            message.error(response.message || `${actionText}失败`);
+          }
+        } catch (error) {
+          console.error(`${actionText}失败:`, error);
+          message.error(`${actionText}失败`);
+        }
+      },
+    });
   };
 
   // 处理置顶/取消置顶
   const handleToggleTop = async (record: HelpItemType) => {
-    const isTop = record.isTop === '1';
+    const isTop = record.isTop === TopStatus.YES;
     const actionText = isTop ? '取消置顶' : '置顶';
-    const newIsTop = isTop ? '0' : '1';
+    const newIsTop = isTop ? TopStatus.NO : TopStatus.YES;
 
-    try {
-      // 调用API更新置顶状态
-      await updateHelpTopStatus(record.id, newIsTop);
-      // 更新本地数据
-      const newData = helpData.map(item =>
-        item.id === record.id ? { ...item, isTop: newIsTop } : item
-      );
-      setHelpData(newData);
-      message.success(`${actionText}成功`);
-    } catch (error) {
-      console.error(`${actionText}失败:`, error);
-      message.error(`${actionText}失败`);
-    }
+    confirm({
+      title: `确定要${actionText}该帮助吗?`,
+      icon: <ExclamationCircleOutlined />,
+      content: `标题: ${record.title}`,
+      okText: '确定',
+      cancelText: '取消',
+      maskClosable: false,
+      onOk: async () => {
+        try {
+          // 调用API更新置顶状态
+          const response = await updateHelpTopStatus(record.id, newIsTop);
+          if (response && response.success) {
+            message.success(`${actionText}成功`);
+            fetchHelpList(pagination.current, pagination.pageSize, searchParams);
+          } else {
+            message.error(response.message || `${actionText}失败`);
+          }
+        } catch (error) {
+          console.error(`${actionText}失败:`, error);
+          message.error(`${actionText}失败`);
+        }
+      },
+    });
   };
 
   // 获取状态标签
   const getStatusTag = (status: string) => {
-    switch (status) {
-      case '0':
-        return <Tag color="default">草稿</Tag>;
-      case '1':
-        return <Tag color="green">已发布</Tag>;
-      case '2':
-        return <Tag color="orange">已下架</Tag>;
-      default:
-        return <Tag color="default">未知</Tag>;
-    }
+    const statusKey = status as keyof typeof HelpStatusText;
+    const color = HelpStatusColor[statusKey] || 'default';
+    const text = HelpStatusText[statusKey] || '未知';
+    return <Tag color={color}>{text}</Tag>;
   };
 
   // 处理表格分页变化
   const handleTableChange = (newPagination: any) => {
-    fetchHelpList(newPagination.current, newPagination.pageSize);
+    fetchHelpList(newPagination.current, newPagination.pageSize, searchParams);
   };
 
   // 处理批量删除
@@ -232,17 +275,19 @@ const HelpManage: React.FC = () => {
           // 获取可删除的ID（非已发布状态）
           const deleteIds = selectedRowKeys.filter(key => {
             const record = helpData.find(item => item.key === key);
-            return record && record.status !== '1';
+            return record && record.status !== HelpStatus.PUBLISHED;
           }) as string[];
 
           if (deleteIds.length > 0) {
             // 调用批量删除API
-            await batchDeleteHelp(deleteIds);
-            // 更新本地数据
-            const newData = helpData.filter(item => !deleteIds.includes(item.key));
-            setHelpData(newData);
-            setSelectedRowKeys([]);
-            message.success('删除成功');
+            const response = await batchDeleteHelp(deleteIds);
+            if (response && response.success) {
+              setSelectedRowKeys([]);
+              message.success('删除成功');
+              fetchHelpList(pagination.current, pagination.pageSize, searchParams);
+            } else {
+              message.error(response.message || '批量删除失败');
+            }
           } else {
             message.warning('没有可删除的帮助');
           }
@@ -265,97 +310,26 @@ const HelpManage: React.FC = () => {
     selectedRowKeys,
     onChange: onSelectChange,
     getCheckboxProps: (record: HelpItemType) => ({
-      disabled: record.status === '1', // 已发布的不能选择
+      disabled: record.status === HelpStatus.PUBLISHED, // 已发布的不能选择
     }),
   };
 
   const hasSelected = selectedRowKeys.length > 0;
 
-  // 处理模态框提交
-  const handleModalSubmit = () => {
-    // 先触发所有字段的验证
-    modalForm.validateFields()
-      .then(async values => {
-        try {
-          const helpParams: API.HelpRequest = {
-            title: values.titleZh,
-            titleEn: values.titleEn || '',
-            content: values.contentZh,
-            contentEn: values.contentEn || '',
-            type: values.type,
-            isTop: values.isTop ? '1' : '0',
-            settingEn: values.titleEn && values.contentEn ? 1 : 0,
-          };
-
-          if (isEdit) {
-            // 编辑模式，调用更新API
-            await updateHelp(currentId, helpParams);
-            message.success('更新成功');
-          } else {
-            // 新增模式，调用添加API
-            await addHelp(helpParams);
-            message.success('添加成功');
-          }
-
-          setModalVisible(false);
-          modalForm.resetFields();
-          // 刷新列表
-          fetchHelpList(pagination.current, pagination.pageSize);
-        } catch (error) {
-          console.error(isEdit ? '更新帮助失败:' : '添加帮助失败:', error);
-          message.error(isEdit ? '更新失败' : '添加失败');
-        }
-      })
-      .catch(errorInfo => {
-        // 获取所有字段的错误信息
-        const errorFields = errorInfo.errorFields || [];
-
-        // 检查是否有中文标题或内容的错误
-        const hasZhError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleZh') || fieldName.includes('contentZh');
-        });
-
-        // 检查是否有英文标题或内容的错误
-        const hasEnError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleEn') || fieldName.includes('contentEn');
-        });
-
-        // 如果有中文字段错误，切换到中文Tab
-        if (hasZhError) {
-          setActiveTabKey('zh');
-        }
-        // 如果只有英文字段错误，切换到英文Tab
-        else if (hasEnError && !hasZhError) {
-          setActiveTabKey('en');
-        }
-
-        console.log('表单验证失败:', errorInfo);
-      });
-  };
-
-  // 处理Tab切换
-  const handleTabChange = (key: string) => {
-    setActiveTabKey(key);
-  };
-
   // 处理模态框取消
   const handleModalCancel = () => {
     setModalVisible(false);
-    modalForm.resetFields();
+    setIsViewMode(false);
+    setViewData(null);
   };
 
   // 表格列定义
   const columns = [
     {
       title: '序号',
-      dataIndex: 'id',
-      key: 'id',
-      align: 'center' as const,
+      render: (_: any, record: HelpItemType, index: number) => index + 1,
       width: 80,
+      align: 'center' as const,
     },
     {
       title: '标题',
@@ -367,7 +341,7 @@ const HelpManage: React.FC = () => {
       render: (title: string, record: HelpItemType) => (
         <Tooltip placement="topLeft" title={title}>
           <span>
-            {record.isTop === '1' && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
+            {record.isTop === TopStatus.YES && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
             {title}
           </span>
         </Tooltip>
@@ -407,7 +381,10 @@ const HelpManage: React.FC = () => {
       align: 'center' as const,
       render: (_: unknown, record: HelpItemType) => (
         <>
-          {record.status === '1' ? (
+          <Button type="link" onClick={() => handleView(record)}>
+            查看
+          </Button>
+          {record.status === HelpStatus.PUBLISHED ? (
             <>
               <Button type="link" onClick={() => handlePublishStatus(record)}>
                 下架
@@ -416,7 +393,7 @@ const HelpManage: React.FC = () => {
                 type="link"
                 onClick={() => handleToggleTop(record)}
               >
-                {record.isTop === '1' ? '取消置顶' : '置顶'}
+                {record.isTop === TopStatus.YES ? '取消置顶' : '置顶'}
               </Button>
             </>
           ) : (
@@ -432,7 +409,6 @@ const HelpManage: React.FC = () => {
               </Button>
               <Button
                 type="link"
-                danger
                 onClick={() => showDeleteConfirm(record)}
               >
                 删除
@@ -441,7 +417,7 @@ const HelpManage: React.FC = () => {
                 type="link"
                 onClick={() => handleToggleTop(record)}
               >
-                {record.isTop === '1' ? '取消置顶' : '置顶'}
+                {record.isTop === TopStatus.YES ? '取消置顶' : '置顶'}
               </Button>
             </>
           )}
@@ -450,14 +426,6 @@ const HelpManage: React.FC = () => {
     },
   ];
 
-  // 分类选项
-  const categoryOptions = [
-    { value: '注册指南', label: '注册指南' },
-    { value: '投标指南', label: '投标指南' },
-    { value: '常见问题', label: '常见问题' },
-    { value: '联系我们', label: '联系我们' },
-  ];
-
   return (
     <div className="common-container">
       <div className="filter-action-row">
@@ -482,9 +450,9 @@ const HelpManage: React.FC = () => {
           </Form.Item>
           <Form.Item name="status" label="状态">
             <Select placeholder="请选择状态" allowClear style={{ width: 120 }}>
-              <Option value="0">草稿</Option>
-              <Option value="1">已发布</Option>
-              <Option value="2">已下架</Option>
+              <Option value={HelpStatus.DRAFT}>草稿</Option>
+              <Option value={HelpStatus.PUBLISHED}>已发布</Option>
+              <Option value={HelpStatus.UNPUBLISHED}>已下架</Option>
             </Select>
           </Form.Item>
           <Form.Item className="filter-btns">
@@ -497,8 +465,7 @@ const HelpManage: React.FC = () => {
               icon={<DeleteOutlined />}
               onClick={() => {
                 form.resetFields();
-                setSearchParams({});
-                handleSearch({});
+                fetchHelpList(1, pagination.pageSize, {});
               }}
             >
               重置
@@ -544,85 +511,38 @@ const HelpManage: React.FC = () => {
         />
       </div>
 
-      {/* 新增/编辑模态框 */}
+      {/* 新增/编辑/查看模态框 */}
       <Modal
-        title={isEdit ? "编辑帮助" : "新增帮助"}
+        title={isViewMode ? "查看帮助" : isEdit ? "编辑帮助" : "新增帮助"}
         visible={modalVisible}
-        onOk={handleModalSubmit}
         onCancel={handleModalCancel}
         width={900}
         maskClosable={false}
         destroyOnClose
+        footer={
+          isViewMode
+            ? [
+                <Button key="close" onClick={handleModalCancel}>
+                  关闭
+                </Button>,
+              ]
+            : null
+        }
       >
-        <Form
-          form={modalForm}
-          layout="vertical"
-          name="helpForm"
-          preserve={false}
-        >
-          <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
-            <Switch />
-          </Form.Item>
-
-          <Form.Item
-            name="type"
-            label="问题类型"
-            rules={[{ required: true, message: '请选择问题类型' }]}
-          >
-            <Select placeholder="请选择问题类型">
-              {categoryOptions.map(option => (
-                <Option key={option.value} value={option.value}>
-                  {option.label}
-                </Option>
-              ))}
-            </Select>
-          </Form.Item>
-
-          <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
-            <TabPane tab="中文版" key="zh">
-              <Form.Item
-                name="titleZh"
-                label="标题（中文）"
-                rules={[{ required: true, message: '请输入中文标题' }]}
-              >
-                <Input placeholder="请输入中文标题" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentZh"
-                label="内容（中文）"
-                rules={[{ required: true, message: '请输入中文内容' }]}
-              >
-                <WangEditor
-                  language="zh-CN"
-                  height="300px"
-                  placeholder="请输入帮助内容..."
-                />
-              </Form.Item>
-            </TabPane>
-            <TabPane tab="英文版" key="en">
-              <Form.Item
-                name="titleEn"
-                label="标题（英文）"
-                rules={[{ required: true, message: 'Please enter title in English' }]}
-              >
-                <Input placeholder="Please enter title in English" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentEn"
-                label="内容（英文）"
-                rules={[{ required: true, message: 'Please enter content in English' }]}
-              >
-                <WangEditor
-                  language="en"
-                  height="300px"
-                  placeholder="Please enter help content..."
-                />
-              </Form.Item>
-            </TabPane>
-          </Tabs>
-        </Form>
+        {isViewMode && viewData ? (
+          // 查看详情模式
+          <HelpManageInfo data={viewData} />
+        ) : (
+          // 编辑/新增模式
+          <HelpManageForm
+            id={currentId}
+            isEdit={isEdit}
+            onSuccess={() => {
+              setModalVisible(false);
+              fetchHelpList(pagination.current, pagination.pageSize, searchParams);
+            }}
+          />
+        )}
       </Modal>
     </div>
   );
diff --git a/src/pages/noticeManage/NoticeManageForm.tsx b/src/pages/noticeManage/NoticeManageForm.tsx
new file mode 100644
index 0000000..061bab9
--- /dev/null
+++ b/src/pages/noticeManage/NoticeManageForm.tsx
@@ -0,0 +1,179 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Switch, Tabs, message, Button } from 'antd';
+import WangEditor from '@/components/WangEidtor/WangEidtor';
+import { TopStatus, EnglishSetting } from '@/dicts/noticeManageDict';
+import { addNotice, updateNotice, getNoticeDetail } from '@/servers/api/notice';
+
+const { TabPane } = Tabs;
+
+interface NoticeManageFormProps {
+  id?: string;
+  isEdit: boolean;
+  onSuccess: () => void;
+}
+
+const NoticeManageForm: React.FC<NoticeManageFormProps> = ({ id, isEdit, onSuccess }) => {
+  const [form] = Form.useForm();
+  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 获取详情数据
+  useEffect(() => {
+    const fetchNoticeDetail = async (noticeId: string) => {
+      setLoading(true);
+      try {
+        const response = await getNoticeDetail(noticeId);
+        if (response && response.success) {
+          const detail = response.data;
+          form.setFieldsValue({
+            isTop: detail.isTop === TopStatus.YES,
+            titleZh: detail.title,
+            titleEn: detail.titleEn,
+            contentZh: detail.content,
+            contentEn: detail.contentEn,
+          });
+        } else {
+          message.error(response.message || '获取详情失败');
+        }
+      } catch (error) {
+        console.error('获取通知详情失败:', error);
+        message.error('获取详情失败');
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    if (isEdit && id) {
+      fetchNoticeDetail(id);
+    }
+  }, [isEdit, id, form]);
+
+  // 处理Tab切换
+  const handleTabChange = (key: string) => {
+    setActiveTabKey(key);
+  };
+
+  // 提交表单
+  const handleSubmit = async () => {
+    setLoading(true);
+    try {
+      // 一次性验证所有表单项
+      try {
+        await form.validateFields();
+      } catch (error: any) {
+        console.log(error);
+        // 如果有验证错误，自动切换到相应Tab
+        if (error.errorFields && error.errorFields.length > 0) {
+          // 获取第一个错误字段
+          const firstError = error.errorFields[0];
+          const fieldName = firstError.name[0];
+
+          // 根据字段名判断应该切换到哪个Tab
+          if (fieldName === 'titleZh' || fieldName === 'contentZh') {
+            setActiveTabKey('zh');
+          } else if (fieldName === 'titleEn' || fieldName === 'contentEn') {
+            setActiveTabKey('en');
+          }
+        }
+
+        throw error;
+      }
+
+      // 获取所有表单值
+      const values = form.getFieldsValue();
+
+      // 转换表单数据为API需要的格式
+      const requestData = {
+        title: values.titleZh,
+        titleEn: values.titleEn || '',
+        content: values.contentZh,
+        contentEn: values.contentEn || '',
+        isTop: values.isTop ? TopStatus.YES : TopStatus.NO,
+        settingEn: values.titleEn && values.contentEn ? EnglishSetting.YES : EnglishSetting.NO,
+      };
+
+      let response;
+      if (isEdit && id) {
+        response = await updateNotice(id, requestData);
+      } else {
+        response = await addNotice(requestData);
+      }
+
+      if (response && response.success) {
+        message.success(isEdit ? '更新成功' : '添加成功');
+        onSuccess(); // 回调父组件
+      } else {
+        message.error(response.message || (isEdit ? '更新失败' : '添加失败'));
+      }
+    } catch (error: any) {
+      console.error('表单验证或提交失败:', error);
+      // 错误已在前面处理
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div>
+      <Form form={form} layout="vertical" name="noticeForm" preserve={false}>
+        <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
+          <Switch />
+        </Form.Item>
+
+        <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
+          <TabPane tab="中文版" key="zh" forceRender={true}>
+            <Form.Item
+              name="titleZh"
+              label="标题（中文）"
+              rules={[{ required: true, message: '请输入中文标题' }]}
+            >
+              <Input placeholder="请输入中文标题" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentZh"
+              label="内容（中文）"
+              rules={[{ required: true, message: '请输入中文内容' }]}
+            >
+              <WangEditor language="zh-CN" height="300px" placeholder="请输入通知内容..." />
+            </Form.Item>
+          </TabPane>
+          <TabPane tab="英文版" key="en" forceRender={true}>
+            <Form.Item
+              name="titleEn"
+              label="标题（英文）"
+              rules={[{ required: true, message: 'Please enter title in English' }]}
+            >
+              <Input placeholder="Please enter title in English" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentEn"
+              label="内容（英文）"
+              rules={[{ required: true, message: 'Please enter content in English' }]}
+            >
+              <WangEditor
+                language="en"
+                height="300px"
+                placeholder="Please enter notice content..."
+              />
+            </Form.Item>
+          </TabPane>
+        </Tabs>
+      </Form>
+      <div style={{ textAlign: 'right', marginTop: '20px' }}>
+        <Button onClick={() => onSuccess()}>取消</Button>
+        <Button
+          type="primary"
+          loading={loading}
+          onClick={handleSubmit}
+          style={{ marginLeft: '8px' }}
+        >
+          提交
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+export default NoticeManageForm;
diff --git a/src/pages/noticeManage/NoticeManageInfo.tsx b/src/pages/noticeManage/NoticeManageInfo.tsx
new file mode 100644
index 0000000..edd25bd
--- /dev/null
+++ b/src/pages/noticeManage/NoticeManageInfo.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { Descriptions, Divider, Card, Tag } from 'antd';
+import { NoticeStatus, NoticeStatusText, NoticeStatusColor } from '@/dicts/noticeManageDict';
+
+interface NoticeManageInfoProps {
+  data: API.NoticeRecord | null;
+}
+
+// 获取状态标签
+const getStatusTag = (status: string) => {
+  const statusKey = status as keyof typeof NoticeStatusText;
+  const color = NoticeStatusColor[statusKey] || 'default';
+  const text = NoticeStatusText[statusKey] || '未知';
+  return <Tag color={color}>{text}</Tag>;
+};
+
+const NoticeManageInfo: React.FC<NoticeManageInfoProps> = ({ data }) => {
+  if (!data) return null;
+
+  return (
+    <div className="notice-detail-view">
+      <Descriptions bordered column={2} size="small">
+        <Descriptions.Item label="标题" span={2}>
+          {data.title}
+        </Descriptions.Item>
+        {data.titleEn && (
+          <Descriptions.Item label="英文标题" span={2}>
+            {data.titleEn}
+          </Descriptions.Item>
+        )}
+        <Descriptions.Item label="是否置顶">{data.isTop === '1' ? '是' : '否'}</Descriptions.Item>
+        <Descriptions.Item label="状态">{getStatusTag(data.status)}</Descriptions.Item>
+        <Descriptions.Item label="创建人">{data.createBy}</Descriptions.Item>
+        <Descriptions.Item label="创建时间">{data.createTime}</Descriptions.Item>
+      </Descriptions>
+
+      <Divider orientation="left">中文内容</Divider>
+      <Card size="small" bordered={false} className="content-card">
+        <div className="notice-content" dangerouslySetInnerHTML={{ __html: data.content }} />
+      </Card>
+
+      {data.contentEn && (
+        <>
+          <Divider orientation="left">英文内容</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="notice-content" dangerouslySetInnerHTML={{ __html: data.contentEn }} />
+          </Card>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default NoticeManageInfo;
diff --git a/src/pages/noticeManage/noticeManage.tsx b/src/pages/noticeManage/noticeManage.tsx
index bf76580..7a59239 100644
--- a/src/pages/noticeManage/noticeManage.tsx
+++ b/src/pages/noticeManage/noticeManage.tsx
@@ -1,26 +1,38 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'umi';
-import { Button, Table, Modal, message, Input, Select, Form, Tooltip, Switch, Tag, Tabs } from 'antd';
+import { Button, Table, Modal, message, Input, Select, Form, Tooltip, Tag, Tabs } from 'antd';
 import {
   PlusOutlined,
   DeleteOutlined,
   ExclamationCircleOutlined,
   SearchOutlined,
-  VerticalAlignTopOutlined,
+  EyeOutlined,
 } from '@ant-design/icons';
-import { getNoticeList, addNotice, updateNotice, deleteNotice, batchDeleteNotice, updateNoticeStatus, updateNoticeTopStatus } from '@/servers/api/notice';
+import { getNoticeList, addNotice, updateNotice, deleteNotice, batchDeleteNotice, updateNoticeStatus, updateNoticeTopStatus, getNoticeDetail } from '@/servers/api/notice';
 import './noticeManage.less';
-// 引入封装的WangEditor组件
-import WangEditor from '@/components/WangEidtor/WangEidtor';
+import {
+  NoticeStatus,
+  NoticeStatusText,
+  NoticeStatusColor,
+  TopStatus,
+  ModalType,
+} from '@/dicts/noticeManageDict';
+
+import NoticeManageForm from './NoticeManageForm';
+import NoticeManageInfo from './NoticeManageInfo';
 
 const { Option } = Select;
-const { TextArea } = Input;
 const { TabPane } = Tabs;
 
 type NoticeType = API.NoticeRecord & {
   key: string;
 };
 
+interface SearchParams {
+  title?: string;
+  status?: string;
+}
+
 const NoticeManage: React.FC = () => {
   const intl = useIntl();
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
@@ -28,121 +40,56 @@ const NoticeManage: React.FC = () => {
   const [form] = Form.useForm();
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [isEdit, setIsEdit] = useState<boolean>(false);
+  const [isViewMode, setIsViewMode] = useState<boolean>(false);
   const [currentId, setCurrentId] = useState<string>('');
-  const [modalForm] = Form.useForm();
 
-  // 富文本内容状态
-  const [htmlZh, setHtmlZh] = useState<string>('');
-  const [htmlEn, setHtmlEn] = useState<string>('');
-
-  const [noticeData, setNoticeData] = useState<NoticeType[]>([
-    {
-      key: '1',
-      id: '1',
-      title: '系统维护通知',
-      titleEn: 'System Maintenance Notice',
-      content: '系统将于2023年7月1日进行例行维护，请提前做好准备。',
-      contentEn: 'The system will undergo routine maintenance on July 1, 2023. Please prepare in advance.',
-      createTime: '2023-06-25 10:30:00',
-      createBy: 'admin',
-      status: '1', // 已发布
-      isTop: '1', // 已置顶
-      settingEn: 1, // 设置英文
-    },
-    {
-      key: '2',
-      id: '2',
-      title: '新功能上线通知',
-      titleEn: 'New Feature Launch',
-      content: '系统新增了XXXX功能，欢迎使用。',
-      contentEn: 'The system has added XXXX function, welcome to use.',
-      createTime: '2023-06-20 14:45:00',
-      createBy: 'admin',
-      status: '0', // 草稿
-      isTop: '0', // 未置顶
-      settingEn: 1,
-    },
-    {
-      key: '3',
-      id: '3',
-      title: '用户反馈调查',
-      titleEn: '',
-      content: '为了提升用户体验，我们正在收集用户反馈...',
-      contentEn: '',
-      createTime: '2023-06-18 09:15:00',
-      createBy: 'admin',
-      status: '1', // 已发布
-      isTop: '0', // 未置顶
-      settingEn: 0,
-    },
-  ]);
+  // 查看详情数据
+  const [viewData, setViewData] = useState<API.NoticeRecord | null>(null);
+  const [noticeData, setNoticeData] = useState<NoticeType[]>([]);
   const [pagination, setPagination] = useState({
     current: 1,
     pageSize: 10,
-    total: 3,
+    total: 0,
     showSizeChanger: true,
     showQuickJumper: true,
     showTotal: (total: number) => `共 ${total} 条记录`,
   });
-  const [searchParams, setSearchParams] = useState<API.NoticeSearchParams>({});
-  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
+  const [searchParams, setSearchParams] = useState<SearchParams>({});
+
+  // 获取通知列表
+  const fetchNoticeList = (current: number = 1, pageSize: number = 10, params: SearchParams = searchParams) => {
+    // 更新搜索参数状态
+    if (params !== searchParams) {
+      setSearchParams(params);
+    }
 
-  // 获取通知列表（模拟数据）
-  const fetchNoticeList = (current: number = 1, pageSize: number = 10) => {
     setLoading(true);
     // 实际项目中应调用API
     getNoticeList({
-      ...searchParams,
+      ...params,
+      pageNo: current,
+      pageSize: pageSize,
     })
       .then(res => {
-        // 此处为模拟数据，实际项目中应使用API返回的数据
-        setNoticeData([
-          {
-            key: '1',
-            id: '1',
-            title: '系统维护通知',
-            titleEn: 'System Maintenance Notice',
-            content: '系统将于2023年7月1日进行例行维护，请提前做好准备。',
-            contentEn: 'The system will undergo routine maintenance on July 1, 2023. Please prepare in advance.',
-            createTime: '2023-06-25 10:30:00',
-            createBy: 'admin',
-            status: '1', // 已发布
-            isTop: '1', // 已置顶
-            settingEn: 1,
-          },
-          {
-            key: '2',
-            id: '2',
-            title: '新功能上线通知',
-            titleEn: 'New Feature Launch',
-            content: '系统新增了XXXX功能，欢迎使用。',
-            contentEn: 'The system has added XXXX function, welcome to use.',
-            createTime: '2023-06-20 14:45:00',
-            createBy: 'admin',
-            status: '0', // 草稿
-            isTop: '0', // 未置顶
-            settingEn: 1,
-          },
-          {
-            key: '3',
-            id: '3',
-            title: '用户反馈调查',
-            titleEn: '',
-            content: '为了提升用户体验，我们正在收集用户反馈...',
-            contentEn: '',
-            createTime: '2023-06-18 09:15:00',
-            createBy: 'admin',
-            status: '1', // 已发布
-            isTop: '0', // 未置顶
-            settingEn: 0,
-          },
-        ]);
-        setPagination({
-          ...pagination,
-          current,
-          pageSize,
-          total: 3, // 应该是res.total
-        });
+        if (res && res.success) {
+          const { records, total, current: currentPage, size } = res.data;
+
+          // 添加key属性
+          setNoticeData(
+            records.map((item: API.NoticeRecord) => ({
+              ...item,
+              key: item.id,
+            }))
+          );
+          setPagination({
+            ...pagination,
+            current: currentPage,
+            pageSize: size,
+            total: total,
+          });
+        } else {
+          message.error(res.message || '获取通知列表失败');
+        }
       })
       .catch(error => {
         console.error('获取通知列表失败:', error);
@@ -155,36 +102,47 @@ const NoticeManage: React.FC = () => {
 
   // 首次加载时获取数据
   useEffect(() => {
-    fetchNoticeList();
+    fetchNoticeList(1, pagination.pageSize, {});
   }, []);
 
+  // 处理查看
+  const handleView = async (record: NoticeType) => {
+    setCurrentId(record.id);
+    setIsViewMode(true);
+
+    try {
+      const response = await getNoticeDetail(record.id);
+      if (response && response.success) {
+        // 设置查看详情数据
+        setViewData(response.data);
+        setModalVisible(true);
+      } else {
+        message.error(response.message || '获取详情失败');
+      }
+    } catch (error) {
+      console.error('获取通知详情失败:', error);
+      message.error('获取详情失败');
+    }
+  };
+
   // 处理编辑
   const handleEdit = (record: NoticeType) => {
     // 检查是否为已发布状态
-    if (record.status === '1') {
+    if (record.status === NoticeStatus.PUBLISHED) {
       message.warning('已发布的通知不能编辑');
       return;
     }
 
     setIsEdit(true);
+    setIsViewMode(false);
     setCurrentId(record.id);
     setModalVisible(true);
-    setActiveTabKey('zh');
-
-    // 填充表单数据
-    modalForm.setFieldsValue({
-      isTop: record.isTop === '1',
-      titleZh: record.title,
-      titleEn: record.titleEn,
-      contentZh: record.content,
-      contentEn: record.contentEn || '',
-    });
   };
 
   // 处理删除
   const showDeleteConfirm = (record: NoticeType) => {
     // 检查是否为已发布状态
-    if (record.status === '1') {
+    if (record.status === NoticeStatus.PUBLISHED) {
       message.warning('已发布的通知不能删除');
       return;
     }
@@ -200,11 +158,13 @@ const NoticeManage: React.FC = () => {
       onOk: async () => {
         try {
           // 调用删除API
-          await deleteNotice(record.id);
-          // 更新本地数据
-          const newData = noticeData.filter(item => item.id !== record.id);
-          setNoticeData(newData);
-          message.success('删除成功');
+          const response = await deleteNotice(record.id);
+          if (response && response.success) {
+            message.success('删除成功');
+            fetchNoticeList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+          } else {
+            message.error(response.message || '删除失败');
+          }
         } catch (error) {
           console.error('删除通知失败:', error);
           message.error('删除失败');
@@ -216,19 +176,19 @@ const NoticeManage: React.FC = () => {
   // 处理发布/下架
   const handlePublishStatus = async (record: NoticeType) => {
     // 状态: 0-草稿，1-已发布
-    const isPublished = record.status === '1';
+    const isPublished = record.status === NoticeStatus.PUBLISHED;
     const actionText = isPublished ? '下架' : '发布';
-    const newStatus = isPublished ? '0' : '1';
+    const newStatus = isPublished ? NoticeStatus.UNPUBLISHED : NoticeStatus.PUBLISHED;
 
     try {
       // 调用API更新状态
-      await updateNoticeStatus(record.id, newStatus);
-      // 更新本地数据
-      const newData = noticeData.map(item =>
-        item.id === record.id ? { ...item, status: newStatus } : item
-      );
-      setNoticeData(newData);
-      message.success(`${actionText}成功`);
+      const response = await updateNoticeStatus(record.id, newStatus);
+      if (response && response.success) {
+        message.success(`${actionText}成功`);
+        fetchNoticeList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+      } else {
+        message.error(response.message || `${actionText}失败`);
+      }
     } catch (error) {
       console.error(`${actionText}失败:`, error);
       message.error(`${actionText}失败`);
@@ -237,19 +197,19 @@ const NoticeManage: React.FC = () => {
 
   // 处理置顶/取消置顶
   const handleToggleTop = async (record: NoticeType) => {
-    const isTop = record.isTop === '1';
+    const isTop = record.isTop === TopStatus.YES;
     const actionText = isTop ? '取消置顶' : '置顶';
-    const newIsTop = isTop ? '0' : '1';
+    const newIsTop = isTop ? TopStatus.NO : TopStatus.YES;
 
     try {
       // 调用API更新置顶状态
-      await updateNoticeTopStatus(record.id, newIsTop);
-      // 更新本地数据
-      const newData = noticeData.map(item =>
-        item.id === record.id ? { ...item, isTop: newIsTop } : item
-      );
-      setNoticeData(newData);
-      message.success(`${actionText}成功`);
+      const response = await updateNoticeTopStatus(record.id, newIsTop);
+      if (response && response.success) {
+        message.success(`${actionText}成功`);
+        fetchNoticeList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+      } else {
+        message.error(response.message || `${actionText}失败`);
+      }
     } catch (error) {
       console.error(`${actionText}失败:`, error);
       message.error(`${actionText}失败`);
@@ -258,30 +218,23 @@ const NoticeManage: React.FC = () => {
 
   // 获取状态标签
   const getStatusTag = (status: string) => {
-    switch (status) {
-      case '0':
-        return <Tag color="default">草稿</Tag>;
-      case '1':
-        return <Tag color="green">已发布</Tag>;
-      case '2':
-        return <Tag color="orange">已下架</Tag>;
-      default:
-        return <Tag color="default">未知</Tag>;
-    }
+    const statusKey = status as keyof typeof NoticeStatusText;
+    const color = NoticeStatusColor[statusKey] || 'default';
+    const text = NoticeStatusText[statusKey] || '未知';
+    return <Tag color={color}>{text}</Tag>;
   };
 
   // 处理表格分页变化
   const handleTableChange = (newPagination: any) => {
-    fetchNoticeList(newPagination.current, newPagination.pageSize);
+    fetchNoticeList(newPagination.current, newPagination.pageSize, searchParams);
   };
 
   const columns = [
     {
       title: '序号',
-      dataIndex: 'id',
-      key: 'id',
-      align: 'center' as const,
+      render: (text: string, record: NoticeType, index: number) => index + 1,
       width: 80,
+      align: 'center' as const,
     },
     {
       title: '标题',
@@ -293,7 +246,7 @@ const NoticeManage: React.FC = () => {
       render: (title: string, record: NoticeType) => (
         <Tooltip placement="topLeft" title={title}>
           <span>
-            {record.isTop === '1' && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
+            {record.isTop === TopStatus.YES && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
             {title}
           </span>
         </Tooltip>
@@ -325,7 +278,10 @@ const NoticeManage: React.FC = () => {
       align: 'center' as const,
       render: (_: unknown, record: NoticeType) => (
         <>
-          {record.status === '1' ? (
+          <Button type="link" onClick={() => handleView(record)}>
+            查看
+          </Button>
+          {record.status === NoticeStatus.PUBLISHED ? (
             <>
               <Button type="link" onClick={() => handlePublishStatus(record)}>
                 下架
@@ -334,7 +290,7 @@ const NoticeManage: React.FC = () => {
                 type="link"
                 onClick={() => handleToggleTop(record)}
               >
-                {record.isTop === '1' ? '取消置顶' : '置顶'}
+                {record.isTop === TopStatus.YES ? '取消置顶' : '置顶'}
               </Button>
             </>
           ) : (
@@ -358,7 +314,7 @@ const NoticeManage: React.FC = () => {
                 type="link"
                 onClick={() => handleToggleTop(record)}
               >
-                {record.isTop === '1' ? '取消置顶' : '置顶'}
+                {record.isTop === TopStatus.YES ? '取消置顶' : '置顶'}
               </Button>
             </>
           )}
@@ -369,7 +325,7 @@ const NoticeManage: React.FC = () => {
 
   // 行选择限制
   const checkSelectable = (record: NoticeType) => {
-    return record.status !== '1'; // 已发布的不能选择
+    return record.status !== NoticeStatus.PUBLISHED; // 已发布的不能选择
   };
 
   const onSelectChange = (newSelectedRowKeys: React.Key[]) => {
@@ -380,7 +336,7 @@ const NoticeManage: React.FC = () => {
     selectedRowKeys,
     onChange: onSelectChange,
     getCheckboxProps: (record: NoticeType) => ({
-      disabled: record.status === '1', // 已发布的不能选择
+      disabled: record.status === NoticeStatus.PUBLISHED, // 已发布的不能选择
     }),
   };
 
@@ -389,10 +345,10 @@ const NoticeManage: React.FC = () => {
   // 处理添加
   const handleAdd = () => {
     setIsEdit(false);
+    setIsViewMode(false);
     setCurrentId('');
-    modalForm.resetFields();
+    setViewData(null);
     setModalVisible(true);
-    setActiveTabKey('zh');
   };
 
   // 处理批量删除
@@ -411,17 +367,19 @@ const NoticeManage: React.FC = () => {
           // 获取可删除的ID（非已发布状态）
           const deleteIds = selectedRowKeys.filter(key => {
             const record = noticeData.find(item => item.key === key);
-            return record && record.status !== '1';
+            return record && record.status !== NoticeStatus.PUBLISHED;
           }) as string[];
 
           if (deleteIds.length > 0) {
             // 调用批量删除API
-            await batchDeleteNotice(deleteIds);
-            // 更新本地数据
-            const newData = noticeData.filter(item => !deleteIds.includes(item.key));
-            setNoticeData(newData);
-            setSelectedRowKeys([]);
-            message.success('删除成功');
+            const response = await batchDeleteNotice(deleteIds);
+            if (response && response.success) {
+              setSelectedRowKeys([]);
+              message.success('删除成功');
+              fetchNoticeList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+            } else {
+              message.error(response.message || '批量删除失败');
+            }
           } else {
             message.warning('没有可删除的通知');
           }
@@ -436,85 +394,15 @@ const NoticeManage: React.FC = () => {
   };
 
   // 处理搜索
-  const handleSearch = (values: API.NoticeSearchParams) => {
-    setSearchParams(values);
-    fetchNoticeList(1, pagination.pageSize);
-  };
-
-  // 处理模态框提交
-  const handleModalSubmit = () => {
-    // 先触发所有字段的验证
-    modalForm.validateFields()
-      .then(async values => {
-        try {
-          const noticeParams: API.NoticeRequest = {
-            title: values.titleZh,
-            titleEn: values.titleEn || '',
-            content: values.contentZh,
-            contentEn: values.contentEn || '',
-            isTop: values.isTop ? '1' : '0',
-            settingEn: values.titleEn && values.contentEn ? 1 : 0,
-          };
-
-          if (isEdit) {
-            // 编辑模式，调用更新API
-            await updateNotice(currentId, noticeParams);
-            message.success('更新成功');
-          } else {
-            // 新增模式，调用添加API
-            await addNotice(noticeParams);
-            message.success('添加成功');
-          }
-
-          setModalVisible(false);
-          modalForm.resetFields();
-          // 刷新列表
-          fetchNoticeList(pagination.current, pagination.pageSize);
-        } catch (error) {
-          console.error(isEdit ? '更新通知失败:' : '添加通知失败:', error);
-          message.error(isEdit ? '更新失败' : '添加失败');
-        }
-      })
-      .catch(errorInfo => {
-        // 获取所有字段的错误信息
-        const errorFields = errorInfo.errorFields || [];
-
-        // 检查是否有中文标题或内容的错误
-        const hasZhError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleZh') || fieldName.includes('contentZh');
-        });
-
-        // 检查是否有英文标题或内容的错误
-        const hasEnError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleEn') || fieldName.includes('contentEn');
-        });
-
-        // 如果有中文字段错误，切换到中文Tab
-        if (hasZhError) {
-          setActiveTabKey('zh');
-        }
-        // 如果只有英文字段错误，切换到英文Tab
-        else if (hasEnError && !hasZhError) {
-          setActiveTabKey('en');
-        }
-
-        console.log('表单验证失败:', errorInfo);
-      });
-  };
-
-  // 处理Tab切换
-  const handleTabChange = (key: string) => {
-    setActiveTabKey(key);
+  const handleSearch = (values: SearchParams) => {
+    fetchNoticeList(1, pagination.pageSize, values);
   };
 
   // 处理模态框取消
   const handleModalCancel = () => {
     setModalVisible(false);
-    modalForm.resetFields();
+    setIsViewMode(false);
+    setViewData(null);
   };
 
   return (
@@ -532,9 +420,9 @@ const NoticeManage: React.FC = () => {
           </Form.Item>
           <Form.Item name="status" label="状态">
             <Select placeholder="请选择状态" allowClear>
-              <Option value="0">草稿</Option>
-              <Option value="1">已发布</Option>
-              <Option value="2">已下架</Option>
+              <Option value={NoticeStatus.DRAFT}>草稿</Option>
+              <Option value={NoticeStatus.PUBLISHED}>已发布</Option>
+              <Option value={NoticeStatus.UNPUBLISHED}>已下架</Option>
             </Select>
           </Form.Item>
           <Form.Item className="filter-btns">
@@ -547,8 +435,7 @@ const NoticeManage: React.FC = () => {
               icon={<DeleteOutlined />}
               onClick={() => {
                 form.resetFields();
-                setSearchParams({});
-                handleSearch({});
+                fetchNoticeList(1, pagination.pageSize, {});
               }}
             >
               重置
@@ -593,71 +480,38 @@ const NoticeManage: React.FC = () => {
         />
       </div>
 
-      {/* 新增/编辑模态框 */}
+      {/* 新增/编辑/查看模态框 */}
       <Modal
-        title={isEdit ? "编辑通知" : "新增通知"}
+        title={isViewMode ? "查看通知" : isEdit ? "编辑通知" : "新增通知"}
         visible={modalVisible}
-        onOk={handleModalSubmit}
         onCancel={handleModalCancel}
         width={900}
         maskClosable={false}
         destroyOnClose
+        footer={
+          isViewMode
+            ? [
+                <Button key="close" onClick={handleModalCancel}>
+                  关闭
+                </Button>,
+              ]
+            : null
+        }
       >
-        <Form
-          form={modalForm}
-          layout="vertical"
-          name="noticeForm"
-          preserve={false}
-        >
-          <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
-            <Switch />
-          </Form.Item>
-
-          <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
-            <TabPane tab="中文版" key="zh">
-              <Form.Item
-                name="titleZh"
-                label="标题（中文）"
-                rules={[{ required: true, message: '请输入中文标题' }]}
-              >
-                <Input placeholder="请输入中文标题" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentZh"
-                label="内容（中文）"
-                rules={[{ required: true, message: '请输入中文内容' }]}
-              >
-                <WangEditor
-                  language="zh-CN"
-                  height="300px"
-                  placeholder="请输入通知内容..."
-                />
-              </Form.Item>
-            </TabPane>
-            <TabPane tab="英文版" key="en">
-              <Form.Item
-                name="titleEn"
-                label="标题（英文）"
-                rules={[{ required: true, message: 'Please enter title in English' }]}
-              >
-                <Input placeholder="Please enter title in English" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentEn"
-                label="内容（英文）"
-                rules={[{ required: true, message: 'Please enter content in English' }]}
-              >
-                <WangEditor
-                  language="en"
-                  height="300px"
-                  placeholder="Please enter notice content..."
-                />
-              </Form.Item>
-            </TabPane>
-          </Tabs>
-        </Form>
+        {isViewMode && viewData ? (
+          // 查看详情模式
+          <NoticeManageInfo data={viewData} />
+        ) : (
+          // 编辑/新增模式
+          <NoticeManageForm
+            id={currentId}
+            isEdit={isEdit}
+            onSuccess={() => {
+              setModalVisible(false);
+              fetchNoticeList(pagination.current, pagination.pageSize, searchParams);
+            }}
+          />
+        )}
       </Modal>
     </div>
   );
diff --git a/src/pages/policyManage/PolicyManageForm.tsx b/src/pages/policyManage/PolicyManageForm.tsx
new file mode 100644
index 0000000..5e3f72b
--- /dev/null
+++ b/src/pages/policyManage/PolicyManageForm.tsx
@@ -0,0 +1,179 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Switch, Tabs, message, Button } from 'antd';
+import WangEditor from '@/components/WangEidtor/WangEidtor';
+import { TopStatus, EnglishSetting } from '@/dicts/policyManageDict';
+import { addPolicy, updatePolicy, getPolicyDetail } from '@/servers/api/policy';
+
+const { TabPane } = Tabs;
+
+interface PolicyManageFormProps {
+  id?: string;
+  isEdit: boolean;
+  onSuccess: () => void;
+}
+
+const PolicyManageForm: React.FC<PolicyManageFormProps> = ({ id, isEdit, onSuccess }) => {
+  const [form] = Form.useForm();
+  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 获取详情数据
+  useEffect(() => {
+    const fetchPolicyDetail = async (policyId: string) => {
+      setLoading(true);
+      try {
+        const response = await getPolicyDetail(policyId);
+        if (response && response.success) {
+          const detail = response.data;
+          form.setFieldsValue({
+            isTop: detail.isTop === TopStatus.YES,
+            titleZh: detail.title,
+            titleEn: detail.titleEn,
+            contentZh: detail.content,
+            contentEn: detail.contentEn,
+          });
+        } else {
+          message.error(response.message || '获取详情失败');
+        }
+      } catch (error) {
+        console.error('获取政策详情失败:', error);
+        message.error('获取详情失败');
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    if (isEdit && id) {
+      fetchPolicyDetail(id);
+    }
+  }, [isEdit, id, form]);
+
+  // 处理Tab切换
+  const handleTabChange = (key: string) => {
+    setActiveTabKey(key);
+  };
+
+  // 提交表单
+  const handleSubmit = async () => {
+    setLoading(true);
+    try {
+      // 一次性验证所有表单项
+      try {
+        await form.validateFields();
+      } catch (error: any) {
+        console.log(error);
+        // 如果有验证错误，自动切换到相应Tab
+        if (error.errorFields && error.errorFields.length > 0) {
+          // 获取第一个错误字段
+          const firstError = error.errorFields[0];
+          const fieldName = firstError.name[0];
+
+          // 根据字段名判断应该切换到哪个Tab
+          if (fieldName === 'titleZh' || fieldName === 'contentZh') {
+            setActiveTabKey('zh');
+          } else if (fieldName === 'titleEn' || fieldName === 'contentEn') {
+            setActiveTabKey('en');
+          }
+        }
+
+        throw error;
+      }
+
+      // 获取所有表单值
+      const values = form.getFieldsValue();
+
+      // 转换表单数据为API需要的格式
+      const requestData = {
+        title: values.titleZh,
+        titleEn: values.titleEn || '',
+        content: values.contentZh,
+        contentEn: values.contentEn || '',
+        isTop: values.isTop ? TopStatus.YES : TopStatus.NO,
+        settingEn: values.titleEn && values.contentEn ? EnglishSetting.YES : EnglishSetting.NO,
+      };
+
+      let response;
+      if (isEdit && id) {
+        response = await updatePolicy(id, requestData);
+      } else {
+        response = await addPolicy(requestData);
+      }
+
+      if (response && response.success) {
+        message.success(isEdit ? '更新成功' : '添加成功');
+        onSuccess(); // 回调父组件
+      } else {
+        message.error(response.message || (isEdit ? '更新失败' : '添加失败'));
+      }
+        } catch (error: any) {
+      console.error('表单验证或提交失败:', error);
+      // 错误已在前面处理
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div>
+      <Form form={form} layout="vertical" name="policyForm" preserve={false}>
+        <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
+          <Switch />
+        </Form.Item>
+
+        <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
+          <TabPane tab="中文版" key="zh" forceRender={true}>
+            <Form.Item
+              name="titleZh"
+              label="标题（中文）"
+              rules={[{ required: true, message: '请输入中文标题' }]}
+            >
+              <Input placeholder="请输入中文标题" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentZh"
+              label="正文内容（中文）"
+              rules={[{ required: true, message: '请输入中文正文' }]}
+            >
+              <WangEditor language="zh-CN" height="300px" placeholder="请输入中文正文内容..." />
+            </Form.Item>
+          </TabPane>
+          <TabPane tab="英文版" key="en" forceRender={true}>
+            <Form.Item
+              name="titleEn"
+              label="标题（英文）"
+              rules={[{ required: true, message: 'Please enter title in English' }]}
+            >
+              <Input placeholder="Please enter title in English" />
+            </Form.Item>
+
+            <Form.Item
+              name="contentEn"
+              label="正文内容（英文）"
+              rules={[{ required: true, message: 'Please enter content in English' }]}
+            >
+              <WangEditor
+                language="en"
+                height="300px"
+                placeholder="Please enter content in English..."
+              />
+            </Form.Item>
+          </TabPane>
+        </Tabs>
+      </Form>
+      <div style={{ textAlign: 'right', marginTop: '20px' }}>
+        <Button onClick={() => onSuccess()}>取消</Button>
+        <Button
+          type="primary"
+          loading={loading}
+          onClick={handleSubmit}
+          style={{ marginLeft: '8px' }}
+        >
+          提交
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+export default PolicyManageForm;
diff --git a/src/pages/policyManage/PolicyManageInfo.tsx b/src/pages/policyManage/PolicyManageInfo.tsx
new file mode 100644
index 0000000..d04d442
--- /dev/null
+++ b/src/pages/policyManage/PolicyManageInfo.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { Descriptions, Divider, Card, Tag } from 'antd';
+import { PolicyStatusText, PolicyStatusColor, PolicyStatus } from '@/dicts/policyManageDict';
+
+interface PolicyManageInfoProps {
+  data: API.PolicyRecord | null;
+}
+
+// 获取状态标签
+const getStatusTag = (status: PolicyStatus) => {
+  const statusKey = status;
+  const color = PolicyStatusColor[statusKey] || 'default';
+  const text = PolicyStatusText[statusKey] || '未知';
+  return <Tag color={color}>{text}</Tag>;
+};
+
+const PolicyManageInfo: React.FC<PolicyManageInfoProps> = ({ data }) => {
+  if (!data) return null;
+
+  return (
+    <div className="policy-detail-view">
+      <Descriptions bordered column={2} size="small">
+        <Descriptions.Item label="标题" span={2}>
+          {data.title}
+        </Descriptions.Item>
+        {data.titleEn && (
+          <Descriptions.Item label="英文标题" span={2}>
+            {data.titleEn}
+          </Descriptions.Item>
+        )}
+        <Descriptions.Item label="是否置顶">{data.isTop ? '是' : '否'}</Descriptions.Item>
+        <Descriptions.Item label="状态">{getStatusTag(data.status)}</Descriptions.Item>
+        <Descriptions.Item label="创建人">{data.createBy}</Descriptions.Item>
+        <Descriptions.Item label="创建时间">{data.createTime}</Descriptions.Item>
+        {data.updateTime && (
+          <Descriptions.Item label="更新时间" span={2}>
+            {data.updateTime}
+          </Descriptions.Item>
+        )}
+      </Descriptions>
+
+      <Divider orientation="left">中文内容</Divider>
+      <Card size="small" bordered={false} className="content-card">
+        <div className="policy-content" dangerouslySetInnerHTML={{ __html: data.content }} />
+      </Card>
+
+      {data.contentEn && (
+        <>
+          <Divider orientation="left">英文内容</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="policy-content" dangerouslySetInnerHTML={{ __html: data.contentEn }} />
+          </Card>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default PolicyManageInfo;
diff --git a/src/pages/policyManage/policyManage.tsx b/src/pages/policyManage/policyManage.tsx
index 035ed53..928ca49 100644
--- a/src/pages/policyManage/policyManage.tsx
+++ b/src/pages/policyManage/policyManage.tsx
@@ -1,27 +1,49 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'umi';
-import { Button, Table, Space, Modal, message, Input, Select, Form, Tooltip, Switch, Tabs, Tag, TablePaginationConfig } from 'antd';
+import {
+  Button,
+  Table,
+  Space,
+  Modal,
+  message,
+  Input,
+  Select,
+  Form,
+  Tooltip,
+  Tag,
+  TablePaginationConfig,
+  Tabs,
+} from 'antd';
 import {
   PlusOutlined,
   DeleteOutlined,
   ExclamationCircleOutlined,
   SearchOutlined,
+  EyeOutlined,
 } from '@ant-design/icons';
-import { addPolicy, getPolicyPage, deletePolicy, publishPolicy, unpublishPolicy, getPolicyDetail, updatePolicy } from '@/servers/api/policy';
-import WangEditor from '@/components/WangEidtor/WangEidtor';
+import {
+  getPolicyPage,
+  deletePolicy,
+  publishPolicy,
+  unpublishPolicy,
+  getPolicyDetail,
+} from '@/servers/api/policy';
+import {
+  PolicyStatus,
+  PolicyStatusText,
+  PolicyStatusColor,
+  TopStatus,
+} from '@/dicts/policyManageDict';
+import PolicyManageInfo from './PolicyManageInfo';
+import PolicyManageForm from './PolicyManageForm';
 
 const { Option } = Select;
 const { TabPane } = Tabs;
 
-interface PolicyType {
+// 扩展 API.PolicyRecord 类型，添加 key 属性
+type PolicyType = API.PolicyRecord & {
   key: string;
-  id: string;
-  title: string;
-  createTime: string;
-  status: string;
-  createBy: string;
-  isTop: string;
-}
+};
 
 interface SearchParams {
   title?: string;
@@ -35,8 +57,11 @@ const PolicyManage: React.FC = () => {
   const [form] = Form.useForm();
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [isEdit, setIsEdit] = useState<boolean>(false);
+  const [isViewMode, setIsViewMode] = useState<boolean>(false);
   const [currentId, setCurrentId] = useState<string>('');
-  const [modalForm] = Form.useForm();
+
+  // 查看详情数据
+  const [viewData, setViewData] = useState<API.PolicyRecord | null>(null);
   const [policyData, setPolicyData] = useState<PolicyType[]>([]);
   const [pagination, setPagination] = useState<TablePaginationConfig>({
     current: 1,
@@ -47,37 +72,40 @@ const PolicyManage: React.FC = () => {
     showTotal: (total) => `共 ${total} 条记录`,
   });
   const [searchParams, setSearchParams] = useState<SearchParams>({});
-  const [activeTabKey, setActiveTabKey] = useState<string>('zh');
 
   // 获取政策列表
-  const fetchPolicyList = async (current: number = 1, pageSize: number = 10) => {
+  const fetchPolicyList = async (
+    current = 1,
+    pageSize = 10,
+    params: SearchParams = searchParams,
+  ) => {
+    // 更新搜索参数状态
+    if (params !== searchParams) {
+      setSearchParams(params);
+    }
+
     setLoading(true);
     try {
       // 构造请求参数
-      const params: API.PageRequest = {
+      const requestParams: API.PageRequest = {
         basePageRequest: {
           pageNo: current,
           pageSize: pageSize,
         },
-        ...searchParams,
+        ...params, // 使用传入的参数，而不是依赖状态
       };
 
-      const response = await getPolicyPage(params);
+      const response = await getPolicyPage(requestParams);
       if (response && response.success) {
         const { records, total, current: currentPage, size } = response.data;
 
-        // 转换数据
-        const formattedData = records.map((item: API.PolicyRecord) => ({
-          key: item.id,
-          id: item.id,
-          title: item.title,
-          createTime: item.createTime,
-          status: item.status,
-          createBy: item.createBy,
-          isTop: item.isTop,
-        }));
-
-        setPolicyData(formattedData);
+        // 只添加必要的 key 属性
+        setPolicyData(
+          records.map((item: API.PolicyRecord) => ({
+            ...item,
+            key: item.id,
+          })),
+        );
         setPagination({
           ...pagination,
           current: currentPage,
@@ -97,27 +125,20 @@ const PolicyManage: React.FC = () => {
 
   // 首次加载获取数据
   useEffect(() => {
-    fetchPolicyList(pagination.current as number, pagination.pageSize as number);
+    fetchPolicyList(pagination.current, pagination.pageSize, {});
   }, []);
 
-  // 处理编辑
-  const handleEdit = async (record: PolicyType) => {
-    setIsEdit(true);
+  // 处理查看
+  const handleView = async (record: PolicyType) => {
     setCurrentId(record.id);
-    setModalVisible(true);
-    setActiveTabKey('zh');
+    setIsViewMode(true);
 
     try {
       const response = await getPolicyDetail(record.id);
       if (response && response.success) {
-        const detail = response.data;
-        modalForm.setFieldsValue({
-          isTop: detail.isTop === '1',
-          titleZh: detail.title,
-          titleEn: detail.titleEn,
-          contentZh: detail.content,
-          contentEn: detail.contentEn,
-        });
+        // 设置查看详情数据
+        setViewData(response.data);
+        setModalVisible(true);
       } else {
         message.error(response.message || '获取详情失败');
       }
@@ -127,6 +148,14 @@ const PolicyManage: React.FC = () => {
     }
   };
 
+  // 处理编辑
+  const handleEdit = (record: PolicyType) => {
+    setIsEdit(true);
+    setIsViewMode(false);
+    setCurrentId(record.id);
+    setModalVisible(true);
+  };
+
   // 处理删除
   const showDeleteConfirm = (record: PolicyType) => {
     Modal.confirm({
@@ -142,7 +171,7 @@ const PolicyManage: React.FC = () => {
           const response = await deletePolicy(record.id);
           if (response && response.success) {
             message.success('删除成功');
-            fetchPolicyList(pagination.current as number, pagination.pageSize as number); // 重新加载数据
+            fetchPolicyList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
           } else {
             message.error(response.message || '删除失败');
           }
@@ -156,54 +185,57 @@ const PolicyManage: React.FC = () => {
 
   // 处理发布/下架
   const handlePublishStatus = async (record: PolicyType) => {
-    // 状态: 0.草稿、1.上架、2.下架
-    const isPublished = record.status === '1';
+    const isPublished = record.status === PolicyStatus.PUBLISHED;
     const actionText = isPublished ? '下架' : '发布';
 
-    try {
-      let response;
-      if (isPublished) {
-        response = await unpublishPolicy(record.id);
-      } else {
-        response = await publishPolicy(record.id);
-      }
+    Modal.confirm({
+      title: `确定要${actionText}该政策吗?`,
+      icon: <ExclamationCircleOutlined />,
+      content: `标题: ${record.title}`,
+      okText: '确定',
+      cancelText: '取消',
+      maskClosable: false,
+      onOk: async () => {
+        try {
+          let response;
+          if (isPublished) {
+            response = await unpublishPolicy(record.id);
+          } else {
+            response = await publishPolicy(record.id);
+          }
 
-      if (response && response.success) {
-        message.success(`${actionText}成功`);
-        fetchPolicyList(pagination.current as number, pagination.pageSize as number); // 重新加载数据
-      } else {
-        message.error(response.message || `${actionText}失败`);
-      }
-    } catch (error) {
-      console.error(`${actionText}失败:`, error);
-      message.error(`${actionText}失败`);
-    }
+          if (response && response.success) {
+            message.success(`${actionText}成功`);
+            fetchPolicyList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+          } else {
+            message.error(response.message || `${actionText}失败`);
+          }
+        } catch (error) {
+          console.error(`${actionText}失败:`, error);
+          message.error(`${actionText}失败`);
+        }
+      },
+    });
   };
 
   // 获取状态标签
   const getStatusTag = (status: string) => {
-    switch (status) {
-      case '0':
-        return <Tag color="default">草稿</Tag>;
-      case '1':
-        return <Tag color="green">已发布</Tag>;
-      case '2':
-        return <Tag color="orange">已下架</Tag>;
-      default:
-        return <Tag color="default">未知</Tag>;
-    }
+    const statusKey = status as keyof typeof PolicyStatusText;
+    const color = PolicyStatusColor[statusKey] || 'default';
+    const text = PolicyStatusText[statusKey] || '未知';
+    return <Tag color={color}>{text}</Tag>;
   };
 
   // 处理表格分页变化
   const handleTableChange = (newPagination: TablePaginationConfig) => {
-    fetchPolicyList(newPagination.current as number, newPagination.pageSize as number);
+    fetchPolicyList(newPagination.current, newPagination.pageSize, searchParams);
   };
 
   const columns = [
     {
       title: '序号',
-      dataIndex: 'id',
-      key: 'id',
+      // pageNo *pageSize +
+      render: (text: string, record: PolicyType, index: number) => index + 1,
       width: 80,
     },
     {
@@ -217,7 +249,11 @@ const PolicyManage: React.FC = () => {
       render: (title: string, record: PolicyType) => (
         <Tooltip placement="topLeft" title={title}>
           <span>
-            {record.isTop === '1' && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
+            {record.isTop === TopStatus.YES && (
+              <Tag color="red" style={{ marginRight: 8 }}>
+                置顶
+              </Tag>
+            )}
             {title}
           </span>
         </Tooltip>
@@ -248,27 +284,28 @@ const PolicyManage: React.FC = () => {
       width: 230,
       align: 'center' as const,
       render: (_: unknown, record: PolicyType) => (
-        <Space size="middle" className="action-space">
-          {record.status === '1' ? (
+        <>
+          <Button type="link" onClick={() => handleView(record)}>
+            查看
+          </Button>
+          {record.status === PolicyStatus.PUBLISHED ? (
             <Button type="link" onClick={() => handlePublishStatus(record)}>
               下架
             </Button>
           ) : (
-            <Button type="link" onClick={() => handlePublishStatus(record)}>
-              发布
-            </Button>
+            <>
+              <Button type="link" onClick={() => handlePublishStatus(record)}>
+                发布
+              </Button>
+              <Button type="link" onClick={() => handleEdit(record)}>
+                编辑
+              </Button>
+              <Button type="link" onClick={() => showDeleteConfirm(record)}>
+                删除
+              </Button>
+            </>
           )}
-          <Button type="link" onClick={() => handleEdit(record)}>
-            编辑
-          </Button>
-          <Button
-            type="link"
-            danger
-            onClick={() => showDeleteConfirm(record)}
-          >
-            删除
-          </Button>
-        </Space>
+        </>
       ),
     },
   ];
@@ -287,10 +324,10 @@ const PolicyManage: React.FC = () => {
   // 处理添加
   const handleAdd = () => {
     setIsEdit(false);
+    setIsViewMode(false);
     setCurrentId('');
-    modalForm.resetFields();
+    setViewData(null);
     setModalVisible(true);
-    setActiveTabKey('zh');
   };
 
   // 处理批量删除
@@ -307,16 +344,16 @@ const PolicyManage: React.FC = () => {
         setLoading(true);
         try {
           // 实际项目中应该使用批量删除API
-          const deletePromises = selectedRowKeys.map(id => deletePolicy(id.toString()));
+          const deletePromises = selectedRowKeys.map((id) => deletePolicy(id.toString()));
           const results = await Promise.all(deletePromises);
 
           // 检查是否所有操作都成功
-          const allSuccess = results.every(res => res.success);
+          const allSuccess = results.every((res) => res.success);
 
           if (allSuccess) {
             setSelectedRowKeys([]);
             message.success('删除成功');
-            fetchPolicyList(pagination.current as number, pagination.pageSize as number); // 重新加载数据
+            fetchPolicyList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
           } else {
             message.error('部分删除失败，请刷新后重试');
           }
@@ -332,85 +369,15 @@ const PolicyManage: React.FC = () => {
 
   // 处理搜索
   const handleSearch = (values: SearchParams) => {
-    setSearchParams(values);
-    fetchPolicyList(1, pagination.pageSize as number); // 搜索时重置为第一页
+    fetchPolicyList(1, pagination.pageSize, values); // 搜索时重置为第一页，直接传入表单值
   };
 
-  // 处理Tab切换
-  const handleTabChange = (key: string) => {
-    setActiveTabKey(key);
-  };
-
-  // 处理模态框提交
-  const handleModalSubmit = () => {
-    modalForm.validateFields()
-      .then(async values => {
-        try {
-          // 转换表单数据为API需要的格式
-          const requestData: API.PolicyRequest = {
-            title: values.titleZh,
-            titleEn: values.titleEn || '',
-            content: values.contentZh,
-            contentEn: values.contentEn || '',
-            isTop: values.isTop ? '1' : '0',
-            settingEn: values.titleEn && values.contentEn ? 1 : 0,
-          };
-
-          let response;
-          if (isEdit) {
-            response = await updatePolicy(currentId, requestData);
-          } else {
-            response = await addPolicy(requestData);
-          }
-
-          if (response && response.success) {
-            message.success(isEdit ? '更新成功' : '添加成功');
-            setModalVisible(false);
-            modalForm.resetFields();
-            fetchPolicyList(1, pagination.pageSize as number); // 操作成功后返回第一页
-          } else {
-            message.error(response.message || (isEdit ? '更新失败' : '添加失败'));
-          }
-        } catch (error) {
-          console.error(isEdit ? '更新政策失败:' : '添加政策失败:', error);
-          message.error(isEdit ? '更新失败' : '添加失败');
-        }
-      })
-      .catch(errorInfo => {
-        // 获取所有字段的错误信息
-        const errorFields = errorInfo.errorFields || [];
-
-        // 检查是否有中文标题或内容的错误
-        const hasZhError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleZh') || fieldName.includes('contentZh');
-        });
-
-        // 检查是否有英文标题或内容的错误
-        const hasEnError = errorFields.some((field: any) => {
-          if (!field.name) return false;
-          const fieldName = Array.isArray(field.name) ? field.name.join('.') : String(field.name);
-          return fieldName.includes('titleEn') || fieldName.includes('contentEn');
-        });
-
-        // 如果有中文字段错误，切换到中文Tab
-        if (hasZhError) {
-          setActiveTabKey('zh');
-        }
-        // 如果只有英文字段错误，切换到英文Tab
-        else if (hasEnError && !hasZhError) {
-          setActiveTabKey('en');
-        }
-
-        console.log('表单验证失败:', errorInfo);
-      });
-  };
 
   // 处理模态框取消
   const handleModalCancel = () => {
     setModalVisible(false);
-    modalForm.resetFields();
+    setIsViewMode(false);
+    setViewData(null);
   };
 
   return (
@@ -443,8 +410,7 @@ const PolicyManage: React.FC = () => {
               icon={<DeleteOutlined />}
               onClick={() => {
                 form.resetFields();
-                setSearchParams({});
-                fetchPolicyList(1, pagination.pageSize as number);
+                fetchPolicyList(1, pagination.pageSize, {});
               }}
             >
               重置
@@ -453,12 +419,7 @@ const PolicyManage: React.FC = () => {
         </Form>
 
         <div className="right-buttons">
-          <Button
-            type="primary"
-            ghost
-            icon={<PlusOutlined />}
-            onClick={handleAdd}
-          >
+          <Button type="primary" ghost icon={<PlusOutlined />} onClick={handleAdd}>
             新增
           </Button>
           <Button
@@ -471,9 +432,7 @@ const PolicyManage: React.FC = () => {
             删除
           </Button>
           {hasSelected && (
-            <span className="selected-count">
-              已选择 {selectedRowKeys.length} 项
-            </span>
+            <span className="selected-count">已选择 {selectedRowKeys.length} 项</span>
           )}
         </div>
       </div>
@@ -489,71 +448,38 @@ const PolicyManage: React.FC = () => {
         />
       </div>
 
-      {/* 新增/编辑模态框 */}
+      {/* 新增/编辑/查看模态框 */}
       <Modal
-        title={isEdit ? "编辑政策法规" : "新增政策法规"}
+        title={isViewMode ? '查看政策法规' : isEdit ? '编辑政策法规' : '新增政策法规'}
         visible={modalVisible}
-        onOk={handleModalSubmit}
         onCancel={handleModalCancel}
         width={900}
         maskClosable={false}
         destroyOnClose
+        footer={
+          isViewMode
+            ? [
+                <Button key="close" onClick={handleModalCancel}>
+                  关闭
+                </Button>,
+              ]
+            : null
+        }
       >
-        <Form
-          form={modalForm}
-          layout="vertical"
-          name="policyForm"
-          preserve={false}
-        >
-          <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
-            <Switch />
-          </Form.Item>
-
-          <Tabs activeKey={activeTabKey} onChange={handleTabChange}>
-            <TabPane tab="中文版" key="zh">
-              <Form.Item
-                name="titleZh"
-                label="标题（中文）"
-                rules={[{ required: true, message: '请输入中文标题' }]}
-              >
-                <Input placeholder="请输入中文标题" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentZh"
-                label="正文内容（中文）"
-                rules={[{ required: true, message: '请输入中文正文' }]}
-              >
-                <WangEditor
-                  language="zh-CN"
-                  height="300px"
-                  placeholder="请输入中文正文内容..."
-                />
-              </Form.Item>
-            </TabPane>
-            <TabPane tab="英文版" key="en">
-              <Form.Item
-                name="titleEn"
-                label="标题（英文）"
-                rules={[{ required: true, message: 'Please enter title in English' }]}
-              >
-                <Input placeholder="Please enter title in English" />
-              </Form.Item>
-
-              <Form.Item
-                name="contentEn"
-                label="正文内容（英文）"
-                rules={[{ required: true, message: 'Please enter content in English' }]}
-              >
-                <WangEditor
-                  language="en"
-                  height="300px"
-                  placeholder="Please enter content in English..."
-                />
-              </Form.Item>
-            </TabPane>
-          </Tabs>
-        </Form>
+        {isViewMode && viewData ? (
+          // 查看详情模式
+          <PolicyManageInfo data={viewData} />
+        ) : (
+          // 编辑/新增模式
+          <PolicyManageForm
+            id={currentId}
+            isEdit={isEdit}
+            onSuccess={() => {
+              setModalVisible(false);
+              fetchPolicyList(1, pagination.pageSize, searchParams);
+            }}
+          />
+        )}
       </Modal>
     </div>
   );
diff --git a/src/pages/userQuestionManage/QuestionModal.tsx b/src/pages/userQuestionManage/QuestionModal.tsx
new file mode 100644
index 0000000..a3e8276
--- /dev/null
+++ b/src/pages/userQuestionManage/QuestionModal.tsx
@@ -0,0 +1,345 @@
+import React, { useState, useEffect } from 'react';
+import { Modal, Button, Form, Input, Switch, message, Descriptions, Divider, Card, Tag } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+import { answerQuestion } from '@/servers/api/userQuestion';
+// 引入字典
+import {
+  AnswerStatus,
+  AnswerStatusText,
+  AnswerStatusColor,
+  PublishStatus,
+  PublishStatusText,
+  PublishStatusColor,
+  TopStatus,
+  TopStatusText,
+  TopStatusColor
+} from '@/dicts/userQuestionDict';
+
+const { TextArea } = Input;
+
+interface QuestionModalProps {
+  visible: boolean;
+  onCancel: () => void;
+  question: any;
+  mode: 'view' | 'answer' | 'edit';
+  onSuccess: () => void;
+}
+
+/**
+ * 问题模态框组件 - 整合了查看详情、回答问题和编辑回答功能
+ */
+const QuestionModal: React.FC<QuestionModalProps> = ({
+  visible,
+  onCancel,
+  question,
+  mode,
+  onSuccess
+}) => {
+  const [form] = Form.useForm();
+  const [answerContent, setAnswerContent] = useState<string>('');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 初始化表单数据
+  useEffect(() => {
+    if (question) {
+      setAnswerContent(question.answerContent || '');
+
+      // 设置表单初始值
+      form.setFieldsValue({
+        answer: question.answerContent || '',
+        isPublished: question.isPublished === 1,
+        isTop: question.isTop === 1
+      });
+    }
+  }, [question, form]);
+
+  // 根据模式设置标题
+  const getModalTitle = () => {
+    switch (mode) {
+      case 'answer':
+        return '回答问题';
+      case 'edit':
+        return '编辑回答';
+      case 'view':
+      default:
+        return '问题详情';
+    }
+  };
+
+  // 获取发布状态标签
+  const getPublishTag = (isPublished: number) => {
+    return isPublished === 1 ?
+      <Tag color="green">已发布</Tag> :
+      <Tag color="orange">未发布</Tag>;
+  };
+
+  // 获取置顶状态标签
+  const getTopTag = (isTop: number) => {
+    return isTop === 1 ?
+      <Tag color="red">已置顶</Tag> :
+      <Tag color="default">未置顶</Tag>;
+  };
+
+  // 获取回答状态标签
+  const getAnswerStatusTag = (questionData: any) => {
+    if (questionData.answerContent && questionData.answerContent.trim() !== '') {
+      return <Tag color="green">已回答</Tag>;
+    } else if (questionData.isAnswer === '1') {
+      return <Tag color="blue">已阅</Tag>;
+    } else {
+      return <Tag color="orange">未阅</Tag>;
+    }
+  };
+
+  // 提交表单处理
+  const handleSubmit = () => {
+    form.validateFields().then(values => {
+      if (!answerContent || answerContent.trim() === '') {
+        message.error('请输入回答内容');
+        return;
+      }
+
+      const actionText = mode === 'answer' ? '提交回答' : '保存修改';
+
+      Modal.confirm({
+        title: `确认${actionText}`,
+        icon: <ExclamationCircleOutlined />,
+        content: mode === 'answer'
+          ? '确定要提交这个回答吗？提交后将变为已回答状态。'
+          : '确定要保存对此回答的修改吗？',
+        okText: '确定',
+        cancelText: '取消',
+        onOk: async () => {
+          setLoading(true);
+          try {
+            // 调用回答问题API
+            const response = await answerQuestion({
+              id: question.id,
+              answerContent,
+              isPublished: values.isPublished ? 1 : 0,
+              isTop: values.isTop ? 1 : 0
+            });
+
+            if (response && response.success) {
+              message.success(mode === 'answer' ? '回答提交成功' : '回答修改成功');
+              onSuccess();
+              onCancel();
+            } else {
+              message.error(response.message || `${actionText}失败`);
+            }
+          } catch (error) {
+            console.error(`${actionText}失败:`, error);
+            message.error(`${actionText}失败`);
+          } finally {
+            setLoading(false);
+          }
+        }
+      });
+    }).catch(errorInfo => {
+      console.log('表单验证失败:', errorInfo);
+    });
+  };
+
+  // 渲染查看模式内容
+  const renderViewContent = () => {
+    if (!question) return null;
+
+    return (
+      <div className="question-detail-view">
+        <Descriptions bordered column={2} size="small">
+          <Descriptions.Item label="标题" span={2}>
+            {question.title}
+          </Descriptions.Item>
+          <Descriptions.Item label="问题分类">
+            {question.type}
+          </Descriptions.Item>
+          <Descriptions.Item label="提问时间">
+            {question.askTime}
+          </Descriptions.Item>
+          <Descriptions.Item label="提问人">
+            {question.userName}
+          </Descriptions.Item>
+          <Descriptions.Item label="公司名称">
+            {question.companyName || '-'}
+          </Descriptions.Item>
+          <Descriptions.Item label="账号">
+            {question.fullName || '-'}
+          </Descriptions.Item>
+          <Descriptions.Item label="联系方式">
+            {question.contactDetails || '-'}
+          </Descriptions.Item>
+          <Descriptions.Item label="邮箱">
+            {question.email || '-'}
+          </Descriptions.Item>
+
+          {/* 只有已回答的问题才会显示以下字段 */}
+          {question.isAnswer === '1' && (
+            <>
+              <Descriptions.Item label="状态">
+                {getAnswerStatusTag(question)}
+              </Descriptions.Item>
+              <Descriptions.Item label="是否发布">
+                {getPublishTag(question.isPublished)}
+              </Descriptions.Item>
+              <Descriptions.Item label="是否置顶">
+                {getTopTag(question.isTop)}
+              </Descriptions.Item>
+              <Descriptions.Item label="回答时间">
+                {question.answerTime || '-'}
+              </Descriptions.Item>
+              <Descriptions.Item label="回答人">
+                {question.answerBy || '-'}
+              </Descriptions.Item>
+            </>
+          )}
+          {/* 未回答的问题显示状态 */}
+          {question.isAnswer !== '1' && (
+            <Descriptions.Item label="状态" span={2}>
+              {getAnswerStatusTag(question)}
+            </Descriptions.Item>
+          )}
+        </Descriptions>
+
+        <Divider orientation="left">问题内容</Divider>
+        <Card size="small" bordered={false} className="content-card">
+          <div className="question-content">
+            {question.content}
+          </div>
+        </Card>
+
+        {question.answerContent && (
+          <>
+            <Divider orientation="left">回答内容</Divider>
+            <Card size="small" bordered={false} className="content-card">
+              <div className="answer-content">
+                {question.answerContent}
+              </div>
+            </Card>
+          </>
+        )}
+      </div>
+    );
+  };
+
+  // 渲染编辑模式内容
+  const renderEditContent = () => {
+    if (!question) return null;
+
+    return (
+      <Form form={form} layout="vertical">
+        <div className="question-info-section">
+          <Descriptions bordered column={2} size="small">
+            <Descriptions.Item label="标题" span={2}>
+              {question.title}
+            </Descriptions.Item>
+            <Descriptions.Item label="问题分类">
+              {question.type}
+            </Descriptions.Item>
+            <Descriptions.Item label="提问时间">
+              {question.askTime}
+            </Descriptions.Item>
+            <Descriptions.Item label="提问人">
+              {question.userName}
+            </Descriptions.Item>
+            <Descriptions.Item label="公司名称">
+              {question.companyName || '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="账号">
+              {question.fullName || '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="联系方式">
+              {question.contactDetails || '-'}
+            </Descriptions.Item>
+            <Descriptions.Item label="邮箱">
+              {question.email || '-'}
+            </Descriptions.Item>
+          </Descriptions>
+
+          <Divider orientation="left">问题内容</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="question-content">
+              {question.content}
+            </div>
+          </Card>
+        </div>
+
+        <Divider orientation="left">回答内容</Divider>
+        <Form.Item
+          name="answer"
+          rules={[{ required: true, message: '请输入回答内容' }]}
+        >
+          <TextArea
+            rows={8}
+            placeholder="请输入回答内容"
+            value={answerContent}
+            onChange={(e) => setAnswerContent(e.target.value)}
+          />
+        </Form.Item>
+
+        <div className="question-settings">
+          <Form.Item name="isPublished" label="是否发布" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item name="isTop" label="是否置顶" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+        </div>
+      </Form>
+    );
+  };
+
+  // 渲染内容
+  const renderContent = () => {
+    if (!question) return null;
+
+    // 查看模式
+    if (mode === 'view') {
+      return renderViewContent();
+    }
+
+    // 回答或编辑模式
+    return renderEditContent();
+  };
+
+  // 渲染底部按钮
+  const renderFooter = () => {
+    if (mode === 'view') {
+      return [
+        <Button key="close" onClick={onCancel}>
+          关闭
+        </Button>
+      ];
+    }
+
+    // 回答或编辑模式的底部按钮
+    return [
+      <Button key="cancel" onClick={onCancel}>
+        取消
+      </Button>,
+      <Button
+        key="submit"
+        type="primary"
+        onClick={handleSubmit}
+        loading={loading}
+      >
+        {mode === 'answer' ? '提交回答' : '保存修改'}
+      </Button>
+    ];
+  };
+
+  return (
+    <Modal
+      title={getModalTitle()}
+      visible={visible}
+      onCancel={onCancel}
+      footer={renderFooter()}
+      width={800}
+      maskClosable={false}
+      destroyOnClose
+    >
+      {renderContent()}
+    </Modal>
+  );
+};
+
+export default QuestionModal;
diff --git a/src/pages/userQuestionManage/QuestionViewDetail.tsx b/src/pages/userQuestionManage/QuestionViewDetail.tsx
new file mode 100644
index 0000000..caf6372
--- /dev/null
+++ b/src/pages/userQuestionManage/QuestionViewDetail.tsx
@@ -0,0 +1,96 @@
+import React from 'react';
+import { Descriptions, Divider, Card, Tag } from 'antd';
+
+interface QuestionDetailProps {
+  question: any; // 可以改为具体的类型
+}
+
+/**
+ * 问题详情查看组件
+ */
+const QuestionViewDetail: React.FC<QuestionDetailProps> = ({ question }) => {
+  if (!question) return null;
+
+  // 获取发布状态标签
+  const getPublishTag = (isPublished: number) => {
+    return isPublished === 1 ?
+      <Tag color="green">已发布</Tag> :
+      <Tag color="orange">未发布</Tag>;
+  };
+
+  // 获取置顶状态标签
+  const getTopTag = (isTop: number) => {
+    return isTop === 1 ?
+      <Tag color="red">已置顶</Tag> :
+      <Tag color="default">未置顶</Tag>;
+  };
+
+  return (
+    <div className="question-detail-view">
+      <Descriptions bordered column={2} size="small">
+        <Descriptions.Item label="标题" span={2}>
+          {question.title}
+        </Descriptions.Item>
+        <Descriptions.Item label="问题分类">
+          {question.type}
+        </Descriptions.Item>
+        <Descriptions.Item label="提问时间">
+          {question.askTime}
+        </Descriptions.Item>
+        <Descriptions.Item label="提问人">
+          {question.userName}
+        </Descriptions.Item>
+        <Descriptions.Item label="公司名称">
+          {question.companyName}
+        </Descriptions.Item>
+        <Descriptions.Item label="账号">
+          {question.fullName}
+        </Descriptions.Item>
+        <Descriptions.Item label="联系方式">
+          {question.contactDetails}
+        </Descriptions.Item>
+        <Descriptions.Item label="邮箱">
+          {question.email}
+        </Descriptions.Item>
+
+        {/* 只有已回答的问题才会显示以下字段 */}
+        {question.isAnswer === '1' && (
+          <>
+            <Descriptions.Item label="是否发布">
+              {getPublishTag(question.isPublished)}
+            </Descriptions.Item>
+            <Descriptions.Item label="是否置顶">
+              {getTopTag(question.isTop)}
+            </Descriptions.Item>
+            <Descriptions.Item label="回答时间">
+              {question.answerTime}
+            </Descriptions.Item>
+            <Descriptions.Item label="回答人">
+              {question.answerBy || '-'}
+            </Descriptions.Item>
+          </>
+        )}
+      </Descriptions>
+
+      <Divider orientation="left">问题内容</Divider>
+      <Card size="small" bordered={false} className="content-card">
+        <div className="question-content">
+          {question.content}
+        </div>
+      </Card>
+
+      {question.answerContent && (
+        <>
+          <Divider orientation="left">回答内容</Divider>
+          <Card size="small" bordered={false} className="content-card">
+            <div className="answer-content">
+              {question.answerContent}
+            </div>
+          </Card>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default QuestionViewDetail;
diff --git a/src/pages/userQuestionManage/readQuestionManage.tsx b/src/pages/userQuestionManage/readQuestionManage.tsx
index 3eefdb6..fc5c949 100644
--- a/src/pages/userQuestionManage/readQuestionManage.tsx
+++ b/src/pages/userQuestionManage/readQuestionManage.tsx
@@ -1,37 +1,44 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'umi';
-import { Button, Table, Modal, message, Input, Form, Tooltip, Tag, Space, Switch } from 'antd';
+import { Button, Table, Modal, message, Input, Form, Tooltip, Tag, Space, Switch, TablePaginationConfig, Select } from 'antd';
 import {
   DeleteOutlined,
   ExclamationCircleOutlined,
-  SearchOutlined,
-  EyeOutlined
+  SearchOutlined
 } from '@ant-design/icons';
 import '../userQuestionManage/userQuestionManage.less';
-// 引入封装的WangEditor组件
-import WangEditor from '@/components/WangEidtor/WangEidtor';
+// 引入封装的组件
+import QuestionModal from './QuestionModal';
+// 引入API
+import {
+  getQuestionPage,
+  getQuestionDetail,
+  deleteQuestion,
+  batchDeleteQuestion
+} from '@/servers/api/userQuestion';
+// 引入字典
+import {
+  QuestionCategoryOptions,
+  AnswerStatus,
+  AnswerStatusText,
+  AnswerStatusColor,
+  PublishStatus
+} from '@/dicts/userQuestionDict';
 
-const { TextArea } = Input;
 const { confirm } = Modal;
+const { Option } = Select;
 
-// 用户提问类型定义
-interface QuestionItemType {
+// 用户提问类型定义，扩展API.QuestionRecord类型，添加key属性
+type QuestionItemType = API.QuestionRecord & {
   key: string;
-  id: string;
-  title: string;
-  category: string;
-  content: string;
-  answer: string;
-  username: string;
-  company: string;
-  account: string;
-  phone: string;
-  email: string;
-  createTime: string;
-  answerTime: string;
-  isPublished: boolean;
-  isTop: boolean;
-  status: string;
+};
+
+// 搜索参数类型
+interface SearchParams {
+  title?: string;
+  type?: string;
+  isAnswer?: number;
+  answerStatus?: string; // 添加回答状态筛选
 }
 
 const ReadQuestionManage: React.FC = () => {
@@ -40,9 +47,10 @@ const ReadQuestionManage: React.FC = () => {
   const [questionData, setQuestionData] = useState<QuestionItemType[]>([]);
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const [form] = Form.useForm();
-  const [detailModalVisible, setDetailModalVisible] = useState<boolean>(false);
+  const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [currentQuestion, setCurrentQuestion] = useState<QuestionItemType | null>(null);
-  const [pagination, setPagination] = useState({
+  const [modalMode, setModalMode] = useState<'view' | 'edit'>('view');
+  const [pagination, setPagination] = useState<TablePaginationConfig>({
     current: 1,
     pageSize: 10,
     total: 0,
@@ -50,226 +58,171 @@ const ReadQuestionManage: React.FC = () => {
     showQuickJumper: true,
     showTotal: (total: number) => `共 ${total} 条记录`,
   });
-  const [searchParams, setSearchParams] = useState<{
-    title?: string;
-    category?: string;
-  }>({});
+  const [searchParams, setSearchParams] = useState<SearchParams>({
+    isAnswer: 1 // 默认已回答
+  });
 
-  // 模拟数据
-  const mockData: QuestionItemType[] = [
-    {
-      key: '1',
-      id: '1',
-      title: '如何查询招标项目进度？',
-      category: '招标流程',
-      content: '我想了解如何在系统中查询我参与的招标项目的进度情况，有哪些步骤？',
-      answer: '<p>您好，感谢您的提问。</p><p>查询招标项目进度的步骤如下：</p><ol><li>登录系统后，点击顶部导航栏的"我的项目"</li><li>在左侧菜单选择"投标项目"</li><li>在项目列表中可以看到所有您参与的项目及其当前状态</li><li>点击具体项目可以查看详细的进度信息</li></ol><p>如有更多问题，请随时咨询。</p>',
-      username: '张三',
-      company: '上海航运有限公司',
-      account: 'zhangsan2024',
-      phone: '13812345678',
-      email: 'zhangsan@example.com',
-      createTime: '2024-05-10 09:30:45',
-      answerTime: '2024-05-10 14:20:30',
-      isPublished: true,
-      isTop: true,
-      status: '1'
-    },
-    {
-      key: '2',
-      id: '2',
-      title: '投标文件格式有什么要求？',
-      category: '投标指南',
-      content: '请问投标文件需要什么格式？是否有模板可以参考？文件大小有限制吗？',
-      answer: '<p>您好：</p><p>关于投标文件的要求如下：</p><p>1. 文件格式：PDF格式为主，技术文档可接受Word格式</p><p>2. 文件大小：单个文件不超过50MB</p><p>3. 模板下载：可在"资料下载"栏目中下载对应项目的投标文件模板</p><p>4. 命名规则：请按"公司名称-项目编号-文件类型"格式命名</p><p>请确保文件内容清晰可辨，签章完整。</p>',
-      username: '李四',
-      company: '北京建设工程有限公司',
-      account: 'lisi2024',
-      phone: '13987654321',
-      email: 'lisi@example.com',
-      createTime: '2024-05-12 11:20:15',
-      answerTime: '2024-05-12 16:45:22',
-      isPublished: true,
-      isTop: false,
-      status: '1'
-    },
-    {
-      key: '3',
-      id: '3',
-      title: '如何修改已提交的投标文件？',
-      category: '投标指南',
-      content: '我已经提交了投标文件，但发现有一处数据填写错误，请问如何修改？是否可以在截止日期前重新提交？',
-      answer: '<p>尊敬的用户：</p><p>关于修改已提交投标文件的问题，解答如下：</p><p>在投标截止时间前，您可以通过以下步骤修改已提交的文件：</p><ol><li>登录系统后进入"我的投标"页面</li><li>找到对应的项目，点击"撤回投标"按钮</li><li>系统会将投标状态改为"已撤回"</li><li>然后您可以点击"重新投标"，上传修改后的文件</li></ol><p>请注意，投标截止时间后将无法进行任何修改。建议您在提交前仔细核对所有信息。</p>',
-      username: '王五',
-      company: '广州海运集团',
-      account: 'wangwu2024',
-      phone: '13765432198',
-      email: 'wangwu@example.com',
-      createTime: '2024-05-15 14:30:00',
-      answerTime: '2024-05-15 17:10:45',
-      isPublished: false,
-      isTop: false,
-      status: '1'
-    },
-    {
-      key: '4',
-      id: '4',
-      title: '资质审核需要多长时间？',
-      category: '注册指南',
-      content: '我刚提交了供应商资质审核材料，请问大概需要多长时间能够完成审核？审核通过后是否会有通知？',
-      answer: '<p>您好！</p><p>关于资质审核时间的问题，回复如下：</p><p>1. 一般情况下，资质审核会在<strong>3-5个工作日</strong>内完成</p><p>2. 如材料齐全且符合要求，可能会更快完成审核</p><p>3. 审核结果将通过以下方式通知您：</p><ul><li>系统站内信</li><li>注册邮箱</li><li>预留手机短信</li></ul><p>如超过5个工作日仍未收到审核结果，建议您联系客服热线：400-123-4567。</p>',
-      username: '赵六',
-      company: '深圳科技有限公司',
-      account: 'zhaoliu2024',
-      phone: '13612345678',
-      email: 'zhaoliu@example.com',
-      createTime: '2024-05-18 10:15:30',
-      answerTime: '2024-05-20 09:25:10',
-      isPublished: true,
-      isTop: true,
-      status: '1'
-    },
-    {
-      key: '5',
-      id: '5',
-      title: '如何查看招标结果公示？',
-      category: '招标流程',
-      content: '我参与了贵公司的一个招标项目，现在已经截止，请问在哪里可以查看招标结果公示？',
-      answer: '<p>尊敬的用户：</p><p>查看招标结果公示的方法如下：</p><ol><li>访问平台首页，在顶部导航栏选择"信息公开"</li><li>在下拉菜单中选择"中标结果公示"</li><li>可以通过项目编号、项目名称或招标单位进行搜索</li><li>也可以在"我的项目"中查看您参与项目的结果状态</li></ol><p>根据相关规定，招标结果将在评标结束后的2个工作日内公示，公示期为3个工作日。</p><p>如有其他疑问，请随时咨询。</p>',
-      username: '钱七',
-      company: '天津贸易有限公司',
-      account: 'qianqi2024',
-      phone: '13898765432',
-      email: 'qianqi@example.com',
-      createTime: '2024-05-22 16:40:20',
-      answerTime: '2024-05-23 10:30:15',
-      isPublished: true,
-      isTop: false,
-      status: '1'
+  // 获取已回答的用户提问列表数据
+  const fetchQuestionList = async (
+    current: number = 1,
+    pageSize: number = 10,
+    params: SearchParams = searchParams,
+  ) => {
+    // 更新搜索参数状态
+    if (params !== searchParams) {
+      setSearchParams(params);
     }
-  ];
 
-  // 获取已回答的用户提问列表数据（使用模拟数据）
-  const fetchQuestionList = (current: number = 1, pageSize: number = 10) => {
     setLoading(true);
+    try {
+      // 构造请求参数
+      const requestParams: API.PageRequest = {
+        basePageRequest: {
+          pageNo: current,
+          pageSize: pageSize,
+        },
+        ...params,
+        isAnswer: 1, // 确保始终查询已回答的问题
+      };
 
-    // 模拟API请求延迟
-    setTimeout(() => {
-      // 根据搜索条件过滤数据
-      let filteredData = [...mockData];
-      if (searchParams.title) {
-        filteredData = filteredData.filter(item =>
-          item.title.toLowerCase().includes(searchParams.title!.toLowerCase())
-        );
+      const response = await getQuestionPage(requestParams);
+      if (response && response.success) {
+        const { records, total, current: currentPage, size } = response.data;
+
+        // 添加key属性用于表格
+        const formattedData = records.map((item: API.QuestionRecord) => ({
+          ...item,
+          key: item.id,
+        }));
+
+        setQuestionData(formattedData);
+        setPagination({
+          ...pagination,
+          current: currentPage,
+          pageSize: size,
+          total,
+        });
+      } else {
+        message.error(response.message || '获取问题列表失败');
       }
-      if (searchParams.category) {
-        filteredData = filteredData.filter(item =>
-          item.category === searchParams.category
-        );
-      }
-
-      // 计算分页数据
-      const startIndex = (current - 1) * pageSize;
-      const endIndex = startIndex + pageSize;
-      const paginatedData = filteredData.slice(startIndex, endIndex);
-
-      setQuestionData(paginatedData);
-      setPagination({
-        ...pagination,
-        current,
-        pageSize,
-        total: filteredData.length,
-      });
+    } catch (error) {
+      console.error('获取问题列表失败:', error);
+      message.error('获取问题列表失败');
+    } finally {
       setLoading(false);
-    }, 500);
+    }
   };
 
   // 首次加载时获取数据
   useEffect(() => {
-    fetchQuestionList();
+    fetchQuestionList(pagination.current, pagination.pageSize);
   }, []);
 
   // 处理搜索
-  const handleSearch = (values: any) => {
-    setSearchParams(values);
-    fetchQuestionList(1, pagination.pageSize);
+  const handleSearch = (values: SearchParams) => {
+    const params = {
+      ...values,
+      isAnswer: 1,
+      // 如果设置了answerStatus为已回答，则需要特殊处理
+      ...values.answerStatus === AnswerStatus.ANSWERED ? { hasAnswerContent: 1 } : {}
+    };
+    fetchQuestionList(1, pagination.pageSize, params);
+  };
+
+  // 获取问题详情
+  const fetchQuestionDetail = async (id: string, mode: 'view' | 'edit') => {
+    try {
+      const response = await getQuestionDetail(id);
+      if (response && response.success) {
+        const detailData = response.data;
+        const formattedDetail = {
+          ...detailData,
+          key: detailData.id
+        };
+
+        setCurrentQuestion(formattedDetail);
+        setModalMode(mode);
+        setModalVisible(true);
+      } else {
+        message.error(response.message || '获取问题详情失败');
+      }
+    } catch (error) {
+      console.error('获取问题详情失败:', error);
+      message.error('获取问题详情失败');
+    }
   };
 
   // 处理查看详情
   const handleView = (record: QuestionItemType) => {
-    setCurrentQuestion(record);
-    setDetailModalVisible(true);
+    fetchQuestionDetail(record.id, 'view');
   };
 
-  // 处理发布状态切换
-  const handlePublishChange = (checked: boolean, record: QuestionItemType) => {
-    const newData = questionData.map(item => {
-      if (item.id === record.id) {
-        return { ...item, isPublished: checked };
-      }
-      return item;
-    });
-    setQuestionData(newData);
-    message.success(`${checked ? '发布' : '取消发布'}成功`);
-  };
-
-  // 处理置顶状态切换
-  const handleTopChange = (checked: boolean, record: QuestionItemType) => {
-    const newData = questionData.map(item => {
-      if (item.id === record.id) {
-        return { ...item, isTop: checked };
-      }
-      return item;
-    });
-    setQuestionData(newData);
-    message.success(`${checked ? '置顶' : '取消置顶'}成功`);
+  // 处理编辑回答
+  const handleEdit = (record: QuestionItemType) => {
+    fetchQuestionDetail(record.id, 'edit');
   };
 
   // 处理删除
   const showDeleteConfirm = (record: QuestionItemType) => {
     confirm({
-      title: intl.formatMessage({ id: 'readQuestion.confirmDelete' }),
+      title: '确认删除',
       icon: <ExclamationCircleOutlined />,
-      content: `${intl.formatMessage({ id: 'readQuestion.question' })}: ${record.title}`,
-      okText: intl.formatMessage({ id: 'readQuestion.delete' }),
+      content: `确定要删除标题为"${record.title}"的问题吗？`,
+      okText: '删除',
       okType: 'danger',
-      cancelText: intl.formatMessage({ id: 'unreadQuestion.cancel' }),
+      cancelText: '取消',
       maskClosable: false,
-      onOk: () => {
-        // 模拟删除操作
-        const newData = questionData.filter(item => item.id !== record.id);
-        setQuestionData(newData);
-        message.success('删除成功');
+      onOk: async () => {
+        try {
+          const response = await deleteQuestion(record.id);
+          if (response && response.success) {
+            message.success('删除成功');
+            fetchQuestionList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+          } else {
+            message.error(response.message || '删除失败');
+          }
+        } catch (error) {
+          console.error('删除问题失败:', error);
+          message.error('删除失败');
+        }
       },
     });
   };
 
   // 处理表格分页变化
-  const handleTableChange = (newPagination: any) => {
-    fetchQuestionList(newPagination.current, newPagination.pageSize);
+  const handleTableChange = (newPagination: TablePaginationConfig) => {
+    fetchQuestionList(newPagination.current, newPagination.pageSize, searchParams);
   };
 
   // 处理批量删除
   const handleBatchDelete = () => {
     if (selectedRowKeys.length === 0) {
-      message.warning(intl.formatMessage({ id: 'readQuestion.selectRequired' }));
+      message.warning('请至少选择一条记录');
       return;
     }
 
     confirm({
-      title: intl.formatMessage({ id: 'readQuestion.batchDelete' }),
+      title: '批量删除',
       icon: <ExclamationCircleOutlined />,
-      content: intl.formatMessage({ id: 'readQuestion.batchDeleteConfirm' }),
-      okText: intl.formatMessage({ id: 'readQuestion.delete' }),
+      content: `确定要删除选中的 ${selectedRowKeys.length} 条记录吗？`,
+      okText: '删除',
       okType: 'danger',
-      cancelText: intl.formatMessage({ id: 'unreadQuestion.cancel' }),
+      cancelText: '取消',
       maskClosable: false,
-      onOk: () => {
-        // 模拟批量删除操作
-        const newData = questionData.filter(item => !selectedRowKeys.includes(item.key));
-        setQuestionData(newData);
-        setSelectedRowKeys([]);
-        message.success('批量删除成功');
+      onOk: async () => {
+        try {
+          const response = await batchDeleteQuestion(selectedRowKeys as string[]);
+          if (response && response.success) {
+            setSelectedRowKeys([]);
+            message.success('批量删除成功');
+            fetchQuestionList(pagination.current, pagination.pageSize, searchParams);
+          } else {
+            message.error(response.message || '批量删除失败');
+          }
+        } catch (error) {
+          console.error('批量删除失败:', error);
+          message.error('批量删除失败');
+        }
       },
     });
   };
@@ -287,16 +240,34 @@ const ReadQuestionManage: React.FC = () => {
   const hasSelected = selectedRowKeys.length > 0;
 
   // 问题分类选项
-  const categoryOptions = [
-    { value: '招标流程', label: '招标流程' },
-    { value: '投标指南', label: '投标指南' },
-    { value: '注册指南', label: '注册指南' },
-    { value: '系统操作', label: '系统操作' },
-    { value: '其他问题', label: '其他问题' },
-  ];
+  const categoryOptions = QuestionCategoryOptions;
+
+  // 获取回答状态标签
+  const getAnswerTag = (record: QuestionItemType) => {
+    if (record.answerContent && record.answerContent.trim() !== '') {
+      return <Tag color={AnswerStatusColor[AnswerStatus.ANSWERED]}>{AnswerStatusText[AnswerStatus.ANSWERED]}</Tag>;
+    } else {
+      return <Tag color={AnswerStatusColor[AnswerStatus.READ]}>{AnswerStatusText[AnswerStatus.READ]}</Tag>;
+    }
+  };
+
+  // 获取置顶状态标签
+  const getTopTag = (isTop: number) => {
+    return isTop === 1 ?
+      <Tag color="red">已置顶</Tag> :
+      null;
+  };
+
+
 
   // 表格列定义
   const columns = [
+    {
+      title: '序号',
+      render: (_: any, __: any, index: number) => index + 1,
+      width: 80,
+      align: 'center' as const,
+    },
     {
       title: '问题标题',
       dataIndex: 'title',
@@ -307,7 +278,7 @@ const ReadQuestionManage: React.FC = () => {
       render: (title: string, record: QuestionItemType) => (
         <Tooltip placement="topLeft" title={title}>
           <span>
-            {record.isTop && <Tag color="red" style={{ marginRight: 8 }}>置顶</Tag>}
+            {record.isTop === 1 && getTopTag(record.isTop)}
             {title}
           </span>
         </Tooltip>
@@ -315,84 +286,107 @@ const ReadQuestionManage: React.FC = () => {
     },
     {
       title: '问题分类',
-      dataIndex: 'category',
-      key: 'category',
-      width: 120,
+      dataIndex: 'type',
+      key: 'type',
+      width: 100,
+      align: 'center' as const,
     },
     {
       title: '提问人',
-      dataIndex: 'username',
-      key: 'username',
+      dataIndex: 'userName',
+      key: 'userName',
       width: 100,
+      align: 'center' as const,
     },
     {
       title: '公司',
-      dataIndex: 'company',
-      key: 'company',
-      width: 180,
+      dataIndex: 'companyName',
+      key: 'companyName',
+      width: 150,
       ellipsis: {
         showTitle: false,
       },
-      render: (company: string) => (
-        <Tooltip placement="topLeft" title={company}>
-          {company}
+      render: (companyName: string) => (
+        <Tooltip placement="topLeft" title={companyName}>
+          {companyName}
         </Tooltip>
       ),
     },
     {
       title: '账号',
-      dataIndex: 'account',
-      key: 'account',
+      dataIndex: 'fullName',
+      key: 'fullName',
       width: 120,
+      align: 'center' as const,
     },
     {
       title: '联系方式',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'contactDetails',
+      key: 'contactDetails',
       width: 120,
+      align: 'center' as const,
     },
     {
-      title: '提问时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
+      title: '邮箱',
+      dataIndex: 'email',
+      key: 'email',
       width: 150,
-      sorter: (a: QuestionItemType, b: QuestionItemType) =>
-        new Date(a.createTime).getTime() - new Date(b.createTime).getTime(),
-    },
-    {
-      title: '是否发布',
-      dataIndex: 'isPublished',
-      key: 'isPublished',
-      width: 100,
-      render: (isPublished: boolean, record: QuestionItemType) => (
-        <Switch
-          checked={isPublished}
-          onChange={(checked) => handlePublishChange(checked, record)}
-        />
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (email: string) => (
+        <Tooltip placement="topLeft" title={email}>
+          {email}
+        </Tooltip>
       ),
     },
     {
-      title: '是否置顶',
-      dataIndex: 'isTop',
-      key: 'isTop',
+      title: '提问时间',
+      dataIndex: 'askTime',
+      key: 'askTime',
+      width: 150,
+      align: 'center' as const,
+    },
+    {
+      title: '回答时间',
+      dataIndex: 'answerTime',
+      key: 'answerTime',
+      width: 150,
+      align: 'center' as const,
+    },
+    {
+      title: '回答人',
+      dataIndex: 'answerBy',
+      key: 'answerBy',
       width: 100,
-      render: (isTop: boolean, record: QuestionItemType) => (
-        <Switch
-          checked={isTop}
-          onChange={(checked) => handleTopChange(checked, record)}
-        />
+      align: 'center' as const,
+    },
+    {
+      title: '状态',
+      key: 'status',
+      width: 100,
+      align: 'center' as const,
+      render: (_: unknown, record: QuestionItemType) => (
+        <Space>
+          {getAnswerTag(record)}
+          {record.isPublished === 1 && <Tag color="green">已发布</Tag>}
+        </Space>
       ),
     },
     {
       title: '操作',
       key: 'action',
-      width: 150,
+      width: 200,
+      align: 'center' as const,
       render: (_: unknown, record: QuestionItemType) => (
         <Space>
-          <Button type="primary" icon={<EyeOutlined />} onClick={() => handleView(record)}>
+          <Button type="link" onClick={() => handleView(record)}>
             查看
           </Button>
-          <Button type="primary" danger onClick={() => showDeleteConfirm(record)}>
+          <Button type="link" onClick={() => handleEdit(record)}>
+            编辑回答
+          </Button>
+          <Button type="link" onClick={() => showDeleteConfirm(record)}>
             删除
           </Button>
         </Space>
@@ -413,15 +407,20 @@ const ReadQuestionManage: React.FC = () => {
           <Form.Item name="title" label="问题标题">
             <Input placeholder="请输入问题标题关键词" allowClear />
           </Form.Item>
-          <Form.Item name="category" label="问题分类">
-            <select className="ant-select" style={{ width: 150, height: 32, borderRadius: 2 }}>
-              <option value="">全部</option>
+          <Form.Item name="type" label="问题分类">
+            <Select placeholder="请选择问题分类" allowClear style={{ width: 150 }}>
               {categoryOptions.map(option => (
-                <option key={option.value} value={option.value}>
+                <Option key={option.value} value={option.value}>
                   {option.label}
-                </option>
+                </Option>
               ))}
-            </select>
+            </Select>
+          </Form.Item>
+          <Form.Item name="answerStatus" label="回答状态">
+            <Select placeholder="请选择状态" allowClear style={{ width: 120 }}>
+              <Option value={AnswerStatus.READ}>{AnswerStatusText[AnswerStatus.READ]}</Option>
+              <Option value={AnswerStatus.ANSWERED}>{AnswerStatusText[AnswerStatus.ANSWERED]}</Option>
+            </Select>
           </Form.Item>
           <Form.Item className="filter-btns">
             <Button type="primary" htmlType="submit" icon={<SearchOutlined />}>
@@ -432,8 +431,8 @@ const ReadQuestionManage: React.FC = () => {
               danger
               onClick={() => {
                 form.resetFields();
-                setSearchParams({});
-                fetchQuestionList(1, pagination.pageSize);
+                setSearchParams({ isAnswer: 1 });
+                fetchQuestionList(1, pagination.pageSize, { isAnswer: 1 });
               }}
             >
               重置
@@ -444,7 +443,6 @@ const ReadQuestionManage: React.FC = () => {
         <div className="right-buttons">
           <Button
             danger
-            icon={<DeleteOutlined />}
             onClick={handleBatchDelete}
             disabled={!hasSelected}
             loading={loading}
@@ -468,79 +466,18 @@ const ReadQuestionManage: React.FC = () => {
           loading={loading}
           onChange={handleTableChange}
           rowKey="id"
-          scroll={{ x: 1500 }}
+          scroll={{ x: 1300 }}
         />
       </div>
 
-      {/* 查看详情模态框 */}
-      <Modal
-        title="问题详情"
-        visible={detailModalVisible}
-        onCancel={() => setDetailModalVisible(false)}
-        footer={[
-          <Button key="close" onClick={() => setDetailModalVisible(false)}>
-            关闭
-          </Button>,
-        ]}
-        width={800}
-        maskClosable={false}
-      >
-        {currentQuestion && (
-          <div>
-            <div className="question-detail-header">
-              <h2>{currentQuestion.title}</h2>
-              <div className="question-meta">
-                <span>分类：{currentQuestion.category}</span>
-                <span>提问人：{currentQuestion.username}</span>
-                <span>提问时间：{currentQuestion.createTime}</span>
-              </div>
-            </div>
-
-            <div className="question-detail-section">
-              <h3>问题内容</h3>
-              <div className="question-detail-content">{currentQuestion.content}</div>
-            </div>
-
-            <div className="question-detail-section">
-              <h3>回答内容</h3>
-              <div className="answer-content-wrapper">
-                <div
-                  className="answer-content"
-                  dangerouslySetInnerHTML={{ __html: currentQuestion.answer }}
-                />
-              </div>
-            </div>
-
-            <div className="question-detail-footer">
-              <div className="question-settings">
-                <div className="setting-item">
-                  <span>是否发布：</span>
-                  <Switch
-                    checked={currentQuestion.isPublished}
-                    onChange={(checked) => {
-                      setCurrentQuestion({ ...currentQuestion, isPublished: checked });
-                      handlePublishChange(checked, currentQuestion);
-                    }}
-                  />
-                </div>
-                <div className="setting-item">
-                  <span>是否置顶：</span>
-                  <Switch
-                    checked={currentQuestion.isTop}
-                    onChange={(checked) => {
-                      setCurrentQuestion({ ...currentQuestion, isTop: checked });
-                      handleTopChange(checked, currentQuestion);
-                    }}
-                  />
-                </div>
-              </div>
-              <div className="answer-info">
-                <span>回答时间：{currentQuestion.answerTime}</span>
-              </div>
-            </div>
-          </div>
-        )}
-      </Modal>
+      {/* 使用封装的问题模态框组件 */}
+      <QuestionModal
+        visible={modalVisible}
+        onCancel={() => setModalVisible(false)}
+        question={currentQuestion}
+        mode={modalMode}
+        onSuccess={() => fetchQuestionList(pagination.current, pagination.pageSize, searchParams)}
+      />
     </div>
   );
 };
diff --git a/src/pages/userQuestionManage/unreadQuestionManage.tsx b/src/pages/userQuestionManage/unreadQuestionManage.tsx
index b97ef1c..9496eb8 100644
--- a/src/pages/userQuestionManage/unreadQuestionManage.tsx
+++ b/src/pages/userQuestionManage/unreadQuestionManage.tsx
@@ -1,36 +1,38 @@
 import React, { useState, useEffect } from 'react';
 import { useIntl } from 'umi';
-import { Button, Table, Modal, message, Input, Form, Tooltip, Tag, Space, Switch } from 'antd';
+import { Button, Table, Modal, message, Input, Form, Tooltip, Tag, Space, TablePaginationConfig } from 'antd';
 import {
   DeleteOutlined,
   ExclamationCircleOutlined,
-  SearchOutlined,
-  EditOutlined
+  SearchOutlined
 } from '@ant-design/icons';
 import '../userQuestionManage/userQuestionManage.less';
-// 引入封装的WangEditor组件
-import WangEditor from '@/components/WangEidtor/WangEidtor';
+// 引入封装的组件
+import QuestionModal from './QuestionModal';
+// 引入API
+import {
+  getQuestionPage,
+  getQuestionDetail,
+  markQuestionSeen,
+  markQuestionSeeEdit,
+  deleteQuestion,
+  batchDeleteQuestion
+} from '@/servers/api/userQuestion';
+// 引入字典
+import { QuestionCategoryOptions } from '@/dicts/userQuestionDict';
 
-const { TextArea } = Input;
 const { confirm } = Modal;
 
-// 用户提问类型定义
-interface QuestionItemType {
+// 用户提问类型定义，扩展API.QuestionRecord类型，添加key属性
+type QuestionItemType = API.QuestionRecord & {
   key: string;
-  id: string;
-  title: string;
-  category: string;
-  content: string;
-  answer: string;
-  username: string;
-  company: string;
-  account: string;
-  phone: string;
-  email: string;
-  createTime: string;
-  isPublished: boolean;
-  isTop: boolean;
-  status: string;
+};
+
+// 搜索参数类型
+interface SearchParams {
+  title?: string;
+  type?: string;
+  isAnswer?: number;
 }
 
 const UnreadQuestionManage: React.FC = () => {
@@ -39,11 +41,9 @@ const UnreadQuestionManage: React.FC = () => {
   const [questionData, setQuestionData] = useState<QuestionItemType[]>([]);
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const [form] = Form.useForm();
-  const [answerForm] = Form.useForm();
   const [answerModalVisible, setAnswerModalVisible] = useState<boolean>(false);
   const [currentQuestion, setCurrentQuestion] = useState<QuestionItemType | null>(null);
-  const [answerContent, setAnswerContent] = useState<string>('');
-  const [pagination, setPagination] = useState({
+  const [pagination, setPagination] = useState<TablePaginationConfig>({
     current: 1,
     pageSize: 10,
     total: 0,
@@ -51,220 +51,163 @@ const UnreadQuestionManage: React.FC = () => {
     showQuickJumper: true,
     showTotal: (total: number) => `共 ${total} 条记录`,
   });
-  const [searchParams, setSearchParams] = useState<{
-    title?: string;
-    category?: string;
-  }>({});
+  const [searchParams, setSearchParams] = useState<SearchParams>({
+    isAnswer: 0 // 默认未回答
+  });
 
-  // 模拟数据
-  const mockData: QuestionItemType[] = [
-    {
-      key: '1',
-      id: '1',
-      title: '如何获取招标文件？',
-      category: '招标流程',
-      content: '我是新注册的用户，想参与一个招标项目，但不知道如何获取招标文件，请问有哪些途径可以获取？是否需要支付费用？',
-      answer: '',
-      username: '刘一',
-      company: '杭州科技有限公司',
-      account: 'liuyi2024',
-      phone: '13712345678',
-      email: 'liuyi@example.com',
-      createTime: '2024-05-24 09:15:30',
-      isPublished: false,
-      isTop: false,
-      status: '0'
-    },
-    {
-      key: '2',
-      id: '2',
-      title: '供应商资质认证流程是什么？',
-      category: '注册指南',
-      content: '我们公司想成为贵平台的供应商，请问资质认证需要准备哪些材料？整个流程大概需要多长时间？',
-      answer: '',
-      username: '陈二',
-      company: '南京电子科技有限公司',
-      account: 'chener2024',
-      phone: '13887654321',
-      email: 'chener@example.com',
-      createTime: '2024-05-23 14:20:15',
-      isPublished: false,
-      isTop: false,
-      status: '0'
-    },
-    {
-      key: '3',
-      id: '3',
-      title: '系统登录异常如何解决？',
-      category: '系统操作',
-      content: '最近几天登录系统时经常提示"网络异常，请稍后再试"，但我的网络连接正常，请问这是什么原因？如何解决？',
-      answer: '',
-      username: '张三',
-      company: '上海航运有限公司',
-      account: 'zhangsan2024',
-      phone: '13812345678',
-      email: 'zhangsan@example.com',
-      createTime: '2024-05-22 16:45:20',
-      isPublished: false,
-      isTop: false,
-      status: '0'
-    },
-    {
-      key: '4',
-      id: '4',
-      title: '如何修改企业信息？',
-      category: '系统操作',
-      content: '我们公司最近更换了法人代表和公司地址，需要在系统中更新这些信息，请问应该如何操作？是否需要重新提交认证材料？',
-      answer: '',
-      username: '李四',
-      company: '北京建设工程有限公司',
-      account: 'lisi2024',
-      phone: '13987654321',
-      email: 'lisi@example.com',
-      createTime: '2024-05-21 11:30:45',
-      isPublished: false,
-      isTop: false,
-      status: '0'
-    },
-    {
-      key: '5',
-      id: '5',
-      title: '投标保证金如何缴纳？',
-      category: '投标指南',
-      content: '我想参与一个工程招标项目，要求缴纳投标保证金，请问保证金应该如何缴纳？有哪些注意事项？缴纳后如何确认到账？',
-      answer: '',
-      username: '王五',
-      company: '广州海运集团',
-      account: 'wangwu2024',
-      phone: '13765432198',
-      email: 'wangwu@example.com',
-      createTime: '2024-05-20 09:25:10',
-      isPublished: false,
-      isTop: false,
-      status: '0'
+  // 获取未回答的用户提问列表数据
+  const fetchQuestionList = async (
+    current: number = 1,
+    pageSize: number = 10,
+    params: SearchParams = searchParams,
+  ) => {
+    // 更新搜索参数状态
+    if (params !== searchParams) {
+      setSearchParams(params);
     }
-  ];
 
-  // 获取未回答的用户提问列表数据（使用模拟数据）
-  const fetchQuestionList = (current: number = 1, pageSize: number = 10) => {
     setLoading(true);
+    try {
+      // 构造请求参数
+      const requestParams: API.PageRequest = {
+        basePageRequest: {
+          pageNo: current,
+          pageSize: pageSize,
+        },
+        ...params,
+        isAnswer: 0, // 确保始终查询未回答的问题
+      };
 
-    // 模拟API请求延迟
-    setTimeout(() => {
-      // 根据搜索条件过滤数据
-      let filteredData = [...mockData];
-      if (searchParams.title) {
-        filteredData = filteredData.filter(item =>
-          item.title.toLowerCase().includes(searchParams.title!.toLowerCase())
-        );
+      const response = await getQuestionPage(requestParams);
+      if (response && response.success) {
+        const { records, total, current: currentPage, size } = response.data;
+
+        // 添加key属性用于表格
+        const formattedData = records.map((item: API.QuestionRecord) => ({
+          ...item,
+          key: item.id,
+        }));
+
+        setQuestionData(formattedData);
+        setPagination({
+          ...pagination,
+          current: currentPage,
+          pageSize: size,
+          total,
+        });
+      } else {
+        message.error(response.message || '获取问题列表失败');
       }
-      if (searchParams.category) {
-        filteredData = filteredData.filter(item =>
-          item.category === searchParams.category
-        );
-      }
-
-      // 计算分页数据
-      const startIndex = (current - 1) * pageSize;
-      const endIndex = startIndex + pageSize;
-      const paginatedData = filteredData.slice(startIndex, endIndex);
-
-      setQuestionData(paginatedData);
-      setPagination({
-        ...pagination,
-        current,
-        pageSize,
-        total: filteredData.length,
-      });
+    } catch (error) {
+      console.error('获取问题列表失败:', error);
+      message.error('获取问题列表失败');
+    } finally {
       setLoading(false);
-    }, 500);
+    }
   };
 
   // 首次加载时获取数据
   useEffect(() => {
-    fetchQuestionList();
+    fetchQuestionList(pagination.current, pagination.pageSize);
   }, []);
 
   // 处理搜索
-  const handleSearch = (values: any) => {
-    setSearchParams(values);
-    fetchQuestionList(1, pagination.pageSize);
+  const handleSearch = (values: SearchParams) => {
+    const params = { ...values, isAnswer: 0 };
+    fetchQuestionList(1, pagination.pageSize, params);
   };
 
   // 处理回答问题
-  const handleAnswer = (record: QuestionItemType) => {
-    setCurrentQuestion(record);
-    setAnswerContent('');
-    answerForm.resetFields();
-    setAnswerModalVisible(true);
-  };
+  const handleAnswer = async (record: QuestionItemType) => {
+    try {
+      // 先标记为已阅
+      const response = await markQuestionSeeEdit(record.id);
+      if (!response || !response.success) {
+        message.error(response?.message || '标记已阅失败');
+        return;
+      }
 
-  // 处理提交回答
-  const handleSubmitAnswer = () => {
-    if (!answerContent || answerContent.trim() === '') {
-      message.error('请输入回答内容');
-      return;
-    }
+      // 获取问题详情
+      const detailResponse = await getQuestionDetail(record.id);
+      if (detailResponse && detailResponse.success) {
+        const detailData = detailResponse.data;
+        const formattedDetail = {
+          ...detailData,
+          key: detailData.id
+        };
 
-    // 模拟提交回答
-    if (currentQuestion) {
-      // 在实际应用中，这里会调用API提交回答
-      message.success('回答提交成功');
-
-      // 从列表中移除已回答的问题
-      const newData = questionData.filter(item => item.id !== currentQuestion.id);
-      setQuestionData(newData);
-
-      setAnswerModalVisible(false);
-      setAnswerContent('');
+        setCurrentQuestion(formattedDetail);
+        setAnswerModalVisible(true);
+      } else {
+        message.error(detailResponse.message || '获取问题详情失败');
+      }
+    } catch (error) {
+      console.error('处理问题失败:', error);
+      message.error('操作失败，请稍后重试');
     }
   };
 
   // 处理删除
   const showDeleteConfirm = (record: QuestionItemType) => {
     confirm({
-      title: intl.formatMessage({ id: 'unreadQuestion.confirmDelete' }),
+      title: '确认删除',
       icon: <ExclamationCircleOutlined />,
-      content: `${intl.formatMessage({ id: 'unreadQuestion.question' })}: ${record.title}`,
-      okText: intl.formatMessage({ id: 'unreadQuestion.delete' }),
+      content: `确定要删除标题为"${record.title}"的问题吗？`,
+      okText: '删除',
       okType: 'danger',
-      cancelText: intl.formatMessage({ id: 'unreadQuestion.cancel' }),
+      cancelText: '取消',
       maskClosable: false,
-      onOk: () => {
-        // 模拟删除操作
-        const newData = questionData.filter(item => item.id !== record.id);
-        setQuestionData(newData);
-        message.success('删除成功');
+      onOk: async () => {
+        try {
+          const response = await deleteQuestion(record.id);
+          if (response && response.success) {
+            message.success('删除成功');
+            fetchQuestionList(pagination.current, pagination.pageSize, searchParams); // 重新加载数据
+          } else {
+            message.error(response.message || '删除失败');
+          }
+        } catch (error) {
+          console.error('删除问题失败:', error);
+          message.error('删除失败');
+        }
       },
     });
   };
 
   // 处理表格分页变化
-  const handleTableChange = (newPagination: any) => {
-    fetchQuestionList(newPagination.current, newPagination.pageSize);
+  const handleTableChange = (newPagination: TablePaginationConfig) => {
+    fetchQuestionList(newPagination.current, newPagination.pageSize, searchParams);
   };
 
   // 处理批量删除
   const handleBatchDelete = () => {
     if (selectedRowKeys.length === 0) {
-      message.warning(intl.formatMessage({ id: 'unreadQuestion.selectRequired' }));
+      message.warning('请至少选择一条记录');
       return;
     }
 
     confirm({
-      title: intl.formatMessage({ id: 'unreadQuestion.batchDelete' }),
+      title: '批量删除',
       icon: <ExclamationCircleOutlined />,
-      content: intl.formatMessage({ id: 'unreadQuestion.batchDeleteConfirm' }),
-      okText: intl.formatMessage({ id: 'unreadQuestion.delete' }),
+      content: `确定要删除选中的 ${selectedRowKeys.length} 条记录吗？`,
+      okText: '删除',
       okType: 'danger',
-      cancelText: intl.formatMessage({ id: 'unreadQuestion.cancel' }),
+      cancelText: '取消',
       maskClosable: false,
-      onOk: () => {
-        // 模拟批量删除操作
-        const newData = questionData.filter(item => !selectedRowKeys.includes(item.key));
-        setQuestionData(newData);
-        setSelectedRowKeys([]);
-        message.success('批量删除成功');
+      onOk: async () => {
+        try {
+          const response = await batchDeleteQuestion(selectedRowKeys as string[]);
+          if (response && response.success) {
+            setSelectedRowKeys([]);
+            message.success('批量删除成功');
+            fetchQuestionList(pagination.current, pagination.pageSize, searchParams);
+          } else {
+            message.error(response.message || '批量删除失败');
+          }
+        } catch (error) {
+          console.error('批量删除失败:', error);
+          message.error('批量删除失败');
+        }
       },
     });
   };
@@ -282,16 +225,16 @@ const UnreadQuestionManage: React.FC = () => {
   const hasSelected = selectedRowKeys.length > 0;
 
   // 问题分类选项
-  const categoryOptions = [
-    { value: '招标流程', label: '招标流程' },
-    { value: '投标指南', label: '投标指南' },
-    { value: '注册指南', label: '注册指南' },
-    { value: '系统操作', label: '系统操作' },
-    { value: '其他问题', label: '其他问题' },
-  ];
+  const categoryOptions = QuestionCategoryOptions;
 
   // 表格列定义
   const columns = [
+    {
+      title: '序号',
+      render: (_: any, __: any, index: number) => index + 1,
+      width: 80,
+      align: 'center' as const,
+    },
     {
       title: '问题标题',
       dataIndex: 'title',
@@ -307,47 +250,51 @@ const UnreadQuestionManage: React.FC = () => {
     },
     {
       title: '问题分类',
-      dataIndex: 'category',
-      key: 'category',
+      dataIndex: 'type',
+      key: 'type',
       width: 120,
+      align: 'center' as const,
     },
     {
       title: '提问人',
-      dataIndex: 'username',
-      key: 'username',
+      dataIndex: 'userName',
+      key: 'userName',
       width: 100,
+      align: 'center' as const,
     },
     {
       title: '公司',
-      dataIndex: 'company',
-      key: 'company',
-      width: 180,
+      dataIndex: 'companyName',
+      key: 'companyName',
+      width: 150,
       ellipsis: {
         showTitle: false,
       },
-      render: (company: string) => (
-        <Tooltip placement="topLeft" title={company}>
-          {company}
+      render: (companyName: string) => (
+        <Tooltip placement="topLeft" title={companyName}>
+          {companyName}
         </Tooltip>
       ),
     },
     {
       title: '账号',
-      dataIndex: 'account',
-      key: 'account',
+      dataIndex: 'fullName',
+      key: 'fullName',
       width: 120,
+      align: 'center' as const,
     },
     {
       title: '联系方式',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'contactDetails',
+      key: 'contactDetails',
       width: 120,
+      align: 'center' as const,
     },
     {
       title: '邮箱',
       dataIndex: 'email',
       key: 'email',
-      width: 180,
+      width: 150,
       ellipsis: {
         showTitle: false,
       },
@@ -359,22 +306,23 @@ const UnreadQuestionManage: React.FC = () => {
     },
     {
       title: '提问时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
+      dataIndex: 'askTime',
+      key: 'askTime',
       width: 150,
-      sorter: (a: QuestionItemType, b: QuestionItemType) =>
-        new Date(a.createTime).getTime() - new Date(b.createTime).getTime(),
+      align: 'center' as const,
     },
+
     {
       title: '操作',
       key: 'action',
       width: 150,
+      align: 'center' as const,
       render: (_: unknown, record: QuestionItemType) => (
         <Space>
-          <Button type="primary" icon={<EditOutlined />} onClick={() => handleAnswer(record)}>
+          <Button type="link" onClick={() => handleAnswer(record)}>
             回答
           </Button>
-          <Button type="primary" danger onClick={() => showDeleteConfirm(record)}>
+          <Button type="link" onClick={() => showDeleteConfirm(record)}>
             删除
           </Button>
         </Space>
@@ -395,7 +343,7 @@ const UnreadQuestionManage: React.FC = () => {
           <Form.Item name="title" label="问题标题">
             <Input placeholder="请输入问题标题关键词" allowClear />
           </Form.Item>
-          <Form.Item name="category" label="问题分类">
+          <Form.Item name="type" label="问题分类">
             <select className="ant-select" style={{ width: 150, height: 32, borderRadius: 2 }}>
               <option value="">全部</option>
               {categoryOptions.map(option => (
@@ -414,8 +362,8 @@ const UnreadQuestionManage: React.FC = () => {
               danger
               onClick={() => {
                 form.resetFields();
-                setSearchParams({});
-                fetchQuestionList(1, pagination.pageSize);
+                setSearchParams({ isAnswer: 0 });
+                fetchQuestionList(1, pagination.pageSize, { isAnswer: 0 });
               }}
             >
               重置
@@ -426,7 +374,6 @@ const UnreadQuestionManage: React.FC = () => {
         <div className="right-buttons">
           <Button
             danger
-            icon={<DeleteOutlined />}
             onClick={handleBatchDelete}
             disabled={!hasSelected}
             loading={loading}
@@ -454,68 +401,14 @@ const UnreadQuestionManage: React.FC = () => {
         />
       </div>
 
-      {/* 回答问题模态框 */}
-      <Modal
-        title="回答问题"
+      {/* 使用封装的问题模态框组件 */}
+      <QuestionModal
         visible={answerModalVisible}
         onCancel={() => setAnswerModalVisible(false)}
-        footer={[
-          <Button key="cancel" onClick={() => setAnswerModalVisible(false)}>
-            取消
-          </Button>,
-          <Button key="submit" type="primary" onClick={handleSubmitAnswer}>
-            提交回答
-          </Button>,
-        ]}
-        width={800}
-        maskClosable={false}
-      >
-        {currentQuestion && (
-          <div>
-            <div className="question-detail-header">
-              <h2>{currentQuestion.title}</h2>
-              <div className="question-meta">
-                <span>分类：{currentQuestion.category}</span>
-                <span>提问人：{currentQuestion.username}</span>
-                <span>提问时间：{currentQuestion.createTime}</span>
-              </div>
-            </div>
-
-            <div className="question-detail-section">
-              <h3>问题内容</h3>
-              <div className="question-detail-content">{currentQuestion.content}</div>
-            </div>
-
-            <Form form={answerForm} layout="vertical">
-              <div className="question-detail-section">
-                <h3>回答内容</h3>
-                <Form.Item
-                  name="answer"
-                  rules={[{ required: true, message: '请输入回答内容' }]}
-                >
-                  <WangEditor
-                    value={answerContent}
-                    onChange={setAnswerContent}
-                  />
-                </Form.Item>
-              </div>
-
-              <div className="question-settings">
-                <div className="setting-item">
-                  <Form.Item name="isPublished" valuePropName="checked" label="是否发布">
-                    <Switch />
-                  </Form.Item>
-                </div>
-                <div className="setting-item">
-                  <Form.Item name="isTop" valuePropName="checked" label="是否置顶">
-                    <Switch />
-                  </Form.Item>
-                </div>
-              </div>
-            </Form>
-          </div>
-        )}
-      </Modal>
+        question={currentQuestion}
+        mode="answer"
+        onSuccess={() => fetchQuestionList(pagination.current, pagination.pageSize, searchParams)}
+      />
     </div>
   );
 };
diff --git a/src/pages/userQuestionManage/userQuestionManage.less b/src/pages/userQuestionManage/userQuestionManage.less
index f62cac8..f684159 100644
--- a/src/pages/userQuestionManage/userQuestionManage.less
+++ b/src/pages/userQuestionManage/userQuestionManage.less
@@ -1,35 +1,41 @@
 .common-container {
-  background: #fff;
-  border-radius: 4px;
   padding: 24px;
+  background-color: #fff;
+  border-radius: 2px;
   min-height: calc(100vh - 184px);
 
   .filter-action-row {
     display: flex;
     justify-content: space-between;
     margin-bottom: 16px;
-    flex-wrap: wrap;
 
     .filter-form {
+      flex: 1;
       display: flex;
       flex-wrap: wrap;
       gap: 8px;
       margin-bottom: 16px;
 
       .filter-btns {
-        display: flex;
-        gap: 8px;
-        margin-bottom: 0;
+        margin-right: 0;
+
+        button {
+          margin-left: 8px;
+        }
       }
     }
 
     .right-buttons {
       display: flex;
       align-items: center;
-      gap: 8px;
+
+      button {
+        margin-left: 8px;
+      }
 
       .selected-count {
-        color: #999;
+        margin-left: 8px;
+        color: rgba(0, 0, 0, 0.45);
       }
     }
   }
@@ -90,27 +96,23 @@
 
   // 问题详情样式
   .question-detail-header {
-    margin-bottom: 20px;
+    margin-bottom: 24px;
     border-bottom: 1px solid #f0f0f0;
     padding-bottom: 16px;
 
     h2 {
-      margin-bottom: 12px;
+      margin-bottom: 8px;
       font-size: 18px;
-      font-weight: 600;
-      color: #333;
+      font-weight: 500;
     }
 
     .question-meta {
       display: flex;
       flex-wrap: wrap;
-      gap: 16px;
-      color: #666;
-      font-size: 14px;
 
       span {
-        display: inline-flex;
-        align-items: center;
+        margin-right: 16px;
+        color: rgba(0, 0, 0, 0.65);
       }
     }
   }
@@ -119,18 +121,17 @@
     margin-bottom: 24px;
 
     h3 {
+      margin-bottom: 8px;
       font-size: 16px;
       font-weight: 500;
-      margin-bottom: 12px;
-      color: #333;
     }
 
     .question-detail-content {
-      background-color: #f9f9f9;
       padding: 16px;
+      background-color: #f5f5f5;
       border-radius: 4px;
       white-space: pre-wrap;
-      line-height: 1.6;
+      word-break: break-all;
     }
 
     .answer-content-wrapper {
@@ -155,38 +156,77 @@
   }
 
   .question-detail-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 24px;
+    margin-top: 16px;
     padding-top: 16px;
     border-top: 1px solid #f0f0f0;
 
     .question-settings {
       display: flex;
-      gap: 24px;
+      margin-bottom: 16px;
 
       .setting-item {
         display: flex;
         align-items: center;
-        gap: 8px;
+        margin-right: 24px;
+
+        span {
+          margin-right: 8px;
+        }
+
+        .switch-wrapper {
+          display: flex;
+          align-items: center;
+
+          .status-indicator {
+            width: 8px;
+            height: 8px;
+            border-radius: 50%;
+            margin-right: 4px;
+
+            &.published {
+              background-color: #52c41a;
+            }
+
+            &.unpublished {
+              background-color: #faad14;
+            }
+
+            &.top {
+              background-color: #f5222d;
+            }
+
+            &.not-top {
+              background-color: #d9d9d9;
+            }
+          }
+        }
       }
     }
 
     .answer-info {
-      color: #666;
-      font-size: 14px;
+      display: flex;
+
+      span {
+        margin-right: 16px;
+        color: rgba(0, 0, 0, 0.45);
+      }
     }
   }
 
-  .question-settings {
-    display: flex;
-    gap: 40px;
-    margin-top: 16px;
+  .answer-form-container {
+    margin-bottom: 24px;
 
-    .setting-item {
+    .question-settings {
       display: flex;
-      align-items: center;
+      margin-top: 16px;
+
+      .ant-form-item {
+        margin-right: 24px;
+      }
+    }
+
+    .answer-content {
+      min-height: 100px;
     }
   }
 
@@ -196,3 +236,68 @@
     }
   }
 }
+
+// 问题查看容器
+.question-view-container {
+  padding: 0;
+}
+
+// 问题编辑容器
+.question-edit-container {
+  padding: 0;
+
+  .form-actions {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 24px;
+  }
+}
+
+// 新增问题详情查看样式
+.question-detail-view {
+  .ant-descriptions {
+    margin-bottom: 24px;
+  }
+
+  .content-card {
+    background-color: #f9f9f9;
+    margin-bottom: 24px;
+
+    .question-content,
+    .answer-content {
+      white-space: pre-wrap;
+      line-height: 1.6;
+      word-break: break-word;
+      padding: 16px 0;
+    }
+  }
+
+  .ant-card-body {
+    padding: 16px;
+  }
+
+  .ant-divider {
+    margin: 24px 0 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+// 添加合并后组件的样式
+.question-info-section {
+  margin-bottom: 24px;
+
+  .ant-descriptions {
+    margin-bottom: 16px;
+  }
+}
+
+.question-settings {
+  display: flex;
+  gap: 24px;
+  margin-top: 16px;
+
+  .ant-form-item {
+    margin-bottom: 0;
+  }
+}
diff --git a/src/pages/userQuestionManage/userQuestionManage.tsx b/src/pages/userQuestionManage/userQuestionManage.tsx
deleted file mode 100644
index 9720728..0000000
--- a/src/pages/userQuestionManage/userQuestionManage.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React from 'react';
-import { useIntl, history } from 'umi';
-import { Card, Row, Col, Button, Statistic } from 'antd';
-import { MessageOutlined, CheckCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
-import './userQuestionManage.less';
-
-const UserQuestionManage: React.FC = () => {
-  const intl = useIntl();
-
-  // 跳转到已阅问题页面
-  const goToReadQuestions = () => {
-    history.push('/readQuestionManage');
-  };
-
-  // 跳转到未阅问题页面
-  const goToUnreadQuestions = () => {
-    history.push('/unreadQuestionManage');
-  };
-
-  return (
-    <div className="common-container">
-      <h2 style={{ marginBottom: 24 }}>{intl.formatMessage({ id: 'userQuestion.title' })}</h2>
-
-      <Row gutter={24}>
-        <Col span={8}>
-          <Card hoverable>
-            <Statistic
-              title={intl.formatMessage({ id: 'userQuestion.title' })}
-              value={150}
-              prefix={<MessageOutlined />}
-              suffix="条"
-            />
-            <div style={{ marginTop: 16 }}>
-              <Button type="primary" onClick={() => history.push('/userQuestionManage')}>
-                {intl.formatMessage({ id: 'userQuestion.viewAll' })}
-              </Button>
-            </div>
-          </Card>
-        </Col>
-
-        <Col span={8}>
-          <Card hoverable onClick={goToUnreadQuestions}>
-            <Statistic
-              title={intl.formatMessage({ id: 'menu.未阅问题' })}
-              value={35}
-              valueStyle={{ color: '#ff4d4f' }}
-              prefix={<QuestionCircleOutlined />}
-              suffix="条"
-            />
-            <div style={{ marginTop: 16 }}>
-              <Button type="primary" danger onClick={goToUnreadQuestions}>
-                {intl.formatMessage({ id: 'userQuestion.reply' })}
-              </Button>
-            </div>
-          </Card>
-        </Col>
-
-        <Col span={8}>
-          <Card hoverable onClick={goToReadQuestions}>
-            <Statistic
-              title={intl.formatMessage({ id: 'menu.已阅问题' })}
-              value={115}
-              valueStyle={{ color: '#52c41a' }}
-              prefix={<CheckCircleOutlined />}
-              suffix="条"
-            />
-            <div style={{ marginTop: 16 }}>
-              <Button type="primary" style={{ backgroundColor: '#52c41a', borderColor: '#52c41a' }} onClick={goToReadQuestions}>
-                {intl.formatMessage({ id: 'userQuestion.view' })}
-              </Button>
-            </div>
-          </Card>
-        </Col>
-      </Row>
-
-      <div style={{ marginTop: 24 }}>
-        <h3>{intl.formatMessage({ id: 'userQuestion.description' })}</h3>
-        <p>{intl.formatMessage({ id: 'userQuestion.descriptionText' })}</p>
-      </div>
-    </div>
-  );
-};
-
-export default UserQuestionManage;
diff --git a/src/servers/api/about.ts b/src/servers/api/about.ts
index 17d9baa..4b48068 100644
--- a/src/servers/api/about.ts
+++ b/src/servers/api/about.ts
@@ -77,3 +77,4 @@ export async function updateAboutUs(params: AboutUsRequest) {
     data: params,
   });
 }
+ 
\ No newline at end of file
diff --git a/src/servers/api/help.ts b/src/servers/api/help.ts
index faaff14..64952f2 100644
--- a/src/servers/api/help.ts
+++ b/src/servers/api/help.ts
@@ -2,21 +2,30 @@ import request from '@/utils/request';
 
 // 获取帮助中心列表
 export async function getHelpList(params: API.HelpSearchParams) {
-  return request('/api/help/list', {
+  return request('/portals/helpqanda/getPage', {
     method: 'POST',
     data: {
       basePageRequest: {
         pageNo: params.pageNo || 1,
         pageSize: params.pageSize || 10,
       },
-      ...params,
+      title: params.title,
+      type: params.type,
+      status: params.status,
     },
   });
 }
 
+// 获取帮助详情
+export async function getHelpDetail(id: string) {
+  return request(`/portals/helpqanda/${id}`, {
+    method: 'GET',
+  });
+}
+
 // 添加帮助
 export async function addHelp(params: API.HelpRequest) {
-  return request('/api/help/add', {
+  return request('/portals/helpqanda', {
     method: 'POST',
     data: params,
   });
@@ -24,39 +33,68 @@ export async function addHelp(params: API.HelpRequest) {
 
 // 更新帮助
 export async function updateHelp(id: string, params: API.HelpRequest) {
-  return request(`/api/help/update/${id}`, {
+  return request('/portals/helpqanda', {
     method: 'PUT',
-    data: params,
+    data: {
+      ...params,
+      id,
+    },
   });
 }
 
 // 删除帮助
 export async function deleteHelp(id: string) {
-  return request(`/api/help/delete/${id}`, {
+  return request(`/portals/helpqanda/${id}`, {
     method: 'DELETE',
   });
 }
 
 // 批量删除帮助
 export async function batchDeleteHelp(ids: string[]) {
-  return request('/api/help/batchDelete', {
-    method: 'DELETE',
-    data: { ids },
+  // 由于没有提供批量删除接口，使用Promise.all进行多次单独删除
+  return Promise.all(ids.map(id => deleteHelp(id))).then(results => {
+    // 检查是否所有删除操作都成功
+    const allSuccess = results.every(res => res.success);
+    return {
+      success: allSuccess,
+      message: allSuccess ? '批量删除成功' : '部分删除失败',
+    };
   });
 }
 
 // 更新帮助状态（发布/下架）
 export async function updateHelpStatus(id: string, status: string) {
-  return request(`/api/help/updateStatus/${id}`, {
-    method: 'PUT',
-    data: { status },
-  });
+  // 根据状态决定调用上架还是下架接口
+  if (status === '1') {
+    // 上架
+    return request('/portals/helpqanda/up', {
+      method: 'POST',
+      data: { id },
+    });
+  } else {
+    // 下架
+    return request('/portals/helpqanda/down', {
+      method: 'POST',
+      data: { id },
+    });
+  }
 }
 
 // 更新帮助置顶状态
 export async function updateHelpTopStatus(id: string, isTop: string) {
-  return request(`/api/help/updateTop/${id}`, {
-    method: 'PUT',
-    data: { isTop },
+  // 根据接口规范，置顶状态的更新应包含在常规更新中
+  // 由于没有专门的置顶接口，这里需要先获取详情，然后更新
+  return getHelpDetail(id).then(res => {
+    if (res.success) {
+      const detail = res.data;
+      return updateHelp(id, {
+        ...detail,
+        isTop,
+      });
+    }
+    return {
+      success: false,
+      message: '获取详情失败，无法更新置顶状态',
+    };
   });
 }
diff --git a/src/servers/api/notice.ts b/src/servers/api/notice.ts
index d60d313..2b3d785 100644
--- a/src/servers/api/notice.ts
+++ b/src/servers/api/notice.ts
@@ -1,8 +1,8 @@
 import request from '@/utils/request';
 
 // 获取通知列表
-export async function getNoticeList(params: API.NoticeSearchParams) {
-  return request('/api/notices', {
+export async function getNoticeList(params: API.NoticeSearchParams & { pageNo?: number; pageSize?: number }) {
+  return request('/notices', {
     method: 'GET',
     params,
   });
@@ -10,14 +10,14 @@ export async function getNoticeList(params: API.NoticeSearchParams) {
 
 // 获取通知详情
 export async function getNoticeDetail(id: string) {
-  return request(`/api/notices/${id}`, {
+  return request(`/notices/${id}`, {
     method: 'GET',
   });
 }
 
 // 新增通知
 export async function addNotice(params: API.NoticeRequest) {
-  return request('/api/notices', {
+  return request('/notices', {
     method: 'POST',
     data: params,
   });
@@ -25,7 +25,7 @@ export async function addNotice(params: API.NoticeRequest) {
 
 // 更新通知
 export async function updateNotice(id: string, params: API.NoticeRequest) {
-  return request(`/api/notices/${id}`, {
+  return request(`/notices/${id}`, {
     method: 'PUT',
     data: params,
   });
@@ -33,14 +33,14 @@ export async function updateNotice(id: string, params: API.NoticeRequest) {
 
 // 删除通知
 export async function deleteNotice(id: string) {
-  return request(`/api/notices/${id}`, {
+  return request(`/notices/${id}`, {
     method: 'DELETE',
   });
 }
 
 // 批量删除通知
 export async function batchDeleteNotice(ids: string[]) {
-  return request('/api/notices/batch', {
+  return request('/notices/batch', {
     method: 'DELETE',
     data: { ids },
   });
@@ -48,7 +48,7 @@ export async function batchDeleteNotice(ids: string[]) {
 
 // 发布/下架通知
 export async function updateNoticeStatus(id: string, status: string) {
-  return request(`/api/notices/${id}/status`, {
+  return request(`/notices/${id}/status`, {
     method: 'PUT',
     data: { status },
   });
@@ -56,7 +56,7 @@ export async function updateNoticeStatus(id: string, status: string) {
 
 // 置顶/取消置顶通知
 export async function updateNoticeTopStatus(id: string, isTop: string) {
-  return request(`/api/notices/${id}/top`, {
+  return request(`/notices/${id}/top`, {
     method: 'PUT',
     data: { isTop },
   });
diff --git a/src/servers/api/typings.d.ts b/src/servers/api/typings.d.ts
index c973415..87d14c3 100644
--- a/src/servers/api/typings.d.ts
+++ b/src/servers/api/typings.d.ts
@@ -141,44 +141,34 @@ declare namespace API {
     }[];
   }[]
 
-  // 基础分页请求参数
-  export interface BasePageRequest {
+  // 通用响应类型
+  type Response<T = any> = {
+    success: boolean;
+    data: T;
+    message?: string;
+    code?: number;
+  };
+
+  // 分页响应类型
+  type PageResponse<T = any> = {
+    records: T[];
+    total: number;
+    size: number;
+    current: number;
+    pages: number;
+  };
+
+  // 基础分页请求
+  interface BasePageRequest {
     pageNo: number;
     pageSize: number;
-    [property: string]: unknown;
+    [property: string]: any;
   }
 
   // 分页请求参数
-  export interface PageRequest {
+  interface PageRequest {
     basePageRequest: BasePageRequest;
-    title?: string;
-    status?: string;
-    [property: string]: unknown;
-  }
-
-  // 基础响应格式
-  export interface Response<T = unknown> {
-    code: number;
-    data: T;
-    message: string;
-    success: boolean;
-    [property: string]: unknown;
-  }
-
-  // 分页数据响应
-  export interface PageResponse<T> {
-    countId: null;
-    current: number;
-    hitCount: boolean;
-    maxLimit: null;
-    optimizeCountSql: boolean;
-    orders: string[];
-    pages: number;
-    records: T[];
-    searchCount: boolean;
-    size: number;
-    total: number;
-    [property: string]: unknown;
+    [property: string]: any;
   }
 
   // 政策法规数据项
@@ -286,6 +276,8 @@ declare namespace API {
   export interface NoticeSearchParams {
     title?: string;
     status?: string;
+    pageNo?: number;
+    pageSize?: number;
   }
 
   // 帮助中心数据项
@@ -360,4 +352,61 @@ declare namespace API {
     pageNo?: number;
     pageSize?: number;
   }
+
+  // 用户问题记录类型
+  interface QuestionRecord {
+    id: string;
+    title: string;
+    type: string;
+    content: string;
+    answerContent?: string;
+    userName: string;
+    companyName: string;
+    fullName: string;
+    contactDetails: string;
+    email: string;
+    askTime: string;
+    answerTime?: string;
+    answerBy?: string;
+    isAnswer: string; // 0-未回答，1-已回答
+    isPublished?: number; // 0-未发布，1-已发布
+    isTop?: number; // 0-未置顶，1-已置顶
+    createTime?: string;
+    updateTime?: string;
+  }
+
+  // 问题列表请求参数
+  interface QuestionListRequest {
+    isAnswer?: number; // 0-未回答，1-已回答
+    title?: string;
+    type?: string;
+    [property: string]: any;
+  }
+
+  // 问题添加请求参数
+  interface QuestionAddRequest {
+    title: string;
+    content: string;
+    type: string;
+    fullName: string;
+    companyName: string;
+    userName: string;
+    contactDetails: string;
+    email: string;
+  }
+
+  // 问题回答请求参数
+  interface QuestionAnswerRequest {
+    id: string;
+    answerContent: string;
+    isPublished?: number; // 0-未发布，1-已发布
+    isTop?: number; // 0-未置顶，1-已置顶
+  }
+
+  // 问题状态更新请求参数
+  interface QuestionStatusRequest {
+    id: string;
+    isPublished?: number; // 0-未发布，1-已发布
+    isTop?: number; // 0-未置顶，1-已置顶
+  }
 }
diff --git a/src/servers/api/userQuestion.ts b/src/servers/api/userQuestion.ts
index d7051c6..519fac8 100644
--- a/src/servers/api/userQuestion.ts
+++ b/src/servers/api/userQuestion.ts
@@ -1,75 +1,81 @@
 import request from '@/utils/request';
 
-// 获取用户提问列表
-export async function getUserQuestions(params: API.UserQuestionSearchParams) {
-  return request('/api/userQuestion/list', {
-    method: 'POST',
-    data: {
-      basePageRequest: {
-        pageNo: params.pageNo || 1,
-        pageSize: params.pageSize || 10,
-      },
-      ...params,
-    },
+// 获取问题列表
+export async function getQuestionList(params: API.QuestionListRequest): Promise<API.Response<API.QuestionRecord[]>> {
+  return request('/portals/qanda', {
+    method: 'GET',
+    params,
   });
 }
 
-// 获取已回答的用户提问列表
-export async function getAnsweredQuestions(params: API.UserQuestionSearchParams) {
-  return request('/api/userQuestion/answered', {
+// 获取问题分页列表
+export async function getQuestionPage(params: API.PageRequest): Promise<API.Response<API.PageResponse<API.QuestionRecord>>> {
+  return request('/portals/qanda/getPage', {
     method: 'POST',
-    data: {
-      basePageRequest: {
-        pageNo: params.pageNo || 1,
-        pageSize: params.pageSize || 10,
-      },
-      ...params,
-      status: '1', // 已回答状态
-    },
+    data: params,
   });
 }
 
-// 获取未回答的用户提问列表
-export async function getUnansweredQuestions(params: API.UserQuestionSearchParams) {
-  return request('/api/userQuestion/unanswered', {
-    method: 'POST',
-    data: {
-      basePageRequest: {
-        pageNo: params.pageNo || 1,
-        pageSize: params.pageSize || 10,
-      },
-      ...params,
-      status: '0', // 未回答状态
-    },
+// 获取问题详情
+export async function getQuestionDetail(id: string): Promise<API.Response<API.QuestionRecord>> {
+  return request(`/portals/qanda/${id}`, {
+    method: 'GET',
   });
 }
 
-// 回复用户提问
-export async function replyQuestion(id: string, answer: string) {
-  return request(`/api/userQuestion/reply/${id}`, {
+// 回答问题
+export async function answerQuestion(params: API.QuestionAnswerRequest): Promise<API.Response<string>> {
+  return request('/portals/qanda', {
     method: 'PUT',
-    data: { answer },
+    data: params,
   });
 }
 
-// 删除用户提问
-export async function deleteQuestion(id: string) {
-  return request(`/api/userQuestion/delete/${id}`, {
+// 标记问题为已阅
+export async function markQuestionSeen(id: string): Promise<API.Response<string>> {
+  return request('/portals/qanda/seeEdit', {
+    method: 'POST',
+    data: {
+      id: id
+    },
+  });
+}
+
+// 标记问题为已阅（新增接口）
+export async function markQuestionSeeEdit(id: string): Promise<API.Response<string>> {
+  return request(`/portals/qanda/seeEdit`, {
+    method: 'POST',
+    data: { id },
+  });
+}
+
+// 更新问题状态（发布/置顶）
+export async function updateQuestionStatus(params: API.QuestionStatusRequest): Promise<API.Response<string>> {
+  return request('/portals/qanda/status', {
+    method: 'PUT',
+    data: params,
+  });
+}
+
+// 删除单个问题
+export async function deleteQuestion(id: string): Promise<API.Response<string>> {
+  return request(`/portals/qanda/${id}`, {
     method: 'DELETE',
   });
 }
 
-// 批量删除用户提问
-export async function batchDeleteQuestions(ids: string[]) {
-  return request('/api/userQuestion/batchDelete', {
+// 批量删除问题
+export async function batchDeleteQuestion(ids: string[]): Promise<API.Response<string>> {
+  return request('/portals/qanda/batch', {
     method: 'DELETE',
     data: { ids },
   });
 }
 
-// 获取用户提问详情
-export async function getQuestionDetail(id: string) {
-  return request(`/api/userQuestion/detail/${id}`, {
-    method: 'GET',
+// 添加问题
+export async function addQuestion(params: API.QuestionAddRequest): Promise<API.Response<string>> {
+  return request('/portals/qanda', {
+    method: 'POST',
+    data: params,
   });
 }