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

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

...@@ -83,7 +83,8 @@ export default { ...@@ -83,7 +83,8 @@ export default {
} }
}, },
created () { created () {
const page = getCurrentPages()[0] let pages = getCurrentPages()
let page = pages[pages.length - 1]
this.$watch('title', () => { this.$watch('title', () => {
this.setNavigationBarTitle() this.setNavigationBarTitle()
}) })
......
...@@ -446,9 +446,10 @@ export default { ...@@ -446,9 +446,10 @@ export default {
}, this.$page.id) }, this.$page.id)
return return
} }
if (!callbackId) { if (!callbackId) {
// fix [...]展开TypedArray在低版本手机报错的问题,使用Array.prototype.slice
return { return {
data: [...imgData.data], data: Array.prototype.slice.call(imgData.data),
width: destWidth, width: destWidth,
height: destHeight height: destHeight
} }
......
...@@ -36,7 +36,7 @@ class RewardedVideoAd { ...@@ -36,7 +36,7 @@ class RewardedVideoAd {
this._loadAd() this._loadAd()
this._dispatchEvent('close', { isEnded: e.isEnded }) this._dispatchEvent('close', { isEnded: e.isEnded })
}) })
rewardAd.onVerify((e) => { rewardAd.onVerify && rewardAd.onVerify((e) => {
this._dispatchEvent('verify', { isValid: e.isValid }) this._dispatchEvent('verify', { isValid: e.isValid })
}) })
rewardAd.onError((e) => { rewardAd.onError((e) => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册