From 792df5edfceb90a9d4b434237a7dd48ca420e79a Mon Sep 17 00:00:00 2001 From: zhangds Date: Thu, 20 Jun 2024 15:16:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/mouseMenu/main.js | 54 +++++++-------- src/pages/home/home.js | 4 +- src/pages/home/home.less | 109 ++++++++++++++++--------------- src/pages/login/login.js | 11 +++- 4 files changed, 99 insertions(+), 79 deletions(-) diff --git a/src/components/mouseMenu/main.js b/src/components/mouseMenu/main.js index a5d5da67..82b8a12f 100644 --- a/src/components/mouseMenu/main.js +++ b/src/components/mouseMenu/main.js @@ -1,24 +1,24 @@ -import React from "react"; -import "./main.less"; -import { Link } from "react-router-dom"; +import React from "react" +import "./main.less" +import { Link } from "react-router-dom" export default class MouseMenu extends React.Component { constructor(props) { - super(props); + super(props) this.state = { activeMenuList: [] //总动态路由数据 - }; + } } componentDidMount() { - let activeMenuList = JSON.parse(sessionStorage.getItem("activeMenu")); - this.setState({ activeMenuList }); + let activeMenuList = JSON.parse(sessionStorage.getItem("activeMenu")) + this.setState({ activeMenuList }) } closeMenuMask() { - this.props.mouseLeaveFn(); + this.props.mouseLeaveFn() } //点击菜单 clickMenuItem(e, it) { if (it.router == "/home/distributor-add") { - sessionStorage.setItem("pathname2", "/home/system/distributor-add"); + sessionStorage.setItem("pathname2", "/home/system/distributor-add") let activerou = [ { pagetitle: "新建", @@ -33,24 +33,26 @@ export default class MouseMenu extends React.Component { } ] } - ]; - sessionStorage.setItem("breaknav", JSON.stringify(activerou)); + ] + sessionStorage.setItem("breaknav", JSON.stringify(activerou)) } - this.props.mouseLeaveFn(); + this.props.mouseLeaveFn() } + render() { - let menuList = this.state.activeMenuList; //路由表 - let urlHref = window.location.href.replace(/^\/|\/$/g, ""); - const pathname = urlHref.lastIndexOf("/"); - const pathnamestr = urlHref.substr(pathname); + let menuList = this.state.activeMenuList //路由表 + let urlHref = window.location.href.replace(/^\/|\/$/g, "") + const pathname = urlHref.lastIndexOf("/") + const pathnamestr = urlHref.substr(pathname) return (
-
-
+ onMouseEnter={this.props.mouseEnter} + > +
+
{menuList?.map((item, i) => { return (
@@ -60,23 +62,23 @@ export default class MouseMenu extends React.Component { key={childI} to={childItem.router} className={ - childItem.router.includes(pathnamestr) && - item.children.length >= 1 + childItem.router.includes(pathnamestr) && item.children.length >= 1 ? "mouse_menuactive menu_items" : "menu_items" } - onClick={(e) => this.clickMenuItem(e, childItem)}> + onClick={(e) => this.clickMenuItem(e, childItem)} + > {childItem.title} - ) : null; + ) : null })}
- ); + ) })}
{/* */}
- ); + ) } } diff --git a/src/pages/home/home.js b/src/pages/home/home.js index 6e57c7f3..b76df614 100644 --- a/src/pages/home/home.js +++ b/src/pages/home/home.js @@ -185,7 +185,9 @@ export default class App extends Component { {/* logo */}
- 营销系统管理平台 + 营销系统管理平台 + + V2.9.7.8
{/* 顶部导航 */}
diff --git a/src/pages/home/home.less b/src/pages/home/home.less index 91ad67d2..9729c6fc 100644 --- a/src/pages/home/home.less +++ b/src/pages/home/home.less @@ -1,22 +1,22 @@ -.start{ +.start { width: 100%; height: 100%; - background: #F5F6F7; + background: #f5f6f7; // overflow-y: scroll; } -.navicon{ +.navicon { display: flex; align-items: center; - img{ + img { width: 20px; margin-right: 5px; } } -.exitIcon{ - font-size: 24px; +.exitIcon { + font-size: 24px; cursor: pointer; } -.start .header{ +.start .header { width: 100%; height: 60px; color: inherit; @@ -33,7 +33,7 @@ align-items: center; padding: 0 20px; } -.start .log{ +.start .log { // margin-right: 80px; font-size: 20px; font-weight: 500; @@ -41,118 +41,125 @@ display: flex; align-items: center; } -.start .log img{ +.start .log img { margin-right: 15px; width: 36px; height: 36px; } -.start .log span{ +.start .log .name { padding-left: 15px; - width: 200px; border-left: 1px solid #ccc; } -.nav{ + +.start .log .versions { + font-size: 12px; + padding: 0 5px; + margin-top: 28px; +} + +.nav { height: 100%; width: 60vw; // min-width: 300px; // flex:1; } //导航栏个人信息 -.nav-person{ - display: flex; +.nav-person { + display: flex; min-width: 130px; flex: 1; justify-content: flex-end; } -.start .helpcenter{ +.start .helpcenter { color: #666; font-weight: bold; } -.start .mainbody{ +.start .mainbody { width: 100%; flex: 1; margin-top: 60px; overflow: scroll; - .subtitle{ + .subtitle { height: 60px; line-height: 60px; - padding-left:30px; + padding-left: 30px; color: #313233; font-size: 16px; - } + } } -.route-box{ - width: 100%; +.route-box { + width: 100%; // height: 100%; // overflow-y: scroll; } -.exit-box{ - width:100%; +.exit-box { + width: 100%; background: #fff; border-radius: 12px; overflow: hidden; } -.exit-header{ +.exit-header { width: 200px; display: flex; padding: 15px; - background: #F7F9FC; + background: #f7f9fc; border-bottom: 1px solid #e0e0e0; - } -.exit-userInfo{ +.exit-userInfo { line-height: 1.5rem; color: #333; font-size: 14px; margin-left: 15px; } -.exit-btn,.modify-btn{ +.exit-btn, +.modify-btn { flex: 1; display: flex; align-items: center; - padding:10px; + padding: 10px; justify-content: center; font-size: 16px; color: #939599; cursor: pointer; } -.exit-btn:hover,.modify-btn:hover{ +.exit-btn:hover, +.modify-btn:hover { color: #296bef; } -.modify-btn{ +.modify-btn { border-left: 1px solid #e0e0e0; } -.userImg{ +.userImg { cursor: pointer; } .exitPop { - border-radius: 12px!important; + border-radius: 12px !important; border: 1px solid #e0e0e0; - overflow: hidden!important; - z-index: 8888!important; + overflow: hidden !important; + z-index: 8888 !important; } -.exitPop .zent-pop-v2-inner{ - padding: 0!important; - border-radius: 12px!important; +.exitPop .zent-pop-v2-inner { + padding: 0 !important; + border-radius: 12px !important; - background: transparent!important; + background: transparent !important; } -.nameItem{ +.nameItem { height: 100%; display: flex; align-items: center; font-weight: bold; } -.help{ +.help { font-size: 12px; - color: #296bef; - padding-right: 10px; - cursor: pointer; - margin-right: 15px; - font-weight: bold; + color: #296bef; + padding-right: 10px; + cursor: pointer; + margin-right: 15px; + font-weight: bold; } -.moveMenu{ +.moveMenu { width: 100%; // height: 400px; background: #fff; @@ -161,12 +168,12 @@ z-index: 9; left: 0; } -.maskMenu{ - width:100vw; +.maskMenu { + width: 100vw; height: 100vh; position: fixed; top: 0; left: 0; - background: rgba(0,0,0,0.2); + background: rgba(0, 0, 0, 0.2); z-index: 5; -} \ No newline at end of file +} diff --git a/src/pages/login/login.js b/src/pages/login/login.js index 30c518f4..ed543841 100644 --- a/src/pages/login/login.js +++ b/src/pages/login/login.js @@ -79,7 +79,16 @@ export default class App extends Component { this.getAccountList() sessionStorage.setItem("showflag", true) if (menuList && menuList.length > 0) { - sessionStorage.setItem("activeMenu", JSON.stringify(menuList)) + // 过滤 系统管理 *** + let xtIndex = menuList.findIndex((item) => item.title === "系统管理") + if (xtIndex !== -1) { + menuList[xtIndex].children = menuList[xtIndex].children.filter( + (item) => item.title !== "定制化模板" + ) + sessionStorage.setItem("activeMenu", JSON.stringify(menuList)) + } else { + sessionStorage.setItem("activeMenu", JSON.stringify(menuList)) + } let market = menuList.filter((item) => item.id == 16) if (market && market[0]?.children.length > 0) { //菜单有营销计划