diff --git a/src/main.js b/src/main.js index e13f5532..d4f53c58 100644 --- a/src/main.js +++ b/src/main.js @@ -11,8 +11,10 @@ import importDirective from '@/directive' import 'iview/dist/styles/iview.css' import './index.less' import '@/assets/icons/iconfont.css' -import env from '../config/env' -if (env === 'development') require('@/mock') +import '@/mock' +// 实际打包时应该不引入mock +// import env from '@/config/env' +// env === 'development' ? require('mock') : '' Vue.use(iView, { i18n: (key, value) => i18n.t(key, value) diff --git a/src/router/index.js b/src/router/index.js index 4cf46f21..3459174a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,7 +7,8 @@ import { getToken, canTurnTo } from '@/libs/util' Vue.use(Router) const router = new Router({ - routes + routes, + mode: 'history' }) const LOGIN_PAGE_NAME = 'login' diff --git a/vue.config.js b/vue.config.js index 67d9e2b2..794ad5c6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,10 +12,11 @@ fs.writeFileSync(path.join(__dirname, './config/env.js'), `export default '${env // 项目部署基础 // 默认情况下,我们假设你的应用将被部署在域的根目录下, // 例如:https://www.my-app.com/ +// 默认:'/' // 如果您的应用程序部署在子路径中,则需要在这指定子路径 // 例如:https://www.foobar.com/my-app/ // 需要将它改为'/my-app/' -const BASE_URL = '/' +const BASE_URL = '/iview-admin/' module.exports = { // Project deployment base