Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into rc

.gitignore

@@ -12,7 +12,6 @@ npm-shrinkwrap.json
 .DS_Store
 .DS_Store
 .AppleDouble
 .AppleDouble
 .LSOverride
 .LSOverride
-yarn.lock
 yarn-error.lock
 yarn-error.lock
 
 
 # IntelliJ project files
 # IntelliJ project files
@@ -57,7 +56,6 @@ npm-debug.log
 
 
 *.zip
 *.zip
 build/vendor.js.map
 build/vendor.js.map
-package-lock.json
 .vscode/*
 .vscode/*
 demo.js
 demo.js
 debug.log
 debug.log

src/modules/root/Menu.less

@@ -64,10 +64,15 @@
       .icon-img-box {
       .icon-img-box {
         // display: flex;
         // display: flex;
         display: inline-block;
         display: inline-block;
+        width: 40px;
         height: 40px;
         height: 40px;
         .icon-img {
         .icon-img {
           margin-left: 12px;
           margin-left: 12px;
         }
         }
+        margin-right: 0 !important;
+      }
+      .icon-img-title {
+        margin-left: 0 !important;
       }
       }
       .icon-img {
       .icon-img {
         width: 18px;
         width: 18px;

src/modules/root/Menu.tsx

@@ -230,7 +230,7 @@ function Aside(props: any) {
                         </div>
                         </div>
                       )
                       )
                     }
                     }
-                    title={menuType ? <span>{item.groupName}</span> : ''}
+                    title={menuType ? <span className='icon-img-title'>{item.groupName}</span> : ''}
                     onTitleClick={() => onOpenChange(item.groupCode)}>
                     onTitleClick={() => onOpenChange(item.groupCode)}>
                     {item.children.map((_item: any, _index: any) => {
                     {item.children.map((_item: any, _index: any) => {
                       if (ctx.xmState.storeUserPermissionList.indexOf(_item.groupCode) === -1) {
                       if (ctx.xmState.storeUserPermissionList.indexOf(_item.groupCode) === -1) {
@@ -258,16 +258,16 @@ function Aside(props: any) {
                     key={item.groupCode}
                     key={item.groupCode}
                     icon={
                     icon={
                       !menuType && item.groupCode === selectKeyParent ? (
                       !menuType && item.groupCode === selectKeyParent ? (
-                        <div className='icon-img-box' style={{ backgroundColor: '#2966FF', width: '40px' }}>
+                        <div className='icon-img-box' style={{ backgroundColor: '#2966FF' }}>
                           <img src={item.selectImg} className='icon-img' />
                           <img src={item.selectImg} className='icon-img' />
                         </div>
                         </div>
                       ) : (
                       ) : (
-                        <div className='icon-img-box' style={{ width: '30px' }}>
+                        <div className='icon-img-box'>
                           <img src={selectKey === item.groupCode ? item.selectImg : item.img} className='icon-img' />
                           <img src={selectKey === item.groupCode ? item.selectImg : item.img} className='icon-img' />
                         </div>
                         </div>
                       )
                       )
                     }>
                     }>
-                    {menuType ? item.groupName : ''}
+                    {menuType ? <span className='icon-img-title'>{item.groupName}</span> : ''}
                   </Menu.Item>
                   </Menu.Item>
                 );
                 );
               }
               }

src/routes/config/menuList.tsx

@@ -49,7 +49,7 @@ export const menuList: any = [
     groupCode: 'TrainManage',
     groupCode: 'TrainManage',
     icon: '',
     icon: '',
     img: 'https://image.xiaomaiketang.com/xm/Yy6pZ6G6kS.png',
     img: 'https://image.xiaomaiketang.com/xm/Yy6pZ6G6kS.png',
-    selectImg: 'https://image.xiaomaiketang.com/xm/TTBGBpf3BJ.png',
+    selectImg: 'https://image.xiaomaiketang.com/xm/Z8G6NMQhaH.png',
     children: [
     children: [
       {
       {
         groupName: '培训计划',
         groupName: '培训计划',