Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

src/pages/user/login/index.js

@@ -20,6 +20,7 @@ const LoginTemplate = {
 export default (props) => {
   const redirect = getParams('redirect');
   useEffect(() => {
+    if(getParams('loginName') && getParams('password')) return
     initGlobalConfig();
   }, [redirect]);
   const template = window.globalConfig && window.globalConfig.loginTemplate;