提交 5f55624e 编写于 作者: fxy060608's avatar fxy060608

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

......@@ -25,11 +25,11 @@ export default {
default: false
},
hoverStartTime: {
type: Number,
type: [Number, String],
default: 20
},
hoverStayTime: {
type: Number,
type: [Number, String],
default: 70
},
formType: {
......
......@@ -47,11 +47,11 @@ export default {
default: 1
},
hoverStartTime: {
type: Number,
type: [Number, String],
default: 20
},
hoverStayTime: {
type: Number,
type: [Number, String],
default: 600
}
},
......
......@@ -41,11 +41,11 @@ function getButton (weex) {
default: false
},
hoverStartTime: {
type: Number,
type: [Number, String],
default: 20
},
hoverStayTime: {
type: Number,
type: [Number, String],
default: 70
},
formType: {
......
......@@ -42,11 +42,11 @@ function getNavigator (weex, uni) {
default: false
},
hoverStartTime: {
type: Number,
type: [Number, String],
default: 50
},
hoverStayTime: {
type: Number,
type: [Number, String],
default: 600
}
},
......
......@@ -17,7 +17,11 @@ const insertHTMLWebView = ({
}
const parentTitleNView = parentWebview.getTitleNView()
if (parentTitleNView) {
if (plus.navigator.isImmersedStatusbar()) {
styles.top = 44 + plus.navigator.getStatusbarHeight()
} else {
styles.top = 44
}
styles.bottom = 0
}
webview = plus.webview.create('', htmlId, styles)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册