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

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
-}
+}