diff --git a/f/web-kboss/.gitignore b/f/web-kboss/.gitignore index 62e44d3..296c744 100644 --- a/f/web-kboss/.gitignore +++ b/f/web-kboss/.gitignore @@ -1,10 +1,8 @@ .DS_Store node_modules/ dist/ -<<<<<<< HEAD ======= # src/ ->>>>>>> a3d0bd5845e8b37373bf85c7c40401a7c67884b9 npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/f/web-kboss/src/assets/image/icon1.png b/f/web-kboss/src/assets/image/icon1.png new file mode 100644 index 0000000..0c486cf Binary files /dev/null and b/f/web-kboss/src/assets/image/icon1.png differ diff --git a/f/web-kboss/src/assets/image/icon2.png b/f/web-kboss/src/assets/image/icon2.png new file mode 100644 index 0000000..d045b1f Binary files /dev/null and b/f/web-kboss/src/assets/image/icon2.png differ diff --git a/f/web-kboss/src/assets/image/icon3.png b/f/web-kboss/src/assets/image/icon3.png new file mode 100644 index 0000000..a54cafe Binary files /dev/null and b/f/web-kboss/src/assets/image/icon3.png differ diff --git a/f/web-kboss/src/assets/image/icon4.png b/f/web-kboss/src/assets/image/icon4.png new file mode 100644 index 0000000..27cf955 Binary files /dev/null and b/f/web-kboss/src/assets/image/icon4.png differ diff --git a/f/web-kboss/src/layout/components/Sidebar/SidebarItem.vue b/f/web-kboss/src/layout/components/Sidebar/SidebarItem.vue index 8587f51..da82b10 100644 --- a/f/web-kboss/src/layout/components/Sidebar/SidebarItem.vue +++ b/f/web-kboss/src/layout/components/Sidebar/SidebarItem.vue @@ -6,7 +6,6 @@ - @@ -94,7 +93,17 @@ export default { } diff --git a/f/web-kboss/src/layout/components/Sidebar/index.vue b/f/web-kboss/src/layout/components/Sidebar/index.vue index 42cc42c..9763d74 100644 --- a/f/web-kboss/src/layout/components/Sidebar/index.vue +++ b/f/web-kboss/src/layout/components/Sidebar/index.vue @@ -1,4 +1,3 @@ -