Merge branch 'feature/gongqun_vite' into feature/gongqun
# Conflicts: # package-lock.json # package.json # src/config/index.js # src/layout/components/Navigation/index.vue # src/layout/components/Sidebar/components/AppLink.vue # src/layout/components/Sidebar/components/SidebarItem.vue # src/layout/components/TagsView/index.vue # src/layout/index.vue # src/main.js # src/router/index.js # src/settings/theme.js # src/store/modules/app.js # src/store/modules/subject.js # src/utils/Storage.js # src/views/login/index.vue # vue.config.js
Showing
- .env.development 3 additions, 1 deletion.env.development
- .env.mock 3 additions, 1 deletion.env.mock
- .env.production 3 additions, 1 deletion.env.production
- .eslintignore 1 addition, 0 deletions.eslintignore
- index.html 21 additions, 0 deletionsindex.html
- package-lock.json 1809 additions, 286 deletionspackage-lock.json
- package.json 13 additions, 4 deletionspackage.json
- src/config/index.js 1 addition, 0 deletionssrc/config/index.js
- src/config/theme.js 1 addition, 1 deletionsrc/config/theme.js
- src/core/base/request.js 5 additions, 3 deletionssrc/core/base/request.js
- src/icons/index.js 6 additions, 4 deletionssrc/icons/index.js
- src/layout/components/Navbar/index.vue 4 additions, 4 deletionssrc/layout/components/Navbar/index.vue
- src/layout/components/Navigation/index.vue 7 additions, 2 deletionssrc/layout/components/Navigation/index.vue
- src/layout/components/Sidebar/components/SidebarItem.vue 2 additions, 2 deletionssrc/layout/components/Sidebar/components/SidebarItem.vue
- src/layout/components/Sidebar/components/Unit.vue 3 additions, 3 deletionssrc/layout/components/Sidebar/components/Unit.vue
- src/layout/components/Sidebar/index.vue 4 additions, 4 deletionssrc/layout/components/Sidebar/index.vue
- src/layout/components/TagsView/index.vue 1 addition, 1 deletionsrc/layout/components/TagsView/index.vue
- src/layout/index.vue 2 additions, 2 deletionssrc/layout/index.vue
- src/plugins/svgBuilder.js 77 additions, 0 deletionssrc/plugins/svgBuilder.js
- src/router/index.js 27 additions, 14 deletionssrc/router/index.js
Please register or sign in to comment