Merge branch 'master' of http://123.56.79.57/xt/xcx-book

# By vking
# Via vking
* 'master' of http://123.56.79.57/xt/xcx-book:
  【一键订C端：在预定详情界面，点击备注后界面被键盘冲没了】https://www.tapd.cn/57419716/bugtrace/bugs/view?bug_id=1157419716001002888

@@ -210,10 +210,15 @@ Page({
   cardEvent(e){
     this.editorReserve()
   },
+  keyboardheight:0,
   keyboardheightchange(e){
     console.log(e);
+    if(e.detail.height==0 || e.detail.height>this.keyboardheight){
+      this.keyboardheight=e.detail.height
+    }
     this.setData({
-      paddingBottom:e.detail.height?(parseInt(e.detail.height)+100):0
+      //paddingBottom:e.detail.height?(parseInt(e.detail.height)+100):0
+      paddingBottom:this.keyboardheight>0?(parseInt(this.keyboardheight)+20):0
     })
     setTimeout(()=>{
       this.pageScrollToBottom()

@@ -76,6 +76,7 @@
                    bindkeyboardheightchange="keyboardheightchange"
                    bindblur="keyboardheightchange"
                    bindconfirm="keyboardheightchange"
+                   adjust-position="{{false}}"
 	               data-key="remark"
 	               value="{{user.remark}}"
 	               placeholder-class="input-pl" maxlength="25"/>