From 01ad10974b58847bc45b9e9fddd77e3b654b11a5 Mon Sep 17 00:00:00 2001 From: xianghenggang Date: Mon, 11 Sep 2017 16:53:13 +0800 Subject: [PATCH] no message --- littleApp_child/pages/CheckReport/CheckReport.js | 3 +- littleApp_child/pages/CheckReport/CheckReport.wxml | 260 ++++++++-------- littleApp_child/pages/CheckReport/CheckReport.wxss | 52 ++++ .../pages/doctor_detail/doctor_detail.js | 2 +- littleApp_child/pages/home/home.wxml | 2 +- littleApp_child/pages/hospitalList/hospitalList.js | 98 +++++- .../pages/hospitalList/hospitalList.json | 1 + .../pages/hospitalList/hospitalList.wxml | 18 +- .../pages/hospitalList/hospitalList.wxss | 9 +- .../pages/hospital_detail/hospital_detail.js | 58 ++-- .../pages/hospital_detail/hospital_detail.wxml | 16 +- .../system_notifacations/system_notifacations.js | 14 +- .../system_notifacations/system_notifacations.wxml | 96 +++--- .../system_notifacations/system_notifacations.wxss | 337 ++++++++++++--------- littleApp_child/source/no_messages.png | Bin 0 -> 4756 bytes littleApp_child/utils/apiFile.js | 11 +- 16 files changed, 613 insertions(+), 364 deletions(-) create mode 100644 littleApp_child/source/no_messages.png diff --git a/littleApp_child/pages/CheckReport/CheckReport.js b/littleApp_child/pages/CheckReport/CheckReport.js index b6f4e6a..e221d17 100644 --- a/littleApp_child/pages/CheckReport/CheckReport.js +++ b/littleApp_child/pages/CheckReport/CheckReport.js @@ -33,7 +33,8 @@ Page({ // 获取到的所以patent数据 allPatient:[], // 当前的pid - currentPID:'' + currentPID:'', + isVisitor:true }, onLoad: function (option) { this.setData({ diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxml b/littleApp_child/pages/CheckReport/CheckReport.wxml index 6915305..f64d430 100644 --- a/littleApp_child/pages/CheckReport/CheckReport.wxml +++ b/littleApp_child/pages/CheckReport/CheckReport.wxml @@ -2,126 +2,146 @@ - - - - - - - {{monthText}} - {{yearText}} - - - - - - - - - - - - 出生日期 - {{userData.birth}} - - - 检查月龄 - {{todayInfo.monthage ? todayInfo.monthage : '0'}} - - - - 健康状况 - {{wzInfo.highRisk == 1 ? '高危' : '良好'}} - - - + + + + + + + {{monthText}} + {{yearText}} - - {{todayInfo.checkhospital ? todayInfo.checkhospital : '-'}} - 检查项目 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + 出生日期 + {{userData.birth}} + + + 检查月龄 + {{todayInfo.monthage ? todayInfo.monthage : '0'}} + + + + 健康状况 + {{wzInfo.highRisk == 1 ? '高危' : '良好'}} + + + + + + {{todayInfo.checkhospital ? todayInfo.checkhospital : '-'}} + 检查项目 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 检查结果 + + + + + + + + + + + + + 高危因素： + 高危 + 高危 + 高危高危高危 + 高危 + 高危 + 高危 + 高危 + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 暂未减档，查询不到相关信息 - 检查结果 - - - - - - - - - - - - - 高危因素： - 高危 - 高危 - 高危高危高危 - 高危 - 高危 - 高危 - 高危 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 温馨提示 + 1.医院若已登记宝宝档案信息，一旦院内人员录入档案信息后，在小程序上登录验证的建档人姓名及手机号一致，即可查看相关信息，请持续关注； + + 2.若没在医院内完成登记相关信息，可查看小程序中“妇幼医院”，并前往医院完成建档后即可获得更多的服务； + + 3.已经完成儿童档案的，请重新登录（建档人姓名、手机号）通过短信验证后即可获得相应服务。 - + + + + @@ -130,24 +150,24 @@ - - + + 预约信息 - + - + 知道了 - + diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxss b/littleApp_child/pages/CheckReport/CheckReport.wxss index 95a7091..daa9248 100644 --- a/littleApp_child/pages/CheckReport/CheckReport.wxss +++ b/littleApp_child/pages/CheckReport/CheckReport.wxss @@ -321,5 +321,57 @@ page { margin-top: 2px; } +.visitorView { + margin-top: 40px; + background: #fff; +} + +.top_divider10 { + background: #eee; + height: 15px; +} + +.visitor_image_view { + text-align: center; + margin-top: 10px; +} + +.no_message_icon { + width: 200px; + height: 112px; +} + +.no_message_icon_text { + font-size: 14px; + color: #666; + /* margin-top: 1px; */ +} + +.divider1 { + background: #eee; + margin-left: 10px; + margin-right: 10px; + margin-top: 20px; + height: 1px; +} + +.notice_view { + margin-left: 10px; + margin-right: 10px; + margin-top: 20px; + padding-bottom: 20px; +} + +.notice { + font-size: 14px; + color: #222; +} + +.notice_text { + font-size: 13px; + margin-top: 10px; + color: #666; +} + diff --git a/littleApp_child/pages/doctor_detail/doctor_detail.js b/littleApp_child/pages/doctor_detail/doctor_detail.js index 109ec44..ab64f5d 100644 --- a/littleApp_child/pages/doctor_detail/doctor_detail.js +++ b/littleApp_child/pages/doctor_detail/doctor_detail.js @@ -25,7 +25,7 @@ Page({ var self = this networkUtil.showLoading() // var param = { page: page, limit: 15, type: 2, categoryId: self.data.id } - networkUtil._get(api.articles + '/' + id, {}, function (res) { + networkUtil._get(api.doctor + '/' + id, {}, function (res) { console.log('数据-----', res) }, function (res) { diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml index 7594648..6f958ee 100644 --- a/littleApp_child/pages/home/home.wxml +++ b/littleApp_child/pages/home/home.wxml @@ -50,7 +50,7 @@ 消息通知 - + 设置 diff --git a/littleApp_child/pages/hospitalList/hospitalList.js b/littleApp_child/pages/hospitalList/hospitalList.js index 8bac63c..104ce2a 100644 --- a/littleApp_child/pages/hospitalList/hospitalList.js +++ b/littleApp_child/pages/hospitalList/hospitalList.js @@ -5,45 +5,111 @@ var networkUtil = require('../../utils/network_util.js') var api = require('../../utils/apiFile.js') +// 地理位置信息 +var latitude = 0 +var longitude = 0 +// 页码 +var page = 1 +// 是否有更多 +var hasMore = true Page({ data: { - hospitalList: [{ - "areaName": "成都", list: [{ "id": "1", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "犯得上发射点发司法所让我去误认为亲热万人更大", "distance": "100km" }, { - "id": "2", - "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km" - }, { "id": "3", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km" },] - }, - { - "areaName": "成都2", list: [{ "id": "31", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name4", "distance": "100km" }, { - "id": "12", - "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name51", "distance": "100km" - }, { "id": "11", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name17", "distance": "100km" },] - }], + hospitalList: [ + // { + // "areaName": "成都", list: [{ "id": "138", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "犯得上发射点发司法所让我去误认为亲热万人更大", "distance": "100km" }, { + // "id": "2", + // "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km" + // }, { "id": "3", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km" },] + // }, + // { + // "areaName": "成都2", list: [{ "id": "31", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name4", "distance": "100km" }, { + // "id": "12", + // "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name51", "distance": "100km" + // }, { "id": "11", "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name17", "distance": "100km" },] + // } + ], + hasMore:true, }, /*---------生命周期--------*/ onLoad: function (options) { networkUtil.showLoading() + this.getUserLocation() this.requestData() }, + onUnload:function(e){ + page = 0 + }, /*---------自定义函数--------*/ + // 获取地理位置 + getUserLocation() { + var self = this + wx.getLocation({ + type: 'wgs84', // 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标 + success: function (res) { + // success + console.log(res) + latitude = res.latitude + longitude = res.longitude + self.requestData() + }, + fail: function (res) { + // fail + console.log(res) + self.requestData() + }, + complete: function (res) { + // complete + console.log(res) + } + }) + latitude = 115.52 + longitude = 38.23 + }, requestData() { var self = this - networkUtil._get(api.doctorList, {}, function (res) { + var param = { page: page, limit: 15, lat: latitude, lng: longitude} + networkUtil._get(api.hospitals, param, function (res) { console.log(res) + var arr = [] + if (page > 0) {// 加载更多模式 + arr = self.data.hospitalList + } + if (res.data.list.length < 15) { + hasMore = false + }else{ + hasMore=true + } + arr = arr.concat(res.data.list) self.setData({ - doctorList: res.data.data, + hospitalList: arr, + hasMore: hasMore }) - }, function (res) { }) }, + // 下拉刷新回调接口 + onPullDownRefresh: function () { + page = 0; + hasMore = true + networkUtil.showLoading() + // 网络请求，重新请求一遍数据 + this.requestData(); + }, + // 加载更多 + loadMore: function (e) { + if (!hasMore) { + return + } + page++ + networkUtil.showLoading() + this.requestData() + }, toHospitalDetail: function (e) { var id = e.currentTarget.dataset.id console.log(e) wx.navigateTo({ - // url: '../doctor/doctor?doctorInfo='+JSON.stringify(this.data.doctorList[e.currentTarget.dataset.myid]), 这个url长度有限，参数太多会被剪切 url: "../hospital_detail/hospital_detail?id="+id }) } diff --git a/littleApp_child/pages/hospitalList/hospitalList.json b/littleApp_child/pages/hospitalList/hospitalList.json index 4ec025e..843b631 100644 --- a/littleApp_child/pages/hospitalList/hospitalList.json +++ b/littleApp_child/pages/hospitalList/hospitalList.json @@ -2,5 +2,6 @@ "navigationBarBackgroundColor": "#48C17B", "navigationBarTitleText": "其他医院", "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, "backgroundColor": "#d8dbd4" } \ No newline at end of file diff --git a/littleApp_child/pages/hospitalList/hospitalList.wxml b/littleApp_child/pages/hospitalList/hospitalList.wxml index be0bd5a..d371d6e 100644 --- a/littleApp_child/pages/hospitalList/hospitalList.wxml +++ b/littleApp_child/pages/hospitalList/hospitalList.wxml @@ -1,16 +1,16 @@ - + - - {{item.areaName}} - + + {{item.name.regionName}} + - - {{sectionItem.name}} - {{sectionItem.distance}} + + {{sectionItem.title}} + {{sectionItem.distance}}km - + 加载更多 - \ No newline at end of file + \ No newline at end of file diff --git a/littleApp_child/pages/hospitalList/hospitalList.wxss b/littleApp_child/pages/hospitalList/hospitalList.wxss index 4d0b583..66e02ad 100644 --- a/littleApp_child/pages/hospitalList/hospitalList.wxss +++ b/littleApp_child/pages/hospitalList/hospitalList.wxss @@ -19,7 +19,9 @@ height: 36px; width: 36px; margin-left: 10px; - margin-top: 12px; + margin-top: 8px; + border-radius: 50%; + border: 3px solid white; } .hospital_name { @@ -47,3 +49,8 @@ height: 1px; background: #e6e6e6; } +.loadmore{ + text-align: center; + padding-top: 10px; + padding-bottom: 5px; +} diff --git a/littleApp_child/pages/hospital_detail/hospital_detail.js b/littleApp_child/pages/hospital_detail/hospital_detail.js index 8c266b4..5c60950 100644 --- a/littleApp_child/pages/hospital_detail/hospital_detail.js +++ b/littleApp_child/pages/hospital_detail/hospital_detail.js @@ -10,20 +10,22 @@ var util = require('../../utils/util.js') Page({ data: { showAllIntro: false, - departmentList: [{ - "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, - { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍" }] - }, - { - "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, - { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }] - }, - { - "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, - { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }] - }, + departmentList: [ + // { + // "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, + // { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍" }] + // }, + // { + // "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, + // { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }] + // }, + // { + // "departName": "name1", "list": [{ "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }, + // { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "dsadawdas" }] + // }, ], - hospitalId: '' + hospitalId: '', + hospital: {}, }, onLoad: function (options) { var id = options.id @@ -31,25 +33,35 @@ Page({ hospitalId: id }) console.log(this.data.hospitalId) - // this.requestData(options.id) + + networkUtil.showLoading() + this.requestHostitalData(options.id) + this.requesDoctorData(options.id) }, onUnload: function () { }, /*---------自定义函数--------*/ - requestData(id) { + requestHostitalData(id) { var self = this - networkUtil.showLoading() // var param = { page: page, limit: 15, type: 2, categoryId: self.data.id } - networkUtil._get(api.articles + '/' + id, {}, function (res) { + networkUtil._get(api.hospital + '/' + id, {}, function (res) { console.log('数据-----', res) - res.data.content = util.convertHtmlToText(res.data.content) - var date = new Date(res.data.created * 1000) - res.data.time = date.getFullYear() + '年' + (date.getMonth() + 1) + '月' + date.getDate() + '日 ' + date.getHours() + ':' + date.getMinutes() self.setData({ - knowledge: res.data, - swiperHeight: wx.getSystemInfoSync().windowWidth * 0.55 + hospital: res.data + }) + }, function (res) { + + }) + }, + requesDoctorData(id) { + var self = this + // var param = { page: page, limit: 15, } + networkUtil._get(api.departments + '/' + id, {}, function (res) { + console.log('requesDoctorData-----', res) + self.setData({ + departmentList: res.data }) }, function (res) { @@ -67,7 +79,7 @@ Page({ url: '../hospitalList/hospitalList', }) }, - toDocotrDetail:function(e){ + toDocotrDetail: function (e) { var id = e.currentTarget.dataset.id console.log(e) wx.navigateTo({ diff --git a/littleApp_child/pages/hospital_detail/hospital_detail.wxml b/littleApp_child/pages/hospital_detail/hospital_detail.wxml index 77d71dd..03565ed 100644 --- a/littleApp_child/pages/hospital_detail/hospital_detail.wxml +++ b/littleApp_child/pages/hospital_detail/hospital_detail.wxml @@ -1,14 +1,14 @@ - + - 医院名称 + {{hospital.title}} 其他医院 - 介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介介绍 - 介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍 + {{hospital.introduction}} + {{hospital.introduction}} @@ -21,15 +21,15 @@ - {{item.departName}} + {{item.areaName}} - + - {{sectionItem.duty}} {{sectionItem.name}} - {{sectionItem.good}} + {{sectionItem.title}} {{sectionItem.username}} + {{sectionItem.goodAt}} diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.js b/littleApp_child/pages/system_notifacations/system_notifacations.js index 7f27835..8e6ad74 100644 --- a/littleApp_child/pages/system_notifacations/system_notifacations.js +++ b/littleApp_child/pages/system_notifacations/system_notifacations.js @@ -27,7 +27,8 @@ Page({ category: '', current_index: 0, hasMore: '', - noData: true + noData: true, + isVisitor:true, }, @@ -83,9 +84,10 @@ Page({ }) page = 1; hasMore = true - networkUtil.showLoading() - this.requestData() - + if (!self.data.isVisitor) { + networkUtil.showLoading() + self.requestData(); + } }, getTitles() { @@ -103,7 +105,9 @@ Page({ category: category }) - self.requestData(); + if (!self.data.isVisitor) { + self.requestData(); + } }, function (res) { isRefresh = false }) diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.wxml b/littleApp_child/pages/system_notifacations/system_notifacations.wxml index 0922cfb..e53e90f 100644 --- a/littleApp_child/pages/system_notifacations/system_notifacations.wxml +++ b/littleApp_child/pages/system_notifacations/system_notifacations.wxml @@ -1,24 +1,24 @@ - - - - - - - + + + + + - + - - - - - - 加载更多... + + + + - - + + + + 加载更多... + + + - + 暂时没有消息通知哦！ + + + + + + 暂未减档，查询不到相关信息 + + + + 温馨提示 + 1.医院若已登记宝宝档案信息，一旦院内人员录入档案信息后，在小程序上登录验证的建档人姓名及手机号一致，即可查看相关信息，请持续关注； + + 2.若没在医院内完成登记相关信息，可查看小程序中“妇幼医院”，并前往医院完成建档后即可获得更多的服务； + + 3.已经完成儿童档案的，请重新登录（建档人姓名、手机号）通过短信验证后即可获得相应服务。 + + + \ No newline at end of file diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.wxss b/littleApp_child/pages/system_notifacations/system_notifacations.wxss index e441531..ff56b4f 100644 --- a/littleApp_child/pages/system_notifacations/system_notifacations.wxss +++ b/littleApp_child/pages/system_notifacations/system_notifacations.wxss @@ -1,197 +1,256 @@ .main { - background: #fff; - width: 100%; - /* margin-top: 40px; */ + background: #fff; + width: 100%; + /* margin-top: 40px; */ } + .title_top_view { - width: 100%; - display: flex; - background: white; - position: fixed; - height: 40px; - padding-left: 10px; - top: 0px; - z-index: 1; + width: 100%; + display: flex; + background: white; + position: fixed; + height: 40px; + padding-left: 10px; + top: 0px; + z-index: 1; } .title_scroll { - width: 90%; - margin-left: 10px; - /*可以滚动 */ - white-space: nowrap; - display: inline-block; + width: 90%; + margin-left: 10px; + /*可以滚动 */ + white-space: nowrap; + display: inline-block; } /*隐藏Scrollview滚动条 */ ::-webkit-scrollbar { - width: 0; - height: 0; - color: transparent; + width: 0; + height: 0; + color: transparent; } .scroll_title_label { - height: 40px; - margin-right: 30px; - text-align: left; - line-height: 40px; - border: 1px; - font-size: 13px; - color: #494949; - border-bottom: 2px; - border-color: #ff5e5e; + height: 40px; + margin-right: 30px; + text-align: left; + line-height: 40px; + border: 1px; + font-size: 13px; + color: #494949; + border-bottom: 2px; + border-color: #ff5e5e; } .title_text { - line-height: 40px; - height: 40px; - font-size: 13px; - padding-top: 10px; - padding-bottom: 7px; + line-height: 40px; + height: 40px; + font-size: 13px; + padding-top: 10px; + padding-bottom: 7px; } + .list_scroll { - height: calc(100vh-40px); - margin-top: 40px; - background: rgb(244, 244, 244); - /* background: rebeccapurple */ + height: calc(100vh-40px); + margin-top: 40px; + background: rgb(244, 244, 244); + /* background: rebeccapurple */ } + /*高危 */ .high_risk_main { - margin-left: 10px; - margin-right: 10px; - margin-top: 10px; - background: #fff; - min-height: 138px; - border-radius: 4px; + margin-left: 10px; + margin-right: 10px; + margin-top: 10px; + background: #fff; + min-height: 138px; + border-radius: 4px; } .high_risk_title { - height: 38px; - width: 100%; - background: #f67272; - line-height: 38px; - text-align: center; - font-size: 14px; - color: #fff; - letter-spacing: 0; - border-radius: 4px 4px 0 0; + height: 38px; + width: 100%; + background: #f67272; + line-height: 38px; + text-align: center; + font-size: 14px; + color: #fff; + letter-spacing: 0; + border-radius: 4px 4px 0 0; } .high_rish_content1 { - padding-left: 10px; - padding-right: 10px; - display: flex; - height:28px; -min-height:28px; - + padding-left: 10px; + padding-right: 10px; + display: flex; + height: 28px; + min-height: 28px; } .high_rish_content_before { - width: 25%; - font-size: 12px; - color: #222; - text-align: left; - display: flex; - letter-spacing: 0; + width: 25%; + font-size: 12px; + color: #222; + text-align: left; + display: flex; + letter-spacing: 0; } .high_rish_content_after { - width: 75%; - font-size: 12px; - color: #888; - letter-spacing: 0; - text-align: left; - display: flex; - word-break: break-all; + width: 75%; + font-size: 12px; + color: #888; + letter-spacing: 0; + text-align: left; + display: flex; + word-break: break-all; } .line { - width: 100%; - border: 0.5px solid #ececec; - margin-top: 5px; + width: 100%; + border: 0.5px solid #ececec; + margin-top: 5px; } .high_rish_date { - width: 25%; - font-size: 12px; - color: #7b7883; - letter-spacing: 0; - margin-top: 5px; - margin-bottom: 5px; + width: 25%; + font-size: 12px; + color: #7b7883; + letter-spacing: 0; + margin-top: 5px; + margin-bottom: 5px; } .high_rish_hospital_name { - width: 75%; - font-size: 12px; - color: #7b7883; - letter-spacing: 0; - margin-top: 5px; - text-align: right; - margin-bottom: 5px; + width: 75%; + font-size: 12px; + color: #7b7883; + letter-spacing: 0; + margin-top: 5px; + text-align: right; + margin-bottom: 5px; } + .other_three_main { - margin-left: 10px; - margin-right: 10px; - margin-top: 10px; - background: #fff; - - min-height: 128px; + margin-left: 10px; + margin-right: 10px; + margin-top: 10px; + background: #fff; + min-height: 128px; } + .red_line { - width: 100%; - background: #f67272; - height: 1px; + width: 100%; + background: #f67272; + height: 1px; } + .green_line { - width: 100%; - background: #48C17B; - height: 1px; -} -.other_three_title{ - height: 40px; - width: 100%; - line-height: 40px; - text-align: center; - font-size: 14px; - font-weight: bold; - color: #333; - letter-spacing: 0; + width: 100%; + background: #48c17b; + height: 1px; +} + +.other_three_title { + height: 40px; + width: 100%; + line-height: 40px; + text-align: center; + font-size: 14px; + font-weight: bold; + color: #333; + letter-spacing: 0; } + .other_three_content { - - font-size: 12px; - color: #888; - letter-spacing: 0; - text-align: left; - margin-left: 10px; - margin-right: 10px; - min-height: 54px; - display: flex; - word-break: break-all; + font-size: 12px; + color: #888; + letter-spacing: 0; + text-align: left; + margin-left: 10px; + margin-right: 10px; + min-height: 54px; + display: flex; + word-break: break-all; } + .other_three_date { - width: 25%; - font-size: 12px; - color: #999999; - letter-spacing: 0; - margin-top: 5px; - margin-bottom: 5px; -} -.other_three_hospital_name{ - width: 75%; - font-size: 12px; - color: #999999; - letter-spacing: 0; - margin-top: 5px; - text-align: right; - margin-bottom: 5px; + width: 25%; + font-size: 12px; + color: #999; + letter-spacing: 0; + margin-top: 5px; + margin-bottom: 5px; +} + +.other_three_hospital_name { + width: 75%; + font-size: 12px; + color: #999; + letter-spacing: 0; + margin-top: 5px; + text-align: right; + margin-bottom: 5px; } .icon_refresh { - position: fixed; - width: 50px; - height: 50px; - right: 20px; - bottom: 30px; + position: fixed; + width: 50px; + height: 50px; + right: 20px; + bottom: 30px; +} + +.visitorView { + margin-top: 40px; + background: #fff; +} + +.top_divider10 { + background: #eee; + height: 10px; +} + +.visitor_image_view { + text-align: center; + margin-top: 10px; +} + +.no_message_icon { + width: 200px; + height: 112px; +} + +.no_message_icon_text { + font-size: 14px; + color: #666; + /* margin-top: 1px; */ +} + +.divider1 { + background: #eee; + margin-left: 10px; + margin-right: 10px; + margin-top: 20px; + height: 1px; +} + +.notice_view { + margin-left: 10px; + margin-right: 10px; + margin-top: 20px; + padding-bottom: 20px; +} + +.notice { + font-size: 14px; + color: #222; +} + +.notice_text { + font-size: 13px; + margin-top: 10px; + color: #666; } diff --git a/littleApp_child/source/no_messages.png b/littleApp_child/source/no_messages.png new file mode 100644 index 0000000000000000000000000000000000000000..da1515733cdad9145e0cbfd562b0b33f25db82da GIT binary patch literal 4756 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 paX-7izxROu*iQ