Merge branch 'dev' into 'master'

src/pages/user/login/template/project/erlianhaote/index.js

@@ -153,7 +153,7 @@ const Login = forwardRef((props, _ref) => {
                 <title>{props.global.title || defaultSetting.title}</title>
                 <meta name="description" content={props.global.title || defaultSetting.title} />
             </Helmet>
-            <div classnames={(styles.erlianhaotelogin, "erlianhaote")}>
+            <div className={classnames(styles.erlianhaotelogin, "erlianhaote")}>
                 <div className={styles['inner-wrapper']}>
                     <div className={styles['left-imgbox']}></div>
                     <div className={styles['inner-center']}>

src/pages/user/login/template/project/erlianhaote/index.less

@@ -23,7 +23,7 @@
 .erlianhaotelogin {
     width: 100%;
     height: 100%;
-    background: url('./images/乐山登录背景.png') no-repeat center;
+    background: url('./images/9.png') no-repeat center;
     background-size: 100% 100%;
     background-clip: border-box;
     position: relative;
@@ -52,7 +52,7 @@
         height: 646px;
         margin-left: -550px;
         margin-top: -298px;
-        background: url('./images/二连浩特登陆框.png') no-repeat top;
+        background: url('./images/7.png') no-repeat top;
         background-size: 100% 100%;
         display: flex;
         align-items: flex-end;
@@ -61,7 +61,7 @@
     .left-imgbox {
         width: 682px;
         height: 596px;
-        background: url('./images/二连浩特登陆界面配图-动态.gif') no-repeat center;
+        background: url('./images/6.gif') no-repeat center;
         background-size: 100% 100%;
         background-clip: border-box;
     }
@@ -213,8 +213,11 @@
 
     }
 
-    :global{
+    
+}
 
+:global{
+    .erlianhaote{
         .@{ant-prefix}src-pages-user-login-components-login-index-login {
             .@{ant-prefix}src-pages-user-login-components-login-index-prefixIcon{
                 color: #00BDA0;
@@ -255,7 +258,6 @@
             background-color: #00BDA0 !important;
             border-color: #00BDA0 !important;
         }
-        
     }
 }
 

src/pages/user/login/template/project/xingan/index.js

@@ -152,7 +152,7 @@ const Login = forwardRef((props, _ref) => {
                 <title>{props.global.title || defaultSetting.title}</title>
                 <meta name="description" content={props.global.title || defaultSetting.title} />
             </Helmet>
-            <div className={styles.xinganlogin}>
+            <div className={classnames(styles.xinganlogin, "xinganxian")}>
                 <div className={styles['inner-wrapper']}>
                     {/* <div className={styles['left-imgbox']}></div> */}
                     <div className={styles['inner-center']}>

src/pages/user/login/template/project/xingan/index.less

@@ -6,7 +6,7 @@
 .xinganlogin {
     width: 100%;
     height: 100%;
-    background: url('./images/6.png') no-repeat;
+    background: url('./images/2.png') no-repeat;
     background-size: 100% 100%;
     background-clip: border-box;
     position: relative;
@@ -182,7 +182,12 @@
         opacity: 0.8;
         cursor: pointer;
     }
-    :global{
+    
+}
+
+
+:global{
+    .popover-style{
         .@{ant-prefix}-popover-inner-content{
             display: flex;
             justify-content: center;
@@ -194,7 +199,16 @@
             align-items: center;
         }
     }
+        
+    
+    
 }
+    
+  
+    
+    
+    
+