Commit c605f7b7388e0883cd60ce9fa85066920c3281ce

Authored by luoye

Merge branch 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child

* 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child:
  bug修改

Showing 3 changed files

littleApp_child/pages/checkTabList/checkTabList.js View file @ c605f7b
... ... @@ -52,6 +52,15 @@
52 52 ear: "",
53 53 spineFours: "",
54 54 portaGenitals: "",
  55 + // bilirubinHead: "",
  56 + // bilirubinChest: "",
  57 + // bilirubinBelly: "",
  58 + bilirubin:"",
  59 + bregma:"",
  60 + bregmaValue:"",
  61 + nerve:"",
  62 + stoopStatus: "",
  63 + stoopSign: "",
55 64 otherTextWZ: "",
56 65 //一般检查
57 66 temperature: "",
... ... @@ -59,6 +68,7 @@
59 68 weight: "",
60 69 head: "",
61 70 chestw: "",
  71 + heightWeight:"",
62 72 temperature: "",
63 73 growthEvaluate: "",
64 74 //辅助检查
... ... @@ -74,6 +84,7 @@
74 84 urineSugar: "",
75 85 urineAcetone: "",
76 86 hematuria:"",
  87 + otherUrine:"",
77 88 other_textFZ:""
78 89 },
79 90 onLoad: function (e) {
... ... @@ -195,6 +206,7 @@
195 206 urineSugar: result.urineSugar,
196 207 urineAcetone: result.urineAcetone,
197 208 hematuria: result.hematuria,
  209 + otherUrine: result.otherUrine,
198 210 other_textFZ: result.otherText,
199 211 })
200 212  
... ... @@ -226,6 +238,15 @@
226 238 ear: result.ear,
227 239 spineFours: result.spineFours,
228 240 portaGenitals: result.portaGenitals,
  241 + // bilirubinHead: result.bilirubinHead,
  242 + // bilirubinChest: result.bilirubinChest,
  243 + // bilirubinBelly: result.bilirubinBelly,
  244 + bilirubin:result.bilirubin,
  245 + bregma: result.bregma,
  246 + bregmaValue:result.bregmaValue,
  247 + nerve: result.nerve,
  248 + stoopStatus: result.stoopStatus,
  249 + stoopSign: result.stoopSign,
229 250 otherTextEK: result.otherText,
230 251 })
231 252  
... ... @@ -248,6 +269,7 @@
248 269 weight: result.weight,
249 270 head: result.head,
250 271 chestw: result.chestw,
  272 + heightWeight: result.heightWeight,
251 273 temperature: result.temperature,
252 274 growthEvaluate: result.growthEvaluate,
253 275 })
littleApp_child/pages/checkTabList/checkTabList.wxml View file @ c605f7b
... ... @@ -58,19 +58,19 @@
58 58  
59 59 </view>
60 60 <view class="content_line">
61   - <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="家庭举措" data-content="{{homeMeasure}}">
62   - <label class="content_front" style="min-width: 60px;">家庭举措:</label>
  61 + <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="家庭措施" data-content="{{homeMeasure}}">
  62 + <label class="content_front" style="min-width: 60px;">家庭措施:</label>
63 63 <label class="content_after">{{homeMeasure}}</label>
64 64 </view>
65   - <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="过敏史" data-content="{{drugGllergic}}">
66   - <label class="content_front" style="min-width: 50px;">过敏史:</label>
  65 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="药物过敏史" data-content="{{drugGllergic}}">
  66 + <label class="content_front" style="min-width: 50px;">药物过敏史:</label>
67 67 <label class="content_after">{{drugGllergic}}</label>
68 68  
69 69 </view>
70 70  
71 71 </view>
72   - <view class="content_line" bindtap="showMoreContent" data-title="两次随访患病情况" data-content="{{morbidity}}">
73   - <label class="content_front" style="min-width: 120px;">两次随访患病情况:</label>
  72 + <view class="content_line" bindtap="showMoreContent" data-title="发病情况" data-content="{{morbidity}}">
  73 + <label class="content_front" style="min-width: 60px;">发病情况:</label>
74 74 <label class="content_after">{{morbidity}}</label>
75 75  
76 76 </view>
... ... @@ -82,7 +82,7 @@
82 82  
83 83  
84 84 </view>
85   - <view wx:if="{{current_index==1}}" class="content2" style="margin-top:50px;">
  85 + <view wx:if="{{current_index==1}}" class="content2" style="margin-top:50px;">
86 86 <view class="" style="background:#ffffff;padding-bottom: 10px;">
87 87 <view class="content_line">
88 88 <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="牙齿" data-content="{{tooth}}">
... ... @@ -167,6 +167,41 @@
167 167 </view>
168 168  
169 169 </view>
  170 + <view class="content_line">
  171 + <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="经皮胆红素" data-content="{{bilirubin}}">
  172 + <label class="content_front" style="min-width: 65px;">经皮胆红素:</label>
  173 + <label class="content_after">{{bilirubin}}</label>
  174 + </view>
  175 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="神经系统检查" data-content="{{nerve}}">
  176 + <label class="content_front" style="min-width: 70px;">神经系统检查:</label>
  177 + <label class="content_after">{{nerve}}</label>
  178 +
  179 + </view>
  180 +
  181 + </view>
  182 + <view class="content_line">
  183 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="前囟" data-content="{{bregma}}">
  184 + <label class="content_front" style="min-width: 35px;">前囟:</label>
  185 + <label class="content_after">{{bregma}}</label>
  186 +
  187 + </view>
  188 + <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="未闭合尺寸" data-content="{{bregmaValue}}">
  189 + <label class="content_front" style="min-width: 65px;">未闭合尺寸:</label>
  190 + <label class="content_after">{{bregmaValue}}</label>
  191 + </view>
  192 +
  193 + </view>
  194 + <view class="content_line">
  195 + <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="可疑佝偻病症状" data-content="{{stoopStatus}}">
  196 + <label class="content_front" style="min-width: 100px;">可疑佝偻病症状:</label>
  197 + <label class="content_after">{{stoopStatus}}</label>
  198 + </view>
  199 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="可疑佝偻病体征" data-content="{{stoopSign}}">
  200 + <label class="content_front" style="min-width: 100px;">可疑佝偻病体征:</label>
  201 + <label class="content_after">{{stoopSign}}</label>
  202 +
  203 + </view>
  204 + </view>
170 205 <view class="other_line">
171 206 <label class="content_front" style="min-width: 35px;">其他:</label>
172 207 <label class="other_text">{{otherTextEK}}</label>
173 208  
... ... @@ -175,15 +210,15 @@
175 210  
176 211  
177 212 </view>
178   - <view wx:if="{{current_index==2}}" class="content3" style="margin-top:50px;">
  213 + <view wx:if="{{current_index==2}}" class="content3" style="margin-top:50px;">
179 214 <view class="" style="background:#ffffff;padding-bottom: 10px;">
180 215 <view class="content_line">
181 216 <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="体温" data-content="{{temperature}}">
182 217 <view class="content_front" style="min-width: 35px;">体温:</view>
183 218 <view class="content_after">{{temperature}}</view>
184 219 </view>
185   - <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身高" data-content="{{height}}">
186   - <label class="content_front" style="min-width: 35px;">身高:</label>
  220 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身长/身高" data-content="{{height}}">
  221 + <label class="content_front" style="min-width: 35px;">身长/身高:</label>
187 222 <label class="content_after">{{height}}</label>
188 223 </view>
189 224  
... ... @@ -204,9 +239,9 @@
204 239 <label class="content_front" style="min-width: 35px;">胸围:</label>
205 240 <label class="content_after">{{chestw}}</label>
206 241 </view>
207   - <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="喂养" data-content="{{}}">
208   - <label class="content_front" style="min-width: 35px;">喂养:</label>
209   - <label class="content_after">{{}}</label>
  242 + <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="身长别体重" data-content="{{heightWeight}}">
  243 + <label class="content_front" style="min-width: 70px;">身长别体重:</label>
  244 + <label class="content_after">{{heightWeight}}</label>
210 245 </view>
211 246  
212 247 </view>
... ... @@ -271,7 +306,7 @@
271 306 </view>
272 307  
273 308 </view>
274   - <view class="fuzhu_check">发育检查</view>
  309 + <view class="fuzhu_check">尿常规</view>
275 310 <view class="" style="background:#ffffff;padding-bottom: 10px;">
276 311 <view class="content_line">
277 312 <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="尿蛋白" data-content="{{urineProtein}}">
278 313  
... ... @@ -295,7 +330,15 @@
295 330 </view>
296 331  
297 332 </view>
  333 + <view class="content_line">
  334 + <view style="display:flex;width:100%" bindtap="showMoreContent" data-title="其他" data-content="{{otherUrine}}">
  335 + <label class="content_front" style="min-width: 35px;">其他:</label>
  336 + <label class="content_after">{{otherUrine}}</label>
  337 + </view>
298 338  
  339 +
  340 + </view>
  341 +
299 342 </view>
300 343 <view class="fuzhu_check">其他</view>
301 344 <view class="fuzhu_other_text">
302 345  
303 346  
304 347  
... ... @@ -307,14 +350,14 @@
307 350 </view>
308 351  
309 352  
310   -<view class="mask_subscribe_bg1" wx:if="{{flag}}">
311   - <view class="mask_subscribe_content1">
  353 +<view class="mask_subscribe_bg1" wx:if="{{flag}}">
  354 + <view class="mask_subscribe_content1">
312 355 <view class="mask_subscribe_title1">{{showTitle}}</view>
313 356 <view class="mask_subscribe_time1">
314   - <label class="mask_subscribe_content_text1">{{showContent}}</label>
  357 + <label class="mask_subscribe_content_text1">{{showContent}}</label>
315 358 </view>
316   -
  359 +
317 360 <view class="mask_subscribe_content_closeBtn1" bindtap="closeMask">知道了</view>
318   - </view>
319   - </view>
  361 + </view>
  362 +</view>
littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxss View file @ c605f7b
1 1 .main {
2 2 background: #fff;
3 3 width: 100%;
4   - height: 100%;
5 4 }
6 5  
7 6 .title_text {