Commit c52acc83 authored by 徐乐's avatar 徐乐

feat: 修改

parent 8a668da7
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn'; // const proxyURL = 'https://work.panda-water.cn';
const proxyURL = 'http://192.168.8.27:8023'; const proxyURL = 'http://120.194.86.66:8096/';
// const proxyURL = 'https://panda-water.cn' // const proxyURL = 'https://panda-water.cn'
//const proxyURL = 'http://192.168.12.189:8816/' //const proxyURL = 'http://192.168.12.189:8816/'
module.exports = { module.exports = {
......
...@@ -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 && first) {
first = false; if (window?.globalConfig?.isIntegration >= 1) {
//集成登录 //集成登录
return BootPageTemplate.integration return BootPageTemplate.integration
} else { } else {
......
...@@ -55,7 +55,7 @@ const Integration = props => { ...@@ -55,7 +55,7 @@ const Integration = props => {
config.client = cli config.client = cli
} }
props.instance && props.instance.updateConfig(config); // props.instance && props.instance.updateConfig(config);
loginAction && loginAction.getUserInfoAndConfig('', true, item.type, cli); loginAction && loginAction.getUserInfoAndConfig('', true, item.type, cli);
} }
}; };
...@@ -145,8 +145,7 @@ const Integration = props => { ...@@ -145,8 +145,7 @@ const Integration = props => {
</div> </div>
)} )}
</li> </li>
), )) : ''}
) : ''}
</ul> </ul>
</section> </section>
</div> </div>
......
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