From f5a3b008d31ee3ea17c7ec46fa61e5698017cdcc Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 26 Feb 2020 20:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/assets/icons/svg/component.svg             |  1 -
 vue/src/assets/icons/svg/cool.svg                  |  1 -
 vue/src/assets/icons/svg/style.svg                 |  1 -
 .../components/Sidebar/components/SidebarItem.vue  |  7 +++----
 vue/src/router/modules/example.js                  | 14 +++++++-------
 5 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 vue/src/assets/icons/svg/component.svg
 delete mode 100644 vue/src/assets/icons/svg/cool.svg
 delete mode 100644 vue/src/assets/icons/svg/style.svg

diff --git a/vue/src/assets/icons/svg/component.svg b/vue/src/assets/icons/svg/component.svg
deleted file mode 100644
index 207ada3..0000000
--- a/vue/src/assets/icons/svg/component.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h54.857v54.857H0V0zm0 73.143h54.857V128H0V73.143zm73.143 0H128V128H73.143V73.143zm27.428-18.286C115.72 54.857 128 42.577 128 27.43 128 12.28 115.72 0 100.571 0 85.423 0 73.143 12.28 73.143 27.429c0 15.148 12.28 27.428 27.428 27.428z"/></svg>
\ No newline at end of file
diff --git a/vue/src/assets/icons/svg/cool.svg b/vue/src/assets/icons/svg/cool.svg
deleted file mode 100644
index 2467bf5..0000000
--- a/vue/src/assets/icons/svg/cool.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="icon" width="200" height="200" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path d="M512 1024c282.784 0 512-229.216 512-512S794.784 0 512 0 0 229.216 0 512s229.216 512 512 512zm0-928c229.76 0 416 186.24 416 416S741.76 928 512 928 96 741.76 96 512 282.24 96 512 96zm288 160c17.6 0 32 14.4 32 32v96c0 35.2-28.8 64-64 64H640c-35.2 0-64-28.8-64-64H448c0 35.2-28.8 64-64 64H256c-35.2 0-64-28.8-64-64v-96c0-17.6 14.4-32 32-32h192c17.6 0 32 14.4 32 32v32h128v-32c0-17.6 14.4-32 32-32h192zM512 768a255.84 255.84 0 00219.552-124.288l54.88 32.928A319.872 319.872 0 01512 832a318.496 318.496 0 01-135.552-30.08l33.152-55.264c31.36 13.728 65.952 21.376 102.368 21.376z"/></svg>
\ No newline at end of file
diff --git a/vue/src/assets/icons/svg/style.svg b/vue/src/assets/icons/svg/style.svg
deleted file mode 100644
index d8415ff..0000000
--- a/vue/src/assets/icons/svg/style.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg class="icon" width="200" height="199.61" viewBox="0 0 1026 1024" xmlns="http://www.w3.org/2000/svg"><path d="M944.4 311.8c-32.7-2.3-63.4 3.5-101.5 54.3s-152.3 20.7-137.5-41c6.6-17.8 7.7-36.4 70.3-66.8 62.6-30.4 36.1-100.4 9.6-115 0 0-241.9-138.7-580.3 60.9-93 54-265.5 251.1-183.5 459.2C73.1 787.7 162.8 858.8 308.3 905c145.5 46.2 314.7 14.7 400.4-29.3 85.7-44 227.8-109.4 294.4-284.2 66.5-174.8-26-277.5-58.7-279.7zm-850 179.6c-3.8-26.8 24.3-53 62.9-58.5 38.5-5.5 72.9 11.8 76.7 38.6 3.8 26.8-24.3 53-62.9 58.5s-72.9-11.8-76.7-38.6zm121 203.6c-40.5 5.8-76.7-12.4-80.7-40.6-4-28.2 25.6-55.7 66.1-61.5 40.5-5.8 76.6 12.4 80.7 40.6 4.1 28.2-25.5 55.7-66.1 61.5zm18.4-325.2c-38.9 5.5-73.5-11.9-77.4-39-3.8-27.1 24.5-53.5 63.4-59s73.5 11.9 77.4 39-24.6 53.4-63.4 59zm172.9 468.8c-44.2 9.3-85.2-8.1-91.7-38.9-6.4-30.7 24.1-63.2 68.3-72.4 44.2-9.3 85.2 8.1 91.7 38.9 6.4 30.7-24.2 63.1-68.3 72.4zm28.9-582c-37 5.3-70-11.3-73.6-37.1-3.7-25.7 23.4-50.9 60.4-56.1 37-5.3 70 11.3 73.6 37.1 3.6 25.7-23.4 50.8-60.4 56.1z"/></svg>
\ No newline at end of file
diff --git a/vue/src/layout/components/Sidebar/components/SidebarItem.vue b/vue/src/layout/components/Sidebar/components/SidebarItem.vue
index 31f38d1..dacc577 100644
--- a/vue/src/layout/components/Sidebar/components/SidebarItem.vue
+++ b/vue/src/layout/components/Sidebar/components/SidebarItem.vue
@@ -26,8 +26,8 @@
                 const showSingle = onlyOneChild && !onlyOneChild.children
 
                 if (showSingle) {
-                    const icon = onlyOneChild.meta.icon || (item.meta && item.meta.icon)
-                    const title = onlyOneChild.meta.title
+                    const {icon, title} = onlyOneChild.meta
+
                     return (
                         <el-menu-item
                             index={onlyOneChild.fullPath}
@@ -38,8 +38,7 @@
                     )
                 }
                 else {
-                    const icon = (item.meta && item.meta.icon) || (onlyOneChild.meta && onlyOneChild.meta.icon)
-                    const title = item.meta.title
+                    const {icon, title} = item.meta
 
                     const children = item.children.map(child => renderNode({
                         isNest: true,
diff --git a/vue/src/router/modules/example.js b/vue/src/router/modules/example.js
index 4b8fdc6..c835873 100644
--- a/vue/src/router/modules/example.js
+++ b/vue/src/router/modules/example.js
@@ -1,4 +1,4 @@
-/*路由表：有意思的组件*/
+/*路由表：演示用例*/
 import Layout from '@/layout'
 
 const router = {
@@ -10,23 +10,23 @@ const router = {
             path: 'style-page',
             name: 'stylePage',
             component: () => import('@/views/example/stylePage'),
-            meta: {title: '样 式', icon: 'style'}
+            meta: {title: '样 式'}
         },
         {
             path: 'icons',
             name: 'icons',
             component: () => import('@/views/example/icons'),
-            meta: {title: '图 标',icon: 'icon'}
+            meta: {title: '图 标'}
         },
         {
             path: 'taobao',
             name: 'taobao',
-            meta: {title: '淘宝iframe', iframe: 'https://www.taobao.com',icon: 'documentation'}
+            meta: {title: '淘宝iframe', iframe: 'https://www.taobao.com'}
         },
         {
             path: 'cool',
             component: {render: h => h('router-view')},
-            meta: {title: '好玩的东东',icon: 'cool'},
+            meta: {title: '好玩的东东'},
             children: [
                 {
                     path: 'fluid',
@@ -45,7 +45,7 @@ const router = {
         {
             path: 'components',
             component: {render: h => h('router-view')},
-            meta: {title: '组件',icon: 'component'},
+            meta: {title: '组件'},
             children: [
                 {
                     path: 'upload',
@@ -83,7 +83,7 @@ const router = {
             path: 'developing-test',
             name: 'developingTest',
             component: () => import('@/views/example/developingTest'),
-            meta: {title: '开发测试',icon: 'bug'}
+            meta: {title: '开发测试'}
         }
     ]
 }