luoye / littleApp_child

Download as
Browse Code »

Commit e05fd30e39b1d32cd9ce824fe6853561b21f2be9

Authored by luoye
2 parents 02daaf192e fcaa0f8e4e
Exists in master and in 2 other branches dev-wrh, dev_wjl

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

* 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child:
  no message
  no message
  no message

Showing 7 changed files

littleApp_child/pages/checkTabList/checkTabList.js View file @ e05fd30
... ... @@ -109,11 +109,14 @@
109 109 // confirmText: '知道了',
110 110 // confirmColor: '#48C17B'
111 111 // })
112   - this.setData({
113   - flag: true,
114   - showTitle: title,
115   - showContent: content,
116   - })
  112 + if(content.length>=4){
  113 + this.setData({
  114 + flag: true,
  115 + showTitle: title,
  116 + showContent: content,
  117 + })
  118 + }
  119 +
117 120 },
118 121 closeMask:function(){
119 122 this.setData({
littleApp_child/pages/checkTabList/checkTabList.wxss View file @ e05fd30
... ... @@ -62,7 +62,7 @@
62 62 }
63 63  
64 64 .content_after {
65   - font-size: 13px;
  65 + font-size: 12px;
66 66 color: #666;
67 67 margin-left: 5px;
68 68 height: 20px;
littleApp_child/pages/childcare_knowledge/childcare_knowledge.js View file @ e05fd30
... ... @@ -11,7 +11,7 @@
11 11 // 获取应用实例
12 12 var app = getApp()
13 13  
14   -var pageLimit=4
  14 +var pageLimit=15
15 15  
16 16 Page({
17 17 data: {
littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml View file @ e05fd30
1 1 <!--articleLists.wxml 文章列表-->
2   -<view style="height:100%;background:#fff">
  2 +<view style="background:#fff">
3 3 <view class="">
4 4 <view class="title_top_view">
5 5 <image class="search_img" src="../../source/ic_search.png" bindtap="toSearch"></image>
littleApp_child/pages/system_notifacations/system_notifacations.js View file @ e05fd30
... ... @@ -9,7 +9,7 @@
9 9 var hasMore
10 10 var isRefresh
11 11  
12   -var pageLimit = 4
  12 +var pageLimit = 15
13 13  
14 14 Page({
15 15  
littleApp_child/pages/system_notifacations/system_notifacations.wxml View file @ e05fd30
... ... @@ -13,8 +13,9 @@
13 13 <view>
14 14 <block hover-class="weui-cell_active" wx:for="{{list}}">
15 15 <view hidden="{{item.type==1?false:true}}" class="high_risk_main">
16   - <view class="high_risk_title">{{item.title}}</view>
17   -
  16 + <!-- <view class="high_risk_title">{{item.title}}</view> -->
  17 + <view class="red_line"></view>
  18 + <view class="other_three_title">{{item.title}}</view>
18 19 <view class="other_three_content">{{item.content}}</view>
19 20 <!-- <view class="high_rish_content1" >
20 21 <label class="high_rish_content_before">危急值：</label>
littleApp_child/pages/system_notifacations/system_notifacations.wxss View file @ e05fd30
... ... @@ -128,6 +128,11 @@
128 128 margin-top: 10px;
129 129 background: #fff;
130 130 }
  131 +.red_line {
  132 + width: 100%;
  133 + background: #f67272;
  134 + height: 2px;
  135 +}
131 136 .green_line {
132 137 width: 100%;
133 138 background: #48C17B;