1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253 |
- <<<<<<< HEAD
- import Vue from 'vue'
- import Vuex from 'vuex'
- import app from './modules/app'
- import dict from './modules/dict'
- import user from './modules/user'
- import tagsView from './modules/tagsView'
- import permission from './modules/permission'
- import settings from './modules/settings'
- import getters from './getters'
- Vue.use(Vuex)
- const store = new Vuex.Store({
- modules: {
- app,
- dict,
- user,
- tagsView,
- permission,
- settings
- },
- getters
- })
- export default store
- =======
- import Vue from 'vue'
- import Vuex from 'vuex'
- import app from './modules/app'
- import dict from './modules/dict'
- import user from './modules/user'
- import tagsView from './modules/tagsView'
- import permission from './modules/permission'
- import settings from './modules/settings'
- import getters from './getters'
- Vue.use(Vuex)
- const store = new Vuex.Store({
- modules: {
- app,
- dict,
- user,
- tagsView,
- permission,
- settings
- },
- getters
- })
- export default store
- >>>>>>> ec6eeb00ce64eb587a455406167d302dc3e59216
|