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

packages/uni-quickapp/bin/service.js

@@ -24,7 +24,7 @@ function getProjectName(e, t) {
     const stripJsonComments = require('strip-json-comments');
     const r = _path.default.join(e, t, "manifest.json");
     const s = JSON.parse(stripJsonComments(_fs.default.readFileSync(r).toString()))
-    return s && s.quickapp && s.quickapp.package || "Bundle"
+    return s && s.quickapp && s.quickapp.package || s.name || "Bundle"
   } catch (e) {
     _sharedUtils.colorconsole.error(`### App Server ### 获取项目名称出错：${e.message}`)
   }

src/core/view/mixins/keyboard.js

@@ -60,12 +60,9 @@ export default {
       plusReady(() => {
         const currentWebview = plus.webview.currentWebview()
         const style = currentWebview.getStyle() || {}
-        if (style.softinputMode === 'adjustResize') {
-          return
-        }
         const rect = this.$el.getBoundingClientRect()
         currentWebview.setSoftinputTemporary && currentWebview.setSoftinputTemporary({
-          mode: this.adjustPosition ? 'adjustPan' : 'nothing',
+          mode: style.softinputMode === 'adjustResize' ? 'adjustResize' : (this.adjustPosition ? 'adjustPan' : 'nothing'),
           position: {
             top: rect.top,
             height: rect.height + (Number(this.cursorSpacing) || 0)