Merge branch 'dev' into 'master'

config/proxy.js

 /* eslint-disable */
 // 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 = 'http://192.168.8.27:8023';
+ const proxyURL = 'http://120.194.86.66:8096/';
 // const proxyURL = 'https://panda-water.cn'
 //const proxyURL = 'http://192.168.12.189:8816/'
 module.exports = {

src/pages/bootpage/index.js

@@ -13,7 +13,7 @@ const BootPageTemplate = {
   integration: IntegrationPage
 
 };
-let first = true;
+
 const BootPage = props => {
   const [info, setInfo] = useState({
     first: true,
@@ -23,8 +23,8 @@ const BootPage = props => {
   const [template, setTemplate] = useState('default');
 
   const RenderComponent = useMemo(() => {
-    if (window?.globalConfig?.isIntegration >= 1 && first) {
-      first = false;
+
+    if (window?.globalConfig?.isIntegration >= 1) {
       //集成登录
       return BootPageTemplate.integration
     } else {

src/pages/bootpage/integration/index.js

@@ -55,7 +55,7 @@ const Integration = props => {
         config.client = cli
       }
 
-      props.instance && props.instance.updateConfig(config);
+      // props.instance && props.instance.updateConfig(config);
       loginAction && loginAction.getUserInfoAndConfig('', true, item.type, cli);
     }
   };
@@ -145,8 +145,7 @@ const Integration = props => {
                   </div>
                 )}
               </li>
-            ),
-            ) : ''}
+            )) : ''}
           </ul>
         </section>
       </div>

src/pages/bootpage/integration/index.less

@@ -111,8 +111,10 @@
           }
 
           .bootPageList {
-            width: 100%;
-            height: 100%;
+            // width: 100%;
+            // height: 100%;
+            width: 300px;
+            height: 270px;
             border-radius: 4px;
             transition: all .2s ease-out;
             display: flex;
@@ -130,6 +132,8 @@
             }
 
             .listMain {
+              width: 207px;
+              height: 218px;
               transition: all 0.2s ease-out;
               display: flex;
               align-items: center;
@@ -137,7 +141,8 @@
               background: url('@/assets/bootPage/bg.png');
               background-size: 100%;
               background-repeat: no-repeat;
-              padding: 30px 54px 48px 43px;
+              // padding: 30px 54px 48px 43px;
+              padding-top: 30px;
 
               img {
                 // width: 298px;