Commit 1729683c authored by 徐乐's avatar 徐乐

feat: 修改

parent f478a91c
...@@ -396,7 +396,7 @@ const Layout = props => { ...@@ -396,7 +396,7 @@ const Layout = props => {
}, [cityData, props.global, props.global.userInfo, siteAction]); }, [cityData, props.global, props.global.userInfo, siteAction]);
useEffect(() => { useEffect(() => {
if (window?.globalConfig?.isIntegration > 1) { if (window?.globalConfig?.isIntegration >= 1) {
GetIntegrationConfig(); GetIntegrationConfig();
} }
window.share.event.on('updateSite', res => { window.share.event.on('updateSite', res => {
...@@ -411,7 +411,7 @@ const Layout = props => { ...@@ -411,7 +411,7 @@ const Layout = props => {
defaultApp(); defaultApp();
}; };
if (window?.globalConfig?.isIntegration > 1) { if (window?.globalConfig?.isIntegration >= 1) {
loginAction.events.on('toggleIndustry', handleToggleIndustry); loginAction.events.on('toggleIndustry', handleToggleIndustry);
} }
...@@ -459,7 +459,7 @@ const Layout = props => { ...@@ -459,7 +459,7 @@ const Layout = props => {
} }
const onMenuHeaderClick = event => { const onMenuHeaderClick = event => {
//集成网站 //集成网站
if (window.globalConfig.isIntegration >= 1) { if (window.globalConfig.isIntegration > 1 || integrationData.length > 1) {
// window.qiankunIsCache = false; // window.qiankunIsCache = false;
history.push('/Industry'); history.push('/Industry');
} }
...@@ -654,7 +654,7 @@ const Layout = props => { ...@@ -654,7 +654,7 @@ const Layout = props => {
popupOffset: [0, 15], popupOffset: [0, 15],
}} }}
headerSiteRender={() => headerSiteRender={() =>
window?.globalConfig?.isIntegration > 1 window?.globalConfig?.isIntegration >= 1
? ?
renderIntegration(integrationData, loginAction, props) renderIntegration(integrationData, loginAction, props)
: :
......
...@@ -13,7 +13,7 @@ const BootPageTemplate = { ...@@ -13,7 +13,7 @@ const BootPageTemplate = {
integration: IntegrationPage integration: IntegrationPage
}; };
let first = true;
const BootPage = props => { const BootPage = props => {
const [info, setInfo] = useState({ const [info, setInfo] = useState({
first: true, first: true,
...@@ -23,8 +23,8 @@ const BootPage = props => { ...@@ -23,8 +23,8 @@ const BootPage = props => {
const [template, setTemplate] = useState('default'); const [template, setTemplate] = useState('default');
const RenderComponent = useMemo(() => { const RenderComponent = useMemo(() => {
if (window?.globalConfig?.isIntegration >= 1) { if (window?.globalConfig?.isIntegration >= 1 && first) {
first = false;
//集成登录 //集成登录
return BootPageTemplate.integration return BootPageTemplate.integration
} else { } else {
......
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