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

src/platforms/h5/components/page/index.vue

@@ -195,7 +195,7 @@ export default {
 
     let offset = upx2px(refreshOptions.offset)
 
-    if (titleNView.type !== 'transparent') {
+    if (titleNView.type !== 'none' && titleNView.type !== 'transparent') {
       offset += NAVBAR_HEIGHT + safeAreaInsets.top
     }
 

src/platforms/h5/service/api/media/choose-video.js

@@ -58,11 +58,20 @@ export function chooseVideo ({
     if (video.onloadedmetadata !== undefined) {
       // 尝试获取视频的宽高信息
       video.onloadedmetadata = function () {
-        callbackResult.duration = video.duration || 0
-        callbackResult.width = video.videoWidth || 0
-        callbackResult.height = video.videoHeight || 0
-        invoke(callbackId, callbackResult)
+        invoke(callbackId, Object.assign({}, callbackResult, {
+          duration: video.duration || 0,
+          width: video.videoWidth || 0,
+          height: video.videoHeight || 0
+        }))
       }
+      // 部分浏览器（如微信内置浏览器）未播放无法触发loadedmetadata事件
+      setTimeout(() => {
+        invoke(callbackId, Object.assign({}, callbackResult, {
+          duration: 0,
+          width: 0,
+          height: 0
+        }))
+      }, 300)
       video.src = filePath
     } else {
       invoke(callbackId, callbackResult)