Merge branch 'lulifa' of https://github.com/lulifa/vue-antd-admin into lulifa

This commit is contained in:
lulifa 2020-12-16 11:54:23 +08:00
commit b855ce11a9
4 changed files with 6 additions and 3 deletions

3
.env
View File

@ -1,3 +1,4 @@
VUE_APP_PUBLIC_PATH=/
VUE_APP_NAME=Admin
VUE_APP_ROUTES_KEY=admin.routes
VUE_APP_PERMISSIONS_KEY=admin.permissions
@ -6,4 +7,4 @@ VUE_APP_USER_KEY=admin.user
VUE_APP_SETTING_KEY=admin.setting
VUE_APP_TBAS_KEY=admin.tabs
VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
VUE_APP_API_BASE_URL=http://api.iczer.com
VUE_APP_API_BASE_URL=http://api.iczer.com

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ selenium-debug.log
*.njsproj
*.sln
package-lock.json
.env.production.local

View File

@ -95,7 +95,8 @@
this.$emit('contextmenu', pageKey, e)
},
pageName(page) {
const custom = this.customTitles.find(item => item.path === page.fullPath)
const pagePath = page.fullPath.split('?')[0]
const custom = this.customTitles.find(item => item.path === pagePath)
return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
}
}

View File

@ -110,7 +110,7 @@ module.exports = {
}
}
},
publicPath: isProd ? '/vue-antd-admin/' : '/',
publicPath: process.env.VUE_APP_PUBLIC_PATH,
outputDir: 'dist',
assetsDir: 'static',
productionSourceMap: false