diff --git a/.codegraph/.gitignore b/.codegraph/.gitignore
index 9de0f16..d20c0fe 100644
--- a/.codegraph/.gitignore
+++ b/.codegraph/.gitignore
@@ -1,16 +1,5 @@
-# CodeGraph data files
-# These are local to each machine and should not be committed
-
-# Database
-*.db
-*.db-wal
-*.db-shm
-
-# Cache
-cache/
-
-# Logs
-*.log
-
-# Hook markers
-.dirty
+# CodeGraph data files — local to each machine, not for committing.
+# Ignore everything in .codegraph/ except this file itself, so transient
+# files (the database, daemon.pid, sockets, logs) never show up in git.
+*
+!.gitignore
diff --git a/config/proxy.ts b/config/proxy.ts
index 6a91cb1..3253cc7 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -44,6 +44,8 @@ export default {
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,
+      // 测试环境目前使用 IP 访问 HTTPS，证书域名不匹配；仅影响本地开发代理。
+      secure: false,
     },
     '/resumegenerator': {
       target: 'http://test.xjshzly.longbiosphere.com',
diff --git a/config/routes.ts b/config/routes.ts
index effdcfc..49833fc 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -48,6 +48,14 @@ export default [
         path: '/job-portal/list', // 职位列表
         component: './JobPortal/List',
       },
+      {
+        path: '/job-portal/job-fair', // 招聘会（线上、户外）
+        component: './JobPortal/JobFair',
+      },
+      {
+        path: '/job-portal/job-fair/detail', // 招聘会详情
+        component: './JobPortal/JobFair/Detail',
+      },
       {
         path: '/job-portal/detail', // 职位详情
         component: './JobPortal/Detail',
@@ -251,6 +259,11 @@ export default [
     name: 'company',
     path: '/company',
     routes: [
+      {
+        name: '企业信息',
+        path: '/company/info/index',
+        component: './Company/Info',
+      },
       {
         name: '企业资质审核详情',
         path: '/company/qualification-review/detail/:id',
@@ -265,21 +278,21 @@ export default [
       {
         name: '公共招聘会列表',
         path: '/jobfair/public-job-fair',
-        component: './Jobfair/Publicjobfair',
+        component: './Jobfair/PublicJobFair',
       },
       {
         name: '招聘会详情',
         path: '/jobfair/public-job-fair/detail',
-        component: './Jobfair/Publicjobfair/Detail',
+        component: './Jobfair/PublicJobFair/Detail',
         access: 'canViewPublicJobFairDetail',
       },
       {
         name: '报名人员',
         path: '/jobfair/public-job-fair/signups',
-        component: './Jobfair/Publicjobfair/Signups',
+        component: './Jobfair/PublicJobFair/Signups',
       },
       {
-        name: '户外招聘会管理',
+        name: '线下招聘会管理',
         path: '/jobfair/outdoor-fair',
         component: './Jobfair/Outdoorfair',
       },
@@ -294,7 +307,7 @@ export default [
         component: './Jobfair/Venueinfo/Detail',
       },
       {
-        name: '户外招聘会详情',
+        name: '线下招聘会详情',
         path: '/jobfair/outdoor-fair/detail',
         component: './Jobfair/Outdoorfair/Detail',
       },
diff --git a/scripts/deploy-production-frontend.sh b/scripts/deploy-production-frontend.sh
new file mode 100755
index 0000000..8160f7b
--- /dev/null
+++ b/scripts/deploy-production-frontend.sh
@@ -0,0 +1,135 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+
+# 正式环境部署参数固定在脚本中，避免通过环境变量误传到测试或其他服务器。
+readonly ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+readonly BUILD_DIR="${ROOT_DIR}/shihezi"
+readonly DEPLOY_HOST="47.111.103.66"
+readonly DEPLOY_USER="root"
+readonly DEPLOY_SSH_PORT="22"
+readonly DEPLOY_PATH="/opt/service/project/shz-admin/dist"
+
+DRY_RUN=0
+
+info() {
+  printf '\033[1;32m%s\033[0m\n' "$*"
+}
+
+error() {
+  printf '\033[1;31m%s\033[0m\n' "$*" >&2
+}
+
+die() {
+  error "$*"
+  exit 1
+}
+
+usage() {
+  cat <<'EOF'
+用法：
+  ./scripts/deploy-production-frontend.sh
+  ./scripts/deploy-production-frontend.sh --dry-run
+
+功能：
+  1. 使用 npm run build 构建当前 PC 前端
+  2. 将 shihezi/ 上传到正式服务器的 Nginx 静态目录
+  3. 校验远程 index.html，并比对本地与远程 SHA-256
+
+正式环境参数（固定）：
+  SSH 主机：root@47.111.103.66:22
+  静态目录：/opt/service/project/shz-admin/dist
+  访问前缀：/shihezi/
+
+参数：
+  --dry-run   只构建并检查产物，不连接服务器、不上传文件
+  -h, --help  显示帮助
+
+说明：
+  脚本不会自动安装依赖。若 node_modules 不存在，请先执行 npm install。
+  上传使用 rsync --delete，远程静态目录中本地没有的文件会被删除。
+  脚本使用当前用户已有的 SSH key/agent，不保存密码。
+EOF
+}
+
+parse_args() {
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --dry-run)
+        DRY_RUN=1
+        ;;
+      -h|--help)
+        usage
+        exit 0
+        ;;
+      *)
+        die "未知参数：$1（使用 --help 查看用法）"
+        ;;
+    esac
+    shift
+  done
+}
+
+validate_local_environment() {
+  command -v npm >/dev/null 2>&1 || die "未找到 npm"
+  command -v ssh >/dev/null 2>&1 || die "未找到 ssh"
+  command -v rsync >/dev/null 2>&1 || die "未找到 rsync"
+  command -v shasum >/dev/null 2>&1 || die "未找到 shasum，无法校验构建产物"
+
+  [[ -f "${ROOT_DIR}/package.json" ]] || die "未找到 ${ROOT_DIR}/package.json"
+  [[ -d "${ROOT_DIR}/node_modules" ]] || die "未找到 node_modules，请先执行 npm install"
+}
+
+build_frontend() {
+  info "开始构建正式前端：npm run build"
+  npm run build
+  [[ -s "${BUILD_DIR}/index.html" ]] || die "构建完成但未找到 ${BUILD_DIR}/index.html"
+  info "本地构建完成：${BUILD_DIR}"
+}
+
+check_production_access() {
+  local target="${DEPLOY_USER}@${DEPLOY_HOST}"
+  info "检查正式服务器目录：${target}:${DEPLOY_PATH}/"
+  ssh -o BatchMode=yes -o ConnectTimeout=10 -p "${DEPLOY_SSH_PORT}" "${target}" \
+    "test -d '${DEPLOY_PATH}' && test -w '${DEPLOY_PATH}'"
+}
+
+upload_frontend() {
+  local target="${DEPLOY_USER}@${DEPLOY_HOST}"
+  local ssh_command="ssh -o BatchMode=yes -o ConnectTimeout=10 -p ${DEPLOY_SSH_PORT}"
+
+  if [[ "${DRY_RUN}" == "1" ]]; then
+    info "DRY RUN：不会连接服务器或上传文件"
+    info "目标：${target}:${DEPLOY_PATH}/"
+    return
+  fi
+
+  check_production_access
+
+  info "上传构建产物：${BUILD_DIR}/ -> ${target}:${DEPLOY_PATH}/"
+  rsync -az --delete --delay-updates \
+    -e "${ssh_command}" \
+    "${BUILD_DIR}/" "${target}:${DEPLOY_PATH}/"
+
+  local local_hash
+  local remote_hash
+  local_hash="$(shasum -a 256 "${BUILD_DIR}/index.html" | awk '{print $1}')"
+  remote_hash="$(ssh -o BatchMode=yes -o ConnectTimeout=10 -p "${DEPLOY_SSH_PORT}" "${target}" \
+    "test -s '${DEPLOY_PATH}/index.html' && sha256sum '${DEPLOY_PATH}/index.html' | awk '{print \$1}'")"
+
+  [[ -n "${remote_hash}" ]] || die "远程 index.html 不存在或为空"
+  [[ "${local_hash}" == "${remote_hash}" ]] || die "远程 index.html 校验失败：本地 ${local_hash}，远程 ${remote_hash}"
+
+  info "正式前端部署完成：http://${DEPLOY_HOST}/shihezi/"
+  info "index.html SHA-256 校验通过：${local_hash}"
+}
+
+main() {
+  parse_args "$@"
+  cd "${ROOT_DIR}"
+  validate_local_environment
+  build_frontend
+  upload_frontend
+}
+
+main "$@"
diff --git a/src/components/JobComplaintModal/index.tsx b/src/components/JobComplaintModal/index.tsx
index 4a2b168..30f3a80 100644
--- a/src/components/JobComplaintModal/index.tsx
+++ b/src/components/JobComplaintModal/index.tsx
@@ -117,7 +117,7 @@ const JobComplaintModal: React.FC<JobComplaintModalProps> = ({
       open={open}
       onCancel={onCancel}
       width={600}
-      destroyOnClose
+      destroyOnHidden
       footer={
         <Space>
           <Button onClick={onCancel}>取消</Button>
diff --git a/src/components/JobPortalHeader/index.tsx b/src/components/JobPortalHeader/index.tsx
index deea569..983a39f 100644
--- a/src/components/JobPortalHeader/index.tsx
+++ b/src/components/JobPortalHeader/index.tsx
@@ -14,6 +14,7 @@ import {
   FileTextOutlined,
   HomeOutlined,
   BellOutlined,
+  CalendarOutlined,
   ReadOutlined,
   LoginOutlined,
   FundProjectionScreenOutlined,
@@ -102,6 +103,7 @@ const JobPortalHeader: React.FC<JobPortalHeaderProps> = ({
 
   // 判断激活导航（简化为 startsWith 匹配）
   const isHome = /^\/job-portal(\/(list|detail))?$/.test(location.pathname);
+  const isJobFair = location.pathname.startsWith('/job-portal/job-fair');
   const isResume = location.pathname.startsWith('/job-portal/resume');
   const isMine = location.pathname.startsWith('/job-portal/personal-center') || location.pathname.startsWith('/job-portal/profile');
   const isMessage = location.pathname.startsWith('/job-portal/message');
@@ -318,6 +320,14 @@ const JobPortalHeader: React.FC<JobPortalHeaderProps> = ({
             >
               找工作
             </Button>
+            <Button
+              type="text"
+              icon={<CalendarOutlined />}
+              onClick={() => handleNavClick('/job-portal/job-fair')}
+              className={`nav-btn${isJobFair ? ' active' : ''}`}
+            >
+              招聘会
+            </Button>
             <Button
               type="text"
               icon={<FileTextOutlined />}
diff --git a/src/pages/Company/Info/index.tsx b/src/pages/Company/Info/index.tsx
new file mode 100644
index 0000000..d77eb2d
--- /dev/null
+++ b/src/pages/Company/Info/index.tsx
@@ -0,0 +1,174 @@
+import React, { useEffect, useState } from 'react';
+import { Button, Card, Form, Input, message, Select, Space, Spin, TreeSelect } from 'antd';
+import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
+import { getDictValueEnum } from '@/services/system/dict';
+import { getCmsIndustryTreeList } from '@/services/classify/industry';
+import { getCmsCurrentCompany, putCmsCurrentCompany } from '@/services/company/list';
+import type { DictValueEnumObj } from '@/components/DictTag';
+
+const CompanyInfoPage: React.FC = () => {
+  const [form] = Form.useForm<API.CompanyList.Company>();
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [scaleEnum, setScaleEnum] = useState<DictValueEnumObj>({});
+  const [companyNatureEnum, setCompanyNatureEnum] = useState<DictValueEnumObj>({});
+  const [industryTree, setIndustryTree] = useState<any[]>([]);
+
+  useEffect(() => {
+    const loadCompanyInfo = async () => {
+      setLoading(true);
+      try {
+        const [companyRes, scaleData, companyNatureData, industryRes] = await Promise.all([
+          getCmsCurrentCompany(),
+          getDictValueEnum('scale', false, true),
+          getDictValueEnum('company_nature', false, true),
+          getCmsIndustryTreeList(),
+        ]);
+        if (companyRes.code !== 200 || !companyRes.data) {
+          message.error(companyRes.msg || '获取企业信息失败');
+          return;
+        }
+        form.setFieldsValue(companyRes.data);
+        setScaleEnum(scaleData);
+        setCompanyNatureEnum(companyNatureData);
+        if (industryRes?.code === 200 && industryRes.data) {
+          setIndustryTree(industryRes.data);
+        }
+      } catch {
+        message.error('获取企业信息失败，请稍后重试');
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    void loadCompanyInfo();
+  }, [form]);
+
+  const handleFinish = async (values: API.CompanyList.Company) => {
+    setSaving(true);
+    try {
+      const companyContactList = (values.companyContactList || [])
+        .filter((contact) => contact.contactPerson || contact.contactPersonPhone)
+        .map((contact) => ({
+          contactPerson: contact.contactPerson,
+          contactPersonPhone: contact.contactPersonPhone,
+        }));
+      const response = await putCmsCurrentCompany({
+        ...values,
+        companyNature: values.companyNature || '',
+        companyContactList,
+      });
+      if (response.code === 200) {
+        message.success('企业信息保存成功');
+        form.setFieldsValue({ ...values, companyContactList });
+      } else {
+        message.error(response.msg || '保存失败');
+      }
+    } catch {
+      message.error('保存失败，请稍后重试');
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <Card title="企业信息" style={{ margin: 24 }}>
+      <Spin spinning={loading}>
+        <Form<API.CompanyList.Company>
+          form={form}
+          layout="vertical"
+          onFinish={handleFinish}
+          style={{ maxWidth: 1100 }}
+        >
+          <Space align="start" size={24} style={{ display: 'flex' }}>
+            <Form.Item
+              name="name"
+              label="单位名称"
+              rules={[{ required: true, message: '请输入单位名称' }]}
+              style={{ flex: 1 }}
+            >
+              <Input placeholder="请输入单位名称" />
+            </Form.Item>
+            <Form.Item name="companyNature" label="企业性质" style={{ flex: 1 }}>
+              <Select allowClear options={Object.values(companyNatureEnum)} placeholder="请选择企业性质" />
+            </Form.Item>
+            <Form.Item
+              name="scale"
+              label="单位规模"
+              rules={[{ required: true, message: '请选择单位规模' }]}
+              style={{ flex: 1 }}
+            >
+              <Select options={Object.values(scaleEnum)} placeholder="请选择单位规模" />
+            </Form.Item>
+          </Space>
+
+          <Space align="start" size={24} style={{ display: 'flex' }}>
+            <Form.Item name="code" label="信用代码" style={{ flex: 1 }}>
+              <Input placeholder="请输入信用代码" />
+            </Form.Item>
+            <Form.Item name="industry" label="主要行业" style={{ flex: 1 }}>
+              <TreeSelect
+                allowClear
+                showSearch
+                treeData={industryTree}
+                treeNodeFilterProp="label"
+                fieldNames={{ label: 'label', value: 'id', children: 'children' }}
+                placeholder="请选择主要行业"
+                style={{ width: '100%' }}
+              />
+            </Form.Item>
+            <Form.Item name="location" label="单位地点" style={{ flex: 1 }}>
+              <Input placeholder="请输入单位地点" />
+            </Form.Item>
+          </Space>
+
+          <Form.Item name="registeredAddress" label="注册地址">
+            <Input placeholder="请输入注册地址" />
+          </Form.Item>
+          <Space align="start" size={24} style={{ display: 'flex' }}>
+            <Form.Item name="legalPerson" label="法人姓名" style={{ flex: 1 }}>
+              <Input placeholder="请输入法人姓名" />
+            </Form.Item>
+            <Form.Item name="legalPhone" label="法人联系方式" style={{ flex: 1 }}>
+              <Input placeholder="请输入法人联系方式" />
+            </Form.Item>
+          </Space>
+          <Form.Item name="description" label="单位介绍">
+            <Input.TextArea rows={6} placeholder="请输入单位介绍" />
+          </Form.Item>
+
+          <Form.Item label="企业联系人">
+            <Form.List name="companyContactList">
+              {(fields, { add, remove }) => (
+                <>
+                  {fields.map(({ key, name, ...restField }) => (
+                    <Space key={key} align="baseline" style={{ display: 'flex', marginBottom: 8 }}>
+                      <Form.Item {...restField} name={[name, 'contactPerson']}>
+                        <Input placeholder="联系人姓名" />
+                      </Form.Item>
+                      <Form.Item {...restField} name={[name, 'contactPersonPhone']}>
+                        <Input placeholder="联系电话" />
+                      </Form.Item>
+                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    </Space>
+                  ))}
+                  <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
+                    添加联系人
+                  </Button>
+                </>
+              )}
+            </Form.List>
+          </Form.Item>
+
+          <Form.Item>
+            <Button type="primary" htmlType="submit" loading={saving}>
+              保存企业信息
+            </Button>
+          </Form.Item>
+        </Form>
+      </Spin>
+    </Card>
+  );
+};
+
+export default CompanyInfoPage;
diff --git a/src/pages/Company/List/edit.tsx b/src/pages/Company/List/edit.tsx
index b41ee75..0aad5fa 100644
--- a/src/pages/Company/List/edit.tsx
+++ b/src/pages/Company/List/edit.tsx
@@ -13,7 +13,6 @@ import {
   PlusOutlined,
   MinusCircleOutlined,
   DeleteOutlined,
-  IdcardOutlined,
   PhoneOutlined,
   UserOutlined,
 } from '@ant-design/icons';
@@ -34,6 +33,7 @@ export type ListFormProps = {
   open: boolean;
   values?: Partial<API.CompanyList.Company>;
   scaleEnum?: DictValueEnumObj;
+  companyNatureEnum?: DictValueEnumObj;
 };
 
 const ListEdit: React.FC<ListFormProps> = (props) => {
@@ -80,7 +80,6 @@ const ListEdit: React.FC<ListFormProps> = (props) => {
           name="name"
           label="单位名称"
           placeholder="请输入单位名称"
-          disabled={!!props.values}
         />
         <ProFormSelect
           width="md"
@@ -89,16 +88,22 @@ const ListEdit: React.FC<ListFormProps> = (props) => {
           valueEnum={props.scaleEnum}
           placeholder="请选择单位规模"
           rules={[{ required: true, message: '请选择单位规模!' }]}
-          disabled={!!props.values}
         />
       </ProForm.Group>
+      <ProFormSelect
+        width="md"
+        name="companyNature"
+        label="企业性质"
+        valueEnum={props.companyNatureEnum}
+        placeholder="请选择企业性质"
+        fieldProps={{ allowClear: true }}
+      />
       <ProForm.Group>
         <ProFormText
           width="md"
           name="code"
           label="信用代码"
           placeholder="请输入信用代码"
-          disabled={!!props.values}
         />
         <ProFormTreeSelect
           name="industry"
@@ -106,7 +111,6 @@ const ListEdit: React.FC<ListFormProps> = (props) => {
           placeholder="请输入主要行业"
           allowClear
           width="md"
-          disabled={!!props.values}
           request={async () => {
             return getCmsIndustryTreeList().then((res) => {
               return res.data;
@@ -135,16 +139,34 @@ const ListEdit: React.FC<ListFormProps> = (props) => {
           name="location"
           label="单位地点"
           placeholder="请输入单位地点"
-          disabled={!!props.values}
         />
-        <ProFormTextArea
+        <ProFormText
           width="xl"
-          name="description"
-          label="单位介绍"
-          placeholder="请输入单位介绍"
-          disabled={!!props.values}
+          name="registeredAddress"
+          label="注册地址"
+          placeholder="请输入注册地址"
         />
       </ProForm.Group>
+      <ProForm.Group>
+        <ProFormText
+          width="md"
+          name="legalPerson"
+          label="法人姓名"
+          placeholder="请输入法人姓名"
+        />
+        <ProFormText
+          width="md"
+          name="legalPhone"
+          label="法人联系方式"
+          placeholder="请输入法人联系方式"
+        />
+      </ProForm.Group>
+      <ProFormTextArea
+        width="xl"
+        name="description"
+        label="单位介绍"
+        placeholder="请输入单位介绍"
+      />
 
       {/* 企业联系人动态表单 */}
       <ProForm.Item label="企业联系人">
@@ -206,6 +228,7 @@ export const CompanyDetailView = ({
   onCancel,
   record,
   scaleEnum,
+  companyNatureEnum,
   industryEnum,
   loading,
 }: {
@@ -213,11 +236,12 @@ export const CompanyDetailView = ({
   onCancel: () => void;
   record?: API.CompanyList.Company;
   scaleEnum?: DictValueEnumObj;
+  companyNatureEnum?: DictValueEnumObj;
   industryEnum?: DictValueEnumObj;
   loading?: boolean;
 }) => {
   const contacts = record?.companyContactList?.filter(
-    (c) => c.contactPerson || c.contactPersonPhone || c.position,
+    (c) => c.contactPerson || c.contactPersonPhone,
   );
 
   const statusTag =
@@ -254,6 +278,9 @@ export const CompanyDetailView = ({
               {record?.scale != null && record.scale !== '' && (
                 <DictTag enums={scaleEnum} value={record.scale} />
               )}
+              {record?.companyNature != null && record.companyNature !== '' && (
+                <DictTag enums={companyNatureEnum} value={record.companyNature} />
+              )}
               {statusTag}
               {record?.industry != null && record.industry !== '' ? (
                 <DictTag enums={industryEnum} value={record.industry} />
@@ -272,9 +299,25 @@ export const CompanyDetailView = ({
               <Descriptions.Item label="公司位置" span={2}>
                 {renderDetailText(record?.location as string)}
               </Descriptions.Item>
+              <Descriptions.Item label="企业性质">
+                {record?.companyNature ? (
+                  <DictTag enums={companyNatureEnum} value={record.companyNature} />
+                ) : (
+                  renderDetailText()
+                )}
+              </Descriptions.Item>
               <Descriptions.Item label="信用代码" span={2}>
                 {renderDetailText(record?.code)}
               </Descriptions.Item>
+              <Descriptions.Item label="注册地址">
+                {renderDetailText(record?.registeredAddress)}
+              </Descriptions.Item>
+              <Descriptions.Item label="法人姓名">
+                {renderDetailText(record?.legalPerson)}
+              </Descriptions.Item>
+              <Descriptions.Item label="法人联系方式">
+                {renderDetailText(record?.legalPhone)}
+              </Descriptions.Item>
             </Descriptions>
           </div>
 
@@ -307,12 +350,6 @@ export const CompanyDetailView = ({
                         <PhoneOutlined />
                         <span>{renderDetailText(contact.contactPersonPhone)}</span>
                       </div>
-                      {contact.position?.trim() ? (
-                        <div className="company-detail__contact-row">
-                          <IdcardOutlined />
-                          <span>{contact.position}</span>
-                        </div>
-                      ) : null}
                     </div>
                   </div>
                 ))}
diff --git a/src/pages/Company/List/index.tsx b/src/pages/Company/List/index.tsx
index c45dd35..40ee021 100644
--- a/src/pages/Company/List/index.tsx
+++ b/src/pages/Company/List/index.tsx
@@ -68,6 +68,7 @@ function ManagementList() {
   const [detailLoading, setDetailLoading] = useState<boolean>(false);
   const [detailData, setDetailData] = useState<API.CompanyList.Company | undefined>();
   const [scaleEnum, setScaleEnum] = useState<Record<string, any>>({});
+  const [companyNatureEnum, setCompanyNatureEnum] = useState<DictValueEnumObj>({});
   const [industryEnum, setIndustryEnum] = useState<DictValueEnumObj>({});
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);
   const [approvalStatus, setApprovalStatus] = useState<1 | 2>(1);
@@ -110,6 +111,9 @@ function ManagementList() {
     getDictValueEnum('scale', true, true).then((data) => {
       setScaleEnum(data);
     });
+    getDictValueEnum('company_nature', false, true).then((data) => {
+      setCompanyNatureEnum(data);
+    });
     getCmsIndustryTreeList().then((res) => {
       if (res?.data) {
         setIndustryEnum(flattenIndustryTree(res.data));
@@ -158,6 +162,14 @@ function ManagementList() {
         return <DictTag enums={scaleEnum} value={record.scale} />;
       },
     },
+    {
+      title: '企业性质',
+      dataIndex: 'companyNature',
+      valueType: 'select',
+      align: 'center',
+      valueEnum: companyNatureEnum,
+      render: (_, record) => <DictTag enums={companyNatureEnum} value={record.companyNature} />,
+    },
     {
       title: '公司位置',
       dataIndex: 'location',
@@ -350,9 +362,15 @@ function ManagementList() {
         onSubmit={async (values) => {
           let resData;
           if (values.companyId) {
-            resData = await putCmsCompanyList(values);
+            resData = await putCmsCompanyList({
+              ...values,
+              companyNature: values.companyNature || '',
+            });
           } else {
-            resData = await addCmsCompanyList(values);
+            resData = await addCmsCompanyList({
+              ...values,
+              companyNature: values.companyNature || '',
+            });
           }
           if (resData.code === 200) {
             setModalVisible(false);
@@ -367,6 +385,7 @@ function ManagementList() {
         }}
         values={currentRow}
         scaleEnum={scaleEnum}
+        companyNatureEnum={companyNatureEnum}
       />
 
       <CompanyDetailView
@@ -378,6 +397,7 @@ function ManagementList() {
         }}
         record={detailData}
         scaleEnum={scaleEnum}
+        companyNatureEnum={companyNatureEnum}
         industryEnum={industryEnum}
       />
 
diff --git a/src/pages/JobPortal/Detail/index.less b/src/pages/JobPortal/Detail/index.less
index e309ea7..30f11dd 100644
--- a/src/pages/JobPortal/Detail/index.less
+++ b/src/pages/JobPortal/Detail/index.less
@@ -69,6 +69,34 @@
       border: 1px solid @jp-primary-border;
     }
 
+    .job-detail-tags-card {
+      .job-detail-tag-groups {
+        display: flex;
+        flex-direction: column;
+        gap: 18px;
+      }
+
+      .job-detail-tag-group {
+        display: grid;
+        grid-template-columns: 128px minmax(0, 1fr);
+        align-items: start;
+        gap: 16px;
+      }
+
+      .job-detail-tag-label {
+        padding-top: 2px;
+        color: @jp-text-secondary;
+        font-weight: 600;
+        line-height: 24px;
+      }
+
+      .ant-tag {
+        margin-inline-end: 0;
+        padding: 2px 10px;
+        border-radius: 999px;
+      }
+    }
+
     .company-info-card {
       .company-overview {
         display: flex;
@@ -163,5 +191,10 @@
 @media (max-width: 768px) {
   .job-detail-page .job-detail-container {
     padding: 0 12px;
+
+    .job-detail-tags-card .job-detail-tag-group {
+      grid-template-columns: 1fr;
+      gap: 8px;
+    }
   }
 }
diff --git a/src/pages/JobPortal/Detail/index.tsx b/src/pages/JobPortal/Detail/index.tsx
index 339f835..45c1d55 100644
--- a/src/pages/JobPortal/Detail/index.tsx
+++ b/src/pages/JobPortal/Detail/index.tsx
@@ -42,6 +42,7 @@ import JobComplaintModal from '@/components/JobComplaintModal';
 import { getDictValueEnum } from '@/services/system/dict';
 import { getCmsIndustryTreeList } from '@/services/classify/industry';
 import type { DictValueEnumObj } from '@/components/DictTag';
+import { parseCommaSeparatedTags } from '@/utils/jobDetailTags';
 
 const { Title, Text, Paragraph } = Typography;
 
@@ -87,9 +88,13 @@ const transformJobData = (jobData: any) => {
       ? formatSalary(jobData.minSalary, jobData.maxSalary)
       : (jobData.salary || '面议'),
     location: jobData.jobLocation || jobData.location,
+    companyNature: jobData.companyNature || jobData.company?.companyNature || '',
     experience: jobData.experience ? experienceMap[jobData.experience] || jobData.experience : '不限',
     education: jobData.education ? educationMap[jobData.education] || jobData.education : '不限',
-    tags: jobData.tags || ['五险一金', '带薪年假', '年终奖'],
+    tags: Array.isArray(jobData.tags) ? jobData.tags : [],
+    salaryComposition: parseCommaSeparatedTags(jobData.salaryComposition),
+    welfareBenefits: parseCommaSeparatedTags(jobData.welfareBenefits),
+    workSchedule: parseCommaSeparatedTags(jobData.workSchedule),
     publishTime: jobData.publishTime || new Date().toISOString().split('T')[0],
     description: jobData.description || `
       <h3>职位职责：</h3>
@@ -137,7 +142,11 @@ const mockJobDetail = {
   location: '青岛·李沧区',
   experience: '3-5年',
   education: '本科',
-  tags: ['五险一金', '带薪年假', '年终奖', '定期体检'],
+  companyNature: '',
+  tags: [],
+  salaryComposition: [] as string[],
+  welfareBenefits: [] as string[],
+  workSchedule: [] as string[],
   publishTime: '2024-03-15',
   description: `
     <h3>职位职责：</h3>
@@ -193,15 +202,27 @@ const JobDetailPage: React.FC = () => {
     { item: '工作地', score: 0 }
   ]);
   const [scaleEnum, setScaleEnum] = useState<DictValueEnumObj>({});
+  const [companyNatureEnum, setCompanyNatureEnum] = useState<DictValueEnumObj>({});
   const [industryTree, setIndustryTree] = useState<any[]>([]);
   const [complaintVisible, setComplaintVisible] = useState(false);
 
+  const detailTagGroups = useMemo(
+    () => [
+      { label: '薪资范围与构成', values: jobDetail.salaryComposition },
+      { label: '福利待遇', values: jobDetail.welfareBenefits },
+      { label: '工作时间安排', values: jobDetail.workSchedule },
+    ].filter((group) => group.values.length > 0),
+    [jobDetail.salaryComposition, jobDetail.welfareBenefits, jobDetail.workSchedule],
+  );
+
   useEffect(() => {
     Promise.all([
       getDictValueEnum('scale', true, true),
+      getDictValueEnum('company_nature', false, true),
       getCmsIndustryTreeList(),
-    ]).then(([scaleData, industryRes]) => {
+    ]).then(([scaleData, companyNatureData, industryRes]) => {
       setScaleEnum(scaleData);
+      setCompanyNatureEnum(companyNatureData);
       if (industryRes?.code === 200 && industryRes?.data) {
         setIndustryTree(industryRes.data);
       }
@@ -243,6 +264,11 @@ const JobDetailPage: React.FC = () => {
       setJobDetail(transformedJobData);
       // 根据 isCollection 字段设置收藏状态
       setIsFavorited(passedJobData?.isCollection !== null && passedJobData?.isCollection !== 0 && passedJobData?.isCollection !== undefined);
+      // 列表卡片不携带详情标签；进入详情页后始终请求详情接口补齐完整岗位数据。
+      const passedJobId = passedJobData.jobId || passedJobData.id || id;
+      if (passedJobId) {
+        fetchJobDetailFromApi(String(passedJobId));
+      }
     } else {
       // 直接刷新页面时，从 URL 参数或 route param 获取 jobId，调 API 获取数据
       const jobIdFromUrl = searchParams.get('jobId');
@@ -507,6 +533,11 @@ const JobDetailPage: React.FC = () => {
                     </Text>
                   </Space>
                   <Space wrap>
+                    {jobDetail.companyNature && (
+                      <Tag color="blue">
+                        {getDictLabel(companyNatureEnum, jobDetail.companyNature)}
+                      </Tag>
+                    )}
                     {jobDetail.tags.map((tag, index) => (
                       <Tag key={index} color="blue">{tag}</Tag>
                     ))}
@@ -549,6 +580,23 @@ const JobDetailPage: React.FC = () => {
         <Row gutter={16}>
           {/* 左侧内容区 */}
           <Col span={16}>
+            {detailTagGroups.length > 0 && (
+              <Card title="岗位待遇与工作安排" className="info-card job-detail-tags-card">
+                <div className="job-detail-tag-groups">
+                  {detailTagGroups.map((group) => (
+                    <div className="job-detail-tag-group" key={group.label}>
+                      <div className="job-detail-tag-label">{group.label}</div>
+                      <Space wrap size={[8, 8]}>
+                        {group.values.map((value) => (
+                          <Tag color="blue" key={`${group.label}-${value}`}>{value}</Tag>
+                        ))}
+                      </Space>
+                    </div>
+                  ))}
+                </div>
+              </Card>
+            )}
+
             {/* 职位描述 */}
             <Card title="职位描述" className="info-card">
               <div
@@ -697,4 +745,3 @@ const JobDetailPage: React.FC = () => {
 };
 
 export default JobDetailPage;
-
diff --git a/src/pages/JobPortal/JobFair/Detail/index.less b/src/pages/JobPortal/JobFair/Detail/index.less
new file mode 100644
index 0000000..2192560
--- /dev/null
+++ b/src/pages/JobPortal/JobFair/Detail/index.less
@@ -0,0 +1,146 @@
+@import '../../theme.less';
+
+.portal-job-fair-detail-page {
+  .job-fair-detail-content {
+    .jp-page-container();
+    padding-top: 24px;
+    padding-bottom: 56px;
+  }
+
+  .job-fair-back {
+    margin: 0 0 12px;
+    padding: 0;
+  }
+
+  .job-fair-detail-card {
+    .jp-card-base();
+
+    .ant-card-body {
+      padding: 32px;
+    }
+  }
+
+  .job-fair-detail-title-row {
+    margin-bottom: 26px;
+
+    .ant-tag {
+      margin-bottom: 12px;
+    }
+
+    .ant-typography {
+      margin: 0;
+      color: @jp-text-primary;
+    }
+  }
+
+  .job-fair-detail-introduction {
+    margin-top: 28px;
+
+    .ant-typography {
+      color: @jp-text-primary;
+    }
+
+    p {
+      margin-bottom: 0;
+      white-space: pre-wrap;
+      color: @jp-text-secondary;
+      line-height: 1.85;
+    }
+  }
+
+  .job-fair-position-section {
+    margin-top: 28px;
+  }
+
+  .job-fair-position-heading {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    .ant-typography {
+      margin: 0;
+      color: @jp-text-primary;
+    }
+  }
+
+  .job-fair-position-card {
+    height: 100%;
+    .jp-card-base();
+    cursor: pointer;
+    transition: all 0.2s;
+
+    &:hover {
+      border-color: @jp-primary-border;
+      box-shadow: @jp-shadow-hover;
+    }
+
+    .job-header {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      gap: 8px;
+      margin-bottom: 10px;
+
+      .ant-typography {
+        flex: 1;
+        margin: 0;
+        color: @jp-text-primary;
+        font-size: 16px;
+        font-weight: 600;
+      }
+
+      .job-salary {
+        .jp-salary-text();
+        flex-shrink: 0;
+        font-size: 15px;
+        white-space: nowrap;
+      }
+    }
+
+    .job-company {
+      display: block;
+      margin-bottom: 10px;
+      color: @jp-text-muted;
+      font-size: 13px;
+    }
+
+    .job-info {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 8px;
+      margin-bottom: 10px;
+
+      .job-location,
+      .job-experience,
+      .job-education {
+        color: @jp-text-muted;
+        font-size: 12px;
+      }
+    }
+
+    .job-tags {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 6px;
+
+      .job-tag {
+        .jp-job-tag();
+        padding: 2px 8px;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+@media (max-width: 576px) {
+  .portal-job-fair-detail-page {
+    .job-fair-detail-content {
+      padding: 16px 12px 36px;
+    }
+
+    .job-fair-detail-card .ant-card-body {
+      padding: 20px;
+    }
+  }
+}
diff --git a/src/pages/JobPortal/JobFair/Detail/index.tsx b/src/pages/JobPortal/JobFair/Detail/index.tsx
new file mode 100644
index 0000000..119ea61
--- /dev/null
+++ b/src/pages/JobPortal/JobFair/Detail/index.tsx
@@ -0,0 +1,344 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { Button, Card, Col, Descriptions, Empty, Row, Spin, Tag, Typography } from 'antd';
+import {
+  ArrowLeftOutlined,
+  CalendarOutlined,
+  EnvironmentOutlined,
+  HomeOutlined,
+  PhoneOutlined,
+  TeamOutlined,
+} from '@ant-design/icons';
+import { history, useLocation } from '@umijs/max';
+import dayjs from 'dayjs';
+import JobPortalHeader from '@/components/JobPortalHeader';
+import {
+  getPortalJobFairDetail,
+  getPortalJobFairPositions,
+  type JobFairChannel,
+  type PortalJobFairItem,
+  type PortalJobFairPosition,
+} from '@/services/jobportal/jobFair';
+import '../index.less';
+import './index.less';
+
+const { Title, Paragraph } = Typography;
+
+interface JobFairDetailLocationState {
+  fair?: PortalJobFairItem;
+}
+
+function formatDateTime(value?: string) {
+  if (!value) {
+    return '暂未公布';
+  }
+  const date = dayjs(value.replace(' ', 'T'));
+  return date.isValid() ? date.format('YYYY年MM月DD日 HH:mm') : value;
+}
+
+const educationMap: Record<string, string> = {
+  '0': '学历不限',
+  '1': '大专',
+  '2': '本科',
+  '3': '硕士',
+  '4': '博士',
+};
+
+const experienceMap: Record<string, string> = {
+  '0': '经验不限',
+  '1': '1年以下',
+  '2': '1-3年',
+  '3': '3-5年',
+  '4': '5-10年',
+  '5': '10年以上',
+};
+
+function formatSalary(position: PortalJobFairPosition) {
+  const { minSalary, maxSalary } = position;
+  if (minSalary && maxSalary) {
+    return `${minSalary / 1000}K-${maxSalary / 1000}K`;
+  }
+  if (minSalary) {
+    return `${minSalary / 1000}K起`;
+  }
+  if (maxSalary) {
+    return `${maxSalary / 1000}K以下`;
+  }
+  return '薪资面议';
+}
+
+function formatRequirement(
+  value: string | undefined,
+  map: Record<string, string>,
+  fallback: string,
+) {
+  return value ? map[value] || value : fallback;
+}
+
+const PortalJobFairDetailPage: React.FC = () => {
+  const location = useLocation();
+  const fallbackDetail = (location.state as JobFairDetailLocationState | null)?.fair;
+  const { channel, jobFairId } = useMemo(() => {
+    const params = new URLSearchParams(location.search);
+    return {
+      channel: params.get('channel') === 'outdoor' ? 'outdoor' : 'online',
+      jobFairId: params.get('jobFairId') || '',
+    } as { channel: JobFairChannel; jobFairId: string };
+  }, [location.search]);
+  const [detail, setDetail] = useState<PortalJobFairItem>();
+  const [loading, setLoading] = useState(true);
+  const [positions, setPositions] = useState<PortalJobFairPosition[]>([]);
+  const [positionsLoading, setPositionsLoading] = useState(false);
+
+  useEffect(() => {
+    if (!jobFairId) {
+      setLoading(false);
+      return;
+    }
+
+    let cancelled = false;
+    const loadDetail = async () => {
+      setLoading(true);
+      try {
+        const response = await getPortalJobFairDetail(channel, jobFairId);
+        if (!cancelled && response?.code === 200) {
+          setDetail(response.data || fallbackDetail);
+        } else if (!cancelled) {
+          setDetail(fallbackDetail);
+        }
+      } catch (error) {
+        if (!cancelled) {
+          setDetail(fallbackDetail);
+        }
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
+      }
+    };
+
+    void loadDetail();
+    return () => {
+      cancelled = true;
+    };
+  }, [channel, fallbackDetail, jobFairId]);
+
+  useEffect(() => {
+    if (!jobFairId || channel === 'outdoor') {
+      setPositions([]);
+      setPositionsLoading(false);
+      return;
+    }
+
+    let cancelled = false;
+    const loadPositions = async () => {
+      setPositionsLoading(true);
+      try {
+        const response = await getPortalJobFairPositions(jobFairId);
+        if (!cancelled) {
+          setPositions(response?.code === 200 ? response.data || [] : []);
+        }
+      } catch (error) {
+        if (!cancelled) {
+          setPositions([]);
+        }
+      } finally {
+        if (!cancelled) {
+          setPositionsLoading(false);
+        }
+      }
+    };
+
+    void loadPositions();
+    return () => {
+      cancelled = true;
+    };
+  }, [channel, jobFairId]);
+
+  const backToList = () => history.push('/job-portal/job-fair');
+
+  const handlePositionClick = (position: PortalJobFairPosition) => {
+    if (!position.jobId) {
+      return;
+    }
+    history.push(`/job-portal/detail?jobId=${encodeURIComponent(String(position.jobId))}`, {
+      jobData: position,
+    });
+  };
+
+  return (
+    <div className="portal-job-fair-page portal-job-fair-detail-page job-portal-page-root">
+      <JobPortalHeader showSearch={false} showHotJobs={false} />
+      <main className="job-fair-detail-content">
+        <Button
+          className="job-fair-back"
+          icon={<ArrowLeftOutlined />}
+          onClick={backToList}
+          type="link"
+        >
+          返回招聘会列表
+        </Button>
+        <Spin spinning={loading}>
+          {detail ? (
+            <Card className="job-fair-detail-card" variant="borderless">
+              <div className="job-fair-detail-title-row">
+                <div>
+                  <Tag color={channel === 'outdoor' ? 'cyan' : 'blue'}>
+                    {channel === 'outdoor' ? '线下招聘会' : '线上招聘会'}
+                  </Tag>
+                  <Title level={2}>{detail.jobFairTitle}</Title>
+                </div>
+              </div>
+              <Descriptions bordered column={{ lg: 2, md: 2, sm: 1, xs: 1 }}>
+                <Descriptions.Item
+                  label={
+                    <>
+                      <CalendarOutlined /> 举办时间
+                    </>
+                  }
+                >
+                  {formatDateTime(detail.jobFairStartTime)} 至{' '}
+                  {formatDateTime(detail.jobFairEndTime)}
+                </Descriptions.Item>
+                <Descriptions.Item
+                  label={
+                    <>
+                      <EnvironmentOutlined /> 举办地点
+                    </>
+                  }
+                >
+                  {detail.jobFairAddress || detail.jobFairVenueName || '暂未公布'}
+                </Descriptions.Item>
+                <Descriptions.Item
+                  label={
+                    <>
+                      <TeamOutlined /> 主办单位
+                    </>
+                  }
+                >
+                  {detail.jobFairHostUnit || detail.jobFairOrganizeUnit || '暂未公布'}
+                </Descriptions.Item>
+                {detail.jobFairRegion && (
+                  <Descriptions.Item
+                    label={
+                      <>
+                        <HomeOutlined /> 举办区域
+                      </>
+                    }
+                  >
+                    {detail.jobFairRegion}
+                  </Descriptions.Item>
+                )}
+                {detail.boothNum && (
+                  <Descriptions.Item label="展位数量">{detail.boothNum}</Descriptions.Item>
+                )}
+                {channel === 'outdoor' && detail.boothMapCount !== undefined && (
+                  <Descriptions.Item label="摊位数量">{detail.boothMapCount}</Descriptions.Item>
+                )}
+                {detail.jobFairPhone && (
+                  <Descriptions.Item
+                    label={
+                      <>
+                        <PhoneOutlined /> 联系电话
+                      </>
+                    }
+                  >
+                    {detail.jobFairPhone}
+                  </Descriptions.Item>
+                )}
+              </Descriptions>
+              <section className="job-fair-detail-introduction">
+                <Title level={4}>招聘会简介</Title>
+                <Paragraph>{detail.jobFairIntroduction || '暂未提供招聘会简介。'}</Paragraph>
+              </section>
+              {channel === 'outdoor' && (
+                <section className="job-fair-detail-introduction">
+                  <Title level={4}>招聘会整体流程</Title>
+                  <Paragraph>{detail.jobFairProcess || '暂未提供招聘会整体流程。'}</Paragraph>
+                </section>
+              )}
+            </Card>
+          ) : (
+            !loading && (
+              <Empty description={jobFairId ? '未找到该招聘会信息' : '缺少招聘会参数'}>
+                <Button onClick={backToList} type="primary">
+                  返回招聘会列表
+                </Button>
+              </Empty>
+            )
+          )}
+        </Spin>
+        {channel === 'online' && detail && (
+          <section className="job-fair-position-section" aria-live="polite">
+            <div className="job-fair-position-heading">
+              <Title level={3}>招聘岗位</Title>
+              <Typography.Text type="secondary">共 {positions.length} 个岗位</Typography.Text>
+            </div>
+            <Spin spinning={positionsLoading}>
+              {positions.length ? (
+                <Row gutter={[16, 16]}>
+                  {positions.map((position, index) => (
+                    <Col
+                      key={position.fairRelationId || position.jobId || index}
+                      md={6}
+                      sm={12}
+                      xs={24}
+                    >
+                      <Card
+                        className="job-fair-position-card"
+                        hoverable
+                        onClick={() => handlePositionClick(position)}
+                      >
+                        <div className="job-header">
+                          <Title level={4}>
+                            {position.isUrgent === 1 && (
+                              <Tag
+                                color="red"
+                                style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }}
+                              >
+                                急聘
+                              </Tag>
+                            )}
+                            {position.jobTitle || '未命名岗位'}
+                          </Title>
+                          <Typography.Text className="job-salary">
+                            {formatSalary(position)}
+                          </Typography.Text>
+                        </div>
+                        <Typography.Text className="job-company">
+                          {position.companyName || '招聘企业暂未公布'}
+                        </Typography.Text>
+                        <div className="job-info">
+                          <Typography.Text className="job-location">
+                            <EnvironmentOutlined />{' '}
+                            {position.jobLocation || position.jobAddress || '地点不限'}
+                          </Typography.Text>
+                          <Typography.Text className="job-experience">
+                            {formatRequirement(position.experience, experienceMap, '经验不限')}
+                          </Typography.Text>
+                          <Typography.Text className="job-education">
+                            {formatRequirement(position.education, educationMap, '学历不限')}
+                          </Typography.Text>
+                        </div>
+                        {position.vacancies && (
+                          <div className="job-tags">
+                            <Tag className="job-tag">招聘 {position.vacancies} 人</Tag>
+                          </div>
+                        )}
+                      </Card>
+                    </Col>
+                  ))}
+                </Row>
+              ) : (
+                !positionsLoading && (
+                  <Empty description="暂未发布招聘岗位" image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                )
+              )}
+            </Spin>
+          </section>
+        )}
+      </main>
+    </div>
+  );
+};
+
+export default PortalJobFairDetailPage;
diff --git a/src/pages/JobPortal/JobFair/index.less b/src/pages/JobPortal/JobFair/index.less
new file mode 100644
index 0000000..4e4b926
--- /dev/null
+++ b/src/pages/JobPortal/JobFair/index.less
@@ -0,0 +1,353 @@
+@import '../theme.less';
+
+.portal-job-fair-page {
+  min-height: 100vh;
+
+  .job-fair-content {
+    .jp-page-container();
+    padding-top: 28px;
+    padding-bottom: 56px;
+  }
+
+  .job-fair-hero {
+    position: relative;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    min-height: 128px;
+    padding: 24px 38px;
+    border-radius: @jp-radius-lg;
+    color: #fff;
+    background: linear-gradient(120deg, #0d6efd, #21a3ee);
+    box-shadow: 0 10px 28px rgba(24, 144, 255, 0.22);
+
+    .ant-typography {
+      color: #fff;
+      margin-bottom: 6px;
+    }
+
+    .job-fair-hero-icon {
+      opacity: 0.18;
+      font-size: 90px;
+    }
+  }
+
+  .job-fair-panel,
+  .fair-calendar-card,
+  .fair-summary-card,
+  .fair-card {
+    .jp-card-base();
+  }
+
+  .job-fair-panel {
+    margin-top: 22px;
+    padding: 0 24px 20px;
+
+    .job-fair-tabs {
+      .ant-tabs-nav {
+        margin-bottom: 16px;
+      }
+
+      .ant-tabs-tab {
+        padding: 16px 8px;
+        font-size: 16px;
+      }
+    }
+  }
+
+  .job-fair-toolbar {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    .ant-input-search {
+      max-width: 440px;
+    }
+
+    .ant-tag {
+      margin: 0;
+      padding: 5px 9px;
+      border-radius: 5px;
+    }
+  }
+
+  .job-fair-supporting {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+    gap: 20px;
+    margin-top: 20px;
+
+    .fair-calendar-card {
+      height: 100%;
+      min-height: 0;
+
+      .ant-card-head,
+      .ant-card-body {
+        border: 0;
+      }
+
+      .ant-picker-calendar {
+        background: transparent;
+      }
+
+      .fair-calendar-date {
+        position: relative;
+        height: 24px;
+        margin: 0 3px;
+        border-radius: 4px;
+        color: @jp-text-primary;
+        line-height: 24px;
+        text-align: center;
+      }
+
+      .ant-picker-cell-selected .fair-calendar-date {
+        color: #fff;
+        background: @jp-primary;
+      }
+
+      .fair-calendar-marker {
+        position: absolute;
+        right: 4px;
+        bottom: 1px;
+        width: 5px;
+        height: 5px;
+        border-radius: 50%;
+        background: #fa8c16;
+      }
+
+      .clear-date-button {
+        padding: 0;
+      }
+    }
+  }
+
+  .fair-summary-grid {
+    display: grid;
+    grid-column: span 2;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 20px;
+    height: 100%;
+
+    .fair-summary-card {
+      height: 100%;
+      min-height: 0;
+
+      .ant-card-head {
+        border-bottom-color: @jp-border;
+      }
+    }
+  }
+
+  .fair-summary-list {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  .fair-summary-item {
+    display: grid;
+    grid-template-columns: 64px minmax(0, 1fr);
+    gap: 10px;
+    width: 100%;
+    padding: 10px;
+    border: 0;
+    border-radius: 6px;
+    color: @jp-text-primary;
+    text-align: left;
+    background: #f8fbff;
+    cursor: pointer;
+    transition: background 0.2s;
+
+    &:hover {
+      background: @jp-primary-light;
+    }
+
+    .fair-summary-date {
+      color: @jp-primary;
+      font-size: 12px;
+      line-height: 20px;
+      white-space: nowrap;
+    }
+
+    .fair-summary-title {
+      overflow: hidden;
+      font-size: 14px;
+      line-height: 20px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  .fair-summary-empty {
+    display: block;
+    padding-top: 24px;
+    text-align: center;
+  }
+
+  .job-fair-list-section {
+    margin-top: 28px;
+  }
+
+  .job-fair-list-heading {
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    .ant-typography {
+      .jp-section-title();
+      margin: 0;
+    }
+  }
+
+  .fair-card {
+    height: 100%;
+    cursor: pointer;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s,
+      transform 0.2s;
+
+    &:hover {
+      border-color: @jp-primary-border;
+      box-shadow: @jp-shadow-hover;
+      transform: translateY(-2px);
+    }
+
+    &:focus-visible {
+      border-color: @jp-primary;
+      outline: none;
+      box-shadow: 0 0 0 3px rgba(22, 119, 255, 0.18);
+    }
+
+    .ant-card-body {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      box-sizing: border-box;
+      padding: 20px;
+    }
+  }
+
+  .fair-card-tags {
+    display: flex;
+    gap: 8px;
+    margin-bottom: 12px;
+
+    .ant-tag {
+      margin: 0;
+    }
+  }
+
+  .fair-card-title {
+    min-height: 48px;
+    margin-bottom: 14px !important;
+    color: @jp-text-primary;
+    line-height: 24px !important;
+  }
+
+  .fair-card-meta {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    gap: 9px;
+    min-height: 82px;
+    color: @jp-text-secondary;
+    font-size: 13px;
+
+    > div {
+      display: flex;
+      align-items: flex-start;
+      line-height: 20px;
+
+      .anticon {
+        flex: 0 0 auto;
+        margin: 3px 8px 0 0;
+        color: @jp-primary;
+      }
+    }
+  }
+
+  .fair-card-introduction {
+    min-height: 42px;
+    margin: 16px 0 0 !important;
+    padding-top: 14px;
+    border-top: 1px solid @jp-border;
+    color: @jp-text-muted;
+    font-size: 13px;
+    line-height: 21px;
+  }
+
+  .fair-card-action {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    margin-top: 16px;
+    color: @jp-primary;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 20px;
+  }
+
+  .job-fair-pagination {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 28px;
+  }
+}
+
+@media (max-width: 900px) {
+  .portal-job-fair-page {
+    .job-fair-supporting,
+    .fair-summary-grid {
+      grid-template-columns: 1fr;
+    }
+
+    .fair-summary-grid {
+      grid-column: auto;
+    }
+
+    .fair-summary-card {
+      min-height: auto !important;
+    }
+  }
+}
+
+@media (max-width: 576px) {
+  .portal-job-fair-page {
+    .job-fair-content {
+      padding: 16px 12px 36px;
+    }
+
+    .job-fair-hero {
+      min-height: 112px;
+      padding: 20px;
+
+      .job-fair-hero-icon {
+        font-size: 62px;
+      }
+    }
+
+    .job-fair-panel {
+      padding: 0 16px 16px;
+    }
+
+    .job-fair-toolbar {
+      align-items: stretch;
+      flex-direction: column;
+
+      .ant-input-search {
+        max-width: none;
+      }
+    }
+
+    .fair-summary-grid {
+      gap: 12px;
+    }
+
+    .job-fair-pagination {
+      justify-content: center;
+    }
+  }
+}
diff --git a/src/pages/JobPortal/JobFair/index.tsx b/src/pages/JobPortal/JobFair/index.tsx
new file mode 100644
index 0000000..7cef9b9
--- /dev/null
+++ b/src/pages/JobPortal/JobFair/index.tsx
@@ -0,0 +1,402 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import {
+  Button,
+  Calendar,
+  Card,
+  Col,
+  ConfigProvider,
+  Empty,
+  Input,
+  Pagination,
+  Row,
+  Spin,
+  Tabs,
+  Tag,
+  Typography,
+} from 'antd';
+import {
+  ArrowRightOutlined,
+  CalendarOutlined,
+  ClockCircleOutlined,
+  EnvironmentOutlined,
+  SearchOutlined,
+  TeamOutlined,
+} from '@ant-design/icons';
+import { history } from '@umijs/max';
+import dayjs, { Dayjs } from 'dayjs';
+import 'dayjs/locale/zh-cn';
+import zhCN from 'antd/locale/zh_CN';
+import JobPortalHeader from '@/components/JobPortalHeader';
+import {
+  getPortalCurrentMonthJobFairs,
+  getPortalCurrentQuarterJobFairs,
+  getPortalJobFairDates,
+  getPortalJobFairPage,
+  type JobFairChannel,
+  type PortalJobFairItem,
+} from '@/services/jobportal/jobFair';
+import './index.less';
+
+const { Title, Text, Paragraph } = Typography;
+
+const PAGE_SIZE = 9;
+
+const fairTabs: Array<{ key: JobFairChannel; label: string }> = [
+  { key: 'online', label: '线上招聘会' },
+  { key: 'outdoor', label: '线下招聘会' },
+];
+
+function formatDateTime(value?: string) {
+  if (!value) {
+    return '时间待定';
+  }
+  const date = dayjs(value.replace(' ', 'T'));
+  return date.isValid() ? date.format('YYYY年MM月DD日 HH:mm') : value;
+}
+
+function formatSummaryDate(value?: string) {
+  if (!value) {
+    return '时间待定';
+  }
+  const date = dayjs(value.replace(' ', 'T'));
+  return date.isValid() ? date.format('MM月DD日') : value.slice(0, 10);
+}
+
+function getFairStatus(fair: PortalJobFairItem) {
+  const start = fair.jobFairStartTime ? dayjs(fair.jobFairStartTime.replace(' ', 'T')) : null;
+  const end = fair.jobFairEndTime ? dayjs(fair.jobFairEndTime.replace(' ', 'T')) : null;
+  const now = dayjs();
+
+  if (start?.isValid() && now.isBefore(start)) {
+    return { label: '待开始', color: 'gold' };
+  }
+  if (end?.isValid() && now.isAfter(end)) {
+    return { label: '已结束', color: 'default' };
+  }
+  if (start?.isValid() && end?.isValid()) {
+    return { label: '进行中', color: 'green' };
+  }
+  return fair.jobFairStatus ? { label: fair.jobFairStatus, color: 'blue' } : null;
+}
+
+const PortalJobFairPage: React.FC = () => {
+  const [channel, setChannel] = useState<JobFairChannel>('online');
+  const [searchInput, setSearchInput] = useState('');
+  const [keyword, setKeyword] = useState('');
+  const [selectedDate, setSelectedDate] = useState<string>();
+  const [calendarValue, setCalendarValue] = useState<Dayjs>(() => dayjs().locale('zh-cn'));
+  const [fairDates, setFairDates] = useState<Set<string>>(new Set());
+  const [fairs, setFairs] = useState<PortalJobFairItem[]>([]);
+  const [monthFairs, setMonthFairs] = useState<PortalJobFairItem[]>([]);
+  const [quarterFairs, setQuarterFairs] = useState<PortalJobFairItem[]>([]);
+  const [pageNum, setPageNum] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [loading, setLoading] = useState(false);
+  const [summaryLoading, setSummaryLoading] = useState(false);
+
+  const loadFairs = useCallback(async () => {
+    setLoading(true);
+    try {
+      const response = await getPortalJobFairPage(channel, {
+        pageNum,
+        pageSize: PAGE_SIZE,
+        jobFairTitle: keyword || undefined,
+        zphjbsj: selectedDate,
+      });
+      if (response?.code !== 200) {
+        throw new Error(response?.msg || '招聘会列表加载失败');
+      }
+      setFairs(response.data?.list || []);
+      setTotal(response.data?.total || 0);
+    } catch (error) {
+      setFairs([]);
+      setTotal(0);
+    } finally {
+      setLoading(false);
+    }
+  }, [channel, keyword, pageNum, selectedDate]);
+
+  useEffect(() => {
+    void loadFairs();
+  }, [loadFairs]);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    const loadSupportingData = async () => {
+      setSummaryLoading(true);
+      try {
+        const [datesResponse, monthResponse, quarterResponse] = await Promise.all([
+          getPortalJobFairDates(channel),
+          getPortalCurrentMonthJobFairs(channel),
+          getPortalCurrentQuarterJobFairs(channel),
+        ]);
+        if (cancelled) {
+          return;
+        }
+        setFairDates(new Set(Array.isArray(datesResponse?.data) ? datesResponse.data : []));
+        setMonthFairs(Array.isArray(monthResponse?.data) ? monthResponse.data : []);
+        setQuarterFairs(Array.isArray(quarterResponse?.data) ? quarterResponse.data : []);
+      } catch (error) {
+        if (!cancelled) {
+          setFairDates(new Set());
+          setMonthFairs([]);
+          setQuarterFairs([]);
+        }
+      } finally {
+        if (!cancelled) {
+          setSummaryLoading(false);
+        }
+      }
+    };
+
+    void loadSupportingData();
+    return () => {
+      cancelled = true;
+    };
+  }, [channel]);
+
+  const handleChannelChange = (nextChannel: string) => {
+    setChannel(nextChannel as JobFairChannel);
+    setPageNum(1);
+    setSelectedDate(undefined);
+  };
+
+  const handleSearch = (value?: string) => {
+    setKeyword((value ?? searchInput).trim());
+    setPageNum(1);
+  };
+
+  const handleSelectDate = (value: Dayjs) => {
+    const localizedValue = value.locale('zh-cn');
+    const nextDate = localizedValue.format('YYYY-MM-DD');
+    setCalendarValue(localizedValue);
+    setSelectedDate(nextDate);
+    setPageNum(1);
+  };
+
+  const handleFairClick = (fair: PortalJobFairItem) => {
+    if (!fair.jobFairId) {
+      return;
+    }
+    history.push(
+      `/job-portal/job-fair/detail?channel=${channel}&jobFairId=${encodeURIComponent(fair.jobFairId)}`,
+      { fair },
+    );
+  };
+
+  const handleFairCardKeyDown = (
+    event: React.KeyboardEvent<HTMLDivElement>,
+    fair: PortalJobFairItem,
+  ) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      handleFairClick(fair);
+    }
+  };
+
+  const renderSummary = (title: string, fairsToRender: PortalJobFairItem[]) => (
+    <Card className="fair-summary-card" title={title} variant="borderless">
+      <Spin spinning={summaryLoading}>
+        {fairsToRender.length ? (
+          <div className="fair-summary-list">
+            {fairsToRender.slice(0, 3).map((fair) => (
+              <button
+                className="fair-summary-item"
+                key={fair.jobFairId}
+                onClick={() => handleFairClick(fair)}
+                title={`查看${fair.jobFairTitle}详情`}
+                type="button"
+              >
+                <span className="fair-summary-date">
+                  {formatSummaryDate(fair.jobFairStartTime)}
+                </span>
+                <span className="fair-summary-title">{fair.jobFairTitle}</span>
+              </button>
+            ))}
+          </div>
+        ) : (
+          <Text type="secondary" className="fair-summary-empty">
+            暂无招聘会安排
+          </Text>
+        )}
+      </Spin>
+    </Card>
+  );
+
+  return (
+    <div className="portal-job-fair-page job-portal-page-root">
+      <JobPortalHeader showSearch={false} showHotJobs={false} />
+
+      <main className="job-fair-content">
+        <section className="job-fair-hero">
+          <div>
+            <Title level={2}>招聘会</Title>
+            <Text>汇集线上与线下招聘会信息，选择日期即可查看当天的活动安排。</Text>
+          </div>
+          <CalendarOutlined className="job-fair-hero-icon" aria-hidden="true" />
+        </section>
+
+        <section className="job-fair-panel" aria-label="招聘会筛选">
+          <Tabs
+            activeKey={channel}
+            className="job-fair-tabs"
+            items={fairTabs}
+            onChange={handleChannelChange}
+          />
+          <div className="job-fair-toolbar">
+            <Input.Search
+              allowClear
+              enterButton={
+                <>
+                  <SearchOutlined /> 搜索
+                </>
+              }
+              onChange={(event) => setSearchInput(event.target.value)}
+              onSearch={handleSearch}
+              placeholder="搜索招聘会名称"
+              value={searchInput}
+            />
+            {selectedDate && (
+              <Tag
+                closable
+                color="blue"
+                onClose={() => {
+                  setSelectedDate(undefined);
+                  setPageNum(1);
+                }}
+              >
+                举办日期：{selectedDate}
+              </Tag>
+            )}
+          </div>
+        </section>
+
+        <section className="job-fair-supporting" aria-label="招聘会日历与近期安排">
+          <Card className="fair-calendar-card" title="招聘会日历" variant="borderless">
+            <ConfigProvider locale={zhCN}>
+              <Calendar
+                fullCellRender={(current, info) => {
+                  if (info.type !== 'date') {
+                    return info.originNode;
+                  }
+                  const date = current.format('YYYY-MM-DD');
+                  return (
+                    <div className="fair-calendar-date">
+                      {current.date()}
+                      {fairDates.has(date) && (
+                        <span className="fair-calendar-marker" title="当天有招聘会" />
+                      )}
+                    </div>
+                  );
+                }}
+                fullscreen={false}
+                onPanelChange={(value) => setCalendarValue(value.locale('zh-cn'))}
+                onSelect={handleSelectDate}
+                value={calendarValue}
+              />
+            </ConfigProvider>
+            <Button
+              className="clear-date-button"
+              disabled={!selectedDate}
+              onClick={() => {
+                setSelectedDate(undefined);
+                setPageNum(1);
+              }}
+              type="link"
+            >
+              查看全部日期
+            </Button>
+          </Card>
+          <div className="fair-summary-grid">
+            {renderSummary(`本月${channel === 'outdoor' ? '线下' : ''}招聘会`, monthFairs)}
+            {renderSummary(`本季度${channel === 'outdoor' ? '线下' : ''}招聘会`, quarterFairs)}
+          </div>
+        </section>
+
+        <section className="job-fair-list-section" aria-live="polite">
+          <div className="job-fair-list-heading">
+            <Title level={3}>{channel === 'outdoor' ? '线下招聘会' : '线上招聘会'}</Title>
+            <Text type="secondary">共 {total} 场</Text>
+          </div>
+
+          <Spin spinning={loading}>
+            {fairs.length ? (
+              <>
+                <Row gutter={[20, 20]}>
+                  {fairs.map((fair) => {
+                    const status = getFairStatus(fair);
+                    return (
+                      <Col key={fair.jobFairId} lg={8} md={12} sm={24} xs={24}>
+                        <Card
+                          aria-label={`查看${fair.jobFairTitle}详情`}
+                          className="fair-card"
+                          hoverable
+                          onClick={() => handleFairClick(fair)}
+                          onKeyDown={(event) => handleFairCardKeyDown(event, fair)}
+                          role="link"
+                          tabIndex={fair.jobFairId ? 0 : -1}
+                        >
+                          <div className="fair-card-tags">
+                            <Tag color={channel === 'outdoor' ? 'cyan' : 'blue'}>
+                              {channel === 'outdoor' ? '线下招聘会' : '线上招聘会'}
+                            </Tag>
+                            {status && <Tag color={status.color}>{status.label}</Tag>}
+                          </div>
+                          <Title
+                            className="fair-card-title"
+                            ellipsis={{ rows: 2 }}
+                            level={4}
+                            title={fair.jobFairTitle}
+                          >
+                            {fair.jobFairTitle}
+                          </Title>
+                          <div className="fair-card-meta">
+                            <div>
+                              <ClockCircleOutlined />
+                              {formatDateTime(fair.jobFairStartTime)}
+                            </div>
+                            <div>
+                              <EnvironmentOutlined />
+                              {fair.jobFairAddress || '地点待定'}
+                            </div>
+                            <div>
+                              <TeamOutlined />
+                              {fair.jobFairHostUnit || fair.jobFairOrganizeUnit || '主办单位待定'}
+                            </div>
+                          </div>
+                          <Paragraph className="fair-card-introduction" ellipsis={{ rows: 2 }}>
+                            {fair.jobFairIntroduction || '暂未提供招聘会简介。'}
+                          </Paragraph>
+                          <div className="fair-card-action" aria-hidden="true">
+                            查看详情 <ArrowRightOutlined />
+                          </div>
+                        </Card>
+                      </Col>
+                    );
+                  })}
+                </Row>
+                {total > PAGE_SIZE && (
+                  <div className="job-fair-pagination">
+                    <Pagination
+                      current={pageNum}
+                      onChange={(nextPage) => setPageNum(nextPage)}
+                      pageSize={PAGE_SIZE}
+                      showSizeChanger={false}
+                      showTotal={(count) => `共 ${count} 场招聘会`}
+                      total={total}
+                    />
+                  </div>
+                )}
+              </>
+            ) : (
+              !loading && <Empty description="暂未找到符合条件的招聘会" />
+            )}
+          </Spin>
+        </section>
+      </main>
+    </div>
+  );
+};
+
+export default PortalJobFairPage;
diff --git a/src/pages/JobPortal/List/index.less b/src/pages/JobPortal/List/index.less
index 4e84c2e..33ca9d3 100644
--- a/src/pages/JobPortal/List/index.less
+++ b/src/pages/JobPortal/List/index.less
@@ -209,6 +209,43 @@
         margin: 20px 0 24px;
       }
 
+      .job-detail-tag-section {
+        margin-bottom: 28px;
+
+        .section-title {
+          margin: 0 0 16px;
+          font-size: 16px;
+          font-weight: 600;
+          color: @jp-text-primary;
+        }
+
+        .job-detail-tag-groups {
+          display: flex;
+          flex-direction: column;
+          gap: 14px;
+        }
+
+        .job-detail-tag-group {
+          display: grid;
+          grid-template-columns: 128px minmax(0, 1fr);
+          align-items: start;
+          gap: 16px;
+        }
+
+        .job-detail-tag-label {
+          color: @jp-text-secondary;
+          font-weight: 500;
+          line-height: 26px;
+        }
+
+        .detail-tag {
+          .jp-job-tag();
+          margin: 0;
+          padding: 2px 10px;
+          line-height: 22px;
+        }
+      }
+
       .job-description {
         .section-title {
           margin: 0 0 16px;
diff --git a/src/pages/JobPortal/List/index.tsx b/src/pages/JobPortal/List/index.tsx
index 6f77075..1884681 100644
--- a/src/pages/JobPortal/List/index.tsx
+++ b/src/pages/JobPortal/List/index.tsx
@@ -12,26 +12,33 @@ import {
   Select,
   Input,
   message,
-  Modal
+  Modal,
 } from 'antd';
 import {
   EnvironmentOutlined,
   HeartOutlined,
   HeartFilled,
-  QrcodeOutlined,
   FlagOutlined,
   ArrowLeftOutlined,
   SearchOutlined,
   TrophyOutlined,
-  StopOutlined
+  StopOutlined,
 } from '@ant-design/icons';
 import { history, useLocation } from '@umijs/max';
 import { getJobList, getJobRecommend } from '@/services/common/jobTitle';
 import JobPortalHeader from '@/components/JobPortalHeader';
-import { favoriteJob, unfavoriteJob, applyJob, browseJob, blockCompany } from '@/services/jobportal/user';
+import {
+  favoriteJob,
+  unfavoriteJob,
+  applyJob,
+  browseJob,
+  blockCompany,
+  getJobDetail,
+} from '@/services/jobportal/user';
 import { ensureJobPortalLogin, requireJobPortalUserId } from '@/utils/jobPortalAuth';
 import { getDictValueEnum } from '@/services/system/dict';
 import { getDictLabel, findTreeLabelById, resolveIndustryLabel } from '@/utils/jobPortalDict';
+import { parseCommaSeparatedTags } from '@/utils/jobDetailTags';
 import JobComplaintModal from '@/components/JobComplaintModal';
 import { getJobTitleTreeSelect } from '@/services/common/jobTitle';
 import { getCmsIndustryTreeList } from '@/services/classify/industry';
@@ -47,15 +54,6 @@ import './index.less';
 const { Title, Text, Paragraph } = Typography;
 const { Option } = Select;
 
-// 学历字典映射
-const educationMap: { [key: string]: string } = {
-  '1': '大专',
-  '2': '本科',
-  '3': '硕士',
-  '4': '博士',
-  '0': '不限'
-};
-
 // 工作经验字典映射
 const experienceMap: { [key: string]: string } = {
   '1': '1年以下',
@@ -63,7 +61,14 @@ const experienceMap: { [key: string]: string } = {
   '3': '3-5年',
   '4': '5-10年',
   '5': '10年以上',
-  '0': '不限'
+  '0': '不限',
+};
+
+const formatVacancyCount = (vacancies: unknown): string | null => {
+  if (vacancies === null || vacancies === undefined || vacancies === '') {
+    return null;
+  }
+  return String(vacancies) === '-1' ? '若干' : String(vacancies);
 };
 
 // 从缓存获取用户信息
@@ -78,18 +83,20 @@ const mockJobs = [
     company: '博凡科技',
     companyInfo: {
       name: '博凡科技',
-      description: '博凡科技是一家专注于企业级应用软件开发的高新技术企业，成立于2015年。公司致力于为客户提供专业的IT解决方案，业务涵盖云计算、大数据、人工智能、物联网等领域。公司拥有一支经验丰富、技术精湛的研发团队，始终坚持技术创新和服务至上，为客户创造价值。'
+      description:
+        '博凡科技是一家专注于企业级应用软件开发的高新技术企业，成立于2015年。公司致力于为客户提供专业的IT解决方案，业务涵盖云计算、大数据、人工智能、物联网等领域。公司拥有一支经验丰富、技术精湛的研发团队，始终坚持技术创新和服务至上，为客户创造价值。',
     },
     location: '北京·东城区·东四',
     tags: ['Java', 'SpringCloud', 'MySQL'],
-    description: '岗位职责：\n1. 负责公司项目的研发工作\n2. 负责后端系统的设计与开发\n3. 参与技术方案的讨论和制定\n\n任职要求：\n1. 5年以上工作经验；本科学历及以上\n2. 熟练掌握Java基础，SpringCloud、SpringBoot\n3. 熟悉Redis、SQL/NoSQL数据库\n4. 熟悉消息队列：Kafka、RabbitMQ、RocketMQ\n5. 熟悉Elasticsearch、Linux运维\n6. 具备良好的问题解决能力和责任心\n7. 具备良好的团队合作精神',
+    description:
+      '岗位职责：\n1. 负责公司项目的研发工作\n2. 负责后端系统的设计与开发\n3. 参与技术方案的讨论和制定\n\n任职要求：\n1. 5年以上工作经验；本科学历及以上\n2. 熟练掌握Java基础，SpringCloud、SpringBoot\n3. 熟悉Redis、SQL/NoSQL数据库\n4. 熟悉消息队列：Kafka、RabbitMQ、RocketMQ\n5. 熟悉Elasticsearch、Linux运维\n6. 具备良好的问题解决能力和责任心\n7. 具备良好的团队合作精神',
     benefits: [
       '完善的社会保险制度；购买五险一金',
       '节假日礼品',
       '带薪年假，法定节假日休息',
       '团建活动：KTV、别墅轰趴',
-      '舒适的工作环境'
-    ]
+      '舒适的工作环境',
+    ],
   },
   {
     id: 2,
@@ -100,17 +107,14 @@ const mockJobs = [
     company: '新华三技术有限公司',
     companyInfo: {
       name: '新华三技术有限公司',
-      description: '新华三技术有限公司是业界领先的IT解决方案提供商，专注于云计算、大数据、信息安全等领域。公司秉承"客户至上、持续创新"的理念，为全球客户提供优质的IT产品和服务。新华三拥有一流的研发团队和完善的人才培养体系，致力于成为最受信赖的IT服务提供商。'
+      description:
+        '新华三技术有限公司是业界领先的IT解决方案提供商，专注于云计算、大数据、信息安全等领域。公司秉承"客户至上、持续创新"的理念，为全球客户提供优质的IT产品和服务。新华三拥有一流的研发团队和完善的人才培养体系，致力于成为最受信赖的IT服务提供商。',
     },
     location: '北京·石景山区·古城',
     tags: ['Java', 'Spring Boot', 'MySQL'],
-    description: '岗位职责：\n1. 参与公司核心业务系统的设计开发\n2. 优化系统性能，提升用户体验\n3. 编写技术文档\n\n任职要求：\n1. 3年以上Java开发经验\n2. 熟悉Spring Boot等主流框架\n3. 熟悉MySQL数据库设计和优化',
-    benefits: [
-      '五险一金',
-      '带薪年假',
-      '年终奖',
-      '定期体检'
-    ]
+    description:
+      '岗位职责：\n1. 参与公司核心业务系统的设计开发\n2. 优化系统性能，提升用户体验\n3. 编写技术文档\n\n任职要求：\n1. 3年以上Java开发经验\n2. 熟悉Spring Boot等主流框架\n3. 熟悉MySQL数据库设计和优化',
+    benefits: ['五险一金', '带薪年假', '年终奖', '定期体检'],
   },
   {
     id: 3,
@@ -121,17 +125,14 @@ const mockJobs = [
     company: '合肥森蕴',
     companyInfo: {
       name: '合肥森蕴科技有限公司',
-      description: '合肥森蕴科技有限公司是一家专业从事软件开发和系统集成的高科技企业，成立于2010年。公司主要业务包括企业信息化建设、互联网应用开发、移动互联网解决方案等。森蕴科技拥有一支年轻富有活力的技术团队，注重技术研发和创新，为客户提供全面、专业的IT服务。公司以"技术驱动创新，服务创造价值"为使命，致力于成为行业领先的IT服务提供商。'
+      description:
+        '合肥森蕴科技有限公司是一家专业从事软件开发和系统集成的高科技企业，成立于2010年。公司主要业务包括企业信息化建设、互联网应用开发、移动互联网解决方案等。森蕴科技拥有一支年轻富有活力的技术团队，注重技术研发和创新，为客户提供全面、专业的IT服务。公司以"技术驱动创新，服务创造价值"为使命，致力于成为行业领先的IT服务提供商。',
     },
     location: '北京·海淀区·苏州桥',
     tags: ['Java', 'Spring', 'Redis'],
-    description: '岗位职责：\n1. 负责架构设计与技术选型\n2. 指导团队成员进行开发\n3. 解决复杂技术问题\n\n任职要求：\n1. 5年以上Java开发经验\n2. 精通Spring框架\n3. 熟悉分布式系统设计',
-    benefits: [
-      '五险一金',
-      '股票期权',
-      '带薪年假',
-      '技术培训'
-    ]
+    description:
+      '岗位职责：\n1. 负责架构设计与技术选型\n2. 指导团队成员进行开发\n3. 解决复杂技术问题\n\n任职要求：\n1. 5年以上Java开发经验\n2. 精通Spring框架\n3. 熟悉分布式系统设计',
+    benefits: ['五险一金', '股票期权', '带薪年假', '技术培训'],
   },
   {
     id: 4,
@@ -142,16 +143,14 @@ const mockJobs = [
     company: '创新科技',
     companyInfo: {
       name: '创新科技有限公司',
-      description: '创新科技有限公司专注于互联网金融和数据分析领域，致力于为金融机构提供专业的技术解决方案。公司成立于2018年，拥有一支在金融科技、云计算、人工智能等领域经验丰富的技术团队。公司秉承"创新驱动发展"的理念，通过技术创新为客户创造价值，推动金融行业的数字化转型。'
+      description:
+        '创新科技有限公司专注于互联网金融和数据分析领域，致力于为金融机构提供专业的技术解决方案。公司成立于2018年，拥有一支在金融科技、云计算、人工智能等领域经验丰富的技术团队。公司秉承"创新驱动发展"的理念，通过技术创新为客户创造价值，推动金融行业的数字化转型。',
     },
     location: '北京·朝阳区·望京',
     tags: ['Python', 'Django', 'MySQL'],
-    description: '岗位职责：\n1. 负责Python后端开发\n2. 参与系统架构设计\n3. 优化系统性能\n\n任职要求：\n1. 3年以上Python开发经验\n2. 熟悉Django、Flask框架\n3. 熟悉MySQL、Redis',
-    benefits: [
-      '五险一金',
-      '带薪年假',
-      '年终奖'
-    ]
+    description:
+      '岗位职责：\n1. 负责Python后端开发\n2. 参与系统架构设计\n3. 优化系统性能\n\n任职要求：\n1. 3年以上Python开发经验\n2. 熟悉Django、Flask框架\n3. 熟悉MySQL、Redis',
+    benefits: ['五险一金', '带薪年假', '年终奖'],
   },
   {
     id: 5,
@@ -162,16 +161,14 @@ const mockJobs = [
     company: '互联网科技',
     companyInfo: {
       name: '互联网科技有限公司',
-      description: '互联网科技有限公司是一家专注于电商平台和移动应用开发的企业，成立于2012年。公司致力于为用户提供优质的产品和服务，在电商、O2O、社交等领域积累了丰富的经验。公司拥有一支年轻、富有创造力的团队，注重用户体验和技术创新，致力于打造行业领先的互联网产品。'
+      description:
+        '互联网科技有限公司是一家专注于电商平台和移动应用开发的企业，成立于2012年。公司致力于为用户提供优质的产品和服务，在电商、O2O、社交等领域积累了丰富的经验。公司拥有一支年轻、富有创造力的团队，注重用户体验和技术创新，致力于打造行业领先的互联网产品。',
     },
     location: '北京·海淀区·中关村',
     tags: ['Vue', 'React', 'TypeScript'],
-    description: '岗位职责：\n1. 负责前端页面开发\n2. 优化用户体验\n3. 与后端协作\n\n任职要求：\n1. 2年以上前端开发经验\n2. 熟悉Vue、React等框架\n3. 熟悉TypeScript',
-    benefits: [
-      '五险一金',
-      '股票期权',
-      '技术培训'
-    ]
+    description:
+      '岗位职责：\n1. 负责前端页面开发\n2. 优化用户体验\n3. 与后端协作\n\n任职要求：\n1. 2年以上前端开发经验\n2. 熟悉Vue、React等框架\n3. 熟悉TypeScript',
+    benefits: ['五险一金', '股票期权', '技术培训'],
   },
   {
     id: 6,
@@ -182,16 +179,14 @@ const mockJobs = [
     company: '质量科技',
     companyInfo: {
       name: '质量科技有限公司',
-      description: '质量科技有限公司是一家专业的软件质量保证服务提供商，成立于2016年。公司专注于为各行业客户提供专业的测试服务和质量保障方案，在自动化测试、性能测试、安全测试等领域具有丰富的经验。公司拥有一支专业的测试团队和完善的测试体系，致力于帮助客户提升产品质量，降低运营风险。'
+      description:
+        '质量科技有限公司是一家专业的软件质量保证服务提供商，成立于2016年。公司专注于为各行业客户提供专业的测试服务和质量保障方案，在自动化测试、性能测试、安全测试等领域具有丰富的经验。公司拥有一支专业的测试团队和完善的测试体系，致力于帮助客户提升产品质量，降低运营风险。',
     },
     location: '北京·大兴区·亦庄',
     tags: ['测试', '自动化', 'Selenium'],
-    description: '岗位职责：\n1. 编写测试用例\n2. 执行功能测试\n3. 参与自动化测试\n\n任职要求：\n1. 1年以上测试经验\n2. 熟悉测试工具\n3. 有责任心',
-    benefits: [
-      '五险一金',
-      '带薪年假',
-      '节日福利'
-    ]
+    description:
+      '岗位职责：\n1. 编写测试用例\n2. 执行功能测试\n3. 参与自动化测试\n\n任职要求：\n1. 1年以上测试经验\n2. 熟悉测试工具\n3. 有责任心',
+    benefits: ['五险一金', '带薪年假', '节日福利'],
   },
 ];
 
@@ -202,7 +197,9 @@ const JobListPage: React.FC = () => {
   const [jobList, setJobList] = useState<any[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
   const [jobCategory, setJobCategory] = useState<string>('');
+  const [educationEnum, setEducationEnum] = useState<DictValueEnumObj>({});
   const [scaleEnum, setScaleEnum] = useState<DictValueEnumObj>({});
+  const [companyNatureEnum, setCompanyNatureEnum] = useState<DictValueEnumObj>({});
   const [jobTitleTree, setJobTitleTree] = useState<any[]>([]);
   const [industryTree, setIndustryTree] = useState<any[]>([]);
   const [searchValue, setSearchValue] = useState<string>(''); // 搜索框的值
@@ -214,9 +211,30 @@ const JobListPage: React.FC = () => {
     { item: '学历', score: 0 },
     { item: '薪资', score: 0 },
     { item: '年龄', score: 0 },
-    { item: '工作地', score: 0 }
+    { item: '工作地', score: 0 },
   ]);
   const [complaintVisible, setComplaintVisible] = useState(false);
+  const selectedJobId = selectedJob?.jobId || selectedJob?.id;
+
+  const selectedJobDetailTagGroups = useMemo(
+    () =>
+      [
+        {
+          label: '薪资范围与构成',
+          values: parseCommaSeparatedTags(selectedJob?.salaryComposition),
+        },
+        {
+          label: '福利待遇',
+          values: parseCommaSeparatedTags(selectedJob?.welfareBenefits),
+        },
+        {
+          label: '工作时间安排',
+          values: parseCommaSeparatedTags(selectedJob?.workSchedule),
+        },
+      ].filter((group) => group.values.length > 0),
+    [selectedJob?.salaryComposition, selectedJob?.welfareBenefits, selectedJob?.workSchedule],
+  );
+
   // 格式化薪资显示
   const formatSalary = (minSalary: number, maxSalary: number) => {
     if (minSalary && maxSalary) {
@@ -231,11 +249,15 @@ const JobListPage: React.FC = () => {
 
   useEffect(() => {
     Promise.all([
+      getDictValueEnum('education', true, true),
       getDictValueEnum('scale', true, true),
+      getDictValueEnum('company_nature', false, true),
       getCmsIndustryTreeList(),
       getJobTitleTreeSelect(),
-    ]).then(([scaleData, industryRes, jobTitleRes]) => {
+    ]).then(([educationData, scaleData, companyNatureData, industryRes, jobTitleRes]) => {
+      setEducationEnum(educationData);
       setScaleEnum(scaleData);
+      setCompanyNatureEnum(companyNatureData);
       if (industryRes?.code === 200 && industryRes?.data) {
         setIndustryTree(industryRes.data);
       }
@@ -302,42 +324,72 @@ const JobListPage: React.FC = () => {
     }
   }, [jobList, selectedJob]);
 
+  // 列表数据不包含岗位待遇字段，选中岗位后补取完整详情。
+  useEffect(() => {
+    if (!selectedJobId) return;
+
+    let cancelled = false;
+    const requestedJobId = selectedJobId;
+
+    getJobDetail(requestedJobId)
+      .then((response) => {
+        if (cancelled || response?.code !== 200 || !response?.data) return;
+
+        setSelectedJob((current: any) => {
+          const currentJobId = current?.jobId || current?.id;
+          if (String(currentJobId) !== String(requestedJobId)) return current;
+          return { ...current, ...response.data };
+        });
+      })
+      .catch(() => {
+        // 详情请求失败时保留列表已有信息，不影响岗位浏览。
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [selectedJobId]);
+
   // 当 selectedJob 变化时，更新收藏状态
   useEffect(() => {
     if (selectedJob) {
       // 根据 isCollection 字段设置收藏状态
       // isCollection 为 null 或 0 表示未收藏，其他值表示已收藏
-      setFavorited(selectedJob?.isCollection !== null && selectedJob?.isCollection !== 0 && selectedJob?.isCollection !== undefined);
+      setFavorited(
+        selectedJob?.isCollection !== null &&
+          selectedJob?.isCollection !== 0 &&
+          selectedJob?.isCollection !== undefined,
+      );
     }
   }, [selectedJob]);
 
   // 当 selectedJob 变化时，获取竞争力分析数据（仅登录）
   useEffect(() => {
-    if (!selectedJob) return;
+    if (!selectedJobId) return;
     if (!isJobPortalLoggedIn()) {
       setOverallScore(0);
       setRadarData(getEmptyCompetitivenessRadar());
       return;
     }
-    const jobIdNum = Number(selectedJob?.jobId || selectedJob?.id);
+    const jobIdNum = Number(selectedJobId);
     if (!Number.isNaN(jobIdNum) && jobIdNum) {
       fetchCompetitiveness(jobIdNum);
     }
-  }, [selectedJob]);
+  }, [selectedJobId]);
 
   // 当 selectedJob 变化时，上报浏览记录（仅登录）
   useEffect(() => {
-    if (!selectedJob) return;
+    if (!selectedJobId) return;
     if (!isJobPortalLoggedIn()) {
       return;
     }
-    const jobIdNum = Number(selectedJob?.jobId || selectedJob?.id);
+    const jobIdNum = Number(selectedJobId);
     if (!Number.isNaN(jobIdNum) && jobIdNum > 0) {
       browseJob({ jobId: jobIdNum }).catch(() => {
         // 浏览上报失败不阻塞页面
       });
     }
-  }, [selectedJob]);
+  }, [selectedJobId]);
 
   const fetchCompetitiveness = async (jobIdNum: number) => {
     if (!isJobPortalLoggedIn()) {
@@ -367,8 +419,8 @@ const JobListPage: React.FC = () => {
           { item: '学历', score: r.education ?? 0 },
           { item: '薪资', score: r.salary ?? 0 },
           { item: '年龄', score: r.age ?? 0 },
-          { item: '工作地', score: r.location ?? 0 }
-        ].map(d => ({ ...d, score: Math.max(0, Math.min(100, d.score)) }));
+          { item: '工作地', score: r.location ?? 0 },
+        ].map((d) => ({ ...d, score: Math.max(0, Math.min(100, d.score)) }));
         setRadarData(mapped);
       } else {
         setRadarData(getEmptyCompetitivenessRadar());
@@ -413,7 +465,9 @@ const JobListPage: React.FC = () => {
     setSelectedJob(job);
     // 根据 isCollection 字段设置收藏状态
     // isCollection 为 null 或 0 表示未收藏，其他值表示已收藏
-    setFavorited(job?.isCollection !== null && job?.isCollection !== 0 && job?.isCollection !== undefined);
+    setFavorited(
+      job?.isCollection !== null && job?.isCollection !== 0 && job?.isCollection !== undefined,
+    );
   };
 
   const handleCollect = async () => {
@@ -423,7 +477,6 @@ const JobListPage: React.FC = () => {
     }
 
     if (favorited) {
-
       // 获取职位ID
       const jobId = selectedJob?.jobId || selectedJob?.id;
       if (!jobId) {
@@ -439,12 +492,16 @@ const JobListPage: React.FC = () => {
           if (selectedJob) {
             setSelectedJob({ ...selectedJob, isCollection: 0 });
             // 同时更新列表中的数据
-            setJobList(jobList.map(job =>
-              (job.jobId === jobId || job.id === jobId) ? { ...job, isCollection: 0 } : job
-            ));
-            setFilteredJobList(filteredJobList.map(job =>
-              (job.jobId === jobId || job.id === jobId) ? { ...job, isCollection: 0 } : job
-            ));
+            setJobList(
+              jobList.map((job) =>
+                job.jobId === jobId || job.id === jobId ? { ...job, isCollection: 0 } : job,
+              ),
+            );
+            setFilteredJobList(
+              filteredJobList.map((job) =>
+                job.jobId === jobId || job.id === jobId ? { ...job, isCollection: 0 } : job,
+              ),
+            );
           }
           message.success('取消收藏成功');
         } else {
@@ -472,12 +529,16 @@ const JobListPage: React.FC = () => {
         if (selectedJob) {
           setSelectedJob({ ...selectedJob, isCollection: 1 });
           // 同时更新列表中的数据
-          setJobList(jobList.map(job =>
-            (job.jobId === jobId || job.id === jobId) ? { ...job, isCollection: 1 } : job
-          ));
-          setFilteredJobList(filteredJobList.map(job =>
-            (job.jobId === jobId || job.id === jobId) ? { ...job, isCollection: 1 } : job
-          ));
+          setJobList(
+            jobList.map((job) =>
+              job.jobId === jobId || job.id === jobId ? { ...job, isCollection: 1 } : job,
+            ),
+          );
+          setFilteredJobList(
+            filteredJobList.map((job) =>
+              job.jobId === jobId || job.id === jobId ? { ...job, isCollection: 1 } : job,
+            ),
+          );
         }
         message.success('收藏成功');
       } else {
@@ -505,18 +566,22 @@ const JobListPage: React.FC = () => {
     try {
       const response = await applyJob({
         jobId: String(jobId),
-        userId: String(userId)
+        userId: String(userId),
       });
       if (response?.code === 200) {
         message.success('申请成功');
         if (selectedJob) {
           setSelectedJob({ ...selectedJob, isApply: 1 });
-          setJobList(jobList.map(job =>
-            (job.jobId === jobId || job.id === jobId) ? { ...job, isApply: 1 } : job
-          ));
-          setFilteredJobList(filteredJobList.map(job =>
-            (job.jobId === jobId || job.id === jobId) ? { ...job, isApply: 1 } : job
-          ));
+          setJobList(
+            jobList.map((job) =>
+              job.jobId === jobId || job.id === jobId ? { ...job, isApply: 1 } : job,
+            ),
+          );
+          setFilteredJobList(
+            filteredJobList.map((job) =>
+              job.jobId === jobId || job.id === jobId ? { ...job, isApply: 1 } : job,
+            ),
+          );
         }
       } else {
         message.error(response?.msg || '申请失败');
@@ -718,15 +783,17 @@ const JobListPage: React.FC = () => {
           <Col span={6} style={{ height: '96%' }}>
             <div className="job-list">
               {filteredJobList.length === 0 ? (
-                <div style={{
-                  textAlign: 'center',
-                  padding: '40px 20px',
-                  color: '#999',
-                  height: '100%',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center'
-                }}>
+                <div
+                  style={{
+                    textAlign: 'center',
+                    padding: '40px 20px',
+                    color: '#999',
+                    height: '100%',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                  }}
+                >
                   <div>
                     <Text style={{ fontSize: '16px' }}>暂无相关职位信息</Text>
                     <br />
@@ -737,55 +804,73 @@ const JobListPage: React.FC = () => {
                 </div>
               ) : (
                 filteredJobList.map((job, index) => (
-                <Card
-                  key={job.jobId || job.id || index}
-                  className={`job-card ${
-                    selectedJob &&
-                    ((selectedJob.jobId && selectedJob.jobId === job.jobId) ||
-                     (selectedJob.id && selectedJob.id === job.id) ||
-                     (selectedJob === job))
-                    ? 'active' : ''
-                  }`}
-                  hoverable
-                  onClick={() => handleJobClick(job)}
-                  bodyStyle={{ padding: '16px' }}
-                  loading={loading}
-                >
-                  <div className="job-card-header">
-                    <Title level={4} className="job-title">
-                      {job.isUrgent === 1 && (
-                        <Tag color="red" style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }}>急聘</Tag>
+                  <Card
+                    key={job.jobId || job.id || index}
+                    className={`job-card ${
+                      selectedJob &&
+                      ((selectedJob.jobId && selectedJob.jobId === job.jobId) ||
+                        (selectedJob.id && selectedJob.id === job.id) ||
+                        selectedJob === job)
+                        ? 'active'
+                        : ''
+                    }`}
+                    hoverable
+                    onClick={() => handleJobClick(job)}
+                    bodyStyle={{ padding: '16px' }}
+                    loading={loading}
+                  >
+                    <div className="job-card-header">
+                      <Title level={4} className="job-title">
+                        {job.isUrgent === 1 && (
+                          <Tag
+                            color="red"
+                            style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }}
+                          >
+                            急聘
+                          </Tag>
+                        )}
+                        {job.jobTitle || job.title}
+                      </Title>
+                      <Text className="job-salary">
+                        {job.minSalary && job.maxSalary
+                          ? formatSalary(job.minSalary, job.maxSalary)
+                          : job.salary || '面议'}
+                      </Text>
+                    </div>
+                    <div className="job-card-info">
+                      <Text className="job-company">{job.companyName || job.company}</Text>
+                    </div>
+                    <div className="job-card-footer">
+                      <Text className="job-location">
+                        <EnvironmentOutlined /> {job.jobLocation || job.location}
+                      </Text>
+                      <Text className="job-experience">
+                        {job.experience ? experienceMap[job.experience] || job.experience : '不限'}
+                      </Text>
+                      <Text className="job-education">
+                        {job.education ? getDictLabel(educationEnum, job.education) : '不限'}
+                      </Text>
+                    </div>
+                    {/* 添加标签区域，与热门岗位保持一致 */}
+                    <div className="job-tags" style={{ marginTop: '8px' }}>
+                      {job.jobCategory && (
+                        <Tag className="job-tag">{resolveJobCategoryLabel(job)}</Tag>
                       )}
-                      {job.jobTitle || job.title}
-                    </Title>
-                    <Text className="job-salary">
-                      {job.minSalary && job.maxSalary ? formatSalary(job.minSalary, job.maxSalary) : (job.salary || '面议')}
-                    </Text>
-                  </div>
-                  <div className="job-card-info">
-                    <Text className="job-company">{job.companyName || job.company}</Text>
-                  </div>
-                  <div className="job-card-footer">
-                    <Text className="job-location">
-                      <EnvironmentOutlined /> {job.jobLocation || job.location}
-                    </Text>
-                    <Text className="job-experience">
-                      {job.experience ? experienceMap[job.experience] || job.experience : '不限'}
-                    </Text>
-                    <Text className="job-education">
-                      {job.education ? educationMap[job.education] || job.education : '不限'}
-                    </Text>
-                  </div>
-                  {/* 添加标签区域，与热门岗位保持一致 */}
-                  <div className="job-tags" style={{ marginTop: '8px' }}>
-                    {job.jobCategory && (
-                      <Tag className="job-tag">{resolveJobCategoryLabel(job)}</Tag>
-                    )}
-                    {/* {job.dataSource && <Tag className="job-tag">{job.dataSource}</Tag>} */}
-                    {job.vacancies && <Tag className="job-tag">招聘{job.vacancies}人</Tag>}
-                    {/* {job.industry && <Tag className="job-tag">{job.industry}</Tag>} */}
-                  </div>
-                </Card>
+                      {(job.companyNature || job.company?.companyNature) && (
+                        <Tag className="job-tag">
+                          {getDictLabel(
+                            companyNatureEnum,
+                            job.companyNature || job.company?.companyNature,
+                          )}
+                        </Tag>
+                      )}
+                      {/* {job.dataSource && <Tag className="job-tag">{job.dataSource}</Tag>} */}
+                      {formatVacancyCount(job.vacancies) && (
+                        <Tag className="job-tag">招聘{formatVacancyCount(job.vacancies)}人</Tag>
+                      )}
+                      {/* {job.industry && <Tag className="job-tag">{job.industry}</Tag>} */}
+                    </div>
+                  </Card>
                 ))
               )}
             </div>
@@ -795,15 +880,17 @@ const JobListPage: React.FC = () => {
           <Col span={18} style={{ height: '93.6%' }}>
             <div className="job-detail-container">
               {!selectedJob ? (
-                <div style={{
-                  textAlign: 'center',
-                  padding: '40px 20px',
-                  color: '#999',
-                  height: '100%',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center'
-                }}>
+                <div
+                  style={{
+                    textAlign: 'center',
+                    padding: '40px 20px',
+                    color: '#999',
+                    height: '100%',
+                    display: 'flex',
+                    alignItems: 'center',
+                    justifyContent: 'center',
+                  }}
+                >
                   <div>
                     <Text style={{ fontSize: '16px' }}>暂无职位详情信息</Text>
                     <br />
@@ -815,173 +902,214 @@ const JobListPage: React.FC = () => {
               ) : (
                 <>
                   <Card className="job-detail-card">
-                  <div className="job-detail-header">
-                    <div className="job-header-info">
-                      <Title level={3} className="job-detail-title">
-                        {selectedJob?.isUrgent === 1 && (
-                          <Tag color="red" style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }}>急聘</Tag>
-                        )}
-                        {selectedJob?.jobTitle || selectedJob?.title || '请选择职位'}
-                      </Title>
-                      <Text className="salary-text">
-                        {selectedJob?.minSalary && selectedJob?.maxSalary
-                          ? formatSalary(selectedJob.minSalary, selectedJob.maxSalary)
-                          : (selectedJob?.salary || '面议')}
-                      </Text>
-                      <div className="job-header-tags">
-                        {(selectedJob?.jobLocation || selectedJob?.location) && (
+                    <div className="job-detail-header">
+                      <div className="job-header-info">
+                        <Title level={3} className="job-detail-title">
+                          {selectedJob?.isUrgent === 1 && (
+                            <Tag
+                              color="red"
+                              style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }}
+                            >
+                              急聘
+                            </Tag>
+                          )}
+                          {selectedJob?.jobTitle || selectedJob?.title || '请选择职位'}
+                        </Title>
+                        <Text className="salary-text">
+                          {selectedJob?.minSalary && selectedJob?.maxSalary
+                            ? formatSalary(selectedJob.minSalary, selectedJob.maxSalary)
+                            : selectedJob?.salary || '面议'}
+                        </Text>
+                        <div className="job-header-tags">
+                          {(selectedJob?.jobLocation || selectedJob?.location) && (
+                            <Tag className="meta-tag">
+                              <EnvironmentOutlined />{' '}
+                              {selectedJob?.jobLocation || selectedJob?.location}
+                            </Tag>
+                          )}
                           <Tag className="meta-tag">
-                            <EnvironmentOutlined /> {selectedJob?.jobLocation || selectedJob?.location}
+                            {selectedJob?.experience
+                              ? experienceMap[selectedJob.experience] || selectedJob.experience
+                              : '经验不限'}
                           </Tag>
-                        )}
-                        <Tag className="meta-tag">
-                          {selectedJob?.experience
-                            ? experienceMap[selectedJob.experience] || selectedJob.experience
-                            : '经验不限'}
-                        </Tag>
-                        <Tag className="meta-tag">
-                          {selectedJob?.education
-                            ? educationMap[selectedJob.education] || selectedJob.education
-                            : '学历不限'}
-                        </Tag>
-                        {selectedJob?.jobCategory && (
-                          <Tag className="meta-tag">{resolveJobCategoryLabel(selectedJob)}</Tag>
-                        )}
-                        {selectedJob?.vacancies && (
-                          <Tag className="meta-tag">招聘{selectedJob.vacancies}人</Tag>
-                        )}
-                        {selectedJob?.tags?.map((tag: string, index: number) => (
-                          <Tag key={index} className="meta-tag">{tag}</Tag>
-                        ))}
+                          <Tag className="meta-tag">
+                            {selectedJob?.education
+                              ? getDictLabel(educationEnum, selectedJob.education)
+                              : '学历不限'}
+                          </Tag>
+                          {selectedJob?.jobCategory && (
+                            <Tag className="meta-tag">{resolveJobCategoryLabel(selectedJob)}</Tag>
+                          )}
+                          {(selectedJob?.companyNature || selectedJob?.company?.companyNature) && (
+                            <Tag className="meta-tag">
+                              {getDictLabel(
+                                companyNatureEnum,
+                                selectedJob.companyNature || selectedJob.company?.companyNature,
+                              )}
+                            </Tag>
+                          )}
+                          {formatVacancyCount(selectedJob?.vacancies) && (
+                            <Tag className="meta-tag">
+                              招聘{formatVacancyCount(selectedJob?.vacancies)}人
+                            </Tag>
+                          )}
+                          {selectedJob?.tags?.map((tag: string, index: number) => (
+                            <Tag key={index} className="meta-tag">
+                              {tag}
+                            </Tag>
+                          ))}
+                        </div>
+                      </div>
+                      <div className="job-header-actions">
+                        <Space size={12}>
+                          <Button
+                            className={`btn-favorite${favorited ? ' favorited' : ''}`}
+                            icon={favorited ? <HeartFilled /> : <HeartOutlined />}
+                            onClick={handleCollect}
+                          >
+                            {favorited ? '已收藏' : '收藏'}
+                          </Button>
+                          <Button
+                            type="primary"
+                            className="btn-apply"
+                            disabled={selectedJob?.isApply === 1}
+                            onClick={handleApply}
+                          >
+                            {selectedJob?.isApply === 1 ? '已投递' : '立即申请'}
+                          </Button>
+                          <Button
+                            danger
+                            icon={<FlagOutlined />}
+                            onClick={() => setComplaintVisible(true)}
+                          >
+                            投诉
+                          </Button>
+                        </Space>
                       </div>
                     </div>
-                    <div className="job-header-actions">
-                      <Space size={12}>
-                        <Button
-                          className={`btn-favorite${favorited ? ' favorited' : ''}`}
-                          icon={favorited ? <HeartFilled /> : <HeartOutlined />}
-                          onClick={handleCollect}
-                        >
-                          {favorited ? '已收藏' : '收藏'}
-                        </Button>
-                        <Button
-                          type="primary"
-                          className="btn-apply"
-                          disabled={selectedJob?.isApply === 1}
-                          onClick={handleApply}
-                        >
-                          {selectedJob?.isApply === 1 ? '已投递' : '立即申请'}
-                        </Button>
-                        <Button
-                          danger
-                          icon={<FlagOutlined />}
-                          onClick={() => setComplaintVisible(true)}
-                        >
-                          投诉
-                        </Button>
-                      </Space>
-                      <Space className="action-icons" size={16}>
-                        <QrcodeOutlined title="微信扫码分享" />
-                      </Space>
-                    </div>
-                  </div>
 
-                  <Divider className="job-detail-divider" />
+                    <Divider className="job-detail-divider" />
 
-                  <Row gutter={16}>
-                    {/* 左侧内容区 */}
-                    <Col span={16}>
-                      <div className="job-description">
-                        <Title level={4} className="section-title">职位描述</Title>
-                        <Paragraph className="description-text">
-                          {selectedJob?.description || '暂无职位描述'}
-                        </Paragraph>
-                      </div>
-                    </Col>
-
-                    {/* 右侧侧边栏 */}
-                    <Col span={8}>
-                      {/* 竞争力分析 */}
-                      <Card
-                        title={
-                          <Space>
-                            <TrophyOutlined />
-                            竞争力分析
-                          </Space>
-                        }
-                        className="competitiveness-card"
-                      >
-                        {isJobPortalLoggedIn() ? (
-                          <div className="radar-chart-container">
-                            <Radar
-                              data={radarData}
-                              xField="item"
-                              yField="score"
-                              area={{
-                                style: {
-                                  fill: 'rgba(24, 144, 255, 0.25)',
-                                  fillOpacity: 0.5,
-                                },
-                              }}
-                              point={{
-                                size: 3,
-                                style: {
-                                  fill: '#1890ff',
-                                  stroke: '#1890ff',
-                                },
-                              }}
-                              line={{
-                                style: {
-                                  stroke: '#1890ff',
-                                  lineWidth: 2,
-                                },
-                              }}
-                              meta={{
-                                score: {
-                                  alias: '评分',
-                                  min: 0,
-                                  max: 100,
-                                  nice: true,
-                                },
-                              }}
-                              yAxis={{
-                                label: false,
-                                tickLine: null,
-                                line: null,
-                                grid: null,
-                              }}
-                              height={300}
-                            />
-                            <div className="radar-summary">
-                              <div className="summary-score">
-                                <div className="score-value">{overallScore}</div>
-                                <div className="score-label">综合评分</div>
-                              </div>
+                    <Row gutter={16}>
+                      {/* 左侧内容区 */}
+                      <Col span={16}>
+                        {selectedJobDetailTagGroups.length > 0 && (
+                          <div className="job-detail-tag-section">
+                            <Title level={4} className="section-title">
+                              岗位待遇与工作安排
+                            </Title>
+                            <div className="job-detail-tag-groups">
+                              {selectedJobDetailTagGroups.map((group) => (
+                                <div className="job-detail-tag-group" key={group.label}>
+                                  <div className="job-detail-tag-label">{group.label}</div>
+                                  <Space wrap size={[8, 8]}>
+                                    {group.values.map((value) => (
+                                      <Tag className="detail-tag" key={`${group.label}-${value}`}>
+                                        {value}
+                                      </Tag>
+                                    ))}
+                                  </Space>
+                                </div>
+                              ))}
                             </div>
                           </div>
-                        ) : (
-                          <div className="competitiveness-login-placeholder">
-                            <TrophyOutlined className="placeholder-icon" />
-                            <Paragraph type="secondary" style={{ marginBottom: 0 }}>
-                              登录后可查看您与该岗位的匹配度分析
-                            </Paragraph>
-                            <Text className="placeholder-hint">基于您的简历信息进行多维度对比</Text>
-                            <Button
-                              type="primary"
-                              onClick={() => ensureJobPortalLogin('查看竞争力分析')}
-                            >
-                              去登录
-                            </Button>
-                          </div>
                         )}
-                      </Card>
-                    </Col>
-                  </Row>
+                        <div className="job-description">
+                          <Title level={4} className="section-title">
+                            职位描述
+                          </Title>
+                          <Paragraph className="description-text">
+                            {selectedJob?.description || '暂无职位描述'}
+                          </Paragraph>
+                        </div>
+                      </Col>
 
-                </Card>
+                      {/* 右侧侧边栏 */}
+                      <Col span={8}>
+                        {/* 竞争力分析 */}
+                        <Card
+                          title={
+                            <Space>
+                              <TrophyOutlined />
+                              竞争力分析
+                            </Space>
+                          }
+                          className="competitiveness-card"
+                        >
+                          {isJobPortalLoggedIn() ? (
+                            <div className="radar-chart-container">
+                              <Radar
+                                data={radarData}
+                                xField="item"
+                                yField="score"
+                                area={{
+                                  style: {
+                                    fill: 'rgba(24, 144, 255, 0.25)',
+                                    fillOpacity: 0.5,
+                                  },
+                                }}
+                                point={{
+                                  size: 3,
+                                  style: {
+                                    fill: '#1890ff',
+                                    stroke: '#1890ff',
+                                  },
+                                }}
+                                line={{
+                                  style: {
+                                    stroke: '#1890ff',
+                                    lineWidth: 2,
+                                  },
+                                }}
+                                meta={{
+                                  score: {
+                                    alias: '评分',
+                                    min: 0,
+                                    max: 100,
+                                    nice: true,
+                                  },
+                                }}
+                                yAxis={{
+                                  label: false,
+                                  tickLine: null,
+                                  line: null,
+                                  grid: null,
+                                }}
+                                height={300}
+                              />
+                              <div className="radar-summary">
+                                <div className="summary-score">
+                                  <div className="score-value">{overallScore}</div>
+                                  <div className="score-label">综合评分</div>
+                                </div>
+                              </div>
+                            </div>
+                          ) : (
+                            <div className="competitiveness-login-placeholder">
+                              <TrophyOutlined className="placeholder-icon" />
+                              <Paragraph type="secondary" style={{ marginBottom: 0 }}>
+                                登录后可查看您与该岗位的匹配度分析
+                              </Paragraph>
+                              <Text className="placeholder-hint">
+                                基于您的简历信息进行多维度对比
+                              </Text>
+                              <Button
+                                type="primary"
+                                onClick={() => ensureJobPortalLogin('查看竞争力分析')}
+                              >
+                                去登录
+                              </Button>
+                            </div>
+                          )}
+                        </Card>
+                      </Col>
+                    </Row>
+                  </Card>
 
                   {/* 公司信息卡片 */}
-                  {(selectedJob?.companyInfo || selectedJob?.companyName || selectedJob?.company) && (
+                  {(selectedJob?.companyInfo ||
+                    selectedJob?.companyName ||
+                    selectedJob?.company) && (
                     <Card className="company-info-card" title="公司信息">
                       <div className="company-overview">
                         <Avatar size={56} className="company-avatar">
@@ -989,7 +1117,9 @@ const JobListPage: React.FC = () => {
                         </Avatar>
                         <div className="company-main">
                           <Title level={5} className="company-name">
-                            {selectedJob?.companyInfo?.name || selectedJob?.companyName || selectedJob?.company}
+                            {selectedJob?.companyInfo?.name ||
+                              selectedJob?.companyName ||
+                              selectedJob?.company}
                           </Title>
                           {selectedCompanyMetaItems.length > 0 && (
                             <div className="company-meta-row">
@@ -1009,11 +1139,7 @@ const JobListPage: React.FC = () => {
                           )}
                         </div>
                         <div className="company-block-action">
-                          <Button
-                            danger
-                            icon={<StopOutlined />}
-                            onClick={handleBlockCompany}
-                          >
+                          <Button danger icon={<StopOutlined />} onClick={handleBlockCompany}>
                             屏蔽该企业
                           </Button>
                         </div>
@@ -1031,8 +1157,8 @@ const JobListPage: React.FC = () => {
                       </div>
                     </Card>
                   )}
-              </>
-            )}
+                </>
+              )}
             </div>
           </Col>
         </Row>
@@ -1049,4 +1175,3 @@ const JobListPage: React.FC = () => {
 };
 
 export default JobListPage;
-
diff --git a/src/pages/JobPortal/index.tsx b/src/pages/JobPortal/index.tsx
index cceab6c..513da20 100644
--- a/src/pages/JobPortal/index.tsx
+++ b/src/pages/JobPortal/index.tsx
@@ -19,6 +19,9 @@ import { getGetInfoCache, saveGetInfoCache } from '@/utils/jobPortalAuth';
 import { getAccessToken } from '@/access';
 import { getUserInfo } from '@/services/session';
 import JobPortalHeader from '@/components/JobPortalHeader';
+import { getDictValueEnum } from '@/services/system/dict';
+import { getDictLabel } from '@/utils/jobPortalDict';
+import type { DictValueEnumObj } from '@/components/DictTag';
 import './index.less';
 
 const { Title, Text } = Typography;
@@ -128,6 +131,7 @@ const JobPortalPage: React.FC = () => {
   const [currentPage, setCurrentPage] = useState<number>(1);
   const [jobTitleData, setJobTitleData] = useState<any>(null);
   const [jobRecommendData, setJobRecommendData] = useState<any>(null);
+  const [companyNatureEnum, setCompanyNatureEnum] = useState<DictValueEnumObj>({});
   const [loading, setLoading] = useState<boolean>(false);
   const [itemsPerPage] = useState<number>(6);
   const [totalPages, setTotalPages] = useState<number>(1);
@@ -189,6 +193,9 @@ const JobPortalPage: React.FC = () => {
 
     fetchJobTitleData();
     fetchJobRecommendData();
+    getDictValueEnum('company_nature', false, true)
+      .then(setCompanyNatureEnum)
+      .catch(() => setCompanyNatureEnum({}));
   }, [itemsPerPage]);
 
   const handleIndustryHover = (industryId: string) => {
@@ -290,6 +297,11 @@ const JobPortalPage: React.FC = () => {
             </div>
             <div className="job-tags">
               {job.jobCategory && <Tag className="job-tag">{job.jobCategory}</Tag>}
+              {(job.companyNature || job.company?.companyNature) && (
+                <Tag className="job-tag">
+                  {getDictLabel(companyNatureEnum, job.companyNature || job.company?.companyNature)}
+                </Tag>
+              )}
               {job.vacancies && <Tag className="job-tag">招聘{job.vacancies}人</Tag>}
             </div>
           </Card>
diff --git a/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx b/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx
index 534d2a5..3062542 100644
--- a/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx
+++ b/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { history, useAccess } from '@umijs/max';
-import { Button, Card, Descriptions, Image, Tag, message } from 'antd';
+import { Button, Card, Descriptions, Divider, Image, Tag, message } from 'antd';
 import { FormOutlined } from '@ant-design/icons';
 import type { OutdoorFairDictForm, OutdoorFairItem } from '@/services/jobportal/outdoorFair';
 import { addOutdoorFairDictOption, updateOutdoorFair } from '@/services/jobportal/outdoorFair';
@@ -157,6 +157,23 @@ const FairInfoTab: React.FC<Props> = ({ fairInfo, onFairUpdate }) => {
               '--'
             )}
           </Descriptions.Item>
+          <Descriptions.Item label="招聘会简介" span={3}>
+            <div style={{ whiteSpace: 'pre-wrap' }}>{fairInfo.fairIntroduction || '--'}</div>
+          </Descriptions.Item>
+          <Descriptions.Item label="招聘会整体流程" span={3}>
+            <div style={{ whiteSpace: 'pre-wrap' }}>{fairInfo.fairProcess || '--'}</div>
+          </Descriptions.Item>
+        </Descriptions>
+        <Divider orientation="left" plain>
+          企业参会专属信息（仅报名企业可见）
+        </Divider>
+        <Descriptions column={3} bordered size="small">
+          <Descriptions.Item label="需携带资料" span={3}>
+            <div style={{ whiteSpace: 'pre-wrap' }}>{fairInfo.requiredMaterials || '--'}</div>
+          </Descriptions.Item>
+          <Descriptions.Item label="到场须知" span={3}>
+            <div style={{ whiteSpace: 'pre-wrap' }}>{fairInfo.attendanceNotes || '--'}</div>
+          </Descriptions.Item>
         </Descriptions>
       </Card>
 
diff --git a/src/pages/Jobfair/Outdoorfair/components/CompanyBoothMapModal.tsx b/src/pages/Jobfair/Outdoorfair/components/CompanyBoothMapModal.tsx
new file mode 100644
index 0000000..c61fd0f
--- /dev/null
+++ b/src/pages/Jobfair/Outdoorfair/components/CompanyBoothMapModal.tsx
@@ -0,0 +1,152 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { Empty, Modal, Space, Spin, Tag, Tooltip, message } from 'antd';
+import {
+  getCurrentCompanyOutdoorFairBoothMap,
+  type OutdoorFairCompanyBoothMap,
+} from '@/services/jobportal/outdoorFair';
+import type { VenueBoothItem } from '@/services/jobportal/venueInfo';
+
+interface Props {
+  fairId?: number;
+  open: boolean;
+  onCancel: () => void;
+}
+
+const BOOTH_WIDTH = 76;
+const BOOTH_HEIGHT = 48;
+const BOOTH_PADDING = 44;
+
+const CompanyBoothMapModal: React.FC<Props> = ({ fairId, open, onCancel }) => {
+  const [loading, setLoading] = useState(false);
+  const [mapData, setMapData] = useState<OutdoorFairCompanyBoothMap>();
+
+  useEffect(() => {
+    if (!open || !fairId) {
+      return;
+    }
+    let cancelled = false;
+    const loadBooths = async () => {
+      setLoading(true);
+      try {
+        const res = await getCurrentCompanyOutdoorFairBoothMap(fairId);
+        if (cancelled) {
+          return;
+        }
+        if (res.code === 200 && res.data) {
+          setMapData(res.data);
+        } else {
+          setMapData(undefined);
+          message.error(res.msg || '展位图加载失败');
+        }
+      } catch {
+        if (!cancelled) {
+          setMapData(undefined);
+          message.error('展位图加载失败');
+        }
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
+      }
+    };
+    void loadBooths();
+    return () => {
+      cancelled = true;
+    };
+  }, [fairId, open]);
+
+  const canvasSize = useMemo(() => {
+    const booths = mapData?.booths || [];
+    const maxX = booths.reduce((max, booth) => Math.max(max, booth.positionX || 0), 0);
+    const maxY = booths.reduce((max, booth) => Math.max(max, booth.positionY || 0), 0);
+    return {
+      width: Math.max(920, maxX + BOOTH_WIDTH + BOOTH_PADDING),
+      height: Math.max(480, maxY + BOOTH_HEIGHT + BOOTH_PADDING),
+    };
+  }, [mapData?.booths]);
+
+  const renderBooth = (booth: VenueBoothItem, index: number) => {
+    const reserved = booth.status === 'reserved';
+    const isCurrentCompany = reserved && booth.companyId === mapData?.currentCompanyId;
+    const color = isCurrentCompany ? '#f5222d' : reserved ? '#52c41a' : '#1890ff';
+    const stateText = isCurrentCompany ? '本企业' : reserved ? '已预定' : '未预定';
+    const tooltip = reserved ? `${booth.boothNumber}：${booth.companyName || stateText}` : `${booth.boothNumber}：未预定`;
+    return (
+      <Tooltip title={tooltip} key={booth.boothId || booth.id || `${booth.boothNumber}-${index}`}>
+        <div
+          style={{
+            position: 'absolute',
+            left: booth.positionX || 0,
+            top: booth.positionY || 0,
+            width: BOOTH_WIDTH,
+            height: BOOTH_HEIGHT,
+            padding: '4px 2px',
+            borderRadius: 4,
+            color: '#fff',
+            background: color,
+            boxShadow: isCurrentCompany ? '0 0 0 3px rgba(245, 34, 45, 0.22)' : undefined,
+            fontSize: 12,
+            userSelect: 'none',
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
+            cursor: 'default',
+          }}
+        >
+          <div>{booth.boothNumber}</div>
+          <div style={{ fontSize: 11 }}>{stateText}</div>
+        </div>
+      </Tooltip>
+    );
+  };
+
+  return (
+    <Modal
+      title="展位图（红色为本企业展位）"
+      open={open}
+      width={1180}
+      footer={null}
+      destroyOnClose
+      onCancel={onCancel}
+    >
+      <Spin spinning={loading}>
+        <Space wrap size={12} style={{ marginBottom: 16 }}>
+          <Tag color="red">本企业展位</Tag>
+          <Tag color="green">其他已预定展位</Tag>
+          <Tag color="blue">未预定展位</Tag>
+          <span style={{ color: '#999' }}>展位图仅供查看，不能编辑或调整。</span>
+        </Space>
+        {mapData?.booths?.length ? (
+          <div
+            role="img"
+            aria-label="招聘会只读展位图"
+            style={{
+              maxHeight: '65vh',
+              overflow: 'auto',
+              border: '1px solid #f0f0f0',
+              background: '#fafafa',
+            }}
+          >
+            <div
+              style={{
+                width: canvasSize.width,
+                height: canvasSize.height,
+                position: 'relative',
+                backgroundSize: '20px 20px',
+                backgroundImage:
+                  'linear-gradient(to right, rgba(0,0,0,0.04) 1px, transparent 1px), linear-gradient(to bottom, rgba(0,0,0,0.04) 1px, transparent 1px)',
+              }}
+            >
+              {mapData.booths.map(renderBooth)}
+            </div>
+          </div>
+        ) : (
+          !loading && <Empty description="当前招聘会暂未配置展位图" />
+        )}
+      </Spin>
+    </Modal>
+  );
+};
+
+export default CompanyBoothMapModal;
diff --git a/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx b/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx
new file mode 100644
index 0000000..cd3312b
--- /dev/null
+++ b/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { Descriptions, Divider, Image, Modal, Tag } from 'antd';
+import type { OutdoorFairItem } from '@/services/jobportal/outdoorFair';
+
+interface Props {
+  fair?: OutdoorFairItem | null;
+  open: boolean;
+  onCancel: () => void;
+}
+
+const content = (value?: string) => <div style={{ whiteSpace: 'pre-wrap' }}>{value || '--'}</div>;
+
+const CompanyFairDetailModal: React.FC<Props> = ({ fair, open, onCancel }) => (
+  <Modal
+    title="招聘会详情"
+    open={open}
+    width={920}
+    footer={null}
+    destroyOnClose
+    onCancel={onCancel}
+  >
+    {fair && (
+      <>
+        <Descriptions bordered column={2} size="small">
+          <Descriptions.Item label="招聘会标题" span={2}>
+            {fair.title || '--'}
+          </Descriptions.Item>
+          <Descriptions.Item label="举办单位">{fair.hostUnit || '--'}</Descriptions.Item>
+          <Descriptions.Item label="招聘会类型">{fair.fairType || '--'}</Descriptions.Item>
+          <Descriptions.Item label="举办区域">{fair.region || '--'}</Descriptions.Item>
+          <Descriptions.Item label="绑定场地">{fair.venueName || '--'}</Descriptions.Item>
+          <Descriptions.Item label="举办地址" span={2}>
+            {fair.address || '--'}
+          </Descriptions.Item>
+          <Descriptions.Item label="展位数量">{fair.boothCount ?? '--'}</Descriptions.Item>
+          <Descriptions.Item label="已预定摊位数">{fair.reservedBoothCount ?? 0}</Descriptions.Item>
+          <Descriptions.Item label="举办时间">{fair.holdTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="截止时间">{fair.endTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="开放申请">{fair.applyStartTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="截止申请">{fair.applyEndTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="线上申请">
+            <Tag color={fair.onlineApply ? 'green' : 'default'}>{fair.onlineApply ? '是' : '否'}</Tag>
+          </Descriptions.Item>
+          <Descriptions.Item label="招聘会照片">
+            {fair.photoUrl ? (
+              <Image src={fair.photoUrl} alt={fair.title} width={180} style={{ objectFit: 'cover' }} />
+            ) : (
+              '--'
+            )}
+          </Descriptions.Item>
+          <Descriptions.Item label="招聘会简介" span={2}>
+            {content(fair.fairIntroduction)}
+          </Descriptions.Item>
+          <Descriptions.Item label="招聘会整体流程" span={2}>
+            {content(fair.fairProcess)}
+          </Descriptions.Item>
+        </Descriptions>
+        <Divider orientation="left" plain>
+          企业参会专属信息
+        </Divider>
+        <Descriptions bordered column={1} size="small">
+          <Descriptions.Item label="需携带资料">{content(fair.requiredMaterials)}</Descriptions.Item>
+          <Descriptions.Item label="到场须知">{content(fair.attendanceNotes)}</Descriptions.Item>
+        </Descriptions>
+      </>
+    )}
+  </Modal>
+);
+
+export default CompanyFairDetailModal;
diff --git a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx
index cd5d6bf..7a9e10a 100644
--- a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx
+++ b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx
@@ -6,6 +6,7 @@ import {
   ProFormSwitch,
   ProFormSelect,
   ProFormText,
+  ProFormTextArea,
 } from '@ant-design/pro-components';
 import { Button, Divider, Form, Image, Input, message, Modal, Space, Upload } from 'antd';
 import { PlusOutlined, UploadOutlined } from '@ant-design/icons';
@@ -141,13 +142,36 @@ const EditModal: React.FC<EditModalProps> = ({
 
   return (
     <ModalForm
-      title={values ? '编辑户外招聘会' : '新增户外招聘会'}
+      title={values ? '编辑线下招聘会' : '新增线下招聘会'}
       form={form}
       open={open}
       width={700}
       modalProps={{ destroyOnClose: true, onCancel }}
       onFinish={async (formValues) => {
-        await onSubmit({ ...formValues, id: values?.id } as OutdoorFairForm);
+        const payload = { ...formValues, id: values?.id } as OutdoorFairForm;
+        const venueChanged =
+          !!values?.id &&
+          values.venueId !== undefined &&
+          Number(values.venueId) !== Number(payload.venueId);
+        if (venueChanged && (values?.boothCount || 0) > 0) {
+          return new Promise<boolean>((resolve) => {
+            Modal.confirm({
+              title: '确认更换场地并重建展位图？',
+              content:
+                '当前招聘会已有展位图。确认后将删除原展位图和所有企业预定，再按新场地的展位模板重新生成；此操作不可恢复。',
+              okText: '确认重建',
+              okButtonProps: { danger: true },
+              cancelText: '取消',
+              onOk: async () => {
+                await onSubmit({ ...payload, resetBoothMap: true });
+                resolve(true);
+              },
+              onCancel: () => resolve(false),
+            });
+          });
+        }
+        await onSubmit(payload);
+        return true;
       }}
     >
       <ProFormText name="id" hidden />
@@ -274,6 +298,33 @@ const EditModal: React.FC<EditModalProps> = ({
         colProps={{ md: 24 }}
         initialValue={false}
       />
+      <ProFormTextArea
+        name="fairIntroduction"
+        label="招聘会简介"
+        placeholder="请输入招聘会简介"
+        fieldProps={{ maxLength: 5000, showCount: true, autoSize: { minRows: 4, maxRows: 8 } }}
+      />
+      <ProFormTextArea
+        name="fairProcess"
+        label="招聘会整体流程"
+        placeholder="请输入招聘会整体流程"
+        fieldProps={{ maxLength: 5000, showCount: true, autoSize: { minRows: 4, maxRows: 8 } }}
+      />
+      <Divider orientation="left" plain>
+        企业参会专属信息（仅报名企业可见）
+      </Divider>
+      <ProFormTextArea
+        name="requiredMaterials"
+        label="需携带资料"
+        placeholder="请输入企业参加招聘会需携带的资料"
+        fieldProps={{ maxLength: 5000, showCount: true, autoSize: { minRows: 3, maxRows: 8 } }}
+      />
+      <ProFormTextArea
+        name="attendanceNotes"
+        label="到场须知"
+        placeholder="请输入企业到场须知"
+        fieldProps={{ maxLength: 5000, showCount: true, autoSize: { minRows: 3, maxRows: 8 } }}
+      />
       <ProForm.Item label="招聘会照片" required>
         <Space direction="vertical" size={12}>
           <Upload
diff --git a/src/pages/Jobfair/Outdoorfair/index.tsx b/src/pages/Jobfair/Outdoorfair/index.tsx
index 0eb5049..bc798db 100644
--- a/src/pages/Jobfair/Outdoorfair/index.tsx
+++ b/src/pages/Jobfair/Outdoorfair/index.tsx
@@ -31,6 +31,8 @@ import { getDictSelectOption, getDictValueEnum } from '@/services/system/dict';
 import { getVenueInfoList } from '@/services/jobportal/venueInfo';
 import { normalizePublicUrl } from '@/utils/publicUrl';
 import EditModal from './components/EditModal';
+import CompanyBoothMapModal from './components/CompanyBoothMapModal';
+import CompanyFairDetailModal from './components/CompanyFairDetailModal';
 import JobEditModal from './Detail/components/JobEditModal';
 
 const OUTDOOR_FAIR_TYPE_DICT = 'outdoor_fair_type';
@@ -51,6 +53,8 @@ const OutdoorFairList: React.FC = () => {
   const [qrInfo, setQrInfo] = useState<OutdoorFairCompanyQrCodeInfo | null>(null);
   const [rejectReasonModalOpen, setRejectReasonModalOpen] = useState(false);
   const [rejectReason, setRejectReason] = useState('');
+  const [companyDetailFair, setCompanyDetailFair] = useState<OutdoorFairItem | null>(null);
+  const [companyBoothFair, setCompanyBoothFair] = useState<OutdoorFairItem | null>(null);
   const [fairTypeValueEnum, setFairTypeValueEnum] = useState<Record<string, any>>({});
   const [fairTypeOptions, setFairTypeOptions] = useState<any[]>([]);
   const [regionValueEnum, setRegionValueEnum] = useState<Record<string, any>>({});
@@ -136,7 +140,7 @@ const OutdoorFairList: React.FC = () => {
   const handleDelete = async (id: number) => {
     Modal.confirm({
       title: '确认删除',
-      content: '确定要删除该户外招聘会吗？',
+      content: '确定要删除该线下招聘会吗？',
       onOk: async () => {
         const res = await deleteOutdoorFair(id);
         if (res.code === 200) {
@@ -202,6 +206,14 @@ const OutdoorFairList: React.FC = () => {
     setRejectReasonModalOpen(true);
   };
 
+  const openCompanyDetail = (record: OutdoorFairItem) => {
+    setCompanyDetailFair(record);
+  };
+
+  const openCompanyBoothMap = (record: OutdoorFairItem) => {
+    setCompanyBoothFair(record);
+  };
+
   const jobColumns: ProColumns<API.OutdoorFairDetail.PostedJob>[] = [
     { title: '岗位名称', dataIndex: 'jobTitle', ellipsis: true },
     {
@@ -286,6 +298,12 @@ const OutdoorFairList: React.FC = () => {
       dataIndex: 'boothCount',
       hideInSearch: true,
     },
+    {
+      title: '已预定摊位数',
+      dataIndex: 'reservedBoothCount',
+      hideInSearch: true,
+      render: (_, record) => record.reservedBoothCount ?? 0,
+    },
     {
       title: '举办时间',
       dataIndex: 'holdTime',
@@ -356,7 +374,7 @@ const OutdoorFairList: React.FC = () => {
     {
       title: '操作',
       valueType: 'option',
-      width: isEnterprise ? 280 : 160,
+      width: isEnterprise ? 520 : 160,
       fixed: 'right',
       render: (_, record) => [
         isEnterprise && !record.signedUp ? (
@@ -391,6 +409,16 @@ const OutdoorFairList: React.FC = () => {
             查看报名岗位
           </Button>
         ) : null,
+        isEnterprise ? (
+          <Button key="companyDetail" type="link" size="small" onClick={() => openCompanyDetail(record)}>
+            招聘会详情
+          </Button>
+        ) : null,
+        isEnterprise && record.signedUp && record.reviewStatus === '1' ? (
+          <Button key="boothMap" type="link" size="small" onClick={() => openCompanyBoothMap(record)}>
+            查看展位图
+          </Button>
+        ) : null,
         <Button
           key="detail"
           type="link"
@@ -432,7 +460,7 @@ const OutdoorFairList: React.FC = () => {
   return (
     <PageContainer>
       <ProTable<OutdoorFairItem>
-        headerTitle="户外招聘会管理列表"
+        headerTitle="线下招聘会管理列表"
         actionRef={actionRef}
         rowKey="id"
         columns={columns}
@@ -538,6 +566,16 @@ const OutdoorFairList: React.FC = () => {
           {rejectReason}
         </Typography.Paragraph>
       </Modal>
+      <CompanyFairDetailModal
+        fair={companyDetailFair}
+        open={!!companyDetailFair}
+        onCancel={() => setCompanyDetailFair(null)}
+      />
+      <CompanyBoothMapModal
+        fairId={companyBoothFair?.id}
+        open={!!companyBoothFair}
+        onCancel={() => setCompanyBoothFair(null)}
+      />
       <Modal
         title={selectedFair ? `${selectedFair.title} - 报名岗位` : '报名岗位'}
         open={jobListModalOpen}
diff --git a/src/pages/Jobfair/PublicJobFair/Detail/index.tsx b/src/pages/Jobfair/PublicJobFair/Detail/index.tsx
index 3a10486..d717ca1 100644
--- a/src/pages/Jobfair/PublicJobFair/Detail/index.tsx
+++ b/src/pages/Jobfair/PublicJobFair/Detail/index.tsx
@@ -23,6 +23,8 @@ import {
   removeJobFromJobFair,
   reviewPublicJobFairCompany,
 } from '@/services/jobfair/publicJobFair';
+import { getDictValueEnum } from '@/services/system/dict';
+import DictTag from '@/components/DictTag';
 import CompanySelectModal from '../components/CompanySelectModal';
 import JobSelectModal from '../components/JobSelectModal';
 
@@ -51,6 +53,7 @@ const JobFairDetail: React.FC = () => {
   const [reviewModalOpen, setReviewModalOpen] = useState(false);
   const [reviewCompany, setReviewCompany] = useState<API.PublicJobFair.CompanyInfo>();
   const [reviewSubmitting, setReviewSubmitting] = useState(false);
+  const [jobFairRegionTypeEnum, setJobFairRegionTypeEnum] = useState<any>({});
   const [reviewForm] = Form.useForm<ReviewFormValues>();
   const reviewStatus = Form.useWatch('reviewStatus', reviewForm);
 
@@ -72,6 +75,10 @@ const JobFairDetail: React.FC = () => {
     }
   }, [jobFairId, isEnterprise]);
 
+  useEffect(() => {
+    getDictValueEnum('job_fair_region_type').then(setJobFairRegionTypeEnum);
+  }, []);
+
   const handleRemoveCompany = (company: API.PublicJobFair.CompanyInfo) => {
     Modal.confirm({
       title: '确认移除',
@@ -174,6 +181,13 @@ const JobFairDetail: React.FC = () => {
               {jobFairTypeMap[detail?.jobFairType || '']}
             </Tag>
           </Descriptions.Item>
+          <Descriptions.Item label="区域类型">
+            {detail?.jobFairRegionType ? (
+              <DictTag enums={jobFairRegionTypeEnum} value={detail.jobFairRegionType} />
+            ) : (
+              '-'
+            )}
+          </Descriptions.Item>
           <Descriptions.Item label="地址">{detail?.jobFairAddress}</Descriptions.Item>
           <Descriptions.Item label="联系电话">{detail?.jobFairPhone}</Descriptions.Item>
           <Descriptions.Item label="招聘会时间">
diff --git a/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx b/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx
index f3cac71..fa6e5cc 100644
--- a/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx
+++ b/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx
@@ -11,7 +11,12 @@ interface CompanySelectModalProps {
   onSuccess: () => void;
 }
 
-const CompanySelectModal: React.FC<CompanySelectModalProps> = ({ open, jobFairId, onCancel, onSuccess }) => {
+const CompanySelectModal: React.FC<CompanySelectModalProps> = ({
+  open,
+  jobFairId,
+  onCancel,
+  onSuccess,
+}) => {
   const actionRef = useRef<ActionType>();
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const [loading, setLoading] = useState(false);
@@ -70,9 +75,11 @@ const CompanySelectModal: React.FC<CompanySelectModalProps> = ({ open, jobFairId
         }}
         request={async (params) => {
           const res = await getCmsCompanyList({
+            current: params.current,
+            pageSize: params.pageSize,
             name: params.name,
-          } as any);
-          return { data: res.rows, total: res.total, success: true };
+          });
+          return { data: res.rows, total: res.total, success: res.code === 200 };
         }}
         toolBarRender={false}
       />
diff --git a/src/pages/Jobfair/PublicJobFair/components/EditModal.tsx b/src/pages/Jobfair/PublicJobFair/components/EditModal.tsx
index dd39ea7..cd0858b 100644
--- a/src/pages/Jobfair/PublicJobFair/components/EditModal.tsx
+++ b/src/pages/Jobfair/PublicJobFair/components/EditModal.tsx
@@ -18,6 +18,7 @@ interface EditModalProps {
   open: boolean;
   values?: API.PublicJobFair.JobFairItem;
   jobFairTypeEnum: any;
+  jobFairRegionTypeEnum: any;
   onCancel: () => void;
   onSubmit: (values: API.PublicJobFair.JobFairForm) => Promise<void>;
 }
@@ -69,6 +70,7 @@ const EditModal: React.FC<EditModalProps> = ({
   open,
   values,
   jobFairTypeEnum,
+  jobFairRegionTypeEnum,
   onCancel,
   onSubmit,
 }) => {
@@ -175,6 +177,12 @@ const EditModal: React.FC<EditModalProps> = ({
         valueEnum={jobFairTypeEnum}
         rules={[{ required: true, message: '请选择招聘会类型' }]}
       />
+      <ProFormRadio.Group
+        name="jobFairRegionType"
+        label="区域类型"
+        valueEnum={jobFairRegionTypeEnum}
+        rules={[{ required: true, message: '请选择区域类型' }]}
+      />
       <ProFormRadio.Group name="isCrossDomain" label="是否跨域" valueEnum={yesNoEnum} />
       {isCrossDomain === 'y' && (
         <ProFormSelect
diff --git a/src/pages/Jobfair/PublicJobFair/index.tsx b/src/pages/Jobfair/PublicJobFair/index.tsx
index c558630..38f0449 100644
--- a/src/pages/Jobfair/PublicJobFair/index.tsx
+++ b/src/pages/Jobfair/PublicJobFair/index.tsx
@@ -33,11 +33,13 @@ const PublicJobFairList: React.FC = () => {
   const [companyJobModalOpen, setCompanyJobModalOpen] = useState(false);
   const [currentJobFair, setCurrentJobFair] = useState<API.PublicJobFair.JobFairItem>();
   const [jobFairTypeEnum, setJobFairTypeEnum] = useState<any>({});
+  const [jobFairRegionTypeEnum, setJobFairRegionTypeEnum] = useState<any>({});
   const [yesNoEnum, setYesNoEnum] = useState<any>({});
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
 
   useEffect(() => {
     getDictValueEnum('job_fair_type', true).then(setJobFairTypeEnum);
+    getDictValueEnum('job_fair_region_type').then(setJobFairRegionTypeEnum);
     getDictValueEnum('sys_yes_no').then(setYesNoEnum);
   }, []);
 
@@ -129,6 +131,26 @@ const PublicJobFairList: React.FC = () => {
       valueEnum: jobFairTypeEnum,
       render: (_, record) => <DictTag enums={jobFairTypeEnum} value={record.jobFairType} />,
     },
+    {
+      title: '区域类型',
+      dataIndex: 'jobFairRegionType',
+      valueType: 'select',
+      valueEnum: jobFairRegionTypeEnum,
+      render: (_, record) => (
+        <DictTag enums={jobFairRegionTypeEnum} value={record.jobFairRegionType} />
+      ),
+    },
+    {
+      title: '举办状态',
+      dataIndex: 'jobFairStatus',
+      hideInSearch: true,
+      render: (_, record) => {
+        const status = record.jobFairStatus;
+        if (!status) return '-';
+        const color = status === '未举办' ? 'blue' : status === '正在举办' ? 'green' : 'default';
+        return <Tag color={color}>{status}</Tag>;
+      },
+    },
     {
       title: '报名审核状态',
       dataIndex: 'enterpriseReviewStatus',
@@ -284,6 +306,7 @@ const PublicJobFairList: React.FC = () => {
             pageSize: params.pageSize,
             jobFairTitle: params.jobFairTitle,
             jobFairType: params.jobFairType,
+            jobFairRegionType: params.jobFairRegionType,
             startDate: params.startDate,
             endDate: params.endDate,
           });
@@ -322,6 +345,7 @@ const PublicJobFairList: React.FC = () => {
         open={modalVisible}
         values={currentRow}
         jobFairTypeEnum={jobFairTypeEnum}
+        jobFairRegionTypeEnum={jobFairRegionTypeEnum}
         onCancel={() => {
           setModalVisible(false);
           setCurrentRow(undefined);
diff --git a/src/pages/Jobfair/Venueinfo/components/VenueBoothMapModal.tsx b/src/pages/Jobfair/Venueinfo/components/VenueBoothMapModal.tsx
new file mode 100644
index 0000000..3b8c802
--- /dev/null
+++ b/src/pages/Jobfair/Venueinfo/components/VenueBoothMapModal.tsx
@@ -0,0 +1,421 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import {
+  Button,
+  Card,
+  Col,
+  Empty,
+  Input,
+  InputNumber,
+  List,
+  Modal,
+  Popover,
+  Row,
+  Space,
+  Tag,
+  message,
+} from 'antd';
+import { ReloadOutlined } from '@ant-design/icons';
+import { Rnd } from 'react-rnd';
+import { getVenueBoothMap, saveVenueBoothMap } from '@/services/jobportal/venueInfo';
+import type { VenueBoothItem, VenueInfoItem } from '@/services/jobportal/venueInfo';
+
+interface Props {
+  open: boolean;
+  venue?: VenueInfoItem;
+  onCancel: () => void;
+  onSaved: () => void;
+}
+
+const BOOTH_WIDTH = 70;
+const BOOTH_HEIGHT = 44;
+const BOOTH_GAP_X = 42;
+const BOOTH_GAP_Y = 54;
+const BOOTH_START_X = 40;
+const BOOTH_START_Y = 40;
+const BOOTHS_PER_ROW = 10;
+
+/**
+ * 场地模板模式的平面编辑器。
+ * 它只处理布局数据，刻意不加载企业、不展示预定/调换/取消预定等招聘会副本交互。
+ */
+const VenueBoothMapModal: React.FC<Props> = ({ open, venue, onCancel, onSaved }) => {
+  const [booths, setBooths] = useState<VenueBoothItem[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
+  const [activeBoothKey, setActiveBoothKey] = useState<string>();
+  const [boothModalOpen, setBoothModalOpen] = useState(false);
+  const [editingBoothKey, setEditingBoothKey] = useState<string>();
+  const [boothNumber, setBoothNumber] = useState('');
+  const [generateModalOpen, setGenerateModalOpen] = useState(false);
+  const [generateRows, setGenerateRows] = useState(2);
+  const [generateColumns, setGenerateColumns] = useState(10);
+
+  const getBoothKey = (booth: VenueBoothItem, index: number) =>
+    String(booth.id || booth.boothId || `${booth.boothNumber}-${index}`);
+
+  const canvasSize = useMemo(() => {
+    const maxX = booths.reduce((max, booth) => Math.max(max, booth.positionX || 0), 0);
+    const maxY = booths.reduce((max, booth) => Math.max(max, booth.positionY || 0), 0);
+    return {
+      width: Math.max(960, maxX + BOOTH_WIDTH + BOOTH_START_X),
+      height: Math.max(520, maxY + BOOTH_HEIGHT + BOOTH_START_Y),
+    };
+  }, [booths]);
+
+  const boothList = useMemo(
+    () =>
+      [...booths].sort((a, b) =>
+        String(a.boothNumber || '').localeCompare(String(b.boothNumber || ''), 'zh-CN', {
+          numeric: true,
+        }),
+      ),
+    [booths],
+  );
+
+  const fetchData = async () => {
+    if (!venue?.id) {
+      return;
+    }
+    setLoading(true);
+    try {
+      const res = await getVenueBoothMap(venue.id);
+      if (res.code === 200) {
+        const fetchedBooths = res.data || [];
+        setBooths(fetchedBooths);
+        if (fetchedBooths.length > 0) {
+          const columns = Math.min(BOOTHS_PER_ROW, fetchedBooths.length);
+          setGenerateColumns(columns);
+          setGenerateRows(Math.max(1, Math.ceil(fetchedBooths.length / columns)));
+        }
+      } else {
+        message.error(res.msg || '场地展位图加载失败');
+      }
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    if (open) {
+      setActiveBoothKey(undefined);
+      fetchData();
+    }
+  }, [open, venue?.id]);
+
+  const getNextBoothNumber = () => {
+    const existingNumbers = new Set(booths.map((item) => item.boothNumber));
+    let next = booths.length + 1;
+    while (existingNumbers.has(`KJ${String(next).padStart(2, '0')}`)) {
+      next += 1;
+    }
+    return `KJ${String(next).padStart(2, '0')}`;
+  };
+
+  const getNextBoothPosition = () => {
+    const columns = Math.max(1, generateColumns || BOOTHS_PER_ROW);
+    const index = booths.length;
+    return {
+      positionX: BOOTH_START_X + (index % columns) * (BOOTH_WIDTH + BOOTH_GAP_X),
+      positionY: BOOTH_START_Y + Math.floor(index / columns) * (BOOTH_HEIGHT + BOOTH_GAP_Y),
+    };
+  };
+
+  const openBoothModal = (booth?: VenueBoothItem, index?: number) => {
+    setEditingBoothKey(booth && index !== undefined ? getBoothKey(booth, index) : undefined);
+    setBoothNumber(booth?.boothNumber || getNextBoothNumber());
+    setBoothModalOpen(true);
+  };
+
+  const handleSaveBoothNumber = () => {
+    const trimmed = boothNumber.trim();
+    if (!trimmed) {
+      message.warning('请输入展位号');
+      return;
+    }
+    if (
+      booths.some(
+        (booth, index) =>
+          booth.boothNumber === trimmed && getBoothKey(booth, index) !== editingBoothKey,
+      )
+    ) {
+      message.warning('展位号不能重复');
+      return;
+    }
+    if (editingBoothKey) {
+      setBooths((prev) =>
+        prev.map((booth, index) =>
+          getBoothKey(booth, index) === editingBoothKey
+            ? { ...booth, boothNumber: trimmed }
+            : booth,
+        ),
+      );
+    } else {
+      const nextPosition = getNextBoothPosition();
+      setBooths((prev) => [...prev, { boothNumber: trimmed, ...nextPosition }]);
+    }
+    setBoothModalOpen(false);
+  };
+
+  const handleMoveBooth = (key: string, x: number, y: number) => {
+    setBooths((prev) =>
+      prev.map((booth, index) =>
+        getBoothKey(booth, index) === key
+          ? { ...booth, positionX: Math.round(x), positionY: Math.round(y) }
+          : booth,
+      ),
+    );
+  };
+
+  const handleDeleteBooth = (key: string) => {
+    setBooths((prev) => prev.filter((booth, index) => getBoothKey(booth, index) !== key));
+    setActiveBoothKey(undefined);
+  };
+
+  const handleGenerateBooths = () => {
+    const rows = Math.max(1, generateRows || 1);
+    const columns = Math.max(1, generateColumns || 1);
+    const count = rows * columns;
+    const existingByNumber = new Map(booths.map((item) => [item.boothNumber, item]));
+    const generated = Array.from({ length: count }).map((_, index) => {
+      const generatedNumber = `KJ${String(index + 1).padStart(2, '0')}`;
+      return {
+        ...existingByNumber.get(generatedNumber),
+        boothNumber: generatedNumber,
+        positionX: BOOTH_START_X + (index % columns) * (BOOTH_WIDTH + BOOTH_GAP_X),
+        positionY: BOOTH_START_Y + Math.floor(index / columns) * (BOOTH_HEIGHT + BOOTH_GAP_Y),
+      };
+    });
+    setBooths(generated);
+    setGenerateModalOpen(false);
+    message.success(`已生成 ${rows} 行 × ${columns} 列，共 ${count} 个展位；请点击保存场地模板`);
+  };
+
+  const handleArrangeBooths = () => {
+    const columns = Math.max(1, generateColumns || BOOTHS_PER_ROW);
+    setBooths((prev) =>
+      prev.map((booth, index) => ({
+        ...booth,
+        positionX: BOOTH_START_X + (index % columns) * (BOOTH_WIDTH + BOOTH_GAP_X),
+        positionY: BOOTH_START_Y + Math.floor(index / columns) * (BOOTH_HEIGHT + BOOTH_GAP_Y),
+      })),
+    );
+    message.success('已整理布局；请点击保存场地模板');
+  };
+
+  const handleSave = async () => {
+    if (!venue?.id) {
+      return;
+    }
+    const invalid = booths.find((booth) => !booth.boothNumber?.trim());
+    if (invalid) {
+      message.warning('展位号不能为空');
+      return;
+    }
+    setSaving(true);
+    try {
+      const res = await saveVenueBoothMap(
+        venue.id,
+        booths.map((booth) => ({
+          id: booth.id,
+          boothNumber: booth.boothNumber.trim(),
+          positionX: booth.positionX || 0,
+          positionY: booth.positionY || 0,
+        })),
+      );
+      if (res.code === 200) {
+        message.success('场地展位模板保存成功');
+        await fetchData();
+        onSaved();
+      } else {
+        message.error(res.msg || '场地展位模板保存失败');
+      }
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <Modal
+      title={venue ? `${venue.venueName} - 展位管理` : '展位管理'}
+      open={open}
+      onCancel={onCancel}
+      width={1240}
+      destroyOnClose
+      footer={null}
+    >
+      <Row gutter={16} wrap={false} align="top">
+        <Col flex="1 1 0" style={{ minWidth: 0 }}>
+          <Card loading={loading} bodyStyle={{ padding: 16 }}>
+            <Space wrap size={12} style={{ marginBottom: 16 }}>
+              <Button onClick={() => openBoothModal()}>新增展位</Button>
+              <Button onClick={() => setGenerateModalOpen(true)}>按行列生成</Button>
+              <Button onClick={handleArrangeBooths}>一键整理布局</Button>
+              <Button type="primary" loading={saving} onClick={handleSave}>
+                保存场地模板
+              </Button>
+              <Button icon={<ReloadOutlined />} onClick={fetchData}>
+                刷新
+              </Button>
+            </Space>
+            {booths.length === 0 ? (
+              <Empty description="当前场地还没有展位模板，请点击“按行列生成”或“新增展位”创建" />
+            ) : (
+              <div
+                style={{
+                  minHeight: 520,
+                  position: 'relative',
+                  overflow: 'auto',
+                  background: '#fafafa',
+                  border: '1px solid #f0f0f0',
+                }}
+              >
+                <div
+                  style={{
+                    width: canvasSize.width,
+                    height: canvasSize.height,
+                    position: 'relative',
+                    backgroundSize: '20px 20px',
+                    backgroundImage:
+                      'linear-gradient(to right, rgba(0,0,0,0.04) 1px, transparent 1px), linear-gradient(to bottom, rgba(0,0,0,0.04) 1px, transparent 1px)',
+                  }}
+                >
+                  {booths.map((booth, index) => {
+                    const key = getBoothKey(booth, index);
+                    return (
+                      <Popover
+                        key={key}
+                        trigger="click"
+                        placement="rightTop"
+                        open={activeBoothKey === key}
+                        onOpenChange={(visible) => setActiveBoothKey(visible ? key : undefined)}
+                        title={`${booth.boothNumber}：场地模板展位`}
+                        content={
+                          <Space direction="vertical" size={8} style={{ width: 160 }}>
+                            <Button
+                              block
+                              size="small"
+                              onClick={() => {
+                                setActiveBoothKey(undefined);
+                                openBoothModal(booth, index);
+                              }}
+                            >
+                              改名称
+                            </Button>
+                            <Button
+                              block
+                              danger
+                              size="small"
+                              onClick={() => handleDeleteBooth(key)}
+                            >
+                              删除
+                            </Button>
+                          </Space>
+                        }
+                      >
+                        <Rnd
+                          bounds="parent"
+                          size={{ width: BOOTH_WIDTH, height: BOOTH_HEIGHT }}
+                          position={{ x: booth.positionX || 0, y: booth.positionY || 0 }}
+                          dragGrid={[8, 8]}
+                          enableResizing={false}
+                          onDragStop={(_, data) => handleMoveBooth(key, data.x, data.y)}
+                        >
+                          <div
+                            style={{
+                              width: '100%',
+                              height: '100%',
+                              padding: '4px 2px',
+                              textAlign: 'center',
+                              borderRadius: 4,
+                              cursor: 'move',
+                              color: '#fff',
+                              background: '#1890ff',
+                              fontSize: 12,
+                              userSelect: 'none',
+                              display: 'flex',
+                              alignItems: 'center',
+                              justifyContent: 'center',
+                            }}
+                          >
+                            {booth.boothNumber}
+                          </div>
+                        </Rnd>
+                      </Popover>
+                    );
+                  })}
+                </div>
+              </div>
+            )}
+          </Card>
+        </Col>
+        <Col flex="260px">
+          <Card title="模板概况" size="small">
+            <Space direction="vertical" style={{ width: '100%' }} size={12}>
+              <Tag color="blue" style={{ width: '100%', textAlign: 'center', padding: 8 }}>
+                模板展位（{booths.length}）
+              </Tag>
+              <div style={{ color: '#999', fontSize: 12, lineHeight: '20px' }}>
+                此处只维护场地布局。创建户外招聘会并绑定该场地时，系统会复制当前模板为招聘会独立展位图，后续双方互不影响。
+              </div>
+              <List
+                size="small"
+                style={{ maxHeight: 420, overflow: 'auto' }}
+                dataSource={boothList}
+                locale={{ emptyText: '暂无模板展位' }}
+                renderItem={(booth) => <List.Item>{booth.boothNumber}</List.Item>}
+              />
+            </Space>
+          </Card>
+        </Col>
+      </Row>
+      <Modal
+        title="按行列生成展位模板"
+        open={generateModalOpen}
+        onCancel={() => setGenerateModalOpen(false)}
+        onOk={handleGenerateBooths}
+        okText="生成"
+      >
+        <Space direction="vertical" size={16} style={{ width: '100%' }}>
+          <Space>
+            <span>行数</span>
+            <InputNumber
+              min={1}
+              max={50}
+              value={generateRows}
+              onChange={(value) => setGenerateRows(Number(value) || 1)}
+            />
+            <span>列数</span>
+            <InputNumber
+              min={1}
+              max={50}
+              value={generateColumns}
+              onChange={(value) => setGenerateColumns(Number(value) || 1)}
+            />
+          </Space>
+          <div style={{ color: '#999' }}>
+            将生成 {Math.max(1, generateRows || 1)} 行 × {Math.max(1, generateColumns || 1)} 列，共{' '}
+            {Math.max(1, generateRows || 1) * Math.max(1, generateColumns || 1)}{' '}
+            个展位。生成后需要保存才会写入场地模板。
+          </div>
+        </Space>
+      </Modal>
+      <Modal
+        title={editingBoothKey ? '修改展位号' : '新增展位'}
+        open={boothModalOpen}
+        onCancel={() => setBoothModalOpen(false)}
+        onOk={handleSaveBoothNumber}
+        okText="确定"
+      >
+        <Input
+          value={boothNumber}
+          maxLength={50}
+          placeholder="请输入展位号，如 KJ01"
+          onChange={(event) => setBoothNumber(event.target.value)}
+          onPressEnter={handleSaveBoothNumber}
+        />
+      </Modal>
+    </Modal>
+  );
+};
+
+export default VenueBoothMapModal;
diff --git a/src/pages/Jobfair/Venueinfo/index.tsx b/src/pages/Jobfair/Venueinfo/index.tsx
index a116601..7486af6 100644
--- a/src/pages/Jobfair/Venueinfo/index.tsx
+++ b/src/pages/Jobfair/Venueinfo/index.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useAccess, useModel } from '@umijs/max';
 import { Button, message, Modal } from 'antd';
 import { ActionType, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
-import { DeleteOutlined, FormOutlined, PlusOutlined } from '@ant-design/icons';
+import { ApartmentOutlined, DeleteOutlined, FormOutlined, PlusOutlined } from '@ant-design/icons';
 import {
   addVenueInfo,
   addVenueInfoDictOption,
@@ -19,6 +19,7 @@ import type {
 import { getCmsLineList } from '@/services/area/subway';
 import { getDictSelectOption, getDictValueEnum } from '@/services/system/dict';
 import EditModal from './components/EditModal';
+import VenueBoothMapModal from './components/VenueBoothMapModal';
 
 const VENUE_TYPE_DICT = 'venue_info_type';
 
@@ -28,6 +29,7 @@ const VenueInfoList: React.FC = () => {
   const actionRef = useRef<ActionType>();
   const [modalVisible, setModalVisible] = useState(false);
   const [currentRow, setCurrentRow] = useState<VenueInfoItem>();
+  const [templateVenue, setTemplateVenue] = useState<VenueInfoItem>();
   const [venueTypeValueEnum, setVenueTypeValueEnum] = useState<Record<string, any>>({});
   const [venueTypeOptions, setVenueTypeOptions] = useState<any[]>([]);
   const [lineOptions, setLineOptions] = useState<any[]>([]);
@@ -153,9 +155,19 @@ const VenueInfoList: React.FC = () => {
     {
       title: '操作',
       valueType: 'option',
-      width: 140,
+      width: 220,
       fixed: 'right',
       render: (_, record) => [
+        <Button
+          key="booths"
+          type="link"
+          size="small"
+          icon={<ApartmentOutlined />}
+          hidden={!access.hasPerms('cms:venueInfo:edit')}
+          onClick={() => setTemplateVenue(record)}
+        >
+          展位管理
+        </Button>,
         <Button
           key="edit"
           type="link"
@@ -240,6 +252,12 @@ const VenueInfoList: React.FC = () => {
           }
         }}
       />
+      <VenueBoothMapModal
+        open={!!templateVenue}
+        venue={templateVenue}
+        onCancel={() => setTemplateVenue(undefined)}
+        onSaved={() => actionRef.current?.reload()}
+      />
     </PageContainer>
   );
 };
diff --git a/src/pages/Management/List/edit.tsx b/src/pages/Management/List/edit.tsx
index 0662de6..ead7237 100644
--- a/src/pages/Management/List/edit.tsx
+++ b/src/pages/Management/List/edit.tsx
@@ -8,14 +8,50 @@ import {
   ProFormTextArea,
   ProDescriptions,
 } from '@ant-design/pro-components';
-import { Form, Button, Input, TreeSelect, Switch } from 'antd';
+import { Form, Button, Input, Tag, TreeSelect, Switch } from 'antd';
 import { PlusOutlined, MinusCircleOutlined, EnvironmentOutlined } from '@ant-design/icons';
+import { useModel } from '@umijs/max';
 import React, { useEffect, useRef, useState } from 'react';
 import { DictValueEnumObj } from '@/components/DictTag';
 import { getCmsCompanyList } from '@/services/company/list';
 import { getCmsJobDetail } from '@/services/Management/list';
 import { getJobTitleTreeSelect } from '@/services/common/jobTitle';
 import ProFromMap from '@/components/ProFromMap';
+import { parseCommaSeparatedTags, serializeCommaSeparatedTags } from '@/utils/jobDetailTags';
+
+type ManageFormValues = Omit<
+  API.ManagementList.Manage,
+  'salaryComposition' | 'welfareBenefits' | 'workSchedule'
+> & {
+  salaryComposition?: string[];
+  welfareBenefits?: string[];
+  workSchedule?: string[];
+};
+
+const toManageFormValues = (
+  values: Partial<API.ManagementList.Manage>,
+): Partial<ManageFormValues> => ({
+  ...values,
+  jobLocationAreaCode: String(values.jobLocationAreaCode || ''),
+  salaryComposition: parseCommaSeparatedTags(values.salaryComposition),
+  welfareBenefits: parseCommaSeparatedTags(values.welfareBenefits),
+  workSchedule: parseCommaSeparatedTags(values.workSchedule),
+});
+
+const renderDetailTags = (value: unknown) => {
+  const tags = parseCommaSeparatedTags(value);
+  if (tags.length === 0) {
+    return <span style={{ color: '#999' }}>暂无</span>;
+  }
+  return tags.map((tag) => <Tag key={tag}>{tag}</Tag>);
+};
+
+const formatVacancyCount = (vacancies: unknown): string => {
+  if (vacancies === null || vacancies === undefined || vacancies === '') {
+    return '-';
+  }
+  return String(vacancies) === '-1' ? '若干' : String(vacancies);
+};
 
 export type ListFormProps = {
   onCancel: (flag?: boolean, formVals?: unknown) => void;
@@ -26,6 +62,9 @@ export type ListFormProps = {
   experienceEnum: DictValueEnumObj;
   areaEnum: DictValueEnumObj;
   jobTypeEnum: DictValueEnumObj;
+  salaryCompositionEnum: DictValueEnumObj;
+  welfareBenefitsEnum: DictValueEnumObj;
+  workScheduleEnum: DictValueEnumObj;
   mode?: 'view' | 'edit' | 'create';
 };
 
@@ -38,42 +77,51 @@ const waitTime = (time: number = 100) => {
 };
 
 const listEdit: React.FC<ListFormProps> = (props) => {
-  const [form] = Form.useForm<API.ManagementList.Manage>();
+  const { initialState } = useModel('@@initialState');
+  const isEnterprise = initialState?.currentUser?.userType === 'view';
+  const [form] = Form.useForm<ManageFormValues>();
   const companyNameMap = useRef<Record<number, string>>({});
   const [jobDetail, setJobDetail] = useState<API.ManagementList.Manage | null>(null);
   const [loading, setLoading] = useState(false);
   const [jobCategoryTreeData, setJobCategoryTreeData] = useState<any[]>([]);
   const [mapOpen, setMapOpen] = useState<boolean>(false);
   const [mapViewInfo, setMapViewInfo] = useState<any>({});
-  const { educationEnum, experienceEnum, areaEnum, jobTypeEnum } = props;
+  const {
+    educationEnum,
+    experienceEnum,
+    areaEnum,
+    jobTypeEnum,
+    salaryCompositionEnum,
+    welfareBenefitsEnum,
+    workScheduleEnum,
+  } = props;
   const { mode = props.values ? 'edit' : 'create' } = props;
   useEffect(() => {
-    if(props.open){
+    if (props.open) {
       form.resetFields();
-    if (props.values) {
-      form.setFieldsValue({
-        ...props.values,
-        jobLocationAreaCode: String(props.values.jobLocationAreaCode || ''),
-      });
-      // 初始化地图位置信息（编辑时回显）
-      if (props.values.latitude || props.values.longitude) {
-        setMapViewInfo({
-          address: props.values.jobLocation || '',
-          latitude: props.values.latitude,
-          longitude: props.values.longitude,
-        });
+      if (props.values) {
+        form.setFieldsValue(toManageFormValues(props.values));
+        // 初始化地图位置信息（编辑时回显）
+        if (props.values.latitude || props.values.longitude) {
+          setMapViewInfo({
+            address: props.values.jobLocation || '',
+            latitude: props.values.latitude,
+            longitude: props.values.longitude,
+          });
+        } else {
+          setMapViewInfo({});
+        }
       } else {
         setMapViewInfo({});
       }
-    } else {
-      setMapViewInfo({});
+      // 加载岗位标签树数据
+      getJobTitleTreeSelect()
+        .then((res) => {
+          setJobCategoryTreeData(res.data || []);
+        })
+        .catch(() => {});
     }
-    // 加载岗位标签树数据
-    getJobTitleTreeSelect().then((res) => {
-      setJobCategoryTreeData(res.data || []);
-    }).catch(() => {});
-  }
-  }, [form, props.values?.jobId,props.open]);
+  }, [form, props.values?.jobId, props.open]);
 
   // 在查看模式和编辑模式下调用API获取详情
   useEffect(() => {
@@ -92,10 +140,7 @@ const listEdit: React.FC<ListFormProps> = (props) => {
         setJobDetail(response.data);
         // 如果是编辑模式，将获取到的详情数据设置到表单中
         if (mode === 'edit') {
-          form.setFieldsValue({
-            ...response.data,
-            jobLocationAreaCode: String(response.data.jobLocationAreaCode || ''),
-          });
+          form.setFieldsValue(toManageFormValues(response.data));
         }
       }
     } catch (error) {
@@ -136,9 +181,12 @@ const listEdit: React.FC<ListFormProps> = (props) => {
       companyName:
         typeof values.companyName === 'string'
           ? values.companyName
-          : companyNameMap.current[values.companyId] ?? '',
+          : (companyNameMap.current[values.companyId] ?? ''),
       minSalary: values.minSalary,
       maxSalary: values.maxSalary,
+      salaryComposition: serializeCommaSeparatedTags(values.salaryComposition),
+      welfareBenefits: serializeCommaSeparatedTags(values.welfareBenefits),
+      workSchedule: serializeCommaSeparatedTags(values.workSchedule),
       education: values.education,
       experience: values.experience,
       jobLocationAreaCode: values.jobLocationAreaCode,
@@ -146,11 +194,13 @@ const listEdit: React.FC<ListFormProps> = (props) => {
       jobType: values.jobType,
       jobLocation: values.jobLocation,
       description: values.description,
-      jobContactList: (values.jobContactList ?? []).map((item: API.ManagementList.ContactPerson) => ({
-        contactPerson: item.contactPerson,
-        contactPersonPhone: item.contactPersonPhone,
-        position: item.position,
-      })),
+      jobContactList: (values.jobContactList ?? []).map(
+        (item: API.ManagementList.ContactPerson) => ({
+          contactPerson: item.contactPerson,
+          contactPersonPhone: item.contactPersonPhone,
+          position: item.position,
+        }),
+      ),
       jobCategory: values.jobCategory,
       isUrgent: values.isUrgent ? 1 : 0,
       latitude: values.latitude,
@@ -175,7 +225,7 @@ const listEdit: React.FC<ListFormProps> = (props) => {
         }}
         submitter={false}
       >
-         <ProDescriptions<API.ManagementList.Manage>
+        <ProDescriptions<API.ManagementList.Manage>
           column={2}
           dataSource={jobDetail || props.values || {}}
           loading={loading}
@@ -190,10 +240,24 @@ const listEdit: React.FC<ListFormProps> = (props) => {
           <ProDescriptions.Item dataIndex="minSalary" label="最低薪资(元/月)" />
           <ProDescriptions.Item dataIndex="maxSalary" label="最高薪资(元/月)" />
           <ProDescriptions.Item
-            dataIndex="education"
-            label="学历要求"
-            valueEnum={educationEnum}
+            dataIndex="salaryComposition"
+            label="薪资范围与构成"
+            span={2}
+            render={(value) => renderDetailTags(value)}
           />
+          <ProDescriptions.Item
+            dataIndex="welfareBenefits"
+            label="福利待遇"
+            span={2}
+            render={(value) => renderDetailTags(value)}
+          />
+          <ProDescriptions.Item
+            dataIndex="workSchedule"
+            label="工作时间安排"
+            span={2}
+            render={(value) => renderDetailTags(value)}
+          />
+          <ProDescriptions.Item dataIndex="education" label="学历要求" valueEnum={educationEnum} />
           <ProDescriptions.Item
             dataIndex="experience"
             label="工作经验"
@@ -204,18 +268,18 @@ const listEdit: React.FC<ListFormProps> = (props) => {
             label="工作区县"
             valueEnum={areaEnum}
           />
-          <ProDescriptions.Item dataIndex="vacancies" label="招聘人数" />
+          <ProDescriptions.Item
+            dataIndex="vacancies"
+            label="招聘人数"
+            render={(value) => formatVacancyCount(value)}
+          />
           <ProDescriptions.Item dataIndex="jobLocation" label="工作地点" />
-           <ProDescriptions.Item
-             dataIndex="jobType"
-             label="岗位类型"
-             valueEnum={jobTypeEnum}
-           />
+          <ProDescriptions.Item dataIndex="jobType" label="区域" valueEnum={jobTypeEnum} />
           <ProDescriptions.Item dataIndex="jobCategory" label="岗位标签" />
           <ProDescriptions.Item
             dataIndex="description"
             label="岗位描述"
-            span={2}  // 跨两列显示
+            span={2} // 跨两列显示
           />
           <ProDescriptions.Item
             dataIndex="company"
@@ -265,67 +329,84 @@ const listEdit: React.FC<ListFormProps> = (props) => {
               }
               return (
                 <div style={{ width: '100%' }}>
-                  <table style={{
-                    width: '100%',
-                    borderCollapse: 'collapse',
-                    border: '1px solid #d9d9d9',
-                    borderRadius: '6px',
-                    overflow: 'hidden'
-                  }}>
+                  <table
+                    style={{
+                      width: '100%',
+                      borderCollapse: 'collapse',
+                      border: '1px solid #d9d9d9',
+                      borderRadius: '6px',
+                      overflow: 'hidden',
+                    }}
+                  >
                     <thead>
                       <tr style={{ backgroundColor: '#fafafa' }}>
-                        <th style={{
-                          padding: '12px 16px',
-                          textAlign: 'left',
-                          borderBottom: '1px solid #d9d9d9',
-                          fontWeight: 600,
-                          color: '#000'
-                        }}>
+                        <th
+                          style={{
+                            padding: '12px 16px',
+                            textAlign: 'left',
+                            borderBottom: '1px solid #d9d9d9',
+                            fontWeight: 600,
+                            color: '#000',
+                          }}
+                        >
                           联系人姓名
                         </th>
-                        <th style={{
-                          padding: '12px 16px',
-                          textAlign: 'left',
-                          borderBottom: '1px solid #d9d9d9',
-                          fontWeight: 600,
-                          color: '#000'
-                        }}>
+                        <th
+                          style={{
+                            padding: '12px 16px',
+                            textAlign: 'left',
+                            borderBottom: '1px solid #d9d9d9',
+                            fontWeight: 600,
+                            color: '#000',
+                          }}
+                        >
                           职务
                         </th>
-                        <th style={{
-                          padding: '12px 16px',
-                          textAlign: 'left',
-                          borderBottom: '1px solid #d9d9d9',
-                          fontWeight: 600,
-                          color: '#000'
-                        }}>
+                        <th
+                          style={{
+                            padding: '12px 16px',
+                            textAlign: 'left',
+                            borderBottom: '1px solid #d9d9d9',
+                            fontWeight: 600,
+                            color: '#000',
+                          }}
+                        >
                           联系电话
                         </th>
                       </tr>
                     </thead>
                     <tbody>
                       {contactList.map((contact: any, index: number) => (
-                        <tr key={index} style={{ backgroundColor: index % 2 === 0 ? '#fff' : '#fafafa' }}>
-                          <td style={{
-                            padding: '12px 16px',
-                            borderBottom: '1px solid #f0f0f0',
-                            color: '#000'
-                          }}>
+                        <tr
+                          key={index}
+                          style={{ backgroundColor: index % 2 === 0 ? '#fff' : '#fafafa' }}
+                        >
+                          <td
+                            style={{
+                              padding: '12px 16px',
+                              borderBottom: '1px solid #f0f0f0',
+                              color: '#000',
+                            }}
+                          >
                             {contact.contactPerson}
                           </td>
-                          <td style={{
-                            padding: '12px 16px',
-                            borderBottom: '1px solid #f0f0f0',
-                            color: '#000'
-                          }}>
+                          <td
+                            style={{
+                              padding: '12px 16px',
+                              borderBottom: '1px solid #f0f0f0',
+                              color: '#000',
+                            }}
+                          >
                             {contact.position}
                           </td>
-                          <td style={{
-                            padding: '12px 16px',
-                            borderBottom: '1px solid #f0f0f0',
-                            color: '#000',
-                            fontWeight: 500
-                          }}>
+                          <td
+                            style={{
+                              padding: '12px 16px',
+                              borderBottom: '1px solid #f0f0f0',
+                              color: '#000',
+                              fontWeight: 500,
+                            }}
+                          >
                             {contact.contactPersonPhone}
                           </td>
                         </tr>
@@ -341,7 +422,7 @@ const listEdit: React.FC<ListFormProps> = (props) => {
     );
   }
   return (
-    <ModalForm<API.ManagementList.Manage>
+    <ModalForm<ManageFormValues>
       title={mode === 'edit' ? '编辑岗位' : '新建岗位'}
       form={form}
       autoFocusFirstInput
@@ -377,26 +458,28 @@ const listEdit: React.FC<ListFormProps> = (props) => {
         initialValue={0}
         fieldProps={{ defaultChecked: false }}
       />
-      <ProFormSelect
-        showSearch
-        width="md"
-        name="companyId"
-        request={async ({ keyWords }) => {
-          const resData = await getCmsCompanyList({ name: keyWords });
-          return resData.rows.map((item) => {
-            companyNameMap.current[item.companyId] = item.name;
-            return { label: item.name, value: item.companyId };
-          });
-        }}
-        fieldProps={{
-          onChange: (companyId: number) => {
-            form.setFieldValue('companyName', companyNameMap.current[companyId] ?? '');
-          },
-        }}
-        placeholder="请输入公司名称选择公司"
-        rules={[{ required: true, message: '请输入公司名称选择公司!' }]}
-        label="招聘公司"
-      />
+      {!isEnterprise && (
+        <ProFormSelect
+          showSearch
+          width="md"
+          name="companyId"
+          request={async ({ keyWords }) => {
+            const resData = await getCmsCompanyList({ name: keyWords });
+            return resData.rows.map((item) => {
+              companyNameMap.current[item.companyId] = item.name;
+              return { label: item.name, value: item.companyId };
+            });
+          }}
+          fieldProps={{
+            onChange: (companyId: number) => {
+              form.setFieldValue('companyName', companyNameMap.current[companyId] ?? '');
+            },
+          }}
+          placeholder="请输入公司名称选择公司"
+          rules={[{ required: true, message: '请输入公司名称选择公司!' }]}
+          label="招聘公司"
+        />
+      )}
       <ProFormDigit
         name="minSalary"
         width="md"
@@ -411,6 +494,33 @@ const listEdit: React.FC<ListFormProps> = (props) => {
         label="最大薪资（元/月）"
         placeholder="请输入最大薪资（元）"
       />
+      <ProFormSelect
+        mode="tags"
+        width="md"
+        name="salaryComposition"
+        label="薪资范围与构成"
+        valueEnum={salaryCompositionEnum}
+        placeholder="请选择或手动输入薪资构成"
+        fieldProps={{ tokenSeparators: [',', '，'], maxTagCount: 'responsive' }}
+      />
+      <ProFormSelect
+        mode="tags"
+        width="md"
+        name="welfareBenefits"
+        label="福利待遇"
+        valueEnum={welfareBenefitsEnum}
+        placeholder="请选择或手动输入福利待遇"
+        fieldProps={{ tokenSeparators: [',', '，'], maxTagCount: 'responsive' }}
+      />
+      <ProFormSelect
+        mode="tags"
+        width="md"
+        name="workSchedule"
+        label="工作时间安排"
+        valueEnum={workScheduleEnum}
+        placeholder="请选择或手动输入工作时间安排"
+        fieldProps={{ tokenSeparators: [',', '，'], maxTagCount: 'responsive' }}
+      />
       <ProFormSelect
         width="md"
         name="education"
@@ -445,12 +555,16 @@ const listEdit: React.FC<ListFormProps> = (props) => {
       <ProFormSelect
         width="md"
         name="jobType"
-        label={'岗位类型'}
+        label={'区域'}
         valueEnum={jobTypeEnum}
-        placeholder="请选择类型"
-        rules={[{ required: true, message: '请选择类型!' }]}
+        placeholder="请选择区域"
+        rules={[{ required: true, message: '请选择区域!' }]}
       />
-      <ProForm.Item name="jobCategory" label="岗位标签" rules={[{ required: true, message: '请选择岗位标签!' }]}>
+      <ProForm.Item
+        name="jobCategory"
+        label="岗位标签"
+        rules={[{ required: true, message: '请选择岗位标签!' }]}
+      >
         <TreeSelect
           showSearch
           allowClear
@@ -468,7 +582,9 @@ const listEdit: React.FC<ListFormProps> = (props) => {
       <ProFormText width="md" name="jobLocation" label="工作地点" placeholder="请输入工作地点" />
       <ProForm.Item label="位置选择" colProps={{ span: 12 }}>
         <div>
-          <Button icon={<EnvironmentOutlined />} onClick={() => setMapOpen(true)}>选择位置信息</Button>
+          <Button icon={<EnvironmentOutlined />} onClick={() => setMapOpen(true)}>
+            选择位置信息
+          </Button>
           <div style={{ margin: '8px 0 0 0', fontSize: 12, color: '#666' }}>
             {mapViewInfo.address ? (
               <>
@@ -485,18 +601,8 @@ const listEdit: React.FC<ListFormProps> = (props) => {
           </div>
         </div>
       </ProForm.Item>
-      <ProFormDigit
-        label="纬度"
-        name="latitude"
-        width="md"
-        hidden
-      />
-      <ProFormDigit
-        label="经度"
-        name="longitude"
-        width="md"
-        hidden
-      />
+      <ProFormDigit label="纬度" name="latitude" width="md" hidden />
+      <ProFormDigit label="经度" name="longitude" width="md" hidden />
 
       <ProFormTextArea
         width="xl"
@@ -513,7 +619,16 @@ const listEdit: React.FC<ListFormProps> = (props) => {
           {(fields, { add, remove }) => (
             <>
               {fields.map(({ key, name, ...restField }) => (
-                <div key={key} style={{ display: 'flex', width: '100%', marginBottom: 8, alignItems: 'center', gap: '8px' }}>
+                <div
+                  key={key}
+                  style={{
+                    display: 'flex',
+                    width: '100%',
+                    marginBottom: 8,
+                    alignItems: 'center',
+                    gap: '8px',
+                  }}
+                >
                   <Form.Item
                     {...restField}
                     name={[name, 'contactPerson']}
@@ -529,7 +644,7 @@ const listEdit: React.FC<ListFormProps> = (props) => {
                     label="联系电话"
                     rules={[
                       { required: true, message: '请输入联系人电话' },
-                      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' }
+                      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' },
                     ]}
                     style={{ marginBottom: 0, flex: 1 }}
                   >
diff --git a/src/pages/Management/List/index.tsx b/src/pages/Management/List/index.tsx
index 505b45d..ec0f94b 100644
--- a/src/pages/Management/List/index.tsx
+++ b/src/pages/Management/List/index.tsx
@@ -12,7 +12,16 @@ import {
 } from '@/services/Management/list';
 import { Button, FormInstance, message, Modal, Switch } from 'antd';
 import { ActionType, ProColumns, ProTable } from '@ant-design/pro-components';
-import { AlignLeftOutlined, BarChartOutlined, DeleteOutlined, FormOutlined, PlusOutlined, DownloadOutlined, UploadOutlined, IdcardOutlined } from '@ant-design/icons';
+import {
+  AlignLeftOutlined,
+  BarChartOutlined,
+  DeleteOutlined,
+  FormOutlined,
+  PlusOutlined,
+  DownloadOutlined,
+  UploadOutlined,
+  IdcardOutlined,
+} from '@ant-design/icons';
 import EditManageRow from './edit';
 import { getDictValueEnum } from '@/services/system/dict';
 import DictTag from '@/components/DictTag';
@@ -85,6 +94,9 @@ function ManagementList() {
   const [isPublishEnum, setIsPublishEnum] = useState<any>([]);
   const [jobTypeEnum, setJobTypeEnum] = useState<any>([]);
   const [compensationEnum, setCompensationEnum] = useState<any>([]);
+  const [salaryCompositionEnum, setSalaryCompositionEnum] = useState<any>([]);
+  const [welfareBenefitsEnum, setWelfareBenefitsEnum] = useState<any>([]);
+  const [workScheduleEnum, setWorkScheduleEnum] = useState<any>([]);
   const [currentRow, setCurrentRow] = useState<API.ManagementList.Manage>();
   const [modalVisible, setModalVisible] = useState<boolean>(false);
   const [mode, setMode] = useState<'view' | 'edit' | 'create'>('create');
@@ -101,12 +113,21 @@ function ManagementList() {
     getDictValueEnum('is_publish', true).then((data) => {
       setIsPublishEnum(data);
     });
-    getDictValueEnum('compensation',true,true).then((data) => {
-      setCompensationEnum(data)
-    })
-    getDictValueEnum('job_type',true,true).then((data) => {
-      setJobTypeEnum(data)
-    })
+    getDictValueEnum('compensation', true, true).then((data) => {
+      setCompensationEnum(data);
+    });
+    getDictValueEnum('job_type', true, true).then((data) => {
+      setJobTypeEnum(data);
+    });
+    getDictValueEnum('salary_composition', false, true).then((data) => {
+      setSalaryCompositionEnum(data);
+    });
+    getDictValueEnum('welfare_benefits', false, true).then((data) => {
+      setWelfareBenefitsEnum(data);
+    });
+    getDictValueEnum('work_schedule', false, true).then((data) => {
+      setWorkScheduleEnum(data);
+    });
   }, []);
 
   async function changeRelease(record: API.ManagementList.Manage) {
@@ -210,17 +231,17 @@ function ManagementList() {
       dataIndex: 'compensation',
       valueType: 'select',
       align: 'center',
-      hideInTable:true,
+      hideInTable: true,
       valueEnum: compensationEnum,
       render: (_, record) => {
-        return (<DictTag enums={compensationEnum} value={record.isHot} />);
+        return <DictTag enums={compensationEnum} value={record.isHot} />;
       },
     },
     {
       title: '信用代码',
       dataIndex: 'code',
       valueType: 'text',
-      hideInTable:true
+      hideInTable: true,
     },
     {
       title: '是否急聘',
@@ -229,13 +250,16 @@ function ManagementList() {
       align: 'center',
       valueEnum: { 0: '否', 1: '是' },
       render: (text, record) => (
-        <Switch checked={record.isUrgent === 1} onChange={async () => {
-          await updateCmsJobList({
-            jobId: record.jobId,
-            isUrgent: record.isUrgent === 1 ? 0 : 1,
-          });
-          actionRef.current?.reload();
-        }} />
+        <Switch
+          checked={record.isUrgent === 1}
+          onChange={async () => {
+            await updateCmsJobList({
+              jobId: record.jobId,
+              isUrgent: record.isUrgent === 1 ? 0 : 1,
+            });
+            actionRef.current?.reload();
+          }}
+        />
       ),
     },
     {
@@ -254,6 +278,8 @@ function ManagementList() {
       valueType: 'text',
       align: 'center',
       hideInSearch: true,
+      render: (_, record) =>
+        String(record.vacancies) === '-1' ? '若干' : (record.vacancies ?? '-'),
     },
     {
       title: '岗位标签',
@@ -263,7 +289,7 @@ function ManagementList() {
       hideInSearch: true,
     },
     {
-      title: '岗位来源',
+      title: '岗位区域',
       dataIndex: 'jobType',
       valueType: 'text',
       align: 'center',
@@ -287,6 +313,19 @@ function ManagementList() {
         );
       },
     },
+    {
+      title: '岗位来源',
+      dataIndex: 'externalSourceName',
+      valueType: 'text',
+      align: 'center',
+      hideInSearch: true,
+      render: (_, record) => {
+        if (record.externalSourceName) {
+          return record.externalSourceName;
+        }
+        return record.dataSource && record.dataSource !== '5' ? record.dataSource : '本地岗位';
+      },
+    },
     {
       title: '浏览量',
       dataIndex: 'view',
@@ -310,83 +349,83 @@ function ManagementList() {
       width: 380,
       render: (jobId, record) => [
         <div key="first-row" style={{ marginBottom: 8, display: 'flex', justifyContent: 'center' }}>
-        <Button
-        type="link"
-        size="small"
-        key="view"
-        icon={<AlignLeftOutlined />}
-        hidden={!access.hasPerms('bussiness:job:query')}
-        onClick={() => {
-          setCurrentRow(record);
-          setModalVisible(true);
-          setMode('view');
-        }}
-      >
-        查看岗位详情
-      </Button>
-      <Button
-          type="link"
-          size="small"
-          key="candidates"
-          icon={<BarChartOutlined />}
-          hidden={!access.hasPerms('bussiness:job:candidates')}
-          onClick={() => history.push(`/management/see-matching/index/${record.jobId}`)}
-        >
-          查看申请人详情
-        </Button>
-        <Button
-          type="link"
-          size="small"
-          key="recommend"
-          icon={<IdcardOutlined />}
-          hidden={!access.hasPerms('bussiness:job:candidates')}
-          onClick={() => history.push(`/management/resume-recommend/index/${record.jobId}`)}
-        >
-          系统简历推荐
-        </Button>
+          <Button
+            type="link"
+            size="small"
+            key="view"
+            icon={<AlignLeftOutlined />}
+            hidden={!access.hasPerms('bussiness:job:query')}
+            onClick={() => {
+              setCurrentRow(record);
+              setModalVisible(true);
+              setMode('view');
+            }}
+          >
+            查看岗位详情
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            key="candidates"
+            icon={<BarChartOutlined />}
+            hidden={!access.hasPerms('bussiness:job:candidates')}
+            onClick={() => history.push(`/management/see-matching/index/${record.jobId}`)}
+          >
+            查看申请人详情
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            key="recommend"
+            icon={<IdcardOutlined />}
+            hidden={!access.hasPerms('bussiness:job:candidates')}
+            onClick={() => history.push(`/management/resume-recommend/index/${record.jobId}`)}
+          >
+            系统简历推荐
+          </Button>
         </div>,
-        <div key="second-row" style={{ display: 'flex', justifyContent: 'space-evenly'}}>
-        <Button
-          type="link"
-          size="small"
-          key="edit"
-          icon={<FormOutlined />}
-          hidden={!access.hasPerms('bussiness:job:edit')}
-          onClick={() => {
-            setCurrentRow(record);
-            setModalVisible(true);
-            setMode('edit');
-          }}
-        >
-          编辑
-        </Button>
-        <Button
-          type="link"
-          size="small"
-          danger
-          key="batchRemove"
-          icon={<DeleteOutlined />}
-          hidden={!access.hasPerms('bussiness:job:remove')}
-          onClick={async () => {
-            Modal.confirm({
-              title: '删除',
-              content: '确定删除该项吗？',
-              okText: '确认',
-              cancelText: '取消',
-              onOk: async () => {
-                const success = await handleRemoveOne(jobId as string);
-                if (success) {
-                  if (actionRef.current) {
-                    actionRef.current.reload();
+        <div key="second-row" style={{ display: 'flex', justifyContent: 'space-evenly' }}>
+          <Button
+            type="link"
+            size="small"
+            key="edit"
+            icon={<FormOutlined />}
+            hidden={!access.hasPerms('bussiness:job:edit')}
+            onClick={() => {
+              setCurrentRow(record);
+              setModalVisible(true);
+              setMode('edit');
+            }}
+          >
+            编辑
+          </Button>
+          <Button
+            type="link"
+            size="small"
+            danger
+            key="batchRemove"
+            icon={<DeleteOutlined />}
+            hidden={!access.hasPerms('bussiness:job:remove')}
+            onClick={async () => {
+              Modal.confirm({
+                title: '删除',
+                content: '确定删除该项吗？',
+                okText: '确认',
+                cancelText: '取消',
+                onOk: async () => {
+                  const success = await handleRemoveOne(jobId as string);
+                  if (success) {
+                    if (actionRef.current) {
+                      actionRef.current.reload();
+                    }
                   }
-                }
-              },
-            });
-          }}
-        >
-          删除
-        </Button>
-        </div>
+                },
+              });
+            }}
+          >
+            删除
+          </Button>
+        </div>,
       ],
     },
   ];
@@ -446,7 +485,8 @@ function ManagementList() {
                 lyrhandleExport(buildListSearchParams(searchVal || {}));
               }}
             >
-              <DownloadOutlined />录用人导出
+              <DownloadOutlined />
+              录用人导出
             </Button>,
             <Button
               type="primary"
@@ -471,9 +511,7 @@ function ManagementList() {
         mode={mode}
         onSubmit={async (values) => {
           const isEdit = mode === 'edit' && values.jobId;
-          const resData = isEdit
-            ? await updateCmsJobList(values)
-            : await addCmsJobList(values);
+          const resData = isEdit ? await updateCmsJobList(values) : await addCmsJobList(values);
           if (resData.code === 200) {
             setModalVisible(false);
             setCurrentRow(undefined);
@@ -492,6 +530,9 @@ function ManagementList() {
         experienceEnum={experienceEnum}
         areaEnum={areaEnum}
         jobTypeEnum={jobTypeEnum}
+        salaryCompositionEnum={salaryCompositionEnum}
+        welfareBenefitsEnum={welfareBenefitsEnum}
+        workScheduleEnum={workScheduleEnum}
       ></EditManageRow>
     </Fragment>
   );
diff --git a/src/pages/NewsInfo/components/DetailModal.tsx b/src/pages/NewsInfo/components/DetailModal.tsx
new file mode 100644
index 0000000..9947846
--- /dev/null
+++ b/src/pages/NewsInfo/components/DetailModal.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { Descriptions, Modal, Tag, Typography } from 'antd';
+import { createStyles } from 'antd-style';
+import DictTag from '@/components/DictTag';
+import type { DictValueEnumObj } from '@/components/DictTag';
+import { normalizeNewsContent } from '@/utils/newsImageUrl';
+
+const useStyles = createStyles(() => ({
+  content: {
+    '& img': {
+      display: 'block',
+      maxWidth: '100%',
+      height: 'auto',
+    },
+  },
+}));
+
+interface DetailModalProps {
+  open: boolean;
+  data?: API.NewsInfo.NewsInfoItem;
+  moduleEnum: DictValueEnumObj;
+  onCancel: () => void;
+}
+
+const DetailModal: React.FC<DetailModalProps> = ({ open, data, moduleEnum, onCancel }) => {
+  const { styles } = useStyles();
+
+  return (
+    <Modal
+      title="新闻资讯详情"
+      open={open}
+      onCancel={onCancel}
+      footer={null}
+      width={900}
+      destroyOnClose
+    >
+      <Descriptions bordered column={2} size="small">
+        <Descriptions.Item label="资讯模块">
+          {data?.module ? <DictTag enums={moduleEnum} value={data.module} /> : '-'}
+        </Descriptions.Item>
+        <Descriptions.Item label="状态">
+          <Tag color={data?.status === '0' ? 'success' : 'default'}>
+            {data?.status === '0' ? '上架' : '下架'}
+          </Tag>
+        </Descriptions.Item>
+        <Descriptions.Item label="标题" span={2}>
+          {data?.title || '-'}
+        </Descriptions.Item>
+        <Descriptions.Item label="创建时间">{data?.createTime || '-'}</Descriptions.Item>
+        <Descriptions.Item label="更新时间">{data?.updateTime || '-'}</Descriptions.Item>
+        <Descriptions.Item label="正文" span={2}>
+          {data?.content ? (
+            <Typography
+              className={`${styles.content} news-detail-content`}
+              dangerouslySetInnerHTML={{ __html: normalizeNewsContent(data.content) }}
+            />
+          ) : (
+            '-'
+          )}
+        </Descriptions.Item>
+        <Descriptions.Item label="备注" span={2}>
+          {data?.remark || '-'}
+        </Descriptions.Item>
+      </Descriptions>
+    </Modal>
+  );
+};
+
+export default DetailModal;
diff --git a/src/pages/NewsInfo/components/EditModal.tsx b/src/pages/NewsInfo/components/EditModal.tsx
new file mode 100644
index 0000000..db58c77
--- /dev/null
+++ b/src/pages/NewsInfo/components/EditModal.tsx
@@ -0,0 +1,111 @@
+import React, { useEffect } from 'react';
+import { useAccess } from '@umijs/max';
+import { Col, Form, Input, Modal, Row, Select, Switch } from 'antd';
+import type { DictValueEnumObj } from '@/components/DictTag';
+import { normalizeNewsContent } from '@/utils/newsImageUrl';
+import RichTextEditor from './RichTextEditor';
+
+interface EditModalProps {
+  open: boolean;
+  values?: API.NewsInfo.NewsInfoItem;
+  moduleEnum: DictValueEnumObj;
+  onCancel: () => void;
+  onSubmit: (values: API.NewsInfo.NewsInfoPayload) => Promise<void> | void;
+}
+
+const EditModal: React.FC<EditModalProps> = ({ open, values, moduleEnum, onCancel, onSubmit }) => {
+  const [form] = Form.useForm<API.NewsInfo.NewsInfoPayload & { published?: boolean }>();
+  const access = useAccess();
+  const canChangeStatus = access.hasPerms('cms:newsInfo:status');
+
+  useEffect(() => {
+    if (!open) return;
+    form.setFieldsValue({
+      module: values?.module,
+      title: values?.title,
+      content: normalizeNewsContent(values?.content || ''),
+      remark: values?.remark,
+      published: values?.status === '0',
+    });
+  }, [form, open, values]);
+
+  const handleOk = async () => {
+    const formValues = await form.validateFields();
+    await onSubmit({
+      id: values?.id,
+      module: formValues.module,
+      title: formValues.title,
+      content: normalizeNewsContent(formValues.content),
+      remark: formValues.remark,
+      status: canChangeStatus ? (formValues.published ? '0' : '1') : values?.status || '1',
+    });
+  };
+
+  const moduleOptions = Object.values(moduleEnum).map((item) => ({
+    label: item.label,
+    value: String(item.value),
+  }));
+
+  return (
+    <Modal
+      title={values ? '编辑新闻资讯' : '新增新闻资讯'}
+      open={open}
+      onCancel={onCancel}
+      onOk={handleOk}
+      width={1000}
+      destroyOnClose
+    >
+      <Form form={form} layout="vertical">
+        <Row gutter={16}>
+          <Col span={8}>
+            <Form.Item
+              name="module"
+              label="资讯模块"
+              rules={[{ required: true, message: '请选择资讯模块' }]}
+            >
+              <Select
+                showSearch
+                optionFilterProp="label"
+                placeholder="请选择业务字典模块"
+                options={moduleOptions}
+              />
+            </Form.Item>
+          </Col>
+          <Col span={16}>
+            <Form.Item
+              name="title"
+              label="标题"
+              rules={[{ required: true, max: 200, message: '请输入200字以内的标题' }]}
+            >
+              <Input showCount maxLength={200} placeholder="请输入新闻资讯标题" />
+            </Form.Item>
+          </Col>
+          <Col span={24}>
+            <Form.Item
+              name="content"
+              label="正文"
+              rules={[{ required: true, message: '请输入正文' }]}
+              valuePropName="value"
+            >
+              <RichTextEditor />
+            </Form.Item>
+          </Col>
+          {canChangeStatus && (
+            <Col span={8}>
+              <Form.Item name="published" label="发布状态" valuePropName="checked">
+                <Switch checkedChildren="上架" unCheckedChildren="下架" />
+              </Form.Item>
+            </Col>
+          )}
+          <Col span={24}>
+            <Form.Item name="remark" label="备注">
+              <Input.TextArea rows={2} maxLength={500} showCount placeholder="可选" />
+            </Form.Item>
+          </Col>
+        </Row>
+      </Form>
+    </Modal>
+  );
+};
+
+export default EditModal;
diff --git a/src/pages/NewsInfo/components/RichTextEditor.less b/src/pages/NewsInfo/components/RichTextEditor.less
new file mode 100644
index 0000000..c07ae5b
--- /dev/null
+++ b/src/pages/NewsInfo/components/RichTextEditor.less
@@ -0,0 +1,35 @@
+.news-rich-editor {
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  overflow: hidden;
+  background: #fff;
+
+  &__toolbar {
+    padding: 6px 8px;
+    border-bottom: 1px solid #f0f0f0;
+    background: #fafafa;
+  }
+
+  &__content {
+    min-height: 280px;
+    padding: 12px;
+    overflow-y: auto;
+    line-height: 1.75;
+    outline: none;
+
+    &:focus {
+      box-shadow: inset 0 0 0 1px #1677ff;
+    }
+
+    img {
+      max-width: 100%;
+    }
+
+    blockquote {
+      margin: 8px 0;
+      padding: 4px 12px;
+      border-left: 4px solid #d9d9d9;
+      color: #666;
+    }
+  }
+}
diff --git a/src/pages/NewsInfo/components/RichTextEditor.tsx b/src/pages/NewsInfo/components/RichTextEditor.tsx
new file mode 100644
index 0000000..e4475f3
--- /dev/null
+++ b/src/pages/NewsInfo/components/RichTextEditor.tsx
@@ -0,0 +1,229 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { Button, Input, Modal, Select, Space, Tooltip, message } from 'antd';
+import {
+  BoldOutlined,
+  CodeOutlined,
+  FontSizeOutlined,
+  ItalicOutlined,
+  LinkOutlined,
+  OrderedListOutlined,
+  PictureOutlined,
+  StrikethroughOutlined,
+  UnderlineOutlined,
+  UnorderedListOutlined,
+} from '@ant-design/icons';
+import { uploadNewsImage } from '@/services/cms/newsInfo';
+import { normalizeNewsContent, normalizeNewsImageUrl } from '@/utils/newsImageUrl';
+import './RichTextEditor.less';
+
+interface RichTextEditorProps {
+  value?: string;
+  onChange?: (value: string) => void;
+  disabled?: boolean;
+}
+
+const RichTextEditor: React.FC<RichTextEditorProps> = ({ value = '', onChange, disabled }) => {
+  const editorRef = useRef<HTMLDivElement>(null);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const lastValueRef = useRef(value);
+  const [uploading, setUploading] = useState(false);
+  const [linkModalOpen, setLinkModalOpen] = useState(false);
+  const [linkUrl, setLinkUrl] = useState('');
+
+  useEffect(() => {
+    const normalizedValue = normalizeNewsContent(value);
+    if (
+      editorRef.current &&
+      value !== lastValueRef.current &&
+      normalizedValue !== editorRef.current.innerHTML
+    ) {
+      editorRef.current.innerHTML = normalizedValue;
+    }
+    lastValueRef.current = normalizedValue;
+  }, [value]);
+
+  const emitChange = () => {
+    const html = editorRef.current?.innerHTML || '';
+    lastValueRef.current = html;
+    onChange?.(html);
+  };
+
+  const exec = (command: string, commandValue?: string) => {
+    if (disabled || !editorRef.current) return;
+    editorRef.current.focus();
+    document.execCommand(command, false, commandValue);
+    emitChange();
+  };
+
+  const insertLink = () => {
+    const url = linkUrl.trim();
+    if (!url) {
+      message.warning('请输入链接地址');
+      return;
+    }
+    exec('createLink', url);
+    setLinkUrl('');
+    setLinkModalOpen(false);
+  };
+
+  const handleImageSelected = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    event.target.value = '';
+    if (!file) return;
+    if (!file.type.startsWith('image/')) {
+      message.error('只支持上传图片');
+      return;
+    }
+    setUploading(true);
+    try {
+      const result = await uploadNewsImage(file);
+      const url = normalizeNewsImageUrl(
+        result.url || result.data?.url,
+        result.fileName || result.data?.fileName,
+      );
+      if (result.code !== 200 || !url) {
+        throw new Error(result.msg || '图片上传失败');
+      }
+      exec('insertImage', url);
+    } catch (error) {
+      message.error(error instanceof Error ? error.message : '图片上传失败');
+    } finally {
+      setUploading(false);
+    }
+  };
+
+  return (
+    <div className="news-rich-editor">
+      <div className="news-rich-editor__toolbar">
+        <Space size={4} wrap>
+          <Tooltip title="加粗">
+            <Button
+              size="small"
+              icon={<BoldOutlined />}
+              disabled={disabled}
+              onClick={() => exec('bold')}
+            />
+          </Tooltip>
+          <Tooltip title="斜体">
+            <Button
+              size="small"
+              icon={<ItalicOutlined />}
+              disabled={disabled}
+              onClick={() => exec('italic')}
+            />
+          </Tooltip>
+          <Tooltip title="下划线">
+            <Button
+              size="small"
+              icon={<UnderlineOutlined />}
+              disabled={disabled}
+              onClick={() => exec('underline')}
+            />
+          </Tooltip>
+          <Tooltip title="删除线">
+            <Button
+              size="small"
+              icon={<StrikethroughOutlined />}
+              disabled={disabled}
+              onClick={() => exec('strikeThrough')}
+            />
+          </Tooltip>
+          <Select
+            size="small"
+            disabled={disabled}
+            value="正文/标题"
+            options={[
+              { value: '正文/标题', label: '正文/标题' },
+              { value: 'H2', label: '标题 2' },
+              { value: 'H3', label: '标题 3' },
+              { value: 'P', label: '正文' },
+            ]}
+            onChange={(format) => exec('formatBlock', format)}
+          />
+          <Tooltip title="无序列表">
+            <Button
+              size="small"
+              icon={<UnorderedListOutlined />}
+              disabled={disabled}
+              onClick={() => exec('insertUnorderedList')}
+            />
+          </Tooltip>
+          <Tooltip title="有序列表">
+            <Button
+              size="small"
+              icon={<OrderedListOutlined />}
+              disabled={disabled}
+              onClick={() => exec('insertOrderedList')}
+            />
+          </Tooltip>
+          <Tooltip title="引用">
+            <Button
+              size="small"
+              icon={<CodeOutlined />}
+              disabled={disabled}
+              onClick={() => exec('formatBlock', 'BLOCKQUOTE')}
+            />
+          </Tooltip>
+          <Tooltip title="插入链接">
+            <Button
+              size="small"
+              icon={<LinkOutlined />}
+              disabled={disabled}
+              onClick={() => setLinkModalOpen(true)}
+            />
+          </Tooltip>
+          <Tooltip title="插入图片">
+            <Button
+              size="small"
+              icon={<PictureOutlined />}
+              disabled={disabled || uploading}
+              loading={uploading}
+              onClick={() => fileInputRef.current?.click()}
+            />
+          </Tooltip>
+          <Tooltip title="清除格式">
+            <Button
+              size="small"
+              icon={<FontSizeOutlined />}
+              disabled={disabled}
+              onClick={() => exec('removeFormat')}
+            />
+          </Tooltip>
+        </Space>
+        <input
+          ref={fileInputRef}
+          type="file"
+          accept="image/*"
+          hidden
+          onChange={handleImageSelected}
+        />
+      </div>
+      <div
+        ref={editorRef}
+        className="news-rich-editor__content"
+        contentEditable={!disabled}
+        suppressContentEditableWarning
+        onInput={emitChange}
+        onBlur={emitChange}
+        dangerouslySetInnerHTML={{ __html: normalizeNewsContent(value) }}
+      />
+      <Modal
+        title="插入链接"
+        open={linkModalOpen}
+        onCancel={() => setLinkModalOpen(false)}
+        onOk={insertLink}
+        destroyOnClose
+      >
+        <Input
+          autoFocus
+          value={linkUrl}
+          placeholder="https://example.com"
+          onChange={(event) => setLinkUrl(event.target.value)}
+          onPressEnter={insertLink}
+        />
+      </Modal>
+    </div>
+  );
+};
+
+export default RichTextEditor;
diff --git a/src/pages/NewsInfo/index.tsx b/src/pages/NewsInfo/index.tsx
new file mode 100644
index 0000000..8555e22
--- /dev/null
+++ b/src/pages/NewsInfo/index.tsx
@@ -0,0 +1,243 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { useAccess } from '@umijs/max';
+import { Button, message, Modal, Switch, Tag } from 'antd';
+import { ActionType, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
+import { DeleteOutlined, EyeOutlined, FormOutlined, PlusOutlined } from '@ant-design/icons';
+import {
+  addNewsInfo,
+  changeNewsInfoStatus,
+  deleteNewsInfo,
+  getNewsInfoDetail,
+  getNewsInfoList,
+  updateNewsInfo,
+} from '@/services/cms/newsInfo';
+import { getDictValueEnum } from '@/services/system/dict';
+import DictTag, { DictValueEnumObj } from '@/components/DictTag';
+import EditModal from './components/EditModal';
+import DetailModal from './components/DetailModal';
+
+const NewsInfoPage: React.FC = () => {
+  const access = useAccess();
+  const actionRef = useRef<ActionType>();
+  const [moduleEnum, setModuleEnum] = useState<DictValueEnumObj>({});
+  const [editOpen, setEditOpen] = useState(false);
+  const [detailOpen, setDetailOpen] = useState(false);
+  const [currentRow, setCurrentRow] = useState<API.NewsInfo.NewsInfoItem>();
+  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
+
+  const loadModules = async () => {
+    setModuleEnum(await getDictValueEnum('news_module', false, true));
+  };
+
+  useEffect(() => {
+    loadModules();
+  }, []);
+
+  const handleDelete = (ids: string) => {
+    Modal.confirm({
+      title: '确认删除',
+      content: '删除后新闻资讯将不再出现在列表和公开接口中，确定继续吗？',
+      onOk: async () => {
+        const result = await deleteNewsInfo(ids);
+        if (result.code === 200) {
+          message.success('删除成功');
+          setSelectedRowKeys([]);
+          actionRef.current?.reload();
+        } else {
+          message.error(result.msg || '删除失败');
+        }
+      },
+    });
+  };
+
+  const handleStatus = (record: API.NewsInfo.NewsInfoItem, checked: boolean) => {
+    const status: '0' | '1' = checked ? '0' : '1';
+    const label = checked ? '上架' : '下架';
+    Modal.confirm({
+      title: `确认${label}`,
+      content: `确定要${label}“${record.title}”吗？`,
+      onOk: async () => {
+        const result = await changeNewsInfoStatus(record.id, status);
+        if (result.code === 200) {
+          message.success(`${label}成功`);
+          actionRef.current?.reload();
+        } else {
+          message.error(result.msg || `${label}失败`);
+        }
+      },
+    });
+  };
+
+  const columns: ProColumns<API.NewsInfo.NewsInfoItem>[] = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      ellipsis: true,
+      formItemProps: { rules: [{ max: 200 }] },
+    },
+    {
+      title: '资讯模块',
+      dataIndex: 'module',
+      valueType: 'select',
+      valueEnum: moduleEnum,
+      render: (_, record) => <DictTag enums={moduleEnum} value={record.module} />,
+    },
+    {
+      title: '上下架',
+      dataIndex: 'status',
+      valueType: 'select',
+      width: 110,
+      valueEnum: {
+        '0': { text: '上架', status: 'Success' },
+        '1': { text: '下架', status: 'Default' },
+      },
+      render: (_, record) =>
+        access.hasPerms('cms:newsInfo:status') ? (
+          <Switch
+            checked={record.status === '0'}
+            checkedChildren="上架"
+            unCheckedChildren="下架"
+            onChange={(checked) => handleStatus(record, checked)}
+          />
+        ) : (
+          <Tag color={record.status === '0' ? 'success' : 'default'}>
+            {record.status === '0' ? '上架' : '下架'}
+          </Tag>
+        ),
+    },
+    { title: '创建时间', dataIndex: 'createTime', hideInSearch: true, width: 170 },
+    {
+      title: '操作',
+      valueType: 'option',
+      fixed: 'right',
+      width: 220,
+      render: (_, record) => [
+        <Button
+          key="detail"
+          type="link"
+          size="small"
+          icon={<EyeOutlined />}
+          onClick={async () => {
+            const result = await getNewsInfoDetail(record.id);
+            if (result.code === 200) {
+              setCurrentRow(result.data);
+              setDetailOpen(true);
+            }
+          }}
+        >
+          详情
+        </Button>,
+        <Button
+          key="edit"
+          type="link"
+          size="small"
+          icon={<FormOutlined />}
+          hidden={!access.hasPerms('cms:newsInfo:edit')}
+          onClick={async () => {
+            const result = await getNewsInfoDetail(record.id);
+            if (result.code === 200) {
+              setCurrentRow(result.data);
+              setEditOpen(true);
+            }
+          }}
+        >
+          编辑
+        </Button>,
+        <Button
+          key="delete"
+          type="link"
+          danger
+          size="small"
+          icon={<DeleteOutlined />}
+          hidden={!access.hasPerms('cms:newsInfo:remove')}
+          onClick={() => handleDelete(String(record.id))}
+        >
+          删除
+        </Button>,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable<API.NewsInfo.NewsInfoItem>
+        headerTitle="新闻资讯列表"
+        actionRef={actionRef}
+        rowKey="id"
+        columns={columns}
+        scroll={{ x: 'max-content' }}
+        rowSelection={{ selectedRowKeys, onChange: setSelectedRowKeys }}
+        request={async (params) => {
+          const result = await getNewsInfoList({
+            pageNum: params.current,
+            pageSize: params.pageSize,
+            title: params.title,
+            module: params.module,
+            status: params.status,
+          });
+          return {
+            data: result.rows || [],
+            total: result.total || 0,
+            success: result.code === 200,
+          };
+        }}
+        toolBarRender={() => [
+          <Button
+            key="add"
+            type="primary"
+            icon={<PlusOutlined />}
+            hidden={!access.hasPerms('cms:newsInfo:add')}
+            onClick={() => {
+              setCurrentRow(undefined);
+              setEditOpen(true);
+            }}
+          >
+            新增
+          </Button>,
+          selectedRowKeys.length > 0 && (
+            <Button
+              key="batch-delete"
+              danger
+              icon={<DeleteOutlined />}
+              hidden={!access.hasPerms('cms:newsInfo:remove')}
+              onClick={() => handleDelete(selectedRowKeys.join(','))}
+            >
+              批量删除
+            </Button>
+          ),
+        ]}
+      />
+      <EditModal
+        open={editOpen}
+        values={currentRow}
+        moduleEnum={moduleEnum}
+        onCancel={() => {
+          setEditOpen(false);
+          setCurrentRow(undefined);
+        }}
+        onSubmit={async (values) => {
+          const result = values.id ? await updateNewsInfo(values) : await addNewsInfo(values);
+          if (result.code !== 200) {
+            message.error(result.msg || '保存失败');
+            return;
+          }
+          message.success(values.id ? '修改成功' : '新增成功');
+          setEditOpen(false);
+          setCurrentRow(undefined);
+          actionRef.current?.reload();
+        }}
+      />
+      <DetailModal
+        open={detailOpen}
+        data={currentRow}
+        moduleEnum={moduleEnum}
+        onCancel={() => {
+          setDetailOpen(false);
+          setCurrentRow(undefined);
+        }}
+      />
+    </PageContainer>
+  );
+};
+
+export default NewsInfoPage;
diff --git a/src/services/cms/newsInfo.ts b/src/services/cms/newsInfo.ts
new file mode 100644
index 0000000..ac6f99f
--- /dev/null
+++ b/src/services/cms/newsInfo.ts
@@ -0,0 +1,68 @@
+import { request } from '@umijs/max';
+import { normalizeNewsContent } from '@/utils/newsImageUrl';
+
+const BASE_URL = '/api/cms/newsInfo';
+
+export async function getNewsInfoList(params?: API.NewsInfo.NewsInfoListParams) {
+  return request<API.NewsInfo.NewsInfoPageResult>(`${BASE_URL}/list`, {
+    method: 'GET',
+    params,
+  });
+}
+
+export async function getNewsInfoDetail(id: number) {
+  return request<API.NewsInfo.NewsInfoDetailResult>(`${BASE_URL}/${id}`, {
+    method: 'GET',
+  });
+}
+
+export async function addNewsInfo(data: API.NewsInfo.NewsInfoPayload) {
+  return request<API.Result>(BASE_URL, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+    data: { ...data, content: normalizeNewsContent(data.content) },
+  });
+}
+
+export async function updateNewsInfo(data: API.NewsInfo.NewsInfoPayload) {
+  return request<API.Result>(BASE_URL, {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+    data: { ...data, content: normalizeNewsContent(data.content) },
+  });
+}
+
+export async function deleteNewsInfo(ids: string) {
+  return request<API.Result>(`${BASE_URL}/${ids}`, {
+    method: 'DELETE',
+  });
+}
+
+export async function changeNewsInfoStatus(id: number, status: '0' | '1') {
+  return request<API.Result>(`${BASE_URL}/changeStatus`, {
+    method: 'PUT',
+    params: { id, status },
+  });
+}
+
+export async function uploadNewsImage(file: File) {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request<API.NewsInfo.NewsInfoUploadResult>('/api/common/upload', {
+    method: 'POST',
+    data: formData,
+  });
+}
+
+export async function getPublishedNewsInfoList(params?: API.NewsInfo.NewsInfoListParams) {
+  return request<API.NewsInfo.NewsInfoPageResult>('/api/app/newsInfo/list', {
+    method: 'GET',
+    params,
+  });
+}
+
+export async function getPublishedNewsInfoDetail(id: number) {
+  return request<API.NewsInfo.NewsInfoDetailResult>(`/api/app/newsInfo/${id}`, {
+    method: 'GET',
+  });
+}
diff --git a/src/services/company/list.ts b/src/services/company/list.ts
index f8572cf..3e38b30 100644
--- a/src/services/company/list.ts
+++ b/src/services/company/list.ts
@@ -58,3 +58,22 @@ export async function getCmsCompanyDetail(companyId: number | string) {
     method: 'GET',
   });
 }
+
+/** 获取当前企业用户关联的企业信息 */
+export async function getCmsCurrentCompany() {
+  return request<{
+    code: number;
+    msg?: string;
+    data?: API.CompanyList.Company;
+  }>('/api/cms/company/current', {
+    method: 'GET',
+  });
+}
+
+/** 修改当前企业用户关联的企业信息 */
+export async function putCmsCurrentCompany(params: API.CompanyList.Params) {
+  return request<API.CompanyList.CompanyListResult>('/api/cms/company/current', {
+    method: 'PUT',
+    data: params,
+  });
+}
diff --git a/src/services/jobportal/jobFair.ts b/src/services/jobportal/jobFair.ts
new file mode 100644
index 0000000..4cb50d2
--- /dev/null
+++ b/src/services/jobportal/jobFair.ts
@@ -0,0 +1,240 @@
+import { request } from '@umijs/max';
+
+export type JobFairChannel = 'online' | 'outdoor';
+
+/** 招聘会公共列表项；线上与户外接口统一为该结构。 */
+export interface PortalJobFairItem {
+  jobFairId: string;
+  jobFairTitle: string;
+  jobFairAddress?: string;
+  /** 线上接口通常为 1/2，户外接口固定返回 outdoor。 */
+  jobFairType?: string;
+  jobFairStartTime?: string;
+  jobFairEndTime?: string;
+  jobFairStatus?: string;
+  jobFairHostUnit?: string;
+  jobFairOrganizeUnit?: string;
+  jobFairIntroduction?: string;
+  jobFairProcess?: string;
+  jobFairPhone?: string;
+  jobFairImage?: string;
+  enterpriseNum?: string;
+  boothNum?: string;
+  /** 户外招聘会展位图中的实际摊位数量 */
+  boothMapCount?: number;
+  divisionName?: string;
+  jobFairCategory?: string;
+  jobFairRegion?: string;
+  jobFairVenueName?: string;
+}
+
+export interface PortalJobFairPageParams {
+  pageNum?: number;
+  pageSize?: number;
+  jobFairTitle?: string;
+  /** 招聘会举办日期，格式 yyyy-MM-dd。 */
+  zphjbsj?: string;
+}
+
+export interface PortalJobFairPageData {
+  total: number;
+  list: PortalJobFairItem[];
+  pageNum?: number;
+  pageSize?: number;
+  pages?: number;
+}
+
+export interface PortalJobFairPageResult {
+  code: number;
+  msg?: string;
+  data?: PortalJobFairPageData;
+}
+
+export interface PortalJobFairListResult {
+  code: number;
+  msg?: string;
+  data?: PortalJobFairItem[];
+}
+
+export interface PortalJobFairDatesResult {
+  code: number;
+  msg?: string;
+  data?: string[];
+}
+
+interface PortalOutdoorFairDetailData extends Partial<PortalJobFairItem> {
+  id?: number;
+  title?: string;
+  hostUnit?: string;
+  fairType?: string;
+  region?: string;
+  venueName?: string;
+  address?: string;
+  boothCount?: number;
+  boothMapCount?: number;
+  holdTime?: string;
+  endTime?: string;
+  photoUrl?: string;
+  fairIntroduction?: string;
+  fairProcess?: string;
+}
+
+interface PortalOutdoorFairDetailResult {
+  code: number;
+  msg?: string;
+  /**
+   * 旧接口返回 { fair: {...} }，当前公共接口直接返回招聘会对象。
+   * 两种格式均保留兼容，避免接口升级后户外详情页显示为空。
+   */
+  data?: PortalOutdoorFairDetailData | { fair?: PortalOutdoorFairDetailData };
+}
+
+function isOutdoorFairDetailWrapper(
+  data: NonNullable<PortalOutdoorFairDetailResult['data']>,
+): data is { fair?: PortalOutdoorFairDetailData } {
+  return 'fair' in data;
+}
+
+export interface PortalJobFairDetailResult {
+  code: number;
+  msg?: string;
+  data?: PortalJobFairItem;
+}
+
+/** 招聘会关联岗位；由公共接口中的企业岗位列表展平得到。 */
+export interface PortalJobFairPosition {
+  jobId?: number | string;
+  fairRelationId?: string;
+  jobTitle?: string;
+  minSalary?: number;
+  maxSalary?: number;
+  education?: string;
+  experience?: string;
+  companyId?: number | string;
+  companyName?: string;
+  jobLocation?: string;
+  jobAddress?: string;
+  vacancies?: number | string;
+  isUrgent?: number;
+}
+
+interface PortalJobFairCompanyWithJobs {
+  companyId?: number | string;
+  companyName?: string;
+  jobInfoList?: PortalJobFairPosition[];
+}
+
+interface PortalJobFairCompaniesWithJobsResult {
+  code: number;
+  msg?: string;
+  data?: PortalJobFairCompanyWithJobs[];
+}
+
+export interface PortalJobFairPositionResult {
+  code: number;
+  msg?: string;
+  data?: PortalJobFairPosition[];
+}
+
+const FAIR_API = {
+  online: '/app/jobfair/public/jobfair',
+  outdoor: '/app/outdoor-fair',
+} as const;
+
+/** 获取线上或户外招聘会分页列表。 */
+export async function getPortalJobFairPage(
+  channel: JobFairChannel,
+  params?: PortalJobFairPageParams,
+) {
+  return request<PortalJobFairPageResult>(`${FAIR_API[channel]}/page`, {
+    method: 'GET',
+    params,
+  });
+}
+
+/** 获取有招聘会的日期，用于与小程序一致的日期筛选提示。 */
+export async function getPortalJobFairDates(channel: JobFairChannel) {
+  return request<PortalJobFairDatesResult>(`${FAIR_API[channel]}/dates`, {
+    method: 'GET',
+  });
+}
+
+/** 获取当前月招聘会摘要。 */
+export async function getPortalCurrentMonthJobFairs(channel: JobFairChannel) {
+  return request<PortalJobFairListResult>(`${FAIR_API[channel]}/currentMonth`, {
+    method: 'GET',
+  });
+}
+
+/** 获取当前季度招聘会摘要。 */
+export async function getPortalCurrentQuarterJobFairs(channel: JobFairChannel) {
+  return request<PortalJobFairListResult>(`${FAIR_API[channel]}/currentQuarter`, {
+    method: 'GET',
+  });
+}
+
+/** 获取招聘会详情，并把户外招聘会详情转换为与列表一致的公共字段。 */
+export async function getPortalJobFairDetail(channel: JobFairChannel, jobFairId: string) {
+  if (channel === 'online') {
+    return request<PortalJobFairDetailResult>(`${FAIR_API.online}/detail`, {
+      method: 'GET',
+      params: { jobFairId },
+    });
+  }
+
+  const response = await request<PortalOutdoorFairDetailResult>(
+    `${FAIR_API.outdoor}/${encodeURIComponent(jobFairId)}`,
+    { method: 'GET' },
+  );
+  const payload = response.data;
+  const fair = payload && (isOutdoorFairDetailWrapper(payload) ? payload.fair : payload);
+  if (!fair) {
+    return { code: response.code, msg: response.msg } as PortalJobFairDetailResult;
+  }
+  return {
+    code: response.code,
+    msg: response.msg,
+    data: {
+      jobFairId: fair.jobFairId || String(fair.id ?? jobFairId),
+      jobFairTitle: fair.jobFairTitle || fair.title || '线下招聘会',
+      jobFairAddress: fair.jobFairAddress || fair.address || fair.venueName,
+      jobFairType: fair.jobFairType || fair.fairType || 'outdoor',
+      jobFairStartTime: fair.jobFairStartTime || fair.holdTime,
+      jobFairEndTime: fair.jobFairEndTime || fair.endTime,
+      jobFairHostUnit: fair.jobFairHostUnit || fair.hostUnit,
+      jobFairOrganizeUnit: fair.jobFairOrganizeUnit,
+      jobFairIntroduction: fair.jobFairIntroduction || fair.fairIntroduction,
+      jobFairProcess: fair.jobFairProcess || fair.fairProcess,
+      jobFairPhone: fair.jobFairPhone,
+      jobFairImage: fair.jobFairImage || fair.photoUrl,
+      boothNum:
+        fair.boothNum || (fair.boothCount === undefined ? undefined : String(fair.boothCount)),
+      boothMapCount: fair.boothMapCount,
+      jobFairRegion: fair.jobFairRegion || fair.region,
+      jobFairVenueName: fair.jobFairVenueName || fair.venueName,
+    },
+  } as PortalJobFairDetailResult;
+}
+
+/** 获取线上招聘会的关联岗位，并将企业分组数据转换为岗位卡片数据。 */
+export async function getPortalJobFairPositions(jobFairId: string) {
+  const response = await request<PortalJobFairCompaniesWithJobsResult>(
+    `${FAIR_API.online}/enterprises-with-jobs-by-job-fair-id`,
+    {
+      method: 'GET',
+      params: { jobFairId },
+    },
+  );
+
+  return {
+    code: response.code,
+    msg: response.msg,
+    data: (response.data || []).flatMap((company) =>
+      (company.jobInfoList || []).map((position) => ({
+        ...position,
+        companyId: position.companyId || company.companyId,
+        companyName: position.companyName || company.companyName,
+      })),
+    ),
+  } as PortalJobFairPositionResult;
+}
diff --git a/src/services/jobportal/outdoorFair.ts b/src/services/jobportal/outdoorFair.ts
index 36b141b..950666d 100644
--- a/src/services/jobportal/outdoorFair.ts
+++ b/src/services/jobportal/outdoorFair.ts
@@ -1,4 +1,5 @@
 import { request } from '@umijs/max';
+import type { VenueBoothItem } from './venueInfo';
 
 /** 户外招聘会列表项 */
 export interface OutdoorFairItem {
@@ -19,6 +20,8 @@ export interface OutdoorFairItem {
   address: string;
   /** 展位数量 */
   boothCount: number;
+  /** 已预定摊位数 */
+  reservedBoothCount?: number;
   /** 举办时间 */
   holdTime: string;
   /** 截止时间 */
@@ -31,6 +34,14 @@ export interface OutdoorFairItem {
   onlineApply: boolean;
   /** 招聘会照片 */
   photoUrl: string;
+  /** 招聘会简介 */
+  fairIntroduction?: string;
+  /** 招聘会整体流程 */
+  fairProcess?: string;
+  /** 企业参加招聘会需携带的资料 */
+  requiredMaterials?: string;
+  /** 企业到场须知 */
+  attendanceNotes?: string;
   /** 当前企业ID */
   companyId?: number;
   /** 当前企业名称 */
@@ -86,6 +97,16 @@ export interface OutdoorFairForm {
   applyEndTime: string;
   onlineApply: boolean;
   photoUrl: string;
+  /** 招聘会简介 */
+  fairIntroduction?: string;
+  /** 招聘会整体流程 */
+  fairProcess?: string;
+  /** 企业参加招聘会需携带的资料 */
+  requiredMaterials?: string;
+  /** 企业到场须知 */
+  attendanceNotes?: string;
+  /** 更换场地时确认清空旧展位图与预定，并按新模板重建 */
+  resetBoothMap?: boolean;
 }
 
 /** 通用响应 */
@@ -113,6 +134,12 @@ export interface OutdoorFairCompanyQrCodeInfo {
   qrCodeContent: string;
 }
 
+/** 企业审核通过后可读取的只读展位图。 */
+export interface OutdoorFairCompanyBoothMap {
+  currentCompanyId: number;
+  booths: VenueBoothItem[];
+}
+
 /** 户外招聘会字典新增表单 */
 export interface OutdoorFairDictForm {
   dictType: 'outdoor_fair_type' | 'outdoor_fair_region';
@@ -157,6 +184,17 @@ export async function getOutdoorFairInfo(id: number) {
   });
 }
 
+/**
+ * 当前企业查看户外招聘会展位图。
+ * 服务端会校验当前企业已报名且审核通过，接口只提供读取能力。
+ */
+export async function getCurrentCompanyOutdoorFairBoothMap(fairId: number) {
+  return request<{ code: number; msg?: string; data?: OutdoorFairCompanyBoothMap }>(
+    `${CMS_OUTDOOR_FAIR_BASE}/${fairId}/company/booth-map`,
+    { method: 'GET' },
+  );
+}
+
 /** 招聘会统计-时间桶序列项（曲线图用） */
 export interface OutdoorFairStatisticsSeriesItem {
   time: string;
diff --git a/src/services/jobportal/venueInfo.ts b/src/services/jobportal/venueInfo.ts
index e1a98b8..8084d1f 100644
--- a/src/services/jobportal/venueInfo.ts
+++ b/src/services/jobportal/venueInfo.ts
@@ -170,6 +170,22 @@ export async function addVenueInfoDictOption(data: VenueInfoDictForm) {
   });
 }
 
+/** 查询场地的展位图模板。模板不含企业及预定状态。 */
+export async function getVenueBoothMap(venueId: number) {
+  return request<{ code: number; msg?: string; data: VenueBoothItem[] }>(
+    `${CMS_VENUE_INFO_BASE}/${venueId}/booth-map`,
+    { method: 'GET' },
+  );
+}
+
+/** 完整覆盖保存场地的展位图模板。 */
+export async function saveVenueBoothMap(venueId: number, data: VenueBoothItem[]) {
+  return request<VenueInfoCommonResult>(`${CMS_VENUE_INFO_BASE}/${venueId}/booths`, {
+    method: 'POST',
+    data,
+  });
+}
+
 export async function getOutdoorFairBoothMap(fairId: number) {
   return request<{ code: number; msg?: string; data: VenueBoothItem[] }>(
     `${CMS_VENUE_INFO_BASE}/fair/${fairId}/booth-map`,
diff --git a/src/services/session.ts b/src/services/session.ts
index 2f2e3b9..bf5a650 100644
--- a/src/services/session.ts
+++ b/src/services/session.ts
@@ -6,6 +6,11 @@ import React, { lazy } from 'react';
 
 let remoteMenu: any = null;
 
+// Remote CMS menus are returned by the backend at runtime. Keep newly added
+// pages with an explicit import so production webpack builds cannot tree-shake
+// them out of the dynamic import context before the remote menu is available.
+const newsInfoRemoteComponent = lazy(() => import('@/pages/NewsInfo/index'));
+
 export function getRemoteMenu() {
   return remoteMenu;
 }
@@ -62,7 +67,11 @@ function patchRouteItems(route: any, menu: any, parentPath: string) {
         route.children = [];
       }
       const newRoute = {
-        element: React.createElement(lazy(() => import('@/pages/' + path))),
+        element: React.createElement(
+          path === 'NewsInfo/index.tsx'
+            ? newsInfoRemoteComponent
+            : lazy(() => import('@/pages/' + path)),
+        ),
         path: parentPath + menuItem.path,
       }
       route.children.push(newRoute);
diff --git a/src/types/Management/list.d.ts b/src/types/Management/list.d.ts
index b21b59f..edcb68c 100644
--- a/src/types/Management/list.d.ts
+++ b/src/types/Management/list.d.ts
@@ -23,15 +23,22 @@ declare namespace API.ManagementList {
     longitude?: number;
     maxSalary?: number;
     minSalary?: number;
+    salaryComposition?: string;
+    welfareBenefits?: string;
+    workSchedule?: string;
     postingDate?: string;
     vacancies?: number;
     view?: number;
     release?: number;
     isPublish?: number;
     jobType?: string;
+    dataSource?: string;
+    externalSourceCode?: string;
+    externalSourceName?: string;
     jobContactList?: ContactPerson[];
     createTime?: string;
     jobCategory?: string;
+    description?: string;
   }
 
   export interface AddParams {
@@ -52,6 +59,9 @@ declare namespace API.ManagementList {
     longitude?: number;
     maxSalary?: number;
     minSalary?: number;
+    salaryComposition?: string;
+    welfareBenefits?: string;
+    workSchedule?: string;
     postingDate?: string;
     vacancies?: number;
     view?: number;
@@ -60,6 +70,7 @@ declare namespace API.ManagementList {
     jobType?: string;
     jobContactList?: ContactPerson[];
     jobCategory?: string;
+    description?: string;
   }
 
   export interface ListParams {
diff --git a/src/types/company/list.d.ts b/src/types/company/list.d.ts
index 691575b..900e033 100644
--- a/src/types/company/list.d.ts
+++ b/src/types/company/list.d.ts
@@ -9,7 +9,6 @@ declare namespace API.CompanyList {
   export interface CompanyContact {
     contactPerson: string;
     contactPersonPhone: string;
-    position?: string;
   }
 
   export interface Company {
@@ -19,8 +18,12 @@ declare namespace API.CompanyList {
     location?: any;
     industry: string;
     scale: string;
+    companyNature?: string;
     code: string;
     description: string;
+    registeredAddress?: string;
+    legalPerson?: string;
+    legalPhone?: string;
     companyContactList?: CompanyContact[];
     contactPerson?: string;
     contactPersonPhone?: string;
@@ -30,13 +33,21 @@ declare namespace API.CompanyList {
   }
 
   export interface Params {
+    current?: number;
+    pageSize?: number;
     createTime?: string;
     companyId?: number;
     name?: string;
     location?: any;
     industry?: string;
     scale?: string;
+    companyNature?: string;
     code?: string;
+    description?: string;
+    registeredAddress?: string;
+    legalPerson?: string;
+    legalPhone?: string;
+    companyContactList?: CompanyContact[];
     status?: 0 | 1 | 2;
     startDate?: string;
     endDate?: string;
diff --git a/src/types/jobfair/publicJobFair.d.ts b/src/types/jobfair/publicJobFair.d.ts
index 76980c0..dd02d17 100644
--- a/src/types/jobfair/publicJobFair.d.ts
+++ b/src/types/jobfair/publicJobFair.d.ts
@@ -8,6 +8,7 @@ declare namespace API.PublicJobFair {
     pageSize?: number;
     jobFairTitle?: string;
     jobFairType?: string;
+    jobFairRegionType?: string;
     startDate?: string;
     endDate?: string;
   }
@@ -18,8 +19,10 @@ declare namespace API.PublicJobFair {
     jobFairTitle: string;
     jobFairAddress: string;
     jobFairType: string;
+    jobFairRegionType?: string;
     jobFairStartTime: string;
     jobFairEndTime: string;
+    jobFairStatus?: '未举办' | '正在举办' | '已举办';
     jobFairSignUpStartTime?: string;
     jobFairSignUpEndTime?: string;
     jobFairHostUnit?: string;
@@ -101,6 +104,7 @@ declare namespace API.PublicJobFair {
     jobFairTitle: string;
     jobFairAddress: string;
     jobFairType: string;
+    jobFairRegionType: string;
     jobFairStartTime: string;
     jobFairEndTime: string;
     jobFairSignUpStartTime?: string;
diff --git a/src/types/news-info.d.ts b/src/types/news-info.d.ts
new file mode 100644
index 0000000..06f7313
--- /dev/null
+++ b/src/types/news-info.d.ts
@@ -0,0 +1,54 @@
+declare namespace API.NewsInfo {
+  export interface NewsInfoItem {
+    id: number;
+    module: string;
+    moduleName?: string;
+    title: string;
+    content?: string;
+    status: '0' | '1';
+    createBy?: string;
+    createTime?: string;
+    updateBy?: string;
+    updateTime?: string;
+    remark?: string;
+  }
+
+  export interface NewsInfoPayload {
+    id?: number;
+    module: string;
+    title: string;
+    content: string;
+    status?: '0' | '1';
+    remark?: string;
+  }
+
+  export interface NewsInfoListParams {
+    pageNum?: number;
+    pageSize?: number;
+    title?: string;
+    keyword?: string;
+    module?: string;
+    status?: '0' | '1';
+  }
+
+  export interface NewsInfoPageResult {
+    code: number;
+    msg?: string;
+    total: number;
+    rows: NewsInfoItem[];
+  }
+
+  export interface NewsInfoDetailResult {
+    code: number;
+    msg?: string;
+    data: NewsInfoItem;
+  }
+
+  export interface NewsInfoUploadResult {
+    code: number;
+    msg?: string;
+    url?: string;
+    fileName?: string;
+    data?: { url?: string; fileName?: string };
+  }
+}
diff --git a/src/utils/jobDetailTags.ts b/src/utils/jobDetailTags.ts
new file mode 100644
index 0000000..4d2d078
--- /dev/null
+++ b/src/utils/jobDetailTags.ts
@@ -0,0 +1,16 @@
+export const parseCommaSeparatedTags = (value: unknown): string[] => {
+  const rawValues = Array.isArray(value)
+    ? value
+    : typeof value === 'string'
+      ? value.split(/[,，]/)
+      : [];
+
+  return Array.from(new Set(rawValues.map((item) => String(item ?? '').trim()).filter(Boolean)));
+};
+
+export const serializeCommaSeparatedTags = (value: unknown): string | undefined => {
+  if (value === null || value === undefined) {
+    return undefined;
+  }
+  return parseCommaSeparatedTags(value).join(',');
+};
diff --git a/src/utils/newsImageUrl.ts b/src/utils/newsImageUrl.ts
new file mode 100644
index 0000000..96274c0
--- /dev/null
+++ b/src/utils/newsImageUrl.ts
@@ -0,0 +1,65 @@
+function getPublicApiPrefix(): string {
+  // 开发服务器的 /api 代理会自动补上 /api/shihezi；生产 Nginx 则需要完整前缀。
+  return process.env.NODE_ENV === 'development' ? '/api' : '/api/shihezi';
+}
+
+function getBrowserOrigin(): string {
+  return typeof window === 'undefined' ? '' : window.location.origin;
+}
+
+function isProfileResource(pathname: string): boolean {
+  return /^\/(?:api\/(?:shihezi\/)?)?profile(?:\/|$)/i.test(pathname);
+}
+
+/**
+ * 将通用上传接口返回的本地资源地址转换为浏览器可访问的公开地址。
+ *
+ * 生产反向代理把后端暴露在 /api/shihezi/ 下，而后端默认返回的地址可能
+ * 带有 127.0.0.1:9091 或直接使用 /profile 前缀。图片必须走公开代理地址，
+ * 否则 CMS 浏览器会把服务器内网地址当成图片地址并显示破图。
+ */
+export function normalizeNewsImageUrl(
+  fileUrl?: string,
+  fileName?: string,
+  currentOrigin = getBrowserOrigin(),
+): string {
+  const value = (fileUrl || fileName || '').trim();
+  if (!value) {
+    return '';
+  }
+
+  let parsed: URL;
+  try {
+    parsed = new URL(value, currentOrigin || 'http://localhost');
+  } catch {
+    return value;
+  }
+
+  if (!isProfileResource(parsed.pathname) || !currentOrigin) {
+    return value;
+  }
+
+  const profileIndex = parsed.pathname.toLowerCase().indexOf('/profile');
+  const resourcePath = parsed.pathname.slice(profileIndex);
+  return `${currentOrigin.replace(/\/+$/, '')}${getPublicApiPrefix()}${resourcePath}${
+    parsed.search
+  }${parsed.hash}`;
+}
+
+/**
+ * 修复历史正文中由后端返回的 127.0.0.1/profile 图片地址。
+ * 只改写 img[src]，不改变正文的其他 HTML 结构。
+ */
+export function normalizeNewsContent(content?: string, currentOrigin = getBrowserOrigin()): string {
+  if (!content) {
+    return content || '';
+  }
+
+  return content.replace(
+    /(<img\b[^>]*\bsrc\s*=\s*)(["'])(.*?)\2/gi,
+    (match, prefix: string, quote: string, source: string) => {
+      const normalized = normalizeNewsImageUrl(source, undefined, currentOrigin);
+      return `${prefix}${quote}${normalized || source}${quote}`;
+    },
+  );
+}
diff --git a/tests/utils/jobDetailTags.test.ts b/tests/utils/jobDetailTags.test.ts
new file mode 100644
index 0000000..0e801b2
--- /dev/null
+++ b/tests/utils/jobDetailTags.test.ts
@@ -0,0 +1,21 @@
+import { parseCommaSeparatedTags, serializeCommaSeparatedTags } from '@/utils/jobDetailTags';
+
+describe('job detail tag helpers', () => {
+  it('parses English and Chinese commas, trims values, and removes duplicates', () => {
+    expect(parseCommaSeparatedTags('基本工资, 绩效工资，奖金,基本工资')).toEqual([
+      '基本工资',
+      '绩效工资',
+      '奖金',
+    ]);
+  });
+
+  it('keeps dictionary selections and manual entries in one comma-separated value', () => {
+    expect(serializeCommaSeparatedTags(['五险一金', '带薪年假', '生日福利'])).toBe(
+      '五险一金,带薪年假,生日福利',
+    );
+  });
+
+  it('serializes a cleared selector as an empty string so an existing value can be removed', () => {
+    expect(serializeCommaSeparatedTags([])).toBe('');
+  });
+});
diff --git a/tests/utils/newsImageUrl.test.ts b/tests/utils/newsImageUrl.test.ts
new file mode 100644
index 0000000..801c4f8
--- /dev/null
+++ b/tests/utils/newsImageUrl.test.ts
@@ -0,0 +1,50 @@
+import { normalizeNewsContent, normalizeNewsImageUrl } from '@/utils/newsImageUrl';
+
+describe('news image URL normalization', () => {
+  const origin = 'http://47.111.103.66';
+
+  it('maps the backend internal host to the public API resource path', () => {
+    expect(
+      normalizeNewsImageUrl(
+        'http://127.0.0.1:9091/profile/upload/2026/07/20/news.png',
+        undefined,
+        origin,
+      ),
+    ).toBe('http://47.111.103.66/api/shihezi/profile/upload/2026/07/20/news.png');
+  });
+
+  it('supports the fileName returned by the upload endpoint', () => {
+    expect(normalizeNewsImageUrl(undefined, 'profile/upload/2026/07/20/news.png', origin)).toBe(
+      'http://47.111.103.66/api/shihezi/profile/upload/2026/07/20/news.png',
+    );
+  });
+
+  it('normalizes existing API-prefixed URLs to an absolute browser URL', () => {
+    expect(normalizeNewsImageUrl('/api/shihezi/profile/upload/news.png', undefined, origin)).toBe(
+      'http://47.111.103.66/api/shihezi/profile/upload/news.png',
+    );
+  });
+
+  it('uses the development proxy prefix in development builds', () => {
+    const originalNodeEnv = process.env.NODE_ENV;
+    process.env.NODE_ENV = 'development';
+    try {
+      expect(
+        normalizeNewsImageUrl('/profile/upload/news.png', undefined, 'http://localhost:8000'),
+      ).toBe('http://localhost:8000/api/profile/upload/news.png');
+    } finally {
+      process.env.NODE_ENV = originalNodeEnv;
+    }
+  });
+
+  it('rewrites only image sources in existing rich text', () => {
+    expect(
+      normalizeNewsContent(
+        '<p>正文</p><img src="http://127.0.0.1:9091/profile/upload/news.png"><img src="https://cdn.example.com/news.png">',
+        origin,
+      ),
+    ).toBe(
+      '<p>正文</p><img src="http://47.111.103.66/api/shihezi/profile/upload/news.png"><img src="https://cdn.example.com/news.png">',
+    );
+  });
+});