Merge branch 'master' into master

2021-06-26 12:02:59 +08:00
parent eb6175b2d5 9f5b59c4b5
commit 5ed1292503
15 changed files with 9949 additions and 136 deletions
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -11,6 +11,7 @@ import '../../node_modules/timeline-vuejs/dist/timeline-vuejs.css'
 // 路由守卫
 import Bus from '@/utils/bus'
 // 加载网站配置文件夹
+import '../style/element_visiable.scss' // 导入主题色配置
 import config from './config'
 Vue.prototype.$GIN_VUE_ADMIN = config
 Vue.use(Bus)