From 04089d4d19e06fcb6ae58789b7b305fd3570f9e1 Mon Sep 17 00:00:00 2001 From: Pan Date: Tue, 9 Oct 2018 18:26:56 +0800 Subject: [PATCH] init --- src/lang/index.js | 3 ++- src/main.js | 2 +- src/router/index.js | 7 ++++--- src/settings.js | 25 +++++++++++++++++++++++++ src/store/modules/app.js | 5 +++-- src/store/modules/user.js | 8 +------- 6 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 src/settings.js diff --git a/src/lang/index.js b/src/lang/index.js index a77b07ea..69e6ca58 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -5,6 +5,7 @@ import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang import enLocale from './en' import zhLocale from './zh' +import store from '../store' Vue.use(VueI18n) @@ -22,7 +23,7 @@ const messages = { const i18n = new VueI18n({ // set locale // options: en or zh - locale: Cookies.get('language') || 'en', + locale: Cookies.get('language') || store.getters.language, // set locale messages messages }) diff --git a/src/main.js b/src/main.js index 1ce709c9..cb0ea88a 100644 --- a/src/main.js +++ b/src/main.js @@ -22,7 +22,7 @@ import './mock' // simulation data import * as filters from './filters' // global filters Vue.use(Element, { - size: Cookies.get('size') || 'medium', // set element-ui default size + size: Cookies.get('size') || store.getters.size, // set element-ui default size i18n: (key, value) => i18n.t(key, value) }) diff --git a/src/router/index.js b/src/router/index.js index ab328c46..6b772ba0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,7 +1,6 @@ import Vue from 'vue' import Router from 'vue-router' - -Vue.use(Router) +import settings from '@/settings' /* Layout */ import Layout from '@/views/layout/Layout' @@ -12,6 +11,8 @@ import chartsRouter from './modules/charts' import tableRouter from './modules/table' import nestedRouter from './modules/nested' +Vue.use(Router) + /** note: Submenu only appear when children.length>=1 * detail see https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html **/ @@ -104,7 +105,7 @@ export const constantRouterMap = [ ] export default new Router({ - // mode: 'history', // require service support + mode: settings.routerMode, // require service support scrollBehavior: () => ({ y: 0 }), routes: constantRouterMap }) diff --git a/src/settings.js b/src/settings.js new file mode 100644 index 00000000..bca72c62 --- /dev/null +++ b/src/settings.js @@ -0,0 +1,25 @@ +export default { + + /** + * @property {string} en | zh + * @description User first visited, default language + */ + language: 'en', + + /** + * @property {string} medium | small | mini + * @description User first visited, default size + */ + size: 'medium', + + /** + * @property {string} hash | history + * @description vue-router mode + */ + routerMode: 'hash' + + // permission: true, + // i18n: true + // tagsView: true, + // viewTransition: 'fade-transform', // options:['fade-transform','fade'] +} diff --git a/src/store/modules/app.js b/src/store/modules/app.js index bc4fb478..5df6f28e 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -1,4 +1,5 @@ import Cookies from 'js-cookie' +import settings from '@/settings' const app = { state: { @@ -7,8 +8,8 @@ const app = { withoutAnimation: false }, device: 'desktop', - language: Cookies.get('language') || 'en', - size: Cookies.get('size') || 'medium' + language: Cookies.get('language') || settings.language, + size: Cookies.get('size') || settings.size }, mutations: { TOGGLE_SIDEBAR: state => { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 0f7e2296..5529ad69 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -10,10 +10,7 @@ const user = { name: '', avatar: '', introduction: '', - roles: [], - setting: { - articlePlatform: [] - } + roles: [] }, mutations: { @@ -26,9 +23,6 @@ const user = { SET_INTRODUCTION: (state, introduction) => { state.introduction = introduction }, - SET_SETTING: (state, setting) => { - state.setting = setting - }, SET_STATUS: (state, status) => { state.status = status },