lisang
/
d2-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复显示两个图标的 bug 

Former-commit-id: 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 7230e2ad2d4252e1b1043b79baadf3392f2b13a5 [formerly f404626d8b3ec5698337a28d428fce5f6ab08194]]]]]
Former-commit-id: b01ea1484ba48b0a21f7ec79b7205a661e61d396
Former-commit-id: d7e096d382cbe8ded3e10d0b29ef1f12a7438cce
Former-commit-id: d07064da9622a709f5eed3f4381552abda248c2c [formerly 1ae086520f061f996d7da052b35c7fb122e223c5]
Former-commit-id: 813086fc394a2cb8fcfbf77470c4b1bfa235bc65
Former-commit-id: 0472626b5423e9060d02cbbdfdf21427bbd935f2
Former-commit-id: c20700a96d447d8a091ca42b66a21e4d1a86f3e5
Former-commit-id: a1395ada62828578d69ba2f96aabd1167f31b1da
Former-commit-id: 50bb493c30788c203977e59414a02d396419ede1
This commit is contained in:
liyang 2018-11-16 16:38:03 +08:00
parent b8cff46a51
commit 29cc7f3b00
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "d2-admin",
"version": "1.6.1",
"version": "1.6.2",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",

2
src/layout/header-aside/components/components/menu-item/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-menu-item :index="menu.path || uniqueId">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
<i v-if="menu.icon === undefined" class="fa fa-file-o"></i>
<i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-file-o"></i>
<d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
<span slot="title">{{menu.title || '未命名菜单'}}</span>
</el-menu-item>

2
src/layout/header-aside/components/components/menu-sub/index.vue
View File

@ -2,7 +2,7 @@
<el-submenu :index="menu.path || uniqueId">
<template slot="title">
<i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
<i v-if="menu.icon === undefined" class="fa fa-folder-o"></i>
<i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-folder-o"></i>
<d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
<span slot="title">{{menu.title}}</span>
</template>