Merge pull request #551 from flipped-aurora/gva_gormv2_dev

Gva gormv2 dev

Author: 奇淼（piexlmax

web/src/components/themeChange/index.vue

@@ -58,8 +58,7 @@ import {
   Upload,
   Progress,
   MessageBox,
-  Image,
-  ColorPicker
+  Image
 } from 'element-ui'
 
 Vue.use(Button)
@@ -111,7 +110,6 @@ 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/element_lazy.js

@@ -11,7 +11,6 @@ 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)

web/src/core/gin-vue-admin.js

@@ -5,7 +5,6 @@ import VuexPersistence from 'vuex-persist'
 import { user } from '@/store/module/user'
 import { router } from '@/store/module/router'
 import { dictionary } from '@/store/module/dictionary'
-import { app } from '@/store/module/app'
 Vue.use(Vuex)
 
 const vuexLocal = new VuexPersistence({
@@ -16,8 +15,7 @@ export const store = new Vuex.Store({
   modules: {
     user,
     router,
-    dictionary,
-    app
+    dictionary
   },
   plugins: [vuexLocal.plugin]
 })

web/src/store/index.js

@@ -1,4 +1,3 @@
-
 // basice
 $font-size: 14px;
 $icon-size:17px;
@@ -15,11 +14,10 @@ $width-mobile-aside:210px;
 $color-aside:rgba(255, 255, 255,.9);
 $icon-arrow-size-aside:12px;
 $width-submenu-aside:55px;
-$bg-aside:#fff;
+$bg-aside:#191a23;
 $height-aside-tilte:64px;
 $height-aside-img:30px;
 $width-aside-img:30px;
-$aside-color:#000;
 // header
 $height-header: 60px;
 // nav-scroll
@@ -37,8 +35,3 @@ $height-car:68px;
 // mobile
 $padding-xs: 5px;
 $margin-xs: 5px;
-
-:export{
-  bg_aside : $bg-aside ;
-  color_aside : $aside-color
-}