diff --git a/src/app.tsx b/src/app.tsx index fba80d9..6fdf4be 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -217,9 +217,9 @@ export async function render(oldRender: () => void) { const checkRegion = 5 * 60 * 1000; export const request = { ...errorConfig, - // baseURL: process.env.NODE_ENV === 'development' ? '' : 'https://qd.zhaopinzao8dian.com/api', + baseURL: process.env.NODE_ENV === 'development' ? '' : 'https://qd.zhaopinzao8dian.com/api', // baseURL: 'http://39.98.44.136:8080', - baseURL: process.env.NODE_ENV === 'development' ? '' : 'http://10.213.6.207:19010/api', + // baseURL: process.env.NODE_ENV === 'development' ? '' : 'http://10.213.6.207:19010/api', requestInterceptors: [ (url: any, options: { headers: any }) => { const headers = options.headers ? options.headers : []; diff --git a/src/assets/login_img.e2b033b1.png b/src/assets/login_img.e2b033b1.png new file mode 100644 index 0000000..a4ad495 Binary files /dev/null and b/src/assets/login_img.e2b033b1.png differ diff --git a/src/pages/User/Login/index.tsx b/src/pages/User/Login/index.tsx index 4c4af84..95b41b8 100644 --- a/src/pages/User/Login/index.tsx +++ b/src/pages/User/Login/index.tsx @@ -17,13 +17,14 @@ import { } from '@ant-design/pro-components'; import { useEmotionCss } from '@ant-design/use-emotion-css'; import { FormattedMessage, Helmet, history, SelectLang, useIntl, useModel } from '@umijs/max'; -import { Alert, Col, Image, message, Row, Tabs } from 'antd'; +import { Alert, Col, Image, message, Row, Tabs, QRCode } from 'antd'; import Settings from '../../../../config/defaultSettings'; import React, { useEffect, useState } from 'react'; import { flushSync } from 'react-dom'; // flushSync 允许你强制 React 同步刷新提供的回调中的任何更新。这确保了 DOM 立即更新 import { clearSessionToken, setSessionToken } from '@/access'; import logoImg from '@/assets/logo.svg'; +import login_imge2b033b1 from '@/assets/login_img.e2b033b1.png'; const ActionIcons = () => { const langClassName = useEmotionCss(({ token }) => { @@ -92,6 +93,7 @@ const Login: React.FC = () => { const { initialState, setInitialState } = useModel('@@initialState'); const [captchaCode, setCaptchaCode] = useState(''); const [uuid, setUuid] = useState(''); + const [qrcodeVal, setQrcodeVal] = useState('7655212'); const containerClassName = useEmotionCss(() => { return { @@ -192,7 +194,8 @@ const Login: React.FC = () => { minWidth: 280, maxWidth: '75vw', }} - logo={logo} + submitter={type === 'scanQode' ? false : true} + // logo={logo} title="青岛智慧就业服务系统" // subTitle={intl.formatMessage({ id: 'pages.layouts.userLayout.title' })} initialValues={{ @@ -222,6 +225,10 @@ const Login: React.FC = () => { defaultMessage: '账户密码登录', }), }, + { + key: 'scanQode', + label: '社保卡扫码登录', + }, // { // key: 'mobile', // label: intl.formatMessage({ @@ -232,7 +239,7 @@ const Login: React.FC = () => { ]} /> - {/*{code !== 200 && loginType === 'account' && (*/} + {/* {code !== 200 && loginType === 'account' && ( */} {/* { {/* })}*/} {/* />*/} {/*)}*/} + + {type === 'scanQode' && ( + <> + + + + + + + )} + {type === 'account' && ( <> { /> )} -
- - - - - - -
+ + + + + + + + )}