From 5b628bc37f7909818f8af0bc70634b188f529126 Mon Sep 17 00:00:00 2001
From: xianghenggang <xianghenggang@lymsh.com>
Date: Tue, 15 Aug 2017 10:18:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 littleApp_child/pages/checkTabList/checkTabList.js | 22 ++++++
 .../pages/checkTabList/checkTabList.wxml           | 83 ++++++++++++++++------
 .../childcare_knowledge_detail.wxss                |  1 -
 .../system_notifacations/system_notifacations.json |  2 +-
 4 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/littleApp_child/pages/checkTabList/checkTabList.js b/littleApp_child/pages/checkTabList/checkTabList.js
index 78997da..fa0d656 100644
--- a/littleApp_child/pages/checkTabList/checkTabList.js
+++ b/littleApp_child/pages/checkTabList/checkTabList.js
@@ -52,6 +52,15 @@ Page({
         ear: "",
         spineFours: "",
         portaGenitals: "",
+        // bilirubinHead: "",
+        // bilirubinChest: "",
+        // bilirubinBelly: "",
+        bilirubin:"",
+        bregma:"",
+        bregmaValue:"",
+        nerve:"",
+        stoopStatus: "",
+        stoopSign: "",
         otherTextWZ: "",
         //一般检查
         temperature: "",
@@ -59,6 +68,7 @@ Page({
         weight: "",
         head: "",
         chestw: "",
+        heightWeight:"",
         temperature: "",
         growthEvaluate: "",
         //辅助检查
@@ -74,6 +84,7 @@ Page({
         urineSugar: "",
         urineAcetone: "",
         hematuria:"",
+        otherUrine:"",
         other_textFZ:""
     },
     onLoad: function (e) {
@@ -195,6 +206,7 @@ Page({
                 urineSugar: result.urineSugar,
                 urineAcetone: result.urineAcetone,
                 hematuria: result.hematuria,
+                otherUrine: result.otherUrine,
                 other_textFZ: result.otherText,
             })
 
@@ -226,6 +238,15 @@ Page({
                 ear: result.ear,
                 spineFours: result.spineFours,
                 portaGenitals: result.portaGenitals,
+                // bilirubinHead: result.bilirubinHead,
+                // bilirubinChest: result.bilirubinChest,
+                // bilirubinBelly: result.bilirubinBelly,
+                bilirubin:result.bilirubin,
+                bregma: result.bregma,
+                bregmaValue:result.bregmaValue,
+                nerve: result.nerve,
+                stoopStatus: result.stoopStatus,
+                stoopSign: result.stoopSign,
                 otherTextEK: result.otherText,
             })
 
@@ -248,6 +269,7 @@ Page({
                 weight: result.weight,
                 head: result.head,
                 chestw: result.chestw,
+                heightWeight: result.heightWeight,
                 temperature: result.temperature,
                 growthEvaluate: result.growthEvaluate,
             })
diff --git a/littleApp_child/pages/checkTabList/checkTabList.wxml b/littleApp_child/pages/checkTabList/checkTabList.wxml
index a77f6be..9915442 100644
--- a/littleApp_child/pages/checkTabList/checkTabList.wxml
+++ b/littleApp_child/pages/checkTabList/checkTabList.wxml
@@ -58,19 +58,19 @@
 
                 </view>
                 <view class="content_line">
-                    <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="家庭举措" data-content="{{homeMeasure}}">
-                        <label class="content_front" style="min-width: 60px;">家庭举措:</label>
+                    <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="家庭措施" data-content="{{homeMeasure}}">
+                        <label class="content_front" style="min-width: 60px;">家庭措施:</label>
                         <label class="content_after">{{homeMeasure}}</label>
                     </view>
-                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="过敏史" data-content="{{drugGllergic}}">
-                        <label class="content_front" style="min-width: 50px;">过敏史:</label>
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="药物过敏史" data-content="{{drugGllergic}}">
+                        <label class="content_front" style="min-width: 50px;">药物过敏史:</label>
                         <label class="content_after">{{drugGllergic}}</label>
 
                     </view>
 
                 </view>
-                <view class="content_line" bindtap="showMoreContent" data-title="两次随访患病情况" data-content="{{morbidity}}">
-                    <label class="content_front" style="min-width: 120px;">两次随访患病情况:</label>
+                <view class="content_line" bindtap="showMoreContent" data-title="发病情况" data-content="{{morbidity}}">
+                    <label class="content_front" style="min-width: 60px;">发病情况:</label>
                     <label class="content_after">{{morbidity}}</label>
 
                 </view>
@@ -82,7 +82,7 @@
 
 
         </view>
-        <view wx:if="{{current_index==1}}"  class="content2" style="margin-top:50px;">
+        <view wx:if="{{current_index==1}}" class="content2" style="margin-top:50px;">
             <view class="" style="background:#ffffff;padding-bottom: 10px;">
                 <view class="content_line">
                     <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="牙齿" data-content="{{tooth}}">
@@ -167,6 +167,41 @@
                     </view>
 
                 </view>
+                <view class="content_line">
+                    <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="经皮胆红素" data-content="{{bilirubin}}">
+                        <label class="content_front" style="min-width: 65px;">经皮胆红素:</label>
+                        <label class="content_after">{{bilirubin}}</label>
+                    </view>
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="神经系统检查" data-content="{{nerve}}">
+                        <label class="content_front" style="min-width: 70px;">神经系统检查:</label>
+                        <label class="content_after">{{nerve}}</label>
+
+                    </view>
+
+                </view>
+                <view class="content_line">
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="前囟" data-content="{{bregma}}">
+                        <label class="content_front" style="min-width: 35px;">前囟:</label>
+                        <label class="content_after">{{bregma}}</label>
+
+                    </view>
+                    <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="未闭合尺寸" data-content="{{bregmaValue}}">
+                        <label class="content_front" style="min-width: 65px;">未闭合尺寸:</label>
+                        <label class="content_after">{{bregmaValue}}</label>
+                    </view>
+
+                </view>
+                <view class="content_line">
+                    <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="可疑佝偻病症状" data-content="{{stoopStatus}}">
+                        <label class="content_front" style="min-width: 100px;">可疑佝偻病症状:</label>
+                        <label class="content_after">{{stoopStatus}}</label>
+                    </view>
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="可疑佝偻病体征" data-content="{{stoopSign}}">
+                        <label class="content_front" style="min-width: 100px;">可疑佝偻病体征:</label>
+                        <label class="content_after">{{stoopSign}}</label>
+
+                    </view>
+                </view>
                 <view class="other_line">
                     <label class="content_front" style="min-width: 35px;">其他:</label>
                     <label class="other_text">{{otherTextEK}}</label>
@@ -175,15 +210,15 @@
 
 
         </view>
-        <view wx:if="{{current_index==2}}"  class="content3" style="margin-top:50px;">
+        <view wx:if="{{current_index==2}}" class="content3" style="margin-top:50px;">
             <view class="" style="background:#ffffff;padding-bottom: 10px;">
                 <view class="content_line">
                     <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="体温" data-content="{{temperature}}">
                         <view class="content_front" style="min-width: 35px;">体温:</view>
                         <view class="content_after">{{temperature}}</view>
                     </view>
-                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身高" data-content="{{height}}">
-                        <label class="content_front" style="min-width: 35px;">身高:</label>
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身长/身高" data-content="{{height}}">
+                        <label class="content_front" style="min-width: 35px;">身长/身高:</label>
                         <label class="content_after">{{height}}</label>
                     </view>
 
@@ -204,9 +239,9 @@
                         <label class="content_front" style="min-width: 35px;">胸围:</label>
                         <label class="content_after">{{chestw}}</label>
                     </view>
-                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="喂养" data-content="{{}}">
-                        <label class="content_front" style="min-width: 35px;">喂养:</label>
-                        <label class="content_after">{{}}</label>
+                    <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身长别体重" data-content="{{heightWeight}}">
+                        <label class="content_front" style="min-width: 70px;">身长别体重:</label>
+                        <label class="content_after">{{heightWeight}}</label>
                     </view>
 
                 </view>
@@ -271,7 +306,7 @@
                 </view>
 
             </view>
-            <view class="fuzhu_check">发育检查</view>
+            <view class="fuzhu_check">尿常规</view>
             <view class="" style="background:#ffffff;padding-bottom: 10px;">
                 <view class="content_line">
                     <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="尿蛋白" data-content="{{urineProtein}}">
@@ -295,6 +330,14 @@
                     </view>
 
                 </view>
+                <view class="content_line">
+                    <view style="display:flex;width:100%" bindtap="showMoreContent" data-title="其他" data-content="{{otherUrine}}">
+                        <label class="content_front" style="min-width: 35px;">其他:</label>
+                        <label class="content_after">{{otherUrine}}</label>
+                    </view>
+
+
+                </view>
 
             </view>
             <view class="fuzhu_check">其他</view>
@@ -307,13 +350,13 @@
 </view>
 
 
-<view class="mask_subscribe_bg1" wx:if="{{flag}}"> 
-      <view class="mask_subscribe_content1"> 
+<view class="mask_subscribe_bg1" wx:if="{{flag}}">
+    <view class="mask_subscribe_content1">
         <view class="mask_subscribe_title1">{{showTitle}}</view>
         <view class="mask_subscribe_time1">
-          <label class="mask_subscribe_content_text1">{{showContent}}</label>
+            <label class="mask_subscribe_content_text1">{{showContent}}</label>
         </view>
-        
+
         <view class="mask_subscribe_content_closeBtn1" bindtap="closeMask">知道了</view>
-      </view>
-  </view> 
\ No newline at end of file
+    </view>
+</view>
\ No newline at end of file
diff --git a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxss b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxss
index cb39555..d3638fd 100644
--- a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxss
+++ b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxss
@@ -1,7 +1,6 @@
 .main {
     background: #fff;
     width: 100%;
-    height: 100%;
 }
 
 .title_text {
diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.json b/littleApp_child/pages/system_notifacations/system_notifacations.json
index 876e660..78e35b2 100644
--- a/littleApp_child/pages/system_notifacations/system_notifacations.json
+++ b/littleApp_child/pages/system_notifacations/system_notifacations.json
@@ -1,6 +1,6 @@
 {    
     "navigationBarBackgroundColor": "#48C17B",
-    "navigationBarTitleText": "系统通知",
+    "navigationBarTitleText": "消息通知",
     "navigationBarTextStyle": "white",
     "backgroundColor": "#d8dbd4"
 }
\ No newline at end of file
-- 
1.8.3.1