- {record.companyContactList.map((contact, index) => (
-
-
联系人：{contact.contactPerson}
-
联系电话：{contact.contactPersonPhone}
-
职务：{contact.position}
+
+
+
+
{renderDetailText(record?.name)}
+
+ {record?.scale != null && record.scale !== '' && (
+
+ )}
+ {statusTag}
+ {record?.industry ? (
+ {record.industry}
+ ) : null}
+
+
+
+
+
基本信息
+
+
+ {renderDetailText(record?.location as string)}
+
+
+ {renderDetailText(record?.code)}
+
+
+
+
+
+
单位介绍
+ {record?.description?.trim() ? (
+
{record.description}
+ ) : (
+
+ )}
+
+
+
+
企业联系人
+ {contacts && contacts.length > 0 ? (
+
+ {contacts.map((contact, index) => (
+
+
+
+
+
+
+ {renderDetailText(contact.contactPerson)}
+
+
+
+
{renderDetailText(contact.contactPersonPhone)}
+
+ {contact.position?.trim() ? (
+
+
+ {contact.position}
+
+ ) : null}
+
))}
) : (
-
暂无联系人信息
+
)}
-
-
-
+
+
);
};
diff --git a/src/pages/Company/List/index.tsx b/src/pages/Company/List/index.tsx
index f85107a..3c305a7 100644
--- a/src/pages/Company/List/index.tsx
+++ b/src/pages/Company/List/index.tsx
@@ -1,69 +1,29 @@
import React, { Fragment, useEffect, useRef, useState } from 'react';
import { FormattedMessage, useAccess } from '@umijs/max';
-import { Button, FormInstance, message, Modal, Descriptions } from 'antd';
+import { Button, FormInstance, message, Modal } from 'antd';
import { ActionType, ProColumns, ProTable } from '@ant-design/pro-components';
-import { DeleteOutlined, FormOutlined, PlusOutlined, EyeOutlined, AlignLeftOutlined, AuditOutlined } from '@ant-design/icons';
-import EditCompanyListRow from './edit';
+import { DeleteOutlined, FormOutlined, PlusOutlined, AlignLeftOutlined, AuditOutlined } from '@ant-design/icons';
+import EditCompanyListRow, { CompanyDetailView } from './edit';
import {
addCmsCompanyList,
delCmsCompanyList,
exportCmsCompanyList,
getCmsCompanyList,
+ getCmsCompanyDetail,
+ parseCmsCompanyDetailResponse,
putCmsCompanyList,
} from '@/services/company/list';
-import { getCmsCompanyDetail } from '@/services/company/list';
import { getDictValueEnum } from '@/services/system/dict';
import DictTag from '@/components/DictTag';
import { postCompanyApproval } from '@/services/company/review';
-// 详情查看组件
-const CompanyDetailModal = ({
- visible,
- onCancel,
- record,
- scaleEnum
-}: {
- visible: boolean;
- onCancel: () => void;
- record?: API.CompanyList.Company;
- scaleEnum: Record
;
-}) => {
- return (
-
- 关闭
- ,
- ]}
- >
-
- {record?.name}
- {record?.industry}
-
-
-
- {record?.location}
-
- {record?.companyContactList && record.companyContactList.length > 0 ? (
-
- {record.companyContactList.map((contact, index) => (
-
-
联系人：{contact.contactPerson}
-
联系电话：{contact.contactPersonPhone}
-
- ))}
-
+
+
公司基本信息
{companyDetail.name}
diff --git a/src/pages/ThirdPartyRedirect.tsx b/src/pages/ThirdPartyRedirect.tsx
new file mode 100644
index 0000000..aea6594
--- /dev/null
+++ b/src/pages/ThirdPartyRedirect.tsx
@@ -0,0 +1,202 @@
+import React, { useEffect, useState } from 'react';
+import { Spin, message } from 'antd';
+import { history, useLocation, useModel } from '@umijs/max';
+import { getAccessToken } from '@/access';
+import { getRoutersInfo, setRemoteMenu } from '@/services/session';
+import { flushSync } from 'react-dom';
+
+/** 过渡页文案：避免「登录」表述，强调无缝进入 */
+const STATUS_TEXT = {
+ entering: '正在进入系统…',
+ verifying: '正在核验访问信息…',
+ preparing: '正在准备页面…',
+ loadingProfile: '正在加载您的资料…',
+ noCredential: '未检测到有效访问凭证，请从原系统入口进入',
+ credentialInvalid: '访问凭证已失效，请从原系统重新进入',
+ profileFailed: '暂时无法加载您的信息，请稍后重试',
+} as const;
+
+const HINT_TEXT = '请稍候，页面即将呈现';
+
+const pageStyle: React.CSSProperties = {
+ display: 'flex',
+ flexDirection: 'column',
+ justifyContent: 'center',
+ alignItems: 'center',
+ minHeight: '100vh',
+ padding: '24px',
+ background: 'linear-gradient(180deg, #f0f5ff 0%, #f5f7fa 48%, #fafafa 100%)',
+};
+
+const cardStyle: React.CSSProperties = {
+ textAlign: 'center',
+ width: '100%',
+ maxWidth: 420,
+ padding: '48px 40px 40px',
+ borderRadius: 16,
+ background: '#fff',
+ boxShadow: '0 8px 24px rgba(0, 0, 0, 0.06)',
+ border: '1px solid rgba(0, 0, 0, 0.04)',
+};
+
+const titleStyle: React.CSSProperties = {
+ marginTop: 28,
+ marginBottom: 0,
+ fontSize: 20,
+ fontWeight: 600,
+ color: 'rgba(0, 0, 0, 0.88)',
+ lineHeight: 1.4,
+};
+
+const statusStyle: React.CSSProperties = {
+ marginTop: 12,
+ marginBottom: 0,
+ fontSize: 15,
+ color: 'rgba(0, 0, 0, 0.65)',
+ lineHeight: 1.6,
+};
+
+const hintStyle: React.CSSProperties = {
+ marginTop: 8,
+ fontSize: 14,
+ color: 'rgba(0, 0, 0, 0.45)',
+};
+
+export default function ThirdPartyRedirect() {
+ const location = useLocation();
+ const { initialState, setInitialState } = useModel('@@initialState');
+ const [loading, setLoading] = useState(true);
+ const [status, setStatus] = useState(STATUS_TEXT.entering);
+ const [isError, setIsError] = useState(false);
+
+ useEffect(() => {
+ handleLoginRedirect();
+ }, [location.search]);
+
+ const fetchUserInfo = async () => {
+ try {
+ const userInfo = await initialState?.fetchUserInfo?.();
+ if (userInfo) {
+ console.log('userInfo', userInfo);
+ console.log('user roles:', userInfo?.roles);
+ console.log('first role:', userInfo?.roles?.[0]);
+ flushSync(() => {
+ setInitialState((s) => ({
+ ...s,
+ currentUser: userInfo,
+ }));
+ });
+ if (Number(userInfo?.userType) === 1101) {
+ Number(userInfo?.userType)
+ Number(userInfo?.userType)
+ const params = new URLSearchParams(location.search);
+ const pageName = params.get('pageName');
+ console.log('userType value:', userInfo?.userType, 'type:', typeof userInfo?.userType);
+ if (!pageName) {
+ history.replace(`/job-portal`);
+ }
+ if (pageName === 'message') {
+ history.replace(`/job-portal/${pageName}`);
+ }
+ if (pageName === 'jobDetail') {
+ history.replace(`/job-portal/detail/${params.get('jobId')}`);
+ }
+ if (pageName === 'personal-center') {
+ history.replace(`/job-portal/${pageName}`);
+ }
+ return;
+ } else {
+ const menus = await getRoutersInfo();
+ console.log('userType value:', userInfo?.userType, 'type:', typeof userInfo?.userType);
+ if (menus && menus.length > 0 && Number(userInfo?.userType) !== 1101) {
+ setRemoteMenu(menus);
+ window.location.replace('http://39.98.44.136:6024/shihezi/management/management/list/index')
+ }
+ }
+
+ } else {
+ message.error('暂时无法加载您的信息');
+ setIsError(true);
+ setStatus(STATUS_TEXT.profileFailed);
+ }
+ } catch (error) {
+ setIsError(true);
+ setStatus(STATUS_TEXT.profileFailed);
+ }
+ };
+
+ const handleLoginRedirect = async () => {
+ try {
+ setIsError(false);
+ const params = new URLSearchParams(location.search);
+ const code = params.get('code');
+ const token = params.get('token');
+ const pageName = params.get('pageName');
+
+ if (!code && !token && !pageName) {
+ setIsError(true);
+ setStatus(STATUS_TEXT.noCredential);
+ }
+ if (code || token) {
+ const sessionToken = getAccessToken();
+ if (!sessionToken) {
+ setIsError(true);
+ setStatus(STATUS_TEXT.credentialInvalid);
+ return;
+ }
+ setStatus(STATUS_TEXT.loadingProfile);
+ await fetchUserInfo();
+ return;
+ }
+ if (!token) {
+ if (!pageName) {
+ history.replace(`/job-portal`);
+ }
+ if (pageName === 'message') {
+ history.replace(`/job-portal/${pageName}`);
+ }
+ if (pageName === 'jobDetail') {
+ history.replace(`/job-portal/detail/${params.get('jobId')}`);
+ }
+ if (pageName === 'personal-center') {
+ history.replace(`/job-portal/${pageName}`);
+ }
+ return;
+ }
+ } catch (error) {
+ console.error('单点进入失败:', error);
+ setIsError(true);
+ message.error('进入系统失败，请稍后重试');
+ setStatus(STATUS_TEXT.credentialInvalid);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ return (
+
+
+
+ {!loading && isError && (
+
+ !
+
+ )}
+
{isError ? '暂时无法进入' : '正在进入系统'}
+
{status}
+ {!isError &&
{HINT_TEXT}
}
+
+