Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/User/Login.js

@@ -10,14 +10,14 @@ import {
 
 const FormItem = Form.Item;
 
-let main_admin_top_logo = require('../../assets/logo.png');
+let main_admin_top_logo = require('../../assets/login/logo.png');
 let com_img_info = getSldImgSet('com_img_info');
 if (com_img_info != '') {
-  main_admin_top_logo = com_img_info.filter(item => item.name == 'main_admin_top_logo')[0].imageUrl || main_admin_top_logo;
+  // main_admin_top_logo = com_img_info.filter(item => item.name == 'main_admin_top_logo')[0].imageUrl || main_admin_top_logo;
 }
 const default_login_img = {
-	admin_login_bg: require('../../assets/sld_login_bg.jpg'),//登录背景
-	admin_login_left_bg: require('../../assets/sld_login_left.png'),//登录左侧图片
+	admin_login_bg: require('../../assets/login/sld_login_bg.png'),//登录背景
+	admin_login_left_bg: require('../../assets/login/sld_login_left.png'),//登录左侧图片
   main_admin_top_logo: main_admin_top_logo,//登录页logo
 };
 @connect(({ login, }) => ({
@@ -138,8 +138,7 @@ export default class LoginPage extends Component {
 				/>
           <img
             className={styles.login_logo}
-            src={login_img.main_admin_top_logo}
-            onError={()=>this.showDefault('main_admin_top_logo')}
+            src={main_admin_top_logo}
           />
           <div className={styles.right_bg}>
             <span className={styles.login_title}>{sldComLanguage('平台管理中心')}</span>

xinkeaboard-admin/src/pages/User/Login.less

@@ -51,7 +51,7 @@
     }
     .login_logo{
       max-width: 200px;
-      max-height: 50px;
+      max-height: 88px;
       position: absolute;
       left: 90px;
       top: 87px;
@@ -65,8 +65,8 @@
     right: 80px;
     z-index: 2;
     width: 410px;
-    height: 420px;
-    background: #fff;
+    height: 440px;
+    // background: #fff;
     border-radius: 0 6px 6px 0;
     display: flex;
     flex-direction: column;
@@ -76,9 +76,10 @@
     margin-left: -10px;
 
     .login_title {
-      font-size: 30px;
       font-weight: bold;
-      color: @theme-color;
+      font-size: 30px;
+      color: #282E30;
+      // color: @theme-color;
       //font-family: 'MicrosoftYaHei-Bold';
       letter-spacing: 2px;
       display: flex;