diff --git a/littleApp_child/pages/SearchPage/SearchPage.js b/littleApp_child/pages/SearchPage/SearchPage.js index fb3b0d4..6835025 100644 --- a/littleApp_child/pages/SearchPage/SearchPage.js +++ b/littleApp_child/pages/SearchPage/SearchPage.js @@ -55,6 +55,7 @@ Page({ var self = this isRefresh = true var param = { k: text, limit: 30, page:1} + networkUtil.showLoading() networkUtil._get(api.search, param, function (res) { console.log('数据-----', res) isRefresh = false diff --git a/littleApp_child/pages/SearchPage/SearchPage.json b/littleApp_child/pages/SearchPage/SearchPage.json index e5b6482..f7ca04f 100644 --- a/littleApp_child/pages/SearchPage/SearchPage.json +++ b/littleApp_child/pages/SearchPage/SearchPage.json @@ -1,6 +1,6 @@ { "navigationBarBackgroundColor": "#48C17B", - "navigationBarTitleText": "妈咪Baby", + "navigationBarTitleText": "搜索文章", "navigationBarTextStyle": "white", "backgroundColor": "#d8dbd4" } \ No newline at end of file diff --git a/littleApp_child/pages/SearchPage/SearchPage.wxml b/littleApp_child/pages/SearchPage/SearchPage.wxml index 8a02855..5554b51 100644 --- a/littleApp_child/pages/SearchPage/SearchPage.wxml +++ b/littleApp_child/pages/SearchPage/SearchPage.wxml @@ -23,7 +23,7 @@ - + {{item.title}} diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml index 7548080..d847eec 100644 --- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml +++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml @@ -20,7 +20,7 @@ --> - + diff --git a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js index fe3480e..6578785 100644 --- a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js +++ b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js @@ -28,11 +28,11 @@ Page({ // articleId = options.id // categoryIndex = options.categoryIndex // articleIdIndex = options.artIndex - wx.setNavigationBarTitle({ - title: options.category, - success: function (res) { - } - }) + // wx.setNavigationBarTitle({ + // title: options.category, + // success: function (res) { + // } + // }) this.requestData(options.id) }, onUnload: function () { diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js index 43da9e6..3e947b4 100644 --- a/littleApp_child/pages/home/home.js +++ b/littleApp_child/pages/home/home.js @@ -87,9 +87,10 @@ Page({ success: function (res) { if (res.tapIndex == 0) { wx.setStorageSync('userToken', '') + wx.setStorageSync('userId', '') getApp().globalData.token = '' - that.loginPage() - WebIM.conn.close(); + getApp().globalData.userId = '' + that.toLogin() } }, fail: function (res) { diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml index 0512b7d..e98e2d5 100644 --- a/littleApp_child/pages/home/home.wxml +++ b/littleApp_child/pages/home/home.wxml @@ -20,7 +20,7 @@ 月龄 - {{userData.monthage ? userData.monthage : '-'}} + {{userData.monthage ? userData.monthage : '0'}} @@ -34,14 +34,10 @@ {{hospitalName}} - + 育儿知识 @@ -50,20 +46,24 @@ 消息通知 + + + 敬请期待 + - + {{sectionItem.title}} - + {{item.title}} diff --git a/littleApp_child/pages/home/home.wxss b/littleApp_child/pages/home/home.wxss index 584ca3c..4606d4c 100644 --- a/littleApp_child/pages/home/home.wxss +++ b/littleApp_child/pages/home/home.wxss @@ -56,10 +56,21 @@ } /*上方信息条部分*/ + +.lineView { + width: 100%; + border-right: solid rgba(255, 255, 255, 0.7) 0.5px; + border-left: solid rgba(255, 255, 255, 0.7) 0.5px; + height: 40px; + position: absolute; + top: 10px; +} + .infoBar { width: 100%; - height: 60px; - top: 142px; + min-height: 60px; + /* top: 142px; */ + bottom: 0px; position: absolute; } @@ -71,30 +82,29 @@ box-sizing: border-box; position: relative; background-color: rgba(255, 255, 255, 0.1); -} - -.lineView { - width: 100%; - border-right: solid rgba(255, 255, 255, 0.7) 0.5px; - border-left: solid rgba(255, 255, 255, 0.7) 0.5px; - height: 40px; - position: absolute; - top: 10px; + background: green; } .titleText { margin-top: 12px; display:block; font-size: 11px; -color: #D8FCE7; + color: #D8FCE7; + background: red; } .timeText { + background: rebeccapurple; font-family: PingFangSC-Medium; font-size: 12px; color: #FFFFFF; display:block; margin-top: 2px; + /* overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; */ } .hospitalName { @@ -106,6 +116,7 @@ color: #D8FCE7; font: medium; text-align: center; line-height: 30px; + } /*---------foundation---------*/ @@ -198,6 +209,11 @@ color: #D8FCE7; color: #222222; margin-left: 15px; margin-top: 0px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; } /* 内容文字 */ .article_content_text {