Merge branch 'develop'

Former-commit-id: 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 9ff8f75e7d99ef976c5c16aaf5be8cfe3708603b [formerly 2a6afca [formerly 2b07c25defe6da2d8493840d07efe8cf7ab55100]]]]] Former-commit-id: 559e54f Former-commit-id: b4b9d5c 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
d2-projects · Jan 17, 2019 · 3b7b811 · 3b7b811
2 parents 137ef16 + 770245e
commit 3b7b811
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id
diff --git a/vue.config.js b/vue.config.js
@@ -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: {

diff --git a/yarn.lock.REMOVED.git-id b/yarn.lock.REMOVED.git-id
@@ -1 +1 @@
-13dd0eb82ec0a73b25d0a39fe23a367f31a2aaf8
+eff8b8fb6fe1c6cf58b8d00c3362c33e94ab93eb
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		13dd0eb82ec0a73b25d0a39fe23a367f31a2aaf8
		eff8b8fb6fe1c6cf58b8d00c3362c33e94ab93eb