From c648ca6512082c327585104498a8e96aad0c59e2 Mon Sep 17 00:00:00 2001
From: luoye <397379429@qq.com>
Date: Mon, 7 Aug 2017 18:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B5=E9=9D=A2=E5=88=A4?=
=?UTF-8?q?=E5=AE=9A=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
littleApp_child/app.js | 8 --
littleApp_child/app.json | 13 +-
littleApp_child/pages/SearchPage/SearchPage.js | 10 +-
littleApp_child/pages/SearchPage/SearchPage.wxml | 18 +++
littleApp_child/pages/SearchPage/SearchPage.wxss | 9 +-
littleApp_child/pages/articleLists/articleLists.js | 134 +--------------------
.../pages/articleLists/articleLists.wxml | 74 +++++++++---
.../pages/articleLists/articleLists.wxss | 98 ++++-----------
.../childcare_knowledge/childcare_knowledge.wxml | 2 +-
littleApp_child/pages/home/css/AboutPage.wxss | 54 +++++++++
littleApp_child/pages/home/css/login.wxss | 81 +++++++++++++
littleApp_child/pages/home/home.js | 25 ++--
littleApp_child/pages/home/home.json | 4 +-
littleApp_child/pages/home/home.wxml | 76 +++++++++++-
littleApp_child/pages/home/home.wxss | 5 +-
15 files changed, 356 insertions(+), 255 deletions(-)
create mode 100644 littleApp_child/pages/home/css/AboutPage.wxss
create mode 100644 littleApp_child/pages/home/css/login.wxss
diff --git a/littleApp_child/app.js b/littleApp_child/app.js
index 2b3b7df..0e3a30a 100644
--- a/littleApp_child/app.js
+++ b/littleApp_child/app.js
@@ -317,16 +317,8 @@ App({
},
globalData: {
userInfo: null,
- chatMsg: [],
token: '',
- bedDetail: '',//预约床位详情
openInfo: {},
- hxName: '',
- hxPassWord: '',
- ids: '',// 预约建档类型ids
- typesPicker: '',// 预约建档既往史所有数据
- allCheckedPastHistory:{},// 选择的既往史
- allCheckedPastHistoryIds: '' // 选择的既往史的id
},
})
\ No newline at end of file
diff --git a/littleApp_child/app.json b/littleApp_child/app.json
index ad79e17..2d16359 100644
--- a/littleApp_child/app.json
+++ b/littleApp_child/app.json
@@ -1,14 +1,21 @@
{
"pages": [
+
"pages/home/home",
+
+ "pages/articleLists/articleLists",
+ "pages/hospitalList/hospitalList",
+ "pages/articleDetail/articleDetail",
+
+
"pages/SearchPage/SearchPage",
"pages/login/login",
"pages/inspectionReport/inspectionReport",
- "pages/articleLists/articleLists",
+
"pages/doctorList/doctorList",
"pages/doctor/doctor",
- "pages/hospitalList/hospitalList",
- "pages/articleDetail/articleDetail",
+
+
"pages/hospitalDetail/hospitalDetail",
"pages/chatroom/chatroom",
"pages/chat/chat",
diff --git a/littleApp_child/pages/SearchPage/SearchPage.js b/littleApp_child/pages/SearchPage/SearchPage.js
index 151113b..13313be 100644
--- a/littleApp_child/pages/SearchPage/SearchPage.js
+++ b/littleApp_child/pages/SearchPage/SearchPage.js
@@ -3,11 +3,19 @@
var app = getApp()
Page({
data: {
+ list: [
+ { zar: 12, title: "title1", content: "content1content1content1content1content1content1content1content1content1content1content1ds到场定损", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
+ , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
+ , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
+ , { zar: 12, title: "title1", content: "content1", image: "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" }
+ , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175866434296.jpg" }
+ , { zar: 12, title: "title2", content: "content2", image: "http://img06.tooopen.com/images/20160818/tooopen_sy_175833047715.jpg" }
+ ],
selectHide: false,
inputValue: '',
getSearch: [],
modalHidden: true,
- searching:false
+ searching:true
},
onLoad: function () {
diff --git a/littleApp_child/pages/SearchPage/SearchPage.wxml b/littleApp_child/pages/SearchPage/SearchPage.wxml
index a0915df..bc164e9 100644
--- a/littleApp_child/pages/SearchPage/SearchPage.wxml
+++ b/littleApp_child/pages/SearchPage/SearchPage.wxml
@@ -20,4 +20,22 @@
清除历史记录
+
+
+
+
+ {{item.title}}
+ {{item.content}}
+
+
+ {{item.zar}}
+
+
+
+
+
+
+
+ 加载更多...
+
\ No newline at end of file
diff --git a/littleApp_child/pages/SearchPage/SearchPage.wxss b/littleApp_child/pages/SearchPage/SearchPage.wxss
index ba2126d..5b66603 100644
--- a/littleApp_child/pages/SearchPage/SearchPage.wxss
+++ b/littleApp_child/pages/SearchPage/SearchPage.wxss
@@ -1,4 +1,4 @@
-@import "../../utils/util_UI.wxss";
+@import "../childcare_knowledge/childcare_knowledge.wxss";
.searchBar_bg {
background: #48C17B;
@@ -6,6 +6,7 @@
height: 38px;
position: fixed;
top: 0;
+ z-index: 1;
}
.searchBar_bar {
background: white;
@@ -45,6 +46,7 @@
transform: translateY(-26px);
}
+/* 列表 */
.history_list {
background: white;
margin-top: 40px;
@@ -91,4 +93,9 @@
text-align: center;
height: 40px;
line-height: 40px;
+}
+
+/* 结果列表 */
+.search_detail {
+ margin-top: 40px;
}
\ No newline at end of file
diff --git a/littleApp_child/pages/articleLists/articleLists.js b/littleApp_child/pages/articleLists/articleLists.js
index e85d1d5..2fc7473 100644
--- a/littleApp_child/pages/articleLists/articleLists.js
+++ b/littleApp_child/pages/articleLists/articleLists.js
@@ -1,138 +1,12 @@
-//articleLists.js 文章列表
-// 网络请求工具类
-var networkUtil = require('../../utils/network_util.js')
-var api = require('../../utils/apiFile.js')
-// 事件监听
-var event = require('../../utils/event.js')
-var page
-// 是否有更多
-var hasMore
-var isRefresh
-// 高危指导页面
-var isRisk
+
Page({
data: {
list:[],
- id:0,
- category:''
- },
- onLoad: function (e) {
- this.data.id = e.id
- this.data.category = e.category
- // 数据初始化
- page = 1
- hasMore = true
- isRefresh = false
- isRisk = false
-
- wx.setNavigationBarTitle({
- title: e.category,
- success: function(res) {
- }
- })
- if(e.category == '高危精准指导'){
- isRisk = true
- this.requestRisk()
- } else {
- isRisk = false
- this.requestData()
- }
- // 监听事件
- event.on('listLikeChanged', this, function(data) {
- var artList = this.data.list
- artList[parseInt(data.articleIdIndex)].likeCount ++
- this.setData({
- list : artList
- });
- })
- },
- onUnload: function() {
- // 移除监听
- event.remove('listLikeChanged', this);
- },
- /*---------事件处理函数--------*/
- bindViewTap: function() {
- wx.navigateTo({
- url: '../home/home'
- })
},
- // 加载更多
- loadMore:function(e){
- if(!hasMore || isRefresh == true){
- return
- }
- page ++
- if(isRisk == true){
- this.requestRisk()
- } else {
- this.requestData()
- }
- },
- // 下拉刷新回调接口
- onPullDownRefresh: function() {
- page = 1;
- hasMore = true
- // 网络请求，重新请求一遍数据
- this.requestData();
- },
- myScroll:function(e){
- if(e.detail.scrollTop >= e.detail.scrollHeight-wx.getSystemInfoSync().windowHeight - 3){
- this.loadMore()
- }
- },
- /*---------自定义函数--------*/
- requestData(id){
- var self = this
- isRefresh = true
- networkUtil.showLoading()
- var param = {page:page,limit:15,type:getApp().globalData.userInfo.status,categoryId:self.data.id}
- networkUtil._get(api.articleList,param,function(res){
-
- isRefresh = false
- var arr = []
- if(page > 0) {// 加载更多模式
- arr = self.data.list
- }
- if(res.data.data.length < 15){
- hasMore = false
- }
- arr = arr.concat(res.data.data)
- var temp = self.data.category
- self.setData({
- list:arr,
- hasMore : hasMore,
- category : temp
- })
- },function(res){
- isRefresh = false
- })
- },
- requestRisk(){
- var self = this
- isRefresh = true
- networkUtil.showLoading()
- var param = {page:page,limit:15}
- networkUtil._get(api.riskGuideList,param,function(res){
- console.log(res)
- isRefresh = false
- var arr = []
- if(page > 0) {// 加载更多模式
- arr = self.data.list
- }
- if(res.data.list.length < 15){
- hasMore = false
- }
- arr = arr.concat(res.data.list)
- var temp = self.data.category
- self.setData({
- list:arr,
- hasMore : hasMore,
- category : temp
- })
- },function(res){
- isRefresh = false
- })
+ onLoad:function(){
}
+
+
})
diff --git a/littleApp_child/pages/articleLists/articleLists.wxml b/littleApp_child/pages/articleLists/articleLists.wxml
index 39a0a90..624b431 100644
--- a/littleApp_child/pages/articleLists/articleLists.wxml
+++ b/littleApp_child/pages/articleLists/articleLists.wxml
@@ -1,20 +1,54 @@
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
- {{item.likeCount ? item.likeCount : 0}}
-
-
- {{item.introduction}}
-
-
-
- 加载更多...
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 幼儿保健
+
+ 妈咪baby之“幼儿保健”，主要针对0-6周岁婴幼儿提供院内保健检查信息、诊断指导意见以及相关医疗服务提醒等业务。
+
+
+
+
+ 儿保记录
+
+ 查看婴幼儿在院内检查的各项信息，以及对应的诊断、处理、指导意见。
+
+
+
+
+ 服务提醒
+
+ 可提供高危、复查、预约、精确指导等相关及时提醒服务。
+
+
+
+
+ 育儿知识
+
+ 根据儿童生长发育情况，每周提供针对性婴幼儿日常护理、营养饮食、疾病护理等相关信息。
+
diff --git a/littleApp_child/pages/articleLists/articleLists.wxss b/littleApp_child/pages/articleLists/articleLists.wxss
index b98bb94..bb3a863 100644
--- a/littleApp_child/pages/articleLists/articleLists.wxss
+++ b/littleApp_child/pages/articleLists/articleLists.wxss
@@ -1,84 +1,38 @@
-/**articleLists.wxss 文章列表**/
-.home__list-item{
- position: relative;
- background: white;
-}
-
-/*首页列表文章 item 的文章图片*/
-.home__list__img{
- width: 80px;
- height: 100%;
- vertical-align: top;
- /*垂直居中*/
- display: flex;
- justify-content:center;
- align-items:Center;
-}
-
-.home__list-item-content{
- margin-left: 15px
-}
-
-/*首页列表文章 item 外层布局 右侧*/
-.home__list-item__right{
+.topImg {
width: 100%;
- height: 32px;
- /*background: darkcyan;*/
- position:relative;
+ height: 30%;
}
-/*首页列表文章 item 内的title 布局*/
-.home__list-item__title{
- position:absolute;
- top: 0px;
- left: 0px;
- right: 60px;
- font-size: 14px;
- color: #5e5e5e;
- font:normal;
+.icon {
+ width: 2px;
+ height: 14px;
+ margin-left: 15px;
+ transform: translateY(2px);
+ background: #48C17B;
}
-/*首页列表文章 item 内的的点赞 布局*/
-.home__list-item__like{
- position: absolute;
- top: 0px;
- right: 0px;
- /*垂直居中
- display: flex;
- justify-content:center;
- align-items:Center;*/
+/* 栏目标题文字 */
+.title {
+ height: 17px;
+ display: inline-block;
+ line-height: 17px;
+ font-size: 14px;
+ color: #000;
+ margin-left: 5px;
}
-/*首页列表文章 item 内的点赞手图标*/
-.home__list-item__title-like-icon{
- position: absolute;
- width: 10px;
- height: 10px;
- right: 0px;
- left: 0px;
- top: 7px
-}
-/*首页列表文章 item 内的的点赞 数*/
-.home__list-item__title-like-count{
- /*这个宽度设置后可以变化点赞数整个布局的位置前移后移*/
- width: 30px;
-
- margin-left:15px;
- font-size: 10px;
- margin-top: 4px;
- color: #c8c6c6;
- overflow: hidden;
- text-overflow: ellipsis;
+/* 内容文字 */
+.content {
+ font-size: 12px;
+ color: #888888;
+ margin-left: 15px;
+ margin-right: 15px;
+ margin-top: 0px;
+ display: inline-block;
}
-/*item 分割线*/
-.home__list-item__bottom{
- position: absolute;
- height: 1rpx;
- background: #d8dbd4;
- top: 0px;
- left: 15px;
- right: 15px
+.title_view {
+ margin-top: 25px;
}
\ No newline at end of file
diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
index 58f520b..ef33ffb 100644
--- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
+++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
@@ -19,7 +19,7 @@
-
+
{{item.title}}
diff --git a/littleApp_child/pages/home/css/AboutPage.wxss b/littleApp_child/pages/home/css/AboutPage.wxss
new file mode 100644
index 0000000..c7d2d62
--- /dev/null
+++ b/littleApp_child/pages/home/css/AboutPage.wxss
@@ -0,0 +1,54 @@
+/* 欢迎页面 */
+
+.we_topImg {
+ width: 100%;
+ height: 30%;
+}
+
+.we_icon {
+ width: 2px;
+ height: 14px;
+ margin-left: 15px;
+ transform: translateY(2px);
+ background: #48C17B;
+}
+
+/* 栏目标题文字 */
+.we_title {
+ height: 17px;
+ display: inline-block;
+ line-height: 17px;
+ font-size: 14px;
+ color: #000;
+ margin-left: 5px;
+}
+
+/* 内容文字 */
+.we_content {
+ font-size: 12px;
+ color: #888888;
+ margin-left: 15px;
+ margin-right: 15px;
+ margin-top: 0px;
+ display: inline-block;
+}
+
+.we_title_view {
+ margin-top: 15px;
+}
+
+.we_button {
+ font: medium;
+ font-size: 16px;
+ color: white;
+ width: 60%;
+ height: 38px;
+ line-height: 38px;
+ border-radius: 19px;
+ background-color: #48C17B;
+ margin-left: 50%;
+ margin-top: 42px;
+ margin-bottom: 20px;
+ transform: translateX(-50%);
+ text-align: center;
+}
\ No newline at end of file
diff --git a/littleApp_child/pages/home/css/login.wxss b/littleApp_child/pages/home/css/login.wxss
new file mode 100644
index 0000000..342a20d
--- /dev/null
+++ b/littleApp_child/pages/home/css/login.wxss
@@ -0,0 +1,81 @@
+
+.input-placeholder {
+ font-size: 13px;
+ color: #979797;
+}
+
+page {
+ background-color: white;
+}
+
+.record-topbar {
+ width: 100%;
+ height: 45px;
+ background: #ffd5dd;
+ font-size: 12px;
+ color: #ee7289;
+ text-align: center;
+ line-height: 45px;
+}
+
+.record-input-constainer {
+ margin: 40px 25px 0 25px;
+}
+
+.record-input_bg {
+ /*background: beige;*/
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ height: 45px;
+ border: solid 1px;
+ border-radius: 5px;
+}
+
+.record-input_title {
+ /*background-color: green;*/
+ width: 100px;
+ height: 20px;
+ text-align: center;
+ line-height: 20px;
+ font: medium;
+ font-size: 14px;
+ color: #ee7289;
+ border-right: solid #e8eae5 1px;
+}
+
+.input {
+ /*background-color: red;*/
+ font-size: 13px;
+ color: #5e5e5e;
+ margin-left: 20px;
+ width: 180px;
+ margin-top: 3px;
+}
+
+.record-submit-btn {
+ font: medium;
+ font-size: 20px;
+ color: white;
+ width: 200px;
+ height: 45px;
+ line-height: 45px;
+ border-radius: 22.5px;
+ background-color: #48C17B;
+ position: absolute;
+ bottom: 100px;
+ left: 50%;
+ transform: translateX(-50%);
+ text-align: center;
+}
+
+.record-time-text {
+ margin-right: 20px;
+ font: lighter;
+ font-size: 13px;
+ color: #48C17B;
+ width: 110px;
+ text-align: right;
+ margin-top: 2px;
+ /*background-color: rgba(1, 1, 1, 1);*/
+}
\ No newline at end of file
diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js
index 55aa44b..d016965 100644
--- a/littleApp_child/pages/home/home.js
+++ b/littleApp_child/pages/home/home.js
@@ -18,13 +18,23 @@ Page({
isLogin: '',
item_big_height:0,
item_small: 0,
+ // 首页类型 1登录 2用户首页 3欢迎页
+ pageType:0
},
/*---------生命周期--------*/
onLoad: function () {
+ var isFirst = wx.getStorageSync('isFirst')
+ if(!isFirst){
+ this.setData({
+ pageType:3
+ })
+ console.log('我是空的')
+ } else {
+ console.log('我是空的')
+ }
+
+
// var that = this
- // wx.showShareMenu(
- // 计算功能模块的尺寸
- this.calculatePageSize()
this.networkStatusChange()
// this.networkstatus()
if (app.globalData.token == null || app.globalData.token == '') {
@@ -114,7 +124,6 @@ Page({
networkStatusChange() {
var that = this
wx.onNetworkStatusChange(function (res) {
- console.log('网络状态改变', res)
if (res.isConnected == true) {
that.connectWebIM()
}
@@ -143,12 +152,10 @@ Page({
setUserInfo(data) {
},
- calculatePageSize(){
- var windowWidth = wx.getSystemInfoSync().windowWidth
- var smallWidth = ((windowWidth - 10) / 2 - 10)
+ /*---------------欢迎介绍页面---------------*/
+ toLogin(){
this.setData({
- item_big_height: 'height:' + windowWidth / 4 + 'px',
- item_small: 'width:' + smallWidth / 2 + 'px;height:' + smallWidth / 2 + 'px',
+ pageType:1
})
}
})
diff --git a/littleApp_child/pages/home/home.json b/littleApp_child/pages/home/home.json
index 2211ee4..61be68e 100644
--- a/littleApp_child/pages/home/home.json
+++ b/littleApp_child/pages/home/home.json
@@ -1,7 +1,7 @@
{
"navigationBarBackgroundColor": "#48C17B",
- "navigationBarTitleText": "妈咪Baby",
+ "navigationBarTitleText": "妈咪Baby儿保",
"navigationBarTextStyle": "white",
- "backgroundColor": "#d8dbd4",
+ "backgroundColor": "#F4F4F4",
"enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml
index 7e29d86..67481cf 100644
--- a/littleApp_child/pages/home/home.wxml
+++ b/littleApp_child/pages/home/home.wxml
@@ -1,11 +1,11 @@
-
-
---{{HOSTTypeText}}--
+
+
+
-
+
@@ -56,12 +56,12 @@
-
+
日常护理
-
+
如何提防新生儿败血症
@@ -77,4 +77,68 @@
+
+
+
+
+
+
+
+
+
+
+
+ 幼儿保健
+
+ 妈咪baby之“幼儿保健”，主要针对0-6周岁婴幼儿提供院内保健检查信息、诊断指导意见以及相关医疗服务提醒等业务。
+
+
+
+
+ 儿保记录
+
+ 查看婴幼儿在院内检查的各项信息，以及对应的诊断、处理、指导意见。
+
+
+
+
+ 服务提醒
+
+ 可提供高危、复查、预约、精确指导等相关及时提醒服务。
+
+
+
+
+ 育儿知识
+
+ 根据儿童生长发育情况，每周提供针对性婴幼儿日常护理、营养饮食、疾病护理等相关信息。
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/littleApp_child/pages/home/home.wxss b/littleApp_child/pages/home/home.wxss
index aa47f57..81d6b4c 100644
--- a/littleApp_child/pages/home/home.wxss
+++ b/littleApp_child/pages/home/home.wxss
@@ -1,5 +1,5 @@
-
-
+@import "css/AboutPage.wxss";
+@import "css/login.wxss";
/*通用*/
text {
font-size: 11px;
@@ -254,3 +254,4 @@ color: #D8FCE7;
.navigator_class {
width: 100%;
}
+
--
1.8.3.1