Merge branch 'dev' of https://github.com/dcloudio/uni-app into dev

55b5e684 · 雪洛 · d25c8f0e · 9a8085f4 · 55b5e684
隐藏空白更改
内联并排

Showing with 4 addition and 3 deletion

packages/uni-cli-shared/lib/manifest.js packages/uni-cli-shared/lib/manifest.js +4 -3

未找到文件。
--- a/packages/uni-cli-shared/lib/manifest.js
+++ b/packages/uni-cli-shared/lib/manifest.js
@@ -60,9 +60,10 @@ function getH5Options (manifestJson) {

  let base = h5.router.base

-  if (base.indexOf('/') !== 0) {
+  if (base.indexOf('/') !== 0 && base.indexOf('./') !== 0) {
    base = '/' + base
-  }
+  }
+
  if (base.substr(-1) !== '/') {
    base = base + '/'
  }
@@ -98,4 +99,4 @@ module.exports = {
  parseManifestJson,
  getNetworkTimeout,
  getH5Options
-}
+}