fix: 恢复logo读取逻辑

xinkeaboard-admin/src/components/GlobalHeader/index.js

@@ -8,11 +8,11 @@ import { specialFlag,imUrl } from '@/utils/sldconfig';
 import defaultSettings from '@/defaultSettings';
 
 //设置顶部logo
-let main_admin_top_logo_local = require('../../assets/logo1.png');
-let main_admin_top_logo = require('../../assets/login/logo.png');
+let main_admin_top_logo_local = require('../../assets/login/logo.png');
+let main_admin_top_logo = '';
 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_local;
+    main_admin_top_logo = com_img_info.filter(item => item.name == 'main_admin_top_logo')[0].imageUrl || main_admin_top_logo_local;
 }
 
 export default class GlobalHeader extends PureComponent {

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

@@ -13,7 +13,7 @@ const FormItem = Form.Item;
 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/login/sld_login_bg.png'),//登录背景
@@ -138,7 +138,7 @@ export default class LoginPage extends Component {
 				/>
           <img
             className={styles.login_logo}
-            src={main_admin_top_logo}
+            src={default_login_img.main_admin_top_logo}
           />
           <div className={styles.right_bg}>
             <span className={styles.login_title}>{sldComLanguage('平台管理中心')}</span>

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

@@ -20,7 +20,7 @@ let admin_login_logo = require('../../assets/login/logo.png');
 let main_seller_center_logo_local = admin_login_logo;
 let com_img_login_info = getSldImgSet('com_img_login_info');
 if (com_img_login_info != '') {
-  //  admin_login_logo = com_img_login_info.filter(item => item.name == 'main_seller_center_logo')[0].imageUrl || main_seller_center_logo_local;
+   admin_login_logo = com_img_login_info.filter(item => item.name == 'main_seller_center_logo')[0].imageUrl || main_seller_center_logo_local;
   //admin_login_logo = com_img_info
 }
 const default_login_img = {
@@ -773,7 +773,7 @@ export default class LoginPage extends Component {
             onError={() => this.showDefault('admin_login_left_bg')}
           />
           <div className={`${global.flex_row_center_center} ${styles.login_logo_wrap}`}>
-            <img className={styles.login_logo} src={admin_login_logo} onError={(e) => {
+            <img className={styles.login_logo} src={default_login_img.main_seller_center_logo} onError={(e) => {
               e.target.onerror = null;
               e.target.src = main_seller_center_logo_local;
             }}/>

xinkeaboard-web/components/FooterBottom.vue

@@ -133,8 +133,8 @@ getCopyrightData();
   position: relative;
   overflow: hidden;
   box-sizing: border-box;
-  background: #eaeaea;
-  background: rgb(176 221 204 / 37%);
+  background: #fff;
+  // background: rgb(176 221 204 / 37%);
   .link_box {
     border-top: 1px dashed #f2f2f2;
     padding-top: 50px;
@@ -208,7 +208,8 @@ getCopyrightData();
 
 <style lang="scss" scoped>
 .footer_bottom {
-  background: rgba(176, 221, 204, 0.37);
+  // background: rgba(176, 221, 204, 0.37);
+  background-color: #fff;
   position: absolute;
   width: 100%;
   overflow: hidden;