diff --git a/config/env.js b/config/env.js new file mode 100644 index 000000000..e47b8144b --- /dev/null +++ b/config/env.js @@ -0,0 +1 @@ +export default 'development' diff --git a/config/url.js b/config/url.js new file mode 100644 index 000000000..c6fdf5835 --- /dev/null +++ b/config/url.js @@ -0,0 +1,6 @@ +import env from './env' + +const DEV_URL = 'https://www.easy-mock.com/mock/5add9213ce4d0e69998a6f51/iview-admin/' +const PRO_URL = 'https://produce.com' + +export default env === 'development' ? DEV_URL : PRO_URL diff --git a/src/config/index.js b/src/config/index.js index 4d52e2899..f6a6533de 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -8,7 +8,7 @@ export default { * 如果不使用,则需要在路由中给需要在菜单中展示的路由设置meta: {title: 'xxx'} * 用来在菜单中显示文字 */ - useI18n: true, + useI18n: false, /** * @description api请求基础路径 */ @@ -24,9 +24,9 @@ export default { * @description 需要加载的插件 */ plugin: { - 'error-store': { - showInHeader: true, // 设为false后不会在顶部显示错误日志徽标 - developmentOff: false // 设为true后在开发环境不会收集错误信息,方便开发中排查错误 - } + // 'error-store': { + // showInHeader: true, // 设为false后不会在顶部显示错误日志徽标 + // developmentOff: false // 设为true后在开发环境不会收集错误信息,方便开发中排查错误 + // } } } diff --git a/src/libs/util.js b/src/libs/util.js index 13b82b794..a74a1e5d2 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -197,7 +197,6 @@ export const getNextRoute = (list, route) => { res = getHomeRoute(list) } else { const index = list.findIndex(item => routeEqual(item, route)) - console.log(route, index, list.length) if (index === list.length - 1) res = list[list.length - 2] else res = list[index + 1] } diff --git a/src/router/index.js b/src/router/index.js index ba7f4c440..5dd6a78f1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,7 +36,6 @@ router.beforeEach((to, from, next) => { name: homeName // 跳转到homeName页 }) } else { - console.log(store.state.user.hasGetInfo) if (store.state.user.hasGetInfo) { turnTo(to, store.state.user.access, next) } else { diff --git a/src/router/routers.js b/src/router/routers.js index 3f81176be..09c5c7946 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -58,251 +58,6 @@ export default [ icon: 'ios-book' } }, - { - path: '/join', - name: 'join', - component: Main, - children: [ - { - path: 'join_page', - name: 'join_page', - meta: { - icon: '_qq', - title: 'QQ群' - }, - component: () => import('@/view/join-page.vue') - } - ] - }, - { - path: '/components', - name: 'components', - meta: { - icon: 'logo-buffer', - title: '组件' - }, - component: Main, - children: [ - { - path: 'count_to_page', - name: 'count_to_page', - meta: { - icon: 'md-trending-up', - title: '数字渐变' - }, - component: () => import('@/view/components/count-to/count-to.vue') - }, - { - path: 'drag_list_page', - name: 'drag_list_page', - meta: { - icon: 'ios-infinite', - title: '拖拽列表' - }, - component: () => import('@/view/components/drag-list/drag-list.vue') - }, - { - path: 'tables_page', - name: 'tables_page', - meta: { - icon: 'md-grid', - title: '多功能表格' - }, - component: () => import('@/view/components/tables/tables.vue') - }, - { - path: 'split_pane_page', - name: 'split_pane_page', - meta: { - icon: 'md-pause', - title: '分割窗口' - }, - component: () => import('@/view/components/split-pane/split-pane.vue') - }, - { - path: 'markdown_page', - name: 'markdown_page', - meta: { - icon: 'logo-markdown', - title: 'Markdown编辑器' - }, - component: () => import('@/view/components/markdown/markdown.vue') - }, - { - path: 'editor_page', - name: 'editor_page', - meta: { - icon: 'ios-create', - title: '富文本编辑器' - }, - component: () => import('@/view/components/editor/editor.vue') - }, - { - path: 'icons_page', - name: 'icons_page', - meta: { - icon: '_bear', - title: '自定义图标' - }, - component: () => import('@/view/components/icons/icons.vue') - } - ] - }, - { - path: '/update', - name: 'update', - meta: { - icon: 'md-cloud-upload', - title: '数据上传' - }, - component: Main, - children: [ - { - path: 'update_table_page', - name: 'update_table_page', - meta: { - icon: 'ios-document', - title: '上传Csv' - }, - component: () => import('@/view/update/update-table.vue') - }, - { - path: 'update_paste_page', - name: 'update_paste_page', - meta: { - icon: 'md-clipboard', - title: '粘贴表格数据' - }, - component: () => import('@/view/update/update-paste.vue') - } - ] - }, - { - path: '/excel', - name: 'excel', - meta: { - icon: 'ios-stats', - title: 'EXCEL导入导出' - }, - component: Main, - children: [ - { - path: 'upload-excel', - name: 'upload-excel', - meta: { - icon: 'md-add', - title: '导入EXCEL' - }, - component: () => import('@/view/excel/upload-excel.vue') - }, - { - path: 'export-excel', - name: 'export-excel', - meta: { - icon: 'md-download', - title: '导出EXCEL' - }, - component: () => import('@/view/excel/export-excel.vue') - } - ] - }, - { - path: '/tools_methods', - name: 'tools_methods', - meta: { - hide: true - }, - component: Main, - children: [ - { - path: 'tools_methods_page', - name: 'tools_methods_page', - meta: { - icon: 'ios-hammer', - title: '工具方法', - beforeCloseName: 'before_close_normal' - }, - component: () => import('@/view/tools-methods/tools-methods.vue') - } - ] - }, - { - path: '/i18n', - name: 'i18n', - meta: { - hide: true - }, - component: Main, - children: [ - { - path: 'i18n_page', - name: 'i18n_page', - meta: { - icon: 'md-planet', - title: 'i18n - {{ i18n_page }}' - }, - component: () => import('@/view/i18n/i18n-page.vue') - } - ] - }, - { - path: '/error_store', - name: 'error_store', - meta: { - hide: true - }, - component: Main, - children: [ - { - path: 'error_store_page', - name: 'error_store_page', - meta: { - icon: 'ios-bug', - title: '错误收集' - }, - component: () => import('@/view/error-store/error-store.vue') - } - ] - }, - { - path: '/error_logger', - name: 'error_logger', - meta: { - hide: true, - hideInMenu: true - }, - component: Main, - children: [ - { - path: 'error_logger_page', - name: 'error_logger_page', - meta: { - icon: 'ios-bug', - title: '错误收集' - }, - component: () => import('@/view/single-page/error-logger.vue') - } - ] - }, - { - path: '/directive', - name: 'directive', - meta: { - hide: true - }, - component: Main, - children: [ - { - path: 'directive_page', - name: 'directive_page', - meta: { - icon: 'ios-navigate', - title: '指令' - }, - component: () => import('@/view/directive/directive.vue') - } - ] - }, { path: '/multilevel', name: 'multilevel', @@ -354,37 +109,6 @@ export default [ } ] }, - { - path: '/argu', - name: 'argu', - meta: { - hideInMenu: true - }, - component: Main, - children: [ - { - path: 'params/:id', - name: 'params', - meta: { - icon: 'md-flower', - title: route => `{{ params }}-${route.params.id}`, - notCache: true, - beforeCloseName: 'before_close_normal' - }, - component: () => import('@/view/argu-page/params.vue') - }, - { - path: 'query', - name: 'query', - meta: { - icon: 'md-flower', - title: route => `{{ query }}-${route.query.id}`, - notCache: true - }, - component: () => import('@/view/argu-page/query.vue') - } - ] - }, { path: '/401', name: 'error_401', diff --git a/src/view/argu-page/params.vue b/src/view/argu-page/params.vue deleted file mode 100644 index b203c83ca..000000000 --- a/src/view/argu-page/params.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/src/view/argu-page/query.vue b/src/view/argu-page/query.vue deleted file mode 100644 index b8dbf9059..000000000 --- a/src/view/argu-page/query.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/src/view/components/count-to/count-to.vue b/src/view/components/count-to/count-to.vue deleted file mode 100644 index 33fd44d59..000000000 --- a/src/view/components/count-to/count-to.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - diff --git a/src/view/components/drag-list/drag-list.vue b/src/view/components/drag-list/drag-list.vue deleted file mode 100644 index 8fb75ff8b..000000000 --- a/src/view/components/drag-list/drag-list.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - diff --git a/src/view/components/editor/editor.vue b/src/view/components/editor/editor.vue deleted file mode 100644 index 73f3d736b..000000000 --- a/src/view/components/editor/editor.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/src/view/components/icons/icons.vue b/src/view/components/icons/icons.vue deleted file mode 100644 index 431626eeb..000000000 --- a/src/view/components/icons/icons.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - diff --git a/src/view/components/markdown/markdown.vue b/src/view/components/markdown/markdown.vue deleted file mode 100644 index 0c79c2802..000000000 --- a/src/view/components/markdown/markdown.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/src/view/components/split-pane/split-pane.vue b/src/view/components/split-pane/split-pane.vue deleted file mode 100644 index 9afe0116d..000000000 --- a/src/view/components/split-pane/split-pane.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/view/components/tables/tables.vue b/src/view/components/tables/tables.vue deleted file mode 100644 index 99bcc675b..000000000 --- a/src/view/components/tables/tables.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - diff --git a/src/view/directive/directive.vue b/src/view/directive/directive.vue deleted file mode 100644 index 3e0a342d0..000000000 --- a/src/view/directive/directive.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - diff --git a/src/view/error-store/error-store.vue b/src/view/error-store/error-store.vue deleted file mode 100644 index e66631c97..000000000 --- a/src/view/error-store/error-store.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - diff --git a/src/view/excel/common.less b/src/view/excel/common.less deleted file mode 100644 index 575b58054..000000000 --- a/src/view/excel/common.less +++ /dev/null @@ -1,64 +0,0 @@ -.margin-top-8{ - margin-top: 8px; -} -.margin-top-10{ - margin-top: 10px; -} -.margin-top-20{ - margin-top: 20px; -} -.margin-left-10{ - margin-left: 10px; -} -.margin-bottom-10{ - margin-bottom: 10px; -} -.margin-bottom-100{ - margin-bottom: 100px; -} -.margin-right-10{ - margin-right: 10px; -} -.padding-left-6{ - padding-left: 6px; -} -.padding-left-8{ - padding-left: 5px; -} -.padding-left-10{ - padding-left: 10px; -} -.padding-left-20{ - padding-left: 20px; -} -.height-100{ - height: 100%; -} -.height-120px{ - height: 100px; -} -.height-200px{ - height: 200px; -} -.height-492px{ - height: 492px; -} -.height-460px{ - height: 460px; -} -.line-gray{ - height: 0; - border-bottom: 2px solid #dcdcdc; -} -.notwrap{ - word-break:keep-all; - white-space:nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.padding-left-5{ - padding-left: 10px; -} -[v-cloak]{ - display: none; -} \ No newline at end of file diff --git a/src/view/excel/export-excel.vue b/src/view/excel/export-excel.vue deleted file mode 100644 index 6ae251b1a..000000000 --- a/src/view/excel/export-excel.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/src/view/excel/upload-excel.vue b/src/view/excel/upload-excel.vue deleted file mode 100644 index 0ea2b65b3..000000000 --- a/src/view/excel/upload-excel.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - diff --git a/src/view/i18n/i18n-page.vue b/src/view/i18n/i18n-page.vue deleted file mode 100644 index 7c91e589c..000000000 --- a/src/view/i18n/i18n-page.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/src/view/join-page.vue b/src/view/join-page.vue deleted file mode 100644 index cd06791d6..000000000 --- a/src/view/join-page.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/view/multilevel/level-1.vue b/src/view/multilevel/level-1.vue new file mode 100644 index 000000000..7e1a06374 --- /dev/null +++ b/src/view/multilevel/level-1.vue @@ -0,0 +1,8 @@ + + diff --git a/src/view/multilevel/level-2/level-2-1.vue b/src/view/multilevel/level-2/level-2-1.vue new file mode 100644 index 000000000..ca05ca7e9 --- /dev/null +++ b/src/view/multilevel/level-2/level-2-1.vue @@ -0,0 +1,8 @@ + + diff --git a/src/view/multilevel/level-2/level-2-2.vue b/src/view/multilevel/level-2/level-2-2.vue new file mode 100644 index 000000000..01e6f44a4 --- /dev/null +++ b/src/view/multilevel/level-2/level-2-2.vue @@ -0,0 +1,8 @@ + + diff --git a/src/view/multilevel/level-2/level-3/level-3-1.vue b/src/view/multilevel/level-2/level-3/level-3-1.vue new file mode 100644 index 000000000..0b460aad3 --- /dev/null +++ b/src/view/multilevel/level-2/level-3/level-3-1.vue @@ -0,0 +1,8 @@ + + diff --git a/src/view/single-page/error-logger.vue b/src/view/single-page/error-logger.vue deleted file mode 100644 index a4b4ac2f6..000000000 --- a/src/view/single-page/error-logger.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - diff --git a/src/view/tools-methods/tools-methods.vue b/src/view/tools-methods/tools-methods.vue deleted file mode 100644 index 79ad3b013..000000000 --- a/src/view/tools-methods/tools-methods.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - - - diff --git a/src/view/update/update-paste.vue b/src/view/update/update-paste.vue deleted file mode 100644 index fce108114..000000000 --- a/src/view/update/update-paste.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - - - diff --git a/src/view/update/update-table.vue b/src/view/update/update-table.vue deleted file mode 100644 index 831cd1588..000000000 --- a/src/view/update/update-table.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/vue.config.js b/vue.config.js index f3be30b41..b3e1a73d5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,7 +12,7 @@ const resolve = dir => { // 例如:https://www.foobar.com/my-app/ // 需要将它改为'/my-app/' const BASE_URL = process.env.NODE_ENV === 'production' - ? '/iview-admin/' + ? '/' : '/' module.exports = { @@ -27,14 +27,14 @@ module.exports = { // tweak internal webpack configuration. // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md // 如果你不需要使用eslint,把lintOnSave设为false即可 - lintOnSave: true, + lintOnSave: false, chainWebpack: config => { config.resolve.alias .set('@', resolve('src')) // key,value自行定义,比如.set('@@', resolve('src/components')) .set('_c', resolve('src/components')) }, // 打包时不生成.map文件 - productionSourceMap: true + productionSourceMap: false // 这里写你调用接口的基础路径,来解决跨域,如果设置了代理,那你本地开发环境的axios的baseUrl要写为 '' ,即空字符串 // devServer: { // proxy: 'localhost:3000'