diff --git a/src/plugins/full-router.js b/src/assets/config/full-router.js similarity index 68% rename from src/plugins/full-router.js rename to src/assets/config/full-router.js index 9774386..b1557a3 100644 --- a/src/plugins/full-router.js +++ b/src/assets/config/full-router.js @@ -2,12 +2,12 @@ const initFullRouters = function () { return { path: '/a', name: 'Admin', - component: () => import('../components/layout/YcLayout'), + component: () => import('../../components/layout/YcLayout'), children: [ { path: 'home', name: 'Home', - component: () => import('../views/admin/Home'), + component: () => import('../../views/admin/Home'), meta: { title: '首页', icon: 'el-icon-exp-home', @@ -16,7 +16,7 @@ const initFullRouters = function () { }, { path: 'example', name: '组件示例', - component: () => import('../views/admin/EmptyPage'), + component: () => import('../../views/admin/EmptyPage'), meta: { title: '组件示例', icon: 'el-icon-s-grid' @@ -25,7 +25,7 @@ const initFullRouters = function () { { path: 'basic', name: 'Basic', - component: () => import('../views/admin/EmptyPage'), + component: () => import('../../views/admin/EmptyPage'), meta: { title: 'Basic', icon: 'el-icon-c-scale-to-original' @@ -34,7 +34,7 @@ const initFullRouters = function () { { path: 'layout', name: 'Layout', - component: () => import('../views/admin/example/basic/Layout'), + component: () => import('../../views/admin/example/basic/Layout'), meta: { title: 'Layout', icon: 'el-icon-document-copy' @@ -42,7 +42,7 @@ const initFullRouters = function () { }, { path: 'container', name: 'Container', - component: () => import('../views/admin/example/basic/Container'), + component: () => import('../../views/admin/example/basic/Container'), meta: { title: 'Container', icon: 'el-icon-document' @@ -50,7 +50,7 @@ const initFullRouters = function () { }, { path: 'icon', name: 'Icon', - component: () => import('../views/admin/example/basic/Icon'), + component: () => import('../../views/admin/example/basic/Icon'), meta: { title: 'Icon', icon: 'el-icon-finished' @@ -58,7 +58,7 @@ const initFullRouters = function () { }, { path: 'button', name: 'Button', - component: () => import('../views/admin/example/basic/Button'), + component: () => import('../../views/admin/example/basic/Button'), meta: { title: 'Button', icon: 'el-icon-search' @@ -66,7 +66,7 @@ const initFullRouters = function () { }, { path: 'link', name: 'Link', - component: () => import('../views/admin/example/basic/Link'), + component: () => import('../../views/admin/example/basic/Link'), meta: { title: 'Link', icon: 'el-icon-link' @@ -76,7 +76,7 @@ const initFullRouters = function () { }, { path: 'form', name: 'Form', - component: () => import('../views/admin/EmptyPage'), + component: () => import('../../views/admin/EmptyPage'), meta: { title: 'Form', icon: 'el-icon-film' @@ -85,7 +85,7 @@ const initFullRouters = function () { { path: 'radio', name: 'Radio', - component: () => import('../views/admin/example/form/Radio'), + component: () => import('../../views/admin/example/form/Radio'), meta: { title: 'Radio', icon: 'el-icon-open' @@ -93,11 +93,19 @@ const initFullRouters = function () { }, { path: 'checkbox', name: 'Checkbox', - component: () => import('../views/admin/example/form/Checkbox'), + component: () => import('../../views/admin/example/form/Checkbox'), meta: { title: 'Checkbox', icon: 'el-icon-set-up' } + }, { + path: 'input', + name: 'Input', + component: () => import('../../views/admin/example/form/Input'), + meta: { + title: 'Input', + icon: 'el-icon-set-up' + } } ] } @@ -105,7 +113,7 @@ const initFullRouters = function () { }, { path: 'p1', name: 'Page1', - component: () => import('../views/admin/page1/Page1'), + component: () => import('../../views/admin/page1/Page1'), meta: { title: 'Page1', icon: 'el-icon-setting' @@ -113,7 +121,7 @@ const initFullRouters = function () { }, { path: 'p2', name: 'Page2', - component: () => import('../views/admin/EmptyPage'), + component: () => import('../../views/admin/EmptyPage'), meta: { title: 'Page2', icon: 'el-icon-exp-account' @@ -122,7 +130,7 @@ const initFullRouters = function () { { path: 'p2-1', name: 'Page2-1', - component: () => import('../views/admin/page2/page2-1/Page2-1'), + component: () => import('../../views/admin/page2/page2-1/Page2-1'), meta: { title: 'Page2-1', icon: 'el-icon-exp-usergroup', @@ -131,7 +139,7 @@ const initFullRouters = function () { }, { path: 'p2-Detail/:detailId', name: 'Page2-Detail', - component: () => import('../views/admin/page2/page2-1/SubDetail'), + component: () => import('../../views/admin/page2/page2-1/SubDetail'), meta: { title: 'Page2-Detail', icon: 'el-icon-setting', @@ -140,7 +148,7 @@ const initFullRouters = function () { }, { path: 'p2-2', name: 'Page2-2', - component: () => import('../views/admin/page2/Page2'), + component: () => import('../../views/admin/page2/Page2'), meta: { key: 'Page2-2', title: 'Page2-2', diff --git a/src/assets/i18n/i18n.js b/src/assets/i18n/i18n.js index cc6ca4b..c39425c 100644 --- a/src/assets/i18n/i18n.js +++ b/src/assets/i18n/i18n.js @@ -1,17 +1,19 @@ import Vue from 'vue' import locale from 'element-ui/lib/locale' +import enLocale from 'element-ui/lib/locale/lang/en' +import zhLocale from 'element-ui/lib/locale/lang/zh-CN' + import VueI18n from 'vue-i18n' import en from './lang/en' -import cn from './lang/cn' +import zhCN from './lang/zh-CN' Vue.use(VueI18n) const messages = { - en: en, - cn: cn + en: { ...en, ...enLocale }, + 'zh-CN': { ...zhCN, ...zhLocale } } - const i18n = new VueI18n({ - locale: 'cn', // 设置默认语言 + locale: 'zh-CN', // 设置默认语言 messages }) locale.i18n((key, value) => i18n.t(key, value)) diff --git a/src/assets/i18n/lang/cn.js b/src/assets/i18n/lang/zh-CN.js similarity index 100% rename from src/assets/i18n/lang/cn.js rename to src/assets/i18n/lang/zh-CN.js diff --git a/src/plugins/utils/RouteUtils.js b/src/plugins/utils/RouteUtils.js index f432c81..b35b515 100644 --- a/src/plugins/utils/RouteUtils.js +++ b/src/plugins/utils/RouteUtils.js @@ -1,6 +1,6 @@ import router from '../../router' import store from '../../store' -import { getFullRouters } from '../full-router' +import { getFullRouters } from '../../assets/config/full-router' /** * 递归构建用户路由 diff --git a/src/views/admin/example/form/Input.vue b/src/views/admin/example/form/Input.vue new file mode 100644 index 0000000..846a006 --- /dev/null +++ b/src/views/admin/example/form/Input.vue @@ -0,0 +1,86 @@ + + + + +