Commit 84938fcb authored by 周宏民's avatar 周宏民

fix: 修改集成登录通用功能 反回的bug

parent 6d9b183a
Pipeline #92735 passed with stages
...@@ -18,6 +18,8 @@ import imgLogo from '@/assets/bootPage/熊猫图标.png'; ...@@ -18,6 +18,8 @@ import imgLogo from '@/assets/bootPage/熊猫图标.png';
import styles from './index.less'; import styles from './index.less';
const Integration = props => { const Integration = props => {
const dataRef = useRef(); const dataRef = useRef();
let integrationClient = window?.globalConfig?.client || 'city'; // 集成登录client
const [percentBottom, setPercentBottom] = useState(-40); const [percentBottom, setPercentBottom] = useState(-40);
const [currentType, setCurrentType] = useState(''); const [currentType, setCurrentType] = useState('');
const [scale, setScale] = useState(1); const [scale, setScale] = useState(1);
...@@ -130,7 +132,7 @@ const Integration = props => { ...@@ -130,7 +132,7 @@ const Integration = props => {
const handleToggleIndustry = event => { const handleToggleIndustry = event => {
setPercentBottom(38); setPercentBottom(38);
clearInterval(process.current); clearInterval(process.current);
props.history.push(`/?client=${client || props.global.client}`); props.history.push(`/?client=${integrationClient}`);
props.updateCurrentIndex(0); props.updateCurrentIndex(0);
...@@ -169,6 +171,17 @@ const Integration = props => { ...@@ -169,6 +171,17 @@ const Integration = props => {
.catch(err => { .catch(err => {
notification.error({ message: '提示', duration: 3, description: '集成站点配置错误' }); notification.error({ message: '提示', duration: 3, description: '集成站点配置错误' });
}); });
appService
.GetIntegratedloginSetting({
ignoreSite: true,
})
.then(res => {
const { code, data } = res;
if (data.client) {
integrationClient = data.client;
localStorage.setItem('integrationClient', data.client);
}
});
}, []); }, []);
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment