luoye / littleApp_child

Download as
Browse Code »

Commit 51f0f1dcbfd93862d58606e1397b60240969f50c

Authored by luoye
1 parent 89bbbd47ca
Exists in master and in 2 other branches dev-wrh, dev_wjl

提审

Showing 8 changed files with 49 additions and 31 deletions

littleApp_child/pages/SearchPage/SearchPage.js View file @ 51f0f1d
... ... @@ -55,6 +55,7 @@
55 55 var self = this
56 56 isRefresh = true
57 57 var param = { k: text, limit: 30, page:1}
  58 + networkUtil.showLoading()
58 59 networkUtil._get(api.search, param, function (res) {
59 60 console.log('数据-----', res)
60 61 isRefresh = false
littleApp_child/pages/SearchPage/SearchPage.json View file @ 51f0f1d
1 1 {
2 2 "navigationBarBackgroundColor": "#48C17B",
3   - "navigationBarTitleText": "妈咪Baby",
  3 + "navigationBarTitleText": "搜索文章",
4 4 "navigationBarTextStyle": "white",
5 5 "backgroundColor": "#d8dbd4"
6 6 }
littleApp_child/pages/SearchPage/SearchPage.wxml View file @ 51f0f1d
... ... @@ -23,7 +23,7 @@
23 23 <!-- <scroll-view scroll-y="true" style="height: 100%;" bindscroll="myScroll"> -->
24 24  
25 25 <view class="search_detail" wx:if="{{searching}}">
26   - <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail?titlle={{'id=' + item.id}}" hover-class="weui-cell_active" wx:for="{{list}}" wx:key="{{index}}">
  26 + <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail?{{'id=' + item.id}}" hover-class="weui-cell_active" wx:for="{{list}}" wx:key="{{index}}">
27 27 <view class="content_item">
28 28 <view style="margin-left:15px;margin-right:75px;">
29 29 <view class="content_title">{{item.title}}</view>
littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml View file @ 51f0f1d
... ... @@ -20,7 +20,7 @@
20 20 </swiper-item>
21 21 </block>
22 22 </swiper> -->
23   - <image class="swiper" src="{{images.medium}}"></image>
  23 + <image class="swiper" mode="aspectFill" src="{{images.medium}}"></image>
24 24 <view>
25 25 <navigator url="../childcare_knowledge_detail/childcare_knowledge_detail" wx:for="{{list}}" wx:key="{{index}}">
26 26 <view class="content_item">
littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js View file @ 51f0f1d
... ... @@ -28,11 +28,11 @@
28 28 // articleId = options.id
29 29 // categoryIndex = options.categoryIndex
30 30 // articleIdIndex = options.artIndex
31   - wx.setNavigationBarTitle({
32   - title: options.category,
33   - success: function (res) {
34   - }
35   - })
  31 + // wx.setNavigationBarTitle({
  32 + // title: options.category,
  33 + // success: function (res) {
  34 + // }
  35 + // })
36 36 this.requestData(options.id)
37 37 },
38 38 onUnload: function () {
littleApp_child/pages/home/home.js View file @ 51f0f1d
... ... @@ -87,9 +87,10 @@
87 87 success: function (res) {
88 88 if (res.tapIndex == 0) {
89 89 wx.setStorageSync('userToken', '')
  90 + wx.setStorageSync('userId', '')
90 91 getApp().globalData.token = ''
91   - that.loginPage()
92   - WebIM.conn.close();
  92 + getApp().globalData.userId = ''
  93 + that.toLogin()
93 94 }
94 95 },
95 96 fail: function (res) {
littleApp_child/pages/home/home.wxml View file @ 51f0f1d
... ... @@ -20,7 +20,7 @@
20 20 </view>
21 21 <view class="infoView">
22 22 <text class="titleText">月龄</text>
23   - <text class="timeText">{{userData.monthage ? userData.monthage : '-'}}</text>
  23 + <text class="timeText">{{userData.monthage ? userData.monthage : '0'}}</text>
24 24 <view class="lineView"></view>
25 25 </view>
26 26 <view class="infoView">
27 27  
28 28  
... ... @@ -34,15 +34,11 @@
34 34 <view class="hospitalName" wx:if="{{hospitalName}}">{{hospitalName}}</view>
35 35 <!--功能模块-->
36 36 <view class="foundation_BG" style="{{item_big_height}}">
37   - <navigator class="foundation_item_small" url="../inspectionReport/inspectionReport">
  37 + <!-- <navigator class="foundation_item_small" url="../inspectionReport/inspectionReport">
38 38 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
39 39 <view class="foundation_item_small_text">儿保检查记录</view>
40   - </navigator>
  40 + </navigator> -->
41 41 <navigator class="foundation_item_small" url="../childcare_knowledge/childcare_knowledge">
42   - <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
43   - <view class="foundation_item_small_text">育儿百科</view>
44   - </navigator>
45   - <navigator class="foundation_item_small" url="../childcare_knowledge/childcare_knowledge">
46 42 <image src="../../source/yuerzhishi.png" style="{{item_small}}" class="foundation_item_small_image"></image>
47 43 <view class="foundation_item_small_text">育儿知识</view>
48 44 </navigator>
49 45  
50 46  
... ... @@ -50,20 +46,24 @@
50 46 <image src="../../source/xiaoxitongzhi.png" style="{{item_small}}" class="foundation_item_small_image"></image>
51 47 <view class="foundation_item_small_text">消息通知</view>
52 48 </navigator>
  49 + <navigator class="foundation_item_small" url="">
  50 + <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
  51 + <view class="foundation_item_small_text">敬请期待</view>
  52 + </navigator>
53 53 </view>
54 54  
55 55 <!--文章列表-->
56 56 <view class="article_list_bg">
57 57 <view class="article_list">
58 58 <block wx:for="{{list}}" wx:for-index="sectionIndex" wx:for-item="sectionItem">
59   - <view class="article_bg">
  59 + <view class="article_bg" wx:if="{{sectionItem.article.length > 0}}">
60 60 <navigator url="../articleLists/articleLists?categoryId={{sectionItem.id + '&category=' + sectionItem.title}}" class="navigator_class util_bottom_line">
61 61 <image class="article_title_image"></image>
62 62 <view class="article_title">{{sectionItem.title}}</view>
63 63 <image class="article_title_indicator" mode="aspectFit" src="../../source/gengduo.png"></image>
64 64 </navigator>
65 65 <block wx:for="{{sectionItem.article}}">
66   - <navigator class="article_content" url="../childcare_knowledge_detail/childcare_knowledge_detail?id={{item.id + '&category=' + sectionItem.title}}">
  66 + <navigator wx:if="{{index < 2}}" class="article_content" url="../childcare_knowledge_detail/childcare_knowledge_detail?id={{item.id + '&category=' + sectionItem.title}}">
67 67 <view style="height:6px;width:100%;"></view>
68 68 <view class="article_content_title">{{item.title}}</view>
69 69 <label class="article_content_text">{{item.introduction}}</label>
littleApp_child/pages/home/home.wxss View file @ 51f0f1d
... ... @@ -56,10 +56,21 @@
56 56 }
57 57  
58 58 /*上方信息条部分*/
  59 +
  60 +.lineView {
  61 + width: 100%;
  62 + border-right: solid rgba(255, 255, 255, 0.7) 0.5px;
  63 + border-left: solid rgba(255, 255, 255, 0.7) 0.5px;
  64 + height: 40px;
  65 + position: absolute;
  66 + top: 10px;
  67 +}
  68 +
59 69 .infoBar {
60 70 width: 100%;
61   - height: 60px;
62   - top: 142px;
  71 + min-height: 60px;
  72 + /* top: 142px; */
  73 + bottom: 0px;
63 74 position: absolute;
64 75 }
65 76  
66 77  
67 78  
68 79  
69 80  
... ... @@ -71,30 +82,29 @@
71 82 box-sizing: border-box;
72 83 position: relative;
73 84 background-color: rgba(255, 255, 255, 0.1);
  85 + background: green;
74 86 }
75 87  
76   -.lineView {
77   - width: 100%;
78   - border-right: solid rgba(255, 255, 255, 0.7) 0.5px;
79   - border-left: solid rgba(255, 255, 255, 0.7) 0.5px;
80   - height: 40px;
81   - position: absolute;
82   - top: 10px;
83   -}
84   -
85 88 .titleText {
86 89 margin-top: 12px;
87 90 display:block;
88 91 font-size: 11px;
89   -color: #D8FCE7;
  92 + color: #D8FCE7;
  93 + background: red;
90 94 }
91 95  
92 96 .timeText {
  97 + background: rebeccapurple;
93 98 font-family: PingFangSC-Medium;
94 99 font-size: 12px;
95 100 color: #FFFFFF;
96 101 display:block;
97 102 margin-top: 2px;
  103 + /* overflow: hidden;
  104 + text-overflow: ellipsis;
  105 + display: -webkit-box;
  106 + -webkit-box-orient: vertical;
  107 + -webkit-line-clamp: 1; */
98 108 }
99 109  
100 110 .hospitalName {
... ... @@ -106,6 +116,7 @@
106 116 font: medium;
107 117 text-align: center;
108 118 line-height: 30px;
  119 +
109 120 }
110 121  
111 122 /*---------foundation---------*/
... ... @@ -198,6 +209,11 @@
198 209 color: #222222;
199 210 margin-left: 15px;
200 211 margin-top: 0px;
  212 + overflow: hidden;
  213 + text-overflow: ellipsis;
  214 + display: -webkit-box;
  215 + -webkit-box-orient: vertical;
  216 + -webkit-line-clamp: 1;
201 217 }
202 218 /* 内容文字 */
203 219 .article_content_text {