From d8cfa8300f544747d22c85832a75e90dffe9ab4d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Dec 2023 08:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E8=AF=8A=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/inquiryForm/inquiryForm.js   | 4 +++-
 pages/inquiryForm/inquiryForm.wxml | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pages/inquiryForm/inquiryForm.js b/pages/inquiryForm/inquiryForm.js
index 89e11f8..27a2fb8 100644
--- a/pages/inquiryForm/inquiryForm.js
+++ b/pages/inquiryForm/inquiryForm.js
@@ -285,6 +285,7 @@ for (let i = 0; i < list2.length; i++) {
     })
   },
   openMaritalPicker() {
+     wx.hideKeyboard();
       this.setData({
         showMarital: true
       })
@@ -363,7 +364,7 @@ for (let i = 0; i < list2.length; i++) {
     })
   },
   showNation() {
-   
+    wx.hideKeyboard();
       this.setData({
         showNation: true
       })
@@ -385,6 +386,7 @@ for (let i = 0; i < list2.length; i++) {
     })
   },
   showJob() {
+    wx.hideKeyboard();
       this.setData({
         showJob: true
       }) 
diff --git a/pages/inquiryForm/inquiryForm.wxml b/pages/inquiryForm/inquiryForm.wxml
index c010238..7d0744f 100644
--- a/pages/inquiryForm/inquiryForm.wxml
+++ b/pages/inquiryForm/inquiryForm.wxml
@@ -3,7 +3,7 @@
 <nav navName="问诊表"></nav>
 <view class="page">
    <view class="questionbox">
-    <view class="cellbox">
+    <view class="cellbox" wx:if="{{list1.length>0}}">
    <view class="basictitle">基本信息</view>
     <view class="cell" wx:if="{{filter.formatwenzhenList(list1,'height').ISHAS}}">
         <view class="cellrow">
@@ -11,7 +11,7 @@
             {{filter.formatwenzhenList(list1,'height').NUMBER}}、身高（CM）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{personInfo.height}}"  	bindinput="handleIpt"  data-id="name" placeholder="请输入身高" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
@@ -22,7 +22,7 @@
             {{filter.formatwenzhenList(list1,'weight').NUMBER}}、体重（KG）
           </view>
           <view class="iptbox">
-            <input type="text" value="{{user_info.name}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
+            <input type="text" value="{{personInfo.weight}}"  	bindinput="handleIpt"  data-id="name" placeholder="请请输入体重" placeholder-class="placeholder" class="ipt" disabled="{{!showBtn}}" />
 
           </view>
         </view>
@@ -63,7 +63,7 @@
       </view>
      
    </view>
-   <view class="cellbox">
+   <view class="cellbox" wx:if="{{list2.length>0}}">
      <view class="basictitle">个人情况</view>
      <view class="sickHis">
         <view class="list">