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

packages/vue-cli-plugin-uni/lib/env.js

@@ -25,8 +25,8 @@ global.uniPlugin.validate.forEach(validate => {
 })
 
 process.UNI_MANIFEST = manifestJsonObj
-
-process.env.UNI_USING_V3_SCOPED = true
+
+process.env.UNI_USING_V3_SCOPED = true
 
 process.UNI_CLOUD = false
 process.UNI_CLOUD_TCB = false
@@ -410,6 +410,10 @@ global.uniPlugin.configureEnv.forEach(configureEnv => {
   configureEnv()
 })
 
+if (process.env.UNI_PLATFORM.startsWith('mp-')) {
+  console.log('小程序各家浏览器内核及自定义组件实现机制存在差异，可能存在样式布局兼容问题，参考：https://uniapp.dcloud.io/matter?id=mp')
+}
+
 runByHBuilderX && console.log('正在编译中...')
 
 module.exports = {

src/core/view/mixins/keyboard.js

@@ -107,6 +107,10 @@ export default {
       UniViewJSBridge.unsubscribe('hideKeyboard', this.hideKeyboardTemp)
       document.removeEventListener('click', iosHideKeyboard, false)
       this.resetSoftinputNavBar()
+      // 修复ios端显示与点击位置错位的Bug by:wyq
+      if (document.body.scrollIntoView) {
+        document.body.scrollIntoView()
+      }
     }
   }
 }

src/platforms/app-plus/view/framework/plugins/data.js

@@ -127,7 +127,7 @@ function getData (id, name) {
   try {
     return this.$r[id][name]
   } catch (e) {
-    console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
+    // console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
   }
 }
 /**
@@ -143,7 +143,7 @@ function getChangeData (id, name) {
     this.$set(this.wxsProps, wxsPropName, value)
     return value
   } catch (e) {
-    console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
+    // console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
   }
 }