Merge branch 'master' into master

web/src/core/element_lazy.js

@@ -58,7 +58,8 @@ import {
   Upload,
   Progress,
   MessageBox,
-  Image
+  Image,
+  ColorPicker
 } from 'element-ui'
 
 Vue.use(Button)
@@ -110,6 +111,7 @@ Vue.use(Progress)
 Vue.use(Scrollbar)
 Vue.use(Loading.directive)
 Vue.use(Image)
+Vue.use(ColorPicker)
 
 Vue.prototype.$loading = Loading.service
 Vue.prototype.$message = Message

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)