module-menu 0.2.38 → 0.2.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.38",
+  "version": "0.2.40",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/index.jsx

@@ -33,27 +33,9 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
         {},
       )
         .then((res) => {
-          const resD = JSON.parse(localStorage.getItem('moduleRoutes'))
-            let menuGet =
-              (resD?.map((item) => {
-                  return {
-                    ...item,
-                    path:
-                      item.path.indexOf('/') !== -1
-                        ? item.path
-                        : '/' + item.path,
-                  };
-                })) ||
-              [];
-              console.log('menuGet', menuGet)
-            setSessionMenu(menuGet);
-            const menuLists = getNewMenuList(menuGet);
-            setMenuList(menuLists);
-
-          // if (res.data.code === 0) {
+          // const resD = JSON.parse(localStorage.getItem('moduleRoutes'))
           //   let menuGet =
-          //     (res.data.data &&
-          //       res.data.data[0]?.routes?.map((item) => {
+          //     (resD?.map((item) => {
           //         return {
           //           ...item,
           //           path:
@@ -67,7 +49,25 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           //   setSessionMenu(menuGet);
           //   const menuLists = getNewMenuList(menuGet);
           //   setMenuList(menuLists);
-          // }
+
+          if (res.data.code === 0) {
+            let menuGet =
+              (res.data.data &&
+                res.data.data[0]?.routes?.map((item) => {
+                  return {
+                    ...item,
+                    path:
+                      item.path.indexOf('/') !== -1
+                        ? item.path
+                        : '/' + item.path,
+                  };
+                })) ||
+              [];
+              console.log('menuGet', menuGet)
+            setSessionMenu(menuGet);
+            const menuLists = getNewMenuList(menuGet);
+            setMenuList(menuLists);
+          }
         })
         .catch((e) => console.log('e', e));
     }else{
@@ -323,13 +323,15 @@ const ModuleMenu = ({ sysName, stash = '' }) => {
           className={cn(stash !== 'LNRD'? 'menuIcon_size':'menuIcon_size_LNRD', 'menuIcon')}
           onMouseOver={() => setshowMenuList(true)}
           style={{
-            backgroundImage: `url(${menuIconSrc})`,
+            // backgroundImage: `url(${menuIconSrc})`,
             backgroundRepeat: 'no-repeat',
             backgroundSize: '50%',
             backgroundPosition: 'center',
             backgroundColor: stash !== 'LNRD'? '#4091F7':'#EA1A1A'
           }}
-        ></div>
+        >
+          <img src={menuIconSrc} className={cn(stash !== 'LNRD'? null:'menuIcon_img')}></img>
+        </div>
         <div className={cn(stash !== 'LNRD'? 'menu_title_content_size':'menu_title_content_size_LNRD', 'menu_title_content')}
         
         >

package/src/pages/ModuleUser/index.less

@@ -58,7 +58,7 @@
 :global(.right-select_LNRD> .ant-select-arrow>.anticon) {
   color: #FFFFFF !important;
 }
-.right-select_LNRD > .ant-select{
+.right-select_LNRD .ant-select-selection-item{
   color: #FFFFFF !important;
 }
 

package/src/pages/index.jsx

@@ -2,4 +2,4 @@ import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
 export { ModuleMenu, ModuleUser, Footer };
-// export default ModuleMenu;
+// export default ModuleUser;