luoye / littleApp_child

Download as
Browse Code »

Commit f47706549bb80e1c8befe2f101e205828892784a

Authored by luoye
2 parents c648ca6512 d8ca7263e4
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

Showing 5 changed files

littleApp_child/pages/childcare_knowledge/childcare_knowledge.js View file @ f477065
... ... @@ -25,7 +25,7 @@
25 25 // 'http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg',
26 26 'http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg'
27 27 ],
28   - titles: ["日常护理", "营养美食", "疾病护理", "亲子互动", "言传qq"],
  28 + titles: ["日常护理", "营养美食", "疾病护理", "亲子互动", "言传身教"],
29 29 id:0,
30 30 category:'',
31 31 current_index:0,
32 32  
... ... @@ -86,11 +86,11 @@
86 86 })
87 87 },
88 88 /*---------自定义函数--------*/
89   - requestData(id){
  89 + requestData(){
90 90 var self = this
91 91 isRefresh = true
92 92 networkUtil.showLoading()
93   - var param = {page:page,limit:15,type:getApp().globalData.userInfo.status,categoryId:self.data.id}
  93 + var param = {page:page,limit:15}
94 94 networkUtil._get(api.articleList,param,function(res){
95 95  
96 96 isRefresh = false
littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml View file @ f477065
... ... @@ -3,7 +3,7 @@
3 3 <image class="search_img" src="../../source/ic_search.png" bindtap="toSearch"></image>
4 4 <scroll-view class="title_scroll" scroll-x="true" scroll-y="false">
5 5 <label class="scroll_title_label " wx:for="{{titles}}">
6   - <label style="{{current_index == index? 'border-bottom: 2px solid #f4879b;' : 'border-bottom:0px solid #f4879b;'}}" class="title_text" bindtap="titleClick" data-index="{{index}}">{{item}}</label>
  6 + <label style="{{current_index == index? 'border-bottom: 2px solid #48C17B;' : 'border-bottom:0px solid #f4879b;'}}" class="title_text" bindtap="titleClick" data-index="{{index}}">{{item}}</label>
7 7  
8 8 </label>
9 9 </scroll-view>
littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxss View file @ f477065
... ... @@ -72,14 +72,14 @@
72 72  
73 73 .content_item {
74 74 width: 100%;
75   - height: 75px;
  75 + height: 85px;
76 76 right: 75px;
77 77 }
78 78  
79 79 .content_title {
80 80 font-family: PingFangSC-Regular;
81 81 font-size: 14px;
82   - margin-top: 10px;
  82 + padding-top: 7px;
83 83 color: #222;
84 84 display: -webkit-box;
85 85 -webkit-box-orient: vertical;
... ... @@ -129,7 +129,6 @@
129 129 .home__list-item__bottom {
130 130 height: 2px;
131 131 background: #d8dbd4;
132   - margin-bottom: 5px;
133 132 margin-top: 5px;
134 133 left: 15px;
135 134 right: 15px;
littleApp_child/pages/system_notifacations/system_notifacations.js View file @ f477065
... ... @@ -11,24 +11,18 @@
11 11  
12 12  
13 13 Page({
  14 +
14 15 data: {
  16 +
15 17 list: [
16   - {zar:12, title: "title1", content: "content1content1content1content1content1content1content1content1content1content1content1ds到场定损", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
17   - , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
18   - , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
19   - , { zar: 12,title: "title1", content: "content1", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
20   - , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
21   - , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
  18 + { isHighRisk: false,zar:12, title: "title1", content: "content1content1content1content1content1content1content1content1content1content1content1ds到场定损", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
  19 + , { isHighRisk: true, zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
  20 + , { isHighRisk: false, zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
  21 + , { isHighRisk: false, zar: 12,title: "title1", content: "content1", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
  22 + , { isHighRisk: true, zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
  23 + , { isHighRisk: false, zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
22 24 ],
23   - images: [
24   - // 'http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg',
25   - // 'http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg',
26   - 'http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg'
27   - ],
28   - titles: ["日常护理", "营养美食", "疾病护理", "亲子互动", "言传qq"],
29   - id:0,
30   - category:'',
31   - current_index:0,
  25 +
32 26 },
33 27 onLoad: function (e) {
34 28 this.data.id = e.id
... ... @@ -45,12 +39,7 @@
45 39 onUnload: function() {
46 40  
47 41 },
48   - /*---------事件处理函数--------*/
49   - bindViewTap: function() {
50   - wx.navigateTo({
51   - url: '../home/home'
52   - })
53   - },
  42 +
54 43 // 加载更多
55 44 loadMore:function(e){
56 45 if(!hasMore || isRefresh == true){
57 46  
58 47  
... ... @@ -73,19 +62,13 @@
73 62 this.loadMore()
74 63 }
75 64 },
76   - titleClick:function(e){
77   - console.log(e)
78   - var index = e.currentTarget.dataset.index
79   - this.setData({
80   - current_index:index
81   - })
82   - },
  65 +
83 66 /*---------自定义函数--------*/
84   - requestData(id){
  67 + requestData(){
85 68 var self = this
86 69 isRefresh = true
87 70 networkUtil.showLoading()
88   - var param = {page:page,limit:15,type:getApp().globalData.userInfo.status,categoryId:self.data.id}
  71 + var param = {page:page,limit:15,}
89 72 networkUtil._get(api.articleList,param,function(res){
90 73  
91 74 isRefresh = false
littleApp_child/pages/system_notifacations/system_notifacations.wxml View file @ f477065
1   -
2 1 <view class="main">
3 2  
4 3 <scroll-view style="" bindscrolltolower="loadMore">
5   -
  4 +
6 5 <view>
7   - <block hover-class="weui-cell_active" wx:for="{{list}}">
8   - <view class="high_risk_main">
  6 + <block hover-class="weui-cell_active" wx:for="{{list}}">
  7 + <view hidden="{{item.isHighRisk}}" class="high_risk_main">
9 8 <view class="high_risk_title">高危紧急通知</view>
10 9 <view class="high_rish_content1">
11 10 <label class="high_rish_content_before">危急值：</label>
12 11  
13 12  
... ... @@ -24,21 +23,21 @@
24 23 <label class="high_rish_date">2017-7</label>
25 24 <label class="high_rish_hospital_name">紧急提醒</label>
26 25 </view>
27   - </view>
28   - <view class="other_three_main">
29   - <view class="green_line"></view>
30   - <view class="other_three_title">高危紧急通知</view>
31   - <view class="other_three_content">公司的复苏的还记得公司的复苏的还记得公司的复苏的还记得</view>
32   - <view class="line"></view>
  26 + </view>
  27 + <view hidden="{{!item.isHighRisk}}" class="other_three_main">
  28 + <view class="green_line"></view>
  29 + <view class="other_three_title">高危紧急通知</view>
  30 + <view class="other_three_content">公司的复苏的还记得公司的复苏的还记得公司的复苏的还记得</view>
  31 + <view class="line"></view>
33 32 <view class="high_rish_content1">
34 33 <label class="other_three_date">2017-7</label>
35 34 <label class="other_three_hospital_name">紧急提醒</label>
36 35 </view>
37   - </view>
  36 + </view>
38 37 </block>
39 38 <view class="loadMoreView" wx:if="{{hasMore}}">加载更多...</view>
40 39 </view>
41   - </scroll-view>
  40 + </scroll-view>
42 41  
43 42 </view>