Merge branch 'develop'

Former-commit-id: 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 2a6afca43dda2fea963ec7aec3d952616a6d5fc0 [formerly 2b07c25defe6da2d8493840d07efe8cf7ab55100]]]]]
Former-commit-id: 559e54f76f710fae0faf52374ea152fa1a6d877e
Former-commit-id: b4b9d5c4cc030f9112545f41e386e8ae90ae5a1d
Former-commit-id: d6b107828f03866effb85a5b316a50c8472e8696 [formerly 2cf835f9355e8b747525d39ead4b66181a1cfb80]
Former-commit-id: 5436d890360099d3d14ac4142e0e05da73f14e52
Former-commit-id: 4149ca2656e95cbd42bc6b865fb6871e0274af97
Former-commit-id: 80cec3cb429f7dcbf8ebe7c856a5fe0a6003cfcb
Former-commit-id: e17f0dd58bcdb65804651f8c90bc24a55f8b2f2f
Former-commit-id: c34b983757c8aa01c89a594f3f71a385744ec946
This commit is contained in:
liyang
2019-01-17 11:31:06 +08:00
3 changed files with 5 additions and 5 deletions

View File

@@ -1 +1 @@
aba14ba69c1b10aabcba100e3478b48ba9f2c465
9a6ae629e8fc58277768e8bd7156ef7ad1f48d73

View File

@@ -8,13 +8,13 @@ process.env.VUE_APP_VERSION = require('./package.json').version
process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYY-M-D HH:mm:ss')
// 基础路径 注意发布之前要先修改这里
let baseUrl = '/'
let publicPath = '/'
module.exports = {
baseUrl: baseUrl, // 根据你的实际情况更改这里
publicPath: publicPath, // 根据你的实际情况更改这里
lintOnSave: true,
devServer: {
publicPath: baseUrl // 和 baseUrl 保持一致
publicPath: publicPath // 和 publicPath 保持一致
},
css: {
loaderOptions: {

View File

@@ -1 +1 @@
13dd0eb82ec0a73b25d0a39fe23a367f31a2aaf8
eff8b8fb6fe1c6cf58b8d00c3362c33e94ab93eb