Commit e5945a9d authored by Cai Wei's avatar Cai Wei

feat(*): 修复冲突

parent 6edd9922
...@@ -31,11 +31,8 @@ ...@@ -31,11 +31,8 @@
<span>{{getMenuTitle(item_son)}}</span> <span>{{getMenuTitle(item_son)}}</span>
</el-menu-item> </el-menu-item>
</el-sub-menu> </el-sub-menu>
<el-menu-item v-else :index="item.path" <el-menu-item v-else :index="index + ''" class="submenu-box" @click="handleClick(item.path)">
class="submenu-box" <!-- <el-icon><setting /></el-icon> -->
:class="{'ns-active': item.path === activeMenu}"
@click="handleClick(item.path)"
>
<img class="menu-icon" :src="`/src/assets/menu/${item.meta.icon}.png`" alt=""> <img class="menu-icon" :src="`/src/assets/menu/${item.meta.icon}.png`" alt="">
<span>{{getMenuTitle(item)}}</span> <span>{{getMenuTitle(item)}}</span>
</el-menu-item> </el-menu-item>
...@@ -108,6 +105,15 @@ const getMenuTitle = (item) => { ...@@ -108,6 +105,15 @@ const getMenuTitle = (item) => {
} }
.is-active {
color: #fff !important;
background: #03a1b3 !important;
span {
color: #fff !important;
}
}
.is-active { .is-active {
.el-submenu__title { .el-submenu__title {
color: #FFFFFFFF !important; color: #FFFFFFFF !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment