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

# Conflicts:
#	packages/vue-cli-plugin-uni/lib/env.js

src/core/view/mixins/keyboard.js

@@ -44,7 +44,10 @@ export default {
   methods: {
     initKeyboard (el) {
       el.addEventListener('focus', () => {
-        UniViewJSBridge.subscribe('hideKeyboard', hideKeyboard)
+        this.hideKeyboardTemp = function () {
+          hideKeyboard()
+        }
+        UniViewJSBridge.subscribe('hideKeyboard', this.hideKeyboardTemp)
         document.addEventListener('click', iosHideKeyboard, false)
         this.setSoftinputNavBar()
         this.setSoftinputTemporary()
@@ -101,7 +104,7 @@ export default {
       }
     },
     onKeyboardHide () {
-      UniViewJSBridge.unsubscribe('hideKeyboard', hideKeyboard)
+      UniViewJSBridge.unsubscribe('hideKeyboard', this.hideKeyboardTemp)
       document.removeEventListener('click', iosHideKeyboard, false)
       this.resetSoftinputNavBar()
     }

src/platforms/app-plus/service/api/ad/rewarded-video-ad.js

@@ -2,6 +2,7 @@
 const eventNames = [
   'load',
   'close',
+  'verify',
   'error'
 ]
 
@@ -35,6 +36,9 @@ class RewardedVideoAd {
       this._loadAd()
       this._dispatchEvent('close', { isEnded: e.isEnded })
     })
+    rewardAd.onVerify((e) => {
+      this._dispatchEvent('verify', { isValid: e.valid })
+    })
     rewardAd.onError((e) => {
       const { code, message } = e
       const data = { code: code, errMsg: message }
@@ -68,6 +72,9 @@ class RewardedVideoAd {
       }
     })
   }
+  getProvider () {
+    return this._rewardAd.getProvider()
+  }
   _loadAd () {
     this._isLoad = false
     this._rewardAd.load()

src/platforms/app-plus/service/on-web-invoke-app-service.js

@@ -5,7 +5,7 @@ function onMessage (pageId, arg) {
     return
   }
   if (!page.$page.meta.isNVue) {
-    const target = page.$vm._$vd.elements.find(target => target.tagName === 'web-view' && target.events['message'])
+    const target = page.$vm._$vd.elements.find(target => target.type === 'web-view' && target.events['message'])
     if (!target) {
       return
     }