luoye / littleApp_child

Commit 01ad10974b58847bc45b9e9fddd77e3b654b11a5

Authored by xianghenggang over 8 years ago

Exists in master and in 2 other branches

no message

Showing 16 changed files with 613 additions and 364 deletions

littleApp_child/pages/CheckReport/CheckReport.js
littleApp_child/pages/CheckReport/CheckReport.wxml
littleApp_child/pages/CheckReport/CheckReport.wxss
littleApp_child/pages/doctor_detail/doctor_detail.js
littleApp_child/pages/home/home.wxml
littleApp_child/pages/hospitalList/hospitalList.js
littleApp_child/pages/hospitalList/hospitalList.json
littleApp_child/pages/hospitalList/hospitalList.wxml
littleApp_child/pages/hospitalList/hospitalList.wxss
littleApp_child/pages/hospital_detail/hospital_detail.js
littleApp_child/pages/hospital_detail/hospital_detail.wxml
littleApp_child/pages/system_notifacations/system_notifacations.js
littleApp_child/pages/system_notifacations/system_notifacations.wxml
littleApp_child/pages/system_notifacations/system_notifacations.wxss
littleApp_child/source/no_messages.png
littleApp_child/utils/apiFile.js

...	...	@@ -33,7 +33,8 @@
33	33	// 获取到的所以patent数据
34	34	allPatient:[],
35	35	// 当前的pid
36		- currentPID:''
	36	+ currentPID:'',
	37	+ isVisitor:true
37	38	},
38	39	onLoad: function (option) {
39	40	this.setData({

...	...	@@ -2,126 +2,146 @@
2	2
3	3
4	4	<view class="" wx:if="{{!noData}}">
5		- <!-- <image class="TopBgImage" src=""></image> -->
6		- <!--顶部红色有头像等信息的栏目-->
7		- <view class="TopBar">
8		- <!--头像-->
9		- <view class="circle_bg">
10		- <image src="{{userData.avatar.medium ? userData.avatar.medium : ''}}" background-size="cover"></image>
11		- <text>{{monthText}}</text>
12		- <view class="circle_year">{{yearText}}</view>
13		- </view>
14		- <!--选择器-->
15		- <picker range="{{dateList}}" bindchange="clickDate" value='{{dateIndex}}'>
16		- <image class="circle_click" src="../../source/more_date.png"></image>
17		- </picker>
18		- <image class="icon_left" wx:if="{{isShowLeft}}" bindtap="toBefore" src="../../source/left.png"></image>
19		- <image class="icon_right" wx:if="{{isShowRight}}" bindtap="toAfter" src="../../source/right.png"></image>
20		- <image class="subscribe_bg" wx:if="{{subscribe}}" bindtap="lookSubscribe" src="../../source/yuyue.png" mode="aspectFill"></image>
21		- <!--下方黑色横条-->
22		- <view class="infoBar">
23		- <view class="infoView">
24		- <text class="titleText">出生日期</text>
25		- <text class="timeText">{{userData.birth}}</text>
26		- </view>
27		- <view class="infoView">
28		- <text class="titleText">检查月龄</text>
29		- <text class="timeText">{{todayInfo.monthage ? todayInfo.monthage : '0'}}</text>
30		- <view class="lineView"></view>
31		- </view>
32		- <view class="infoView">
33		- <text class="titleText">健康状况</text>
34		- <text class="timeText">{{wzInfo.highRisk == 1 ? '高危' : '良好'}}</text>
35		- </view>
36		- </view>
37		- <!--下方黑色横条-->
	5	+ <!-- <image class="TopBgImage" src=""></image> -->
	6	+ <!--顶部红色有头像等信息的栏目-->
	7	+ <view class="TopBar">
	8	+ <!--头像-->
	9	+ <view class="circle_bg">
	10	+ <image src="{{userData.avatar.medium ? userData.avatar.medium : ''}}" background-size="cover"></image>
	11	+ <text>{{monthText}}</text>
	12	+ <view class="circle_year">{{yearText}}</view>
38	13	</view>
39		- <!--医院名称横条-->
40		- <view class="hospitalName">{{todayInfo.checkhospital ? todayInfo.checkhospital : '-'}}</view>
41		- <view class="title_banner" style="margin-top:-12px;">检查项目</view>
42		- <view class="report_list_bg">
43		- <scroll-view class="report_list_scroll" scroll-x="true">
44		- <view class="report_list_item_bg">
45		- <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=0{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
46		- <image src="../../source/wenzhenjiancha.png"></image>
47		- <!-- <view class="greenColor report_list_item_dot"></view> -->
48		- <label>问诊检查</label>
49		- </navigator>
	14	+ <!--选择器-->
	15	+ <picker range="{{dateList}}" bindchange="clickDate" value='{{dateIndex}}'>
	16	+ <image class="circle_click" src="../../source/more_date.png"></image>
	17	+ </picker>
	18	+ <image class="icon_left" wx:if="{{isShowLeft}}" bindtap="toBefore" src="../../source/left.png"></image>
	19	+ <image class="icon_right" wx:if="{{isShowRight}}" bindtap="toAfter" src="../../source/right.png"></image>
	20	+ <image class="subscribe_bg" wx:if="{{subscribe}}" bindtap="lookSubscribe" src="../../source/yuyue.png" mode="aspectFill"></image>
	21	+ <!--下方黑色横条-->
	22	+ <view class="infoBar">
	23	+ <view class="infoView">
	24	+ <text class="titleText">出生日期</text>
	25	+ <text class="timeText">{{userData.birth}}</text>
	26	+ </view>
	27	+ <view class="infoView">
	28	+ <text class="titleText">检查月龄</text>
	29	+ <text class="timeText">{{todayInfo.monthage ? todayInfo.monthage : '0'}}</text>
	30	+ <view class="lineView"></view>
	31	+ </view>
	32	+ <view class="infoView">
	33	+ <text class="titleText">健康状况</text>
	34	+ <text class="timeText">{{wzInfo.highRisk == 1 ? '高危' : '良好'}}</text>
	35	+ </view>
	36	+ </view>
	37	+ <!--下方黑色横条-->
	38	+ </view>
	39	+ <!--医院名称横条-->
	40	+ <view class="hospitalName">{{todayInfo.checkhospital ? todayInfo.checkhospital : '-'}}</view>
	41	+ <view class="title_banner" style="margin-top:-12px;">检查项目</view>
	42	+ <view class="report_list_bg">
	43	+ <scroll-view class="report_list_scroll" scroll-x="true">
	44	+ <view class="report_list_item_bg">
	45	+ <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=0{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
	46	+ <image src="../../source/wenzhenjiancha.png"></image>
	47	+ <!-- <view class="greenColor report_list_item_dot"></view> -->
	48	+ <label>问诊检查</label>
	49	+ </navigator>
	50	+ </view>
	51	+ <view class="report_list_item_bg">
	52	+ <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=1{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
	53	+ <image src="../../source/erkejiancha.png"></image>
	54	+ <!-- <view class="greenColor report_list_item_dot"></view> -->
	55	+ <label>儿科检查</label>
	56	+ </navigator>
	57	+ </view>
	58	+ <view class="report_list_item_bg">
	59	+ <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=2{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
	60	+ <image src="../../source/yibanjiancha.png"></image>
	61	+ <!-- <view class="greenColor report_list_item_dot"></view> -->
	62	+ <label>一般检查</label>
	63	+ </navigator>
	64	+ </view>
	65	+ <view class="report_list_item_bg">
	66	+ <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=3{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
	67	+ <image src="../../source/fuzhujiancha.png"></image>
	68	+ <!-- <view class="greenColor report_list_item_dot"></view> -->
	69	+ <label>辅助检查</label>
	70	+ </navigator>
	71	+ </view>
	72	+ </scroll-view>
	73	+ </view>
	74	+ <view class="title_banner">检查结果</view>
	75	+ <view class="check_result_main">
	76	+ <view class="check_result_doctoe_line">
	77	+ <view class="check_result_doctoe_line1">
	78	+ <label class="docotr_name">{{todayInfo.doctorname ? todayInfo.doctorname : '-'}}</label>
	79	+ </view>
	80	+ </view>
	81	+ <view class="check_diagnosis" style="{{isShowOne==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
	82	+ <view style="display:flex;width:100%" bindtap="isShowMore" data-index="1">
	83	+ <label class="check_diagnosis_name">检查诊断</label>
	84	+ <image class="icon_more" src="{{isShowOne==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
	85	+ </view>
	86	+ <view class="check_diagnosis_high_risk">
	87	+ <view style='display:inline-block'>高危因素：</view>
	88	+ <view class="high_risk_bg">高危</view>
	89	+ <view class="high_risk_bg">高危</view>
	90	+ <view class="high_risk_bg">高危高危高危</view>
	91	+ <view class="high_risk_bg">高危</view>
	92	+ <view class="high_risk_bg">高危</view>
	93	+ <view class="high_risk_bg">高危</view>
	94	+ <view class="high_risk_bg">高危</view>
	95	+ </view>
	96	+ <view class="check_diagnosis_bg">
	97	+ <label wx:if="{{!isShowOne}}" class="check_diagnosis_content_1_line">诊断：{{wzInfo.diagnose[0]}}</label>
	98	+ <view wx:if="{{isShowOne}}" style="display:flex;width:100%">
	99	+ <label class="check_diagnosis_content_lines">诊断：{{wzInfo.diagnose}}</label>
50	100	</view>
51		- <view class="report_list_item_bg">
52		- <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=1{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
53		- <image src="../../source/erkejiancha.png"></image>
54		- <!-- <view class="greenColor report_list_item_dot"></view> -->
55		- <label>儿科检查</label>
56		- </navigator>
57		- </view>
58		- <view class="report_list_item_bg">
59		- <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=2{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
60		- <image src="../../source/yibanjiancha.png"></image>
61		- <!-- <view class="greenColor report_list_item_dot"></view> -->
62		- <label>一般检查</label>
63		- </navigator>
64		- </view>
65		- <view class="report_list_item_bg">
66		- <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=3{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
67		- <image src="../../source/fuzhujiancha.png"></image>
68		- <!-- <view class="greenColor report_list_item_dot"></view> -->
69		- <label>辅助检查</label>
70		- </navigator>
71		- </view>
72		- </scroll-view>
	101	+ </view>
73	102	</view>
74		- <view class="title_banner">检查结果</view>
75		- <view class="check_result_main">
76		- <view class="check_result_doctoe_line">
77		- <view class="check_result_doctoe_line1">
78		- <label class="docotr_name">{{todayInfo.doctorname ? todayInfo.doctorname : '-'}}</label>
79		- </view>
	103	+ <view class="check_diagnosis" style="{{isShowTwo==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
	104	+ <view style="display:flex;width:100%" bindtap="isShowMore" data-index="2">
	105	+ <label class="check_diagnosis_name">处理意见</label>
	106	+ <image class="icon_more" src="{{isShowTwo==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
80	107	</view>
81		- <view class="check_diagnosis" style="{{isShowOne==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
82		- <view style="display:flex;width:100%" bindtap="isShowMore" data-index="1">
83		- <label class="check_diagnosis_name">检查诊断</label>
84		- <image class="icon_more" src="{{isShowOne==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
85		- </view>
86		- <view class="check_diagnosis_high_risk">
87		- <view style='display:inline-block'>高危因素：</view>
88		- <view class="high_risk_bg">高危</view>
89		- <view class="high_risk_bg">高危</view>
90		- <view class="high_risk_bg">高危高危高危</view>
91		- <view class="high_risk_bg">高危</view>
92		- <view class="high_risk_bg">高危</view>
93		- <view class="high_risk_bg">高危</view>
94		- <view class="high_risk_bg">高危</view>
95		- </view>
96		- <view class="check_diagnosis_bg">
97		- <label wx:if="{{!isShowOne}}" class="check_diagnosis_content_1_line">诊断：{{wzInfo.diagnose[0]}}</label>
98		- <view wx:if="{{isShowOne}}" style="display:flex;width:100%">
99		- <label class="check_diagnosis_content_lines">诊断：{{wzInfo.diagnose}}</label>
100		- </view>
101		- </view>
	108	+ <label wx:if="{{!isShowTwo}}" class="check_diagnosis_content_1_line">{{wzInfo.handlSuggest ? wzInfo.handlSuggest : '暂无处理意见'}}</label>
	109	+ <view wx:if="{{isShowTwo}}" style="display:flex;width:100%">
	110	+ <label class="check_diagnosis_content_lines">{{wzInfo.handlSuggest}}</label>
102	111	</view>
103		- <view class="check_diagnosis" style="{{isShowTwo==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
104		- <view style="display:flex;width:100%" bindtap="isShowMore" data-index="2">
105		- <label class="check_diagnosis_name">处理意见</label>
106		- <image class="icon_more" src="{{isShowTwo==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
107		- </view>
108		- <label wx:if="{{!isShowTwo}}" class="check_diagnosis_content_1_line">{{wzInfo.handlSuggest ? wzInfo.handlSuggest : '暂无处理意见'}}</label>
109		- <view wx:if="{{isShowTwo}}" style="display:flex;width:100%">
110		- <label class="check_diagnosis_content_lines">{{wzInfo.handlSuggest}}</label>
111		- </view>
	112	+ </view>
	113	+ <view class="check_diagnosis" style="{{isShowThree==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
	114	+ <view style="display:flex;width:100%" bindtap="isShowMore" data-index="3">
	115	+ <label class="check_diagnosis_name">指导意见</label>
	116	+ <image class="icon_more" src="{{isShowThree==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
112	117	</view>
113		- <view class="check_diagnosis" style="{{isShowThree==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
114		- <view style="display:flex;width:100%" bindtap="isShowMore" data-index="3">
115		- <label class="check_diagnosis_name">指导意见</label>
116		- <image class="icon_more" src="{{isShowThree==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
117		- </view>
118		- <label wx:if="{{!isShowThree}}" class="check_diagnosis_content_1_line">{{wzInfo.guideSuggest ? wzInfo.guideSuggest : '暂无指导意见'}}</label>
119		- <view wx:if="{{isShowThree}}" style="display:flex;width:100%">
120		- <label class="check_diagnosis_content_lines">{{wzInfo.guideSuggest}}</label>
121		- </view>
	118	+ <label wx:if="{{!isShowThree}}" class="check_diagnosis_content_1_line">{{wzInfo.guideSuggest ? wzInfo.guideSuggest : '暂无指导意见'}}</label>
	119	+ <view wx:if="{{isShowThree}}" style="display:flex;width:100%">
	120	+ <label class="check_diagnosis_content_lines">{{wzInfo.guideSuggest}}</label>
122	121	</view>
123	122	</view>
124		- <view style="background:white;height:30px;"></view>
	123	+ </view>
	124	+
	125	+ <view class="visitorView" wx:if="{{isVisitor==true}}">
	126	+ <view class="top_divider10"></view>
	127	+ <view class="visitor_image_view">
	128	+ <image class="no_message_icon" mode="aspectFit" src="../../source/no_messages.png"></image>
	129	+ <view class="no_message_icon_text">暂未减档，查询不到相关信息</view>
	130	+ </view>
	131	+ <view class="divider1"></view>
	132	+ <view class="notice_view">
	133	+ <view class="notice">温馨提示</view>
	134	+ <view class="notice_text">1.医院若已登记宝宝档案信息，一旦院内人员录入档案信息后，在小程序上登录验证的建档人姓名及手机号一致，即可查看相关信息，请持续关注；
	135	+ </view>
	136	+ <view class="notice_text">2.若没在医院内完成登记相关信息，可查看小程序中“妇幼医院”，并前往医院完成建档后即可获得更多的服务；
	137	+ </view>
	138	+ <view class="notice_text">3.已经完成儿童档案的，请重新登录（建档人姓名、手机号）通过短信验证后即可获得相应服务。
	139	+ </view>
	140	+ </view>
	141	+
	142	+ </view>
	143	+ <view style="background:white;height:30px;"></view>
	144	+
125	145	</view>
126	146
127	147
128	148
129	149
130	150
...	...	@@ -130,24 +150,24 @@
130	150
131	151
132	152	<!-- {{subscribeDetails.office ? subscribeDetails.office : '-'}} -->
133		-<view class="mask_subscribe_bg" wx:if="{{flag}}">
134		- <view class="mask_subscribe_content">
	153	+<view class="mask_subscribe_bg" wx:if="{{flag}}">
	154	+ <view class="mask_subscribe_content">
135	155	<view class="mask_subscribe_title">预约信息</view>
136	156	<view class="mask_subscribe_time">
137	157	<label>预约时间：</label>
138	158	<label class="mask_subscribe_content_text">{{subscribeDetails.nextcheck}}</label>
139	159	</view>
140		- <view class="mask_subscribe_office">
	160	+ <view class="mask_subscribe_office">
141	161	<label>距预约时间：</label>
142	162	<label class="mask_subscribe_content_text">{{subscribeDetails.nextInterval}}</label>
143		- </view>
	163	+ </view>
144	164	<view class="mask_subscribe_hospital">
145	165	<label>医院名称：</label>
146	166	<label class="mask_subscribe_content_text">{{subscribeDetails.checkhospital}}</label>
147	167	</view>
148	168	<view class="mask_subscribe_content_closeBtn" bindtap="closeMask">知道了</view>
149	169	</view>
150		-</view>
	170	+</view>
151	171
152	172	<view class="backgroundView" wx:if="{{noData == true}}">
153	173	<image class="empty_icon" mode="aspectFit" src="../../source/empty.png"></image>

...	...	@@ -320,4 +320,56 @@
320	320	display: inline-block;
321	321	margin-top: 2px;
322	322	}
	323	+
	324	+.visitorView {
	325	+ margin-top: 40px;
	326	+ background: #fff;
	327	+}
	328	+
	329	+.top_divider10 {
	330	+ background: #eee;
	331	+ height: 15px;
	332	+}
	333	+
	334	+.visitor_image_view {
	335	+ text-align: center;
	336	+ margin-top: 10px;
	337	+}
	338	+
	339	+.no_message_icon {
	340	+ width: 200px;
	341	+ height: 112px;
	342	+}
	343	+
	344	+.no_message_icon_text {
	345	+ font-size: 14px;
	346	+ color: #666;
	347	+ /* margin-top: 1px; */
	348	+}
	349	+
	350	+.divider1 {
	351	+ background: #eee;
	352	+ margin-left: 10px;
	353	+ margin-right: 10px;
	354	+ margin-top: 20px;
	355	+ height: 1px;
	356	+}
	357	+
	358	+.notice_view {
	359	+ margin-left: 10px;
	360	+ margin-right: 10px;
	361	+ margin-top: 20px;
	362	+ padding-bottom: 20px;
	363	+}
	364	+
	365	+.notice {
	366	+ font-size: 14px;
	367	+ color: #222;
	368	+}
	369	+
	370	+.notice_text {
	371	+ font-size: 13px;
	372	+ margin-top: 10px;
	373	+ color: #666;
	374	+}

...	...	@@ -25,7 +25,7 @@
25	25	var self = this
26	26	networkUtil.showLoading()
27	27	// var param = { page: page, limit: 15, type: 2, categoryId: self.data.id }
28		- networkUtil._get(api.articles + '/' + id, {}, function (res) {
	28	+ networkUtil._get(api.doctor + '/' + id, {}, function (res) {
29	29	console.log('数据-----', res)
30	30
31	31	}, function (res) {

...	...	@@ -50,7 +50,7 @@
50	50	<image src="../../source/xiaoxitongzhi.png" style="{{item_small}}" class="foundation_item_small_image"></image>
51	51	<view class="foundation_item_small_text">消息通知</view>
52	52	</navigator>
53		- <navigator class="foundation_item_small" url="../Setting/Setting">
	53	+ <navigator class="foundation_item_small" url="../hospitalList/hospitalList">
54	54	<image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
55	55	<view class="foundation_item_small_text">设置</view>
56	56	</navigator>

...	...	@@ -5,45 +5,111 @@
5	5	var api = require('../../utils/apiFile.js')
6	6
7	7
	8	+// 地理位置信息
	9	+var latitude = 0
	10	+var longitude = 0
	11	+// 页码
	12	+var page = 1
	13	+// 是否有更多
	14	+var hasMore = true
8	15	Page({
9	16	data: {
10		- hospitalList: [{
11		- "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" }, {
12		- "id": "2",
13		- "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km"
14		- }, { "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" },]
15		- },
16		- {
17		- "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" }, {
18		- "id": "12",
19		- "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name51", "distance": "100km"
20		- }, { "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" },]
21		- }],
	17	+ hospitalList: [
	18	+ // {
	19	+ // "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" }, {
	20	+ // "id": "2",
	21	+ // "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name1", "distance": "100km"
	22	+ // }, { "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" },]
	23	+ // },
	24	+ // {
	25	+ // "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" }, {
	26	+ // "id": "12",
	27	+ // "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "name": "name51", "distance": "100km"
	28	+ // }, { "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" },]
	29	+ // }
	30	+ ],
	31	+ hasMore:true,
22	32	},
23	33	/---------生命周期--------/
24	34	onLoad: function (options) {
25	35	networkUtil.showLoading()
	36	+ this.getUserLocation()
26	37	this.requestData()
27	38	},
28	39
	40	+ onUnload:function(e){
	41	+ page = 0
	42	+ },
29	43	/---------自定义函数--------/
	44	+ // 获取地理位置
	45	+ getUserLocation() {
	46	+ var self = this
	47	+ wx.getLocation({
	48	+ type: 'wgs84', // 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标
	49	+ success: function (res) {
	50	+ // success
	51	+ console.log(res)
	52	+ latitude = res.latitude
	53	+ longitude = res.longitude
	54	+ self.requestData()
	55	+ },
	56	+ fail: function (res) {
	57	+ // fail
	58	+ console.log(res)
	59	+ self.requestData()
	60	+ },
	61	+ complete: function (res) {
	62	+ // complete
	63	+ console.log(res)
	64	+ }
	65	+ })
	66	+ latitude = 115.52
	67	+ longitude = 38.23
	68	+ },
30	69	requestData() {
31	70	var self = this
32		- networkUtil._get(api.doctorList, {}, function (res) {
	71	+ var param = { page: page, limit: 15, lat: latitude, lng: longitude}
	72	+ networkUtil._get(api.hospitals, param, function (res) {
33	73	console.log(res)
	74	+ var arr = []
	75	+ if (page > 0) {// 加载更多模式
	76	+ arr = self.data.hospitalList
	77	+ }
	78	+ if (res.data.list.length < 15) {
	79	+ hasMore = false
	80	+ }else{
	81	+ hasMore=true
	82	+ }
	83	+ arr = arr.concat(res.data.list)
34	84	self.setData({
35		- doctorList: res.data.data,
	85	+ hospitalList: arr,
	86	+ hasMore: hasMore
36	87	})
37		-
38	88	}, function (res) {
39	89
40	90	})
41	91	},
	92	+ // 下拉刷新回调接口
	93	+ onPullDownRefresh: function () {
	94	+ page = 0;
	95	+ hasMore = true
	96	+ networkUtil.showLoading()
	97	+ // 网络请求，重新请求一遍数据
	98	+ this.requestData();
	99	+ },
	100	+ // 加载更多
	101	+ loadMore: function (e) {
	102	+ if (!hasMore) {
	103	+ return
	104	+ }
	105	+ page++
	106	+ networkUtil.showLoading()
	107	+ this.requestData()
	108	+ },
42	109	toHospitalDetail: function (e) {
43	110	var id = e.currentTarget.dataset.id
44	111	console.log(e)
45	112	wx.navigateTo({
46		- // url: '../doctor/doctor?doctorInfo='+JSON.stringify(this.data.doctorList[e.currentTarget.dataset.myid]), 这个url长度有限，参数太多会被剪切
47	113	url: "../hospital_detail/hospital_detail?id="+id
48	114	})
49	115	}

...	...	@@ -2,6 +2,7 @@
2	2	"navigationBarBackgroundColor": "#48C17B",
3	3	"navigationBarTitleText": "其他医院",
4	4	"navigationBarTextStyle": "white",
	5	+ "enablePullDownRefresh": true,
5	6	"backgroundColor": "#d8dbd4"
6	7	}

1	1	<!-- 医院列表-->
2		-<scroll-view scroll-y="true" style="background:white" bindscrolltolower="loadMore">
	2	+<view scroll-y="true" style="background:white" >
3	3	<!--list的item-->
4		- <block wx:for="{{hospitalList}}" wx:key="index">
5		- <view class='area_name'>{{item.areaName}}</view>
6		- <view wx:for="{{item.list}}" wx:for-index="sectionIndex" wx:for-item="sectionItem" >
	4	+ <block wx:for="{{hospitalList}}" wx:key="index" wx:for-item="item">
	5	+ <view class='area_name'>{{item.name.regionName}}</view>
	6	+ <view wx:for="{{item.data}}" wx:for-index="sectionIndex" wx:for-item="sectionItem" >
7	7	<view class='hospital_item' bindtap='toHospitalDetail' data-id="{{sectionItem.id}}">
8		- <image class='icon' src='{{sectionItem.icon}}'></image>
9		- <view class='hospital_name'>{{sectionItem.name}}</view>
10		- <view class='distance' >{{sectionItem.distance}} </view>
	8	+ <image class='icon' src='{{sectionItem.image.medium}}'></image>
	9	+ <view class='hospital_name'>{{sectionItem.title}}</view>
	10	+ <view class='distance' >{{sectionItem.distance}}km </view>
11	11	</view>
12	12	<view class='divider' wx:if="{{sectionIndex==item.list.length-1?false:true}}"></view>
13	13	</view>
14		-
	14	+ <view class="loadmore" bindtap="loadMore" wx:if="{{index==hospitalList.length-1 &&hasMore==true}}">加载更多</view>
15	15	</block>
16		-</scroll-view>
	16	+</view>

...	...	@@ -19,7 +19,9 @@
19	19	height: 36px;
20	20	width: 36px;
21	21	margin-left: 10px;
22		- margin-top: 12px;
	22	+ margin-top: 8px;
	23	+ border-radius: 50%;
	24	+ border: 3px solid white;
23	25	}
24	26
25	27	.hospital_name {
...	...	@@ -46,5 +48,10 @@
46	48	.divider {
47	49	height: 1px;
48	50	background: #e6e6e6;
	51	+}
	52	+.loadmore{
	53	+ text-align: center;
	54	+ padding-top: 10px;
	55	+ padding-bottom: 5px;
49	56	}

...	...	@@ -10,20 +10,22 @@
10	10	Page({
11	11	data: {
12	12	showAllIntro: false,
13		- departmentList: [{
14		- "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" },
15		- { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍" }]
16		- },
17		- {
18		- "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" },
19		- { "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" }]
20		- },
21		- {
22		- "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" },
23		- { "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" }]
24		- },
	13	+ departmentList: [
	14	+ // {
	15	+ // "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" },
	16	+ // { "icon": "https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=2845876344,2547149135&fm=173&s=CB50DFA600825BEF16B8A43403001073&w=550&h=334&img.JPEG", "duty": "职务", "name": "wqw", "good": "介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍" }]
	17	+ // },
	18	+ // {
	19	+ // "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" },
	20	+ // { "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" }]
	21	+ // },
	22	+ // {
	23	+ // "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" },
	24	+ // { "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" }]
	25	+ // },
25	26	],
26		- hospitalId: ''
	27	+ hospitalId: '',
	28	+ hospital: {},
27	29	},
28	30	onLoad: function (options) {
29	31	var id = options.id
30	32
31	33
32	34
33	35
34	36
35	37
...	...	@@ -31,30 +33,40 @@
31	33	hospitalId: id
32	34	})
33	35	console.log(this.data.hospitalId)
34		- // this.requestData(options.id)
	36	+
	37	+ networkUtil.showLoading()
	38	+ this.requestHostitalData(options.id)
	39	+ this.requesDoctorData(options.id)
35	40	},
36	41	onUnload: function () {
37	42
38	43	},
39	44
40	45	/---------自定义函数--------/
41		- requestData(id) {
	46	+ requestHostitalData(id) {
42	47	var self = this
43		- networkUtil.showLoading()
44	48	// var param = { page: page, limit: 15, type: 2, categoryId: self.data.id }
45		- networkUtil._get(api.articles + '/' + id, {}, function (res) {
	49	+ networkUtil._get(api.hospital + '/' + id, {}, function (res) {
46	50	console.log('数据-----', res)
47		- res.data.content = util.convertHtmlToText(res.data.content)
48		- var date = new Date(res.data.created * 1000)
49		- res.data.time = date.getFullYear() + '年' + (date.getMonth() + 1) + '月' + date.getDate() + '日 ' + date.getHours() + ':' + date.getMinutes()
50	51	self.setData({
51		- knowledge: res.data,
52		- swiperHeight: wx.getSystemInfoSync().windowWidth * 0.55
	52	+ hospital: res.data
53	53	})
54	54	}, function (res) {
55	55
56	56	})
57	57	},
	58	+ requesDoctorData(id) {
	59	+ var self = this
	60	+ // var param = { page: page, limit: 15, }
	61	+ networkUtil._get(api.departments + '/' + id, {}, function (res) {
	62	+ console.log('requesDoctorData-----', res)
	63	+ self.setData({
	64	+ departmentList: res.data
	65	+ })
	66	+ }, function (res) {
	67	+
	68	+ })
	69	+ },
58	70	showAllIntroduce: function () {
59	71	var self = this
60	72	var showAllIntro = !self.data.showAllIntro
...	...	@@ -67,7 +79,7 @@
67	79	url: '../hospitalList/hospitalList',
68	80	})
69	81	},
70		- toDocotrDetail:function(e){
	82	+ toDocotrDetail: function (e) {
71	83	var id = e.currentTarget.dataset.id
72	84	console.log(e)
73	85	wx.navigateTo({

1	1	<view class="main">
2		- <image class="hospital_image" src="../../source/hospital_introduce.jpg"></image>
	2	+ <image class="hospital_image" src="{{hospital.image.medium.length<5?'../../source/hospital_introduce.jpg':hospital.image.medium}}"></image>
3	3
4	4	<view class='name_view'>
5	5	<view class='line'></view>
6		- <view class="title_text">医院名称</view>
	6	+ <view class="title_text">{{hospital.title}}</view>
7	7	<view class='showAll' bindtap='showOtherHospital'>其他医院</view>
8	8	</view>
9	9	<view >
10		- <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介介绍</view>
11		- <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍介绍</view>
	10	+ <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view>
	11	+ <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view>
12	12	<!-- <view class="hospital_introduce1" style='position:absolute;bottom:0;right:0;background:#fff'>展开</view> -->
13	13	</view>
14	14
15	15
16	16
...	...	@@ -21,15 +21,15 @@
21	21	<view wx:for="{{departmentList}}" wx:key="index">
22	22	<view class='departname_view'>
23	23	<view class='line'></view>
24		- <view class="title_text">{{item.departName}}</view>
	24	+ <view class="title_text">{{item.areaName}}</view>
25	25	</view>
26	26	<view>
27		- <view wx:for="{{item.list}}" wx:for-index="sectionIndex" wx:for-item="sectionItem">
	27	+ <view wx:for="{{item.data}}" wx:for-index="sectionIndex" wx:for-item="sectionItem">
28	28	<view class="doctor_view" bindtap='toDocotrDetail' data-id='{{sectionItem.id}}'>
29	29	<image class='doctor_icon' src='{{sectionItem.icon}}'></image>
30	30	<view class='content_view'>
31		- <view class='name_text'>{{sectionItem.duty}} {{sectionItem.name}}</view>
32		- <view class='doctor_intro'>{{sectionItem.good}}</view>
	31	+ <view class='name_text'>{{sectionItem.title}} {{sectionItem.username}}</view>
	32	+ <view class='doctor_intro'>{{sectionItem.goodAt}}</view>
33	33	</view>
34	34	</view>
35	35

...	...	@@ -27,7 +27,8 @@
27	27	category: '',
28	28	current_index: 0,
29	29	hasMore: '',
30		- noData: true
	30	+ noData: true,
	31	+ isVisitor:true,
31	32
32	33
33	34	},
34	35
...	...	@@ -83,10 +84,11 @@
83	84	})
84	85	page = 1;
85	86	hasMore = true
86		- networkUtil.showLoading()
87		- this.requestData()
	87	+ if (!self.data.isVisitor) {
	88	+ networkUtil.showLoading()
	89	+ self.requestData();
	90	+ }
88	91
89		-
90	92	},
91	93	getTitles() {
92	94	var self = this
...	...	@@ -103,7 +105,9 @@
103	105	category: category
104	106
105	107	})
106		- self.requestData();
	108	+ if (!self.data.isVisitor) {
	109	+ self.requestData();
	110	+ }
107	111	}, function (res) {
108	112	isRefresh = false
109	113	})

1	1	<view class="title_top_view">
2		- <scroll-view class="title_scroll" scroll-x="true" scroll-y="false">
3		- <label class="scroll_title_label " wx:for="{{titles}}">
4		- <label style="{{current_index == index? 'border-bottom: 2px solid #48C17B;' : 'border-bottom:0px solid #f4879b;'}}" class="title_text" bindtap="titleClick" data-categoryid="{{item.id}}" data-index="{{index}}">{{item.title}}</label>
5		- </label>
6		- </scroll-view>
7		- </view>
8		-<view style="height:100%;background:#eee" wx:if="{{noData != true}}">
9		-
10		- <view class="main">
	2	+ <scroll-view class="title_scroll" scroll-x="true" scroll-y="false">
	3	+ <label class="scroll_title_label " wx:for="{{titles}}">
	4	+ <label style="{{current_index == index? 'border-bottom: 2px solid #48C17B;' : 'border-bottom:0px solid #f4879b;'}}" class="title_text" bindtap="titleClick" data-categoryid="{{item.id}}" data-index="{{index}}">{{item.title}}</label>
	5	+ </label>
	6	+ </scroll-view>
	7	+</view>
	8	+<view style="height:100%;background:#eee" wx:if="{{isVisitor==false && noData != true}}">
11	9
12		- <scroll-view class="list_scroll" scroll-y="true" bindscrolltolower="myScroll">
	10	+ <view class="main">
13	11
14		- <view>
15		- <block hover-class="weui-cell_active" wx:for="{{list}}">
16		- <view hidden="{{item.type==1?false:true}}" class="high_risk_main">
17		- <!-- <view class="high_risk_title">{{item.title}}</view> -->
18		- <view class="red_line"></view>
19		- <view class="other_three_title">{{item.title}}</view>
20		- <view class="other_three_content">{{item.content}}</view>
21		- <!-- <view class="high_rish_content1" >
	12	+ <scroll-view class="list_scroll" scroll-y="true" bindscrolltolower="myScroll">
	13	+
	14	+ <view>
	15	+ <block hover-class="weui-cell_active" wx:for="{{list}}">
	16	+ <view hidden="{{item.type==1?false:true}}" class="high_risk_main">
	17	+ <!-- <view class="high_risk_title">{{item.title}}</view> -->
	18	+ <view class="red_line"></view>
	19	+ <view class="other_three_title">{{item.title}}</view>
	20	+ <view class="other_three_content">{{item.content}}</view>
	21	+ <!-- <view class="high_rish_content1" >
22	22	<label class="high_rish_content_before">危急值：</label>
23	23	<label class="high_rish_content_after">危急值</label>
24	24	</view>
25	25
26	26
27	27
...	...	@@ -30,31 +30,49 @@
30	30	<label class="high_rish_content_before">紧急提醒：</label>
31	31	<label class="high_rish_content_after">qwertyuiopasdfghjklzxcvbnmqwertyuiopasdfghjklzxcvbnm</label>
32	32	</view> -->
33		- <view class="line"></view>
34		- <view class="high_rish_content1">
35		- <label class="high_rish_date">{{item.time}}</label>
36		- <label class="high_rish_hospital_name">{{item.hospitalName}}</label>
37		- </view>
38		- </view>
39		- <view hidden="{{item.type==1?true:false}}" class="other_three_main">
40		- <view class="green_line"></view>
41		- <view class="other_three_title">{{item.title}}</view>
42		- <view class="other_three_content">{{item.content}}</view>
43		- <view class="line"></view>
44		- <view class="high_rish_content1">
45		- <label class="other_three_date">{{item.time}}</label>
46		- <label class="other_three_hospital_name">{{item.hospitalName}}</label>
47		- </view>
48		- </view>
49		- </block>
50		- <view class="loadMoreView" wx:if="{{hasMore}}">加载更多...</view>
	33	+ <view class="line"></view>
	34	+ <view class="high_rish_content1">
	35	+ <label class="high_rish_date">{{item.time}}</label>
	36	+ <label class="high_rish_hospital_name">{{item.hospitalName}}</label>
51	37	</view>
52		- </scroll-view>
53		- </view>
	38	+ </view>
	39	+ <view hidden="{{item.type==1?true:false}}" class="other_three_main">
	40	+ <view class="green_line"></view>
	41	+ <view class="other_three_title">{{item.title}}</view>
	42	+ <view class="other_three_content">{{item.content}}</view>
	43	+ <view class="line"></view>
	44	+ <view class="high_rish_content1">
	45	+ <label class="other_three_date">{{item.time}}</label>
	46	+ <label class="other_three_hospital_name">{{item.hospitalName}}</label>
	47	+ </view>
	48	+ </view>
	49	+ </block>
	50	+ <view class="loadMoreView" wx:if="{{hasMore}}">加载更多...</view>
	51	+ </view>
	52	+ </scroll-view>
	53	+ </view>
54	54	</view>
55	55
56		-<view class="backgroundView" style="margin-top:40px" wx:if="{{noData == true}}">
	56	+<view class="backgroundView" style="margin-top:40px" wx:if="{{isVisitor==false && noData == true}}">
57	57	<image class="empty_icon" mode="aspectFit" src="../../source/empty.png"></image>
58	58	<view class="empty_text">暂时没有消息通知哦！</view>
	59	+</view>
	60	+<view class="visitorView" wx:if="{{isVisitor==true}}">
	61	+ <view class="top_divider10"></view>
	62	+ <view class="visitor_image_view">
	63	+ <image class="no_message_icon" mode="aspectFit" src="../../source/no_messages.png"></image>
	64	+ <view class="no_message_icon_text">暂未减档，查询不到相关信息</view>
	65	+ </view>
	66	+ <view class="divider1"></view>
	67	+ <view class="notice_view">
	68	+ <view class="notice">温馨提示</view>
	69	+ <view class="notice_text">1.医院若已登记宝宝档案信息，一旦院内人员录入档案信息后，在小程序上登录验证的建档人姓名及手机号一致，即可查看相关信息，请持续关注；
	70	+ </view>
	71	+ <view class="notice_text">2.若没在医院内完成登记相关信息，可查看小程序中“妇幼医院”，并前往医院完成建档后即可获得更多的服务；
	72	+ </view>
	73	+ <view class="notice_text">3.已经完成儿童档案的，请重新登录（建档人姓名、手机号）通过短信验证后即可获得相应服务。
	74	+ </view>
	75	+ </view>
	76	+
59	77	</view>

1	1	.main {
2		- background: #fff;
3		- width: 100%;
4		- /* margin-top: 40px; */
	2	+ background: #fff;
	3	+ width: 100%;
	4	+ /* margin-top: 40px; */
5	5	}
	6	+
6	7	.title_top_view {
7		- width: 100%;
8		- display: flex;
9		- background: white;
10		- position: fixed;
11		- height: 40px;
12		- padding-left: 10px;
13		- top: 0px;
14		- z-index: 1;
	8	+ width: 100%;
	9	+ display: flex;
	10	+ background: white;
	11	+ position: fixed;
	12	+ height: 40px;
	13	+ padding-left: 10px;
	14	+ top: 0px;
	15	+ z-index: 1;
15	16	}
16	17
17	18	.title_scroll {
18		- width: 90%;
19		- margin-left: 10px;
20		- /可以滚动 /
21		- white-space: nowrap;
22		- display: inline-block;
	19	+ width: 90%;
	20	+ margin-left: 10px;
	21	+ /可以滚动 /
	22	+ white-space: nowrap;
	23	+ display: inline-block;
23	24	}
24	25
25	26	/隐藏Scrollview滚动条 /
26	27
27	28	::-webkit-scrollbar {
28		- width: 0;
29		- height: 0;
30		- color: transparent;
	29	+ width: 0;
	30	+ height: 0;
	31	+ color: transparent;
31	32	}
32	33
33	34	.scroll_title_label {
34		- height: 40px;
35		- margin-right: 30px;
36		- text-align: left;
37		- line-height: 40px;
38		- border: 1px;
39		- font-size: 13px;
40		- color: #494949;
41		- border-bottom: 2px;
42		- border-color: #ff5e5e;
	35	+ height: 40px;
	36	+ margin-right: 30px;
	37	+ text-align: left;
	38	+ line-height: 40px;
	39	+ border: 1px;
	40	+ font-size: 13px;
	41	+ color: #494949;
	42	+ border-bottom: 2px;
	43	+ border-color: #ff5e5e;
43	44	}
44	45
45	46	.title_text {
46		- line-height: 40px;
47		- height: 40px;
48		- font-size: 13px;
49		- padding-top: 10px;
50		- padding-bottom: 7px;
	47	+ line-height: 40px;
	48	+ height: 40px;
	49	+ font-size: 13px;
	50	+ padding-top: 10px;
	51	+ padding-bottom: 7px;
51	52	}
	53	+
52	54	.list_scroll {
53		- height: calc(100vh-40px);
54		- margin-top: 40px;
55		- background: rgb(244, 244, 244);
56		- /* background: rebeccapurple */
	55	+ height: calc(100vh-40px);
	56	+ margin-top: 40px;
	57	+ background: rgb(244, 244, 244);
	58	+ /* background: rebeccapurple */
57	59	}
	60	+
58	61	/高危 /
59	62
60	63	.high_risk_main {
61		- margin-left: 10px;
62		- margin-right: 10px;
63		- margin-top: 10px;
64		- background: #fff;
65		- min-height: 138px;
66		- border-radius: 4px;
	64	+ margin-left: 10px;
	65	+ margin-right: 10px;
	66	+ margin-top: 10px;
	67	+ background: #fff;
	68	+ min-height: 138px;
	69	+ border-radius: 4px;
67	70	}
68	71
69	72	.high_risk_title {
70		- height: 38px;
71		- width: 100%;
72		- background: #f67272;
73		- line-height: 38px;
74		- text-align: center;
75		- font-size: 14px;
76		- color: #fff;
77		- letter-spacing: 0;
78		- border-radius: 4px 4px 0 0;
	73	+ height: 38px;
	74	+ width: 100%;
	75	+ background: #f67272;
	76	+ line-height: 38px;
	77	+ text-align: center;
	78	+ font-size: 14px;
	79	+ color: #fff;
	80	+ letter-spacing: 0;
	81	+ border-radius: 4px 4px 0 0;
79	82	}
80	83
81	84	.high_rish_content1 {
82		- padding-left: 10px;
83		- padding-right: 10px;
84		- display: flex;
85		- height:28px;
86		-min-height:28px;
87		-
	85	+ padding-left: 10px;
	86	+ padding-right: 10px;
	87	+ display: flex;
	88	+ height: 28px;
	89	+ min-height: 28px;
88	90	}
89	91
90	92	.high_rish_content_before {
91		- width: 25%;
92		- font-size: 12px;
93		- color: #222;
94		- text-align: left;
95		- display: flex;
96		- letter-spacing: 0;
	93	+ width: 25%;
	94	+ font-size: 12px;
	95	+ color: #222;
	96	+ text-align: left;
	97	+ display: flex;
	98	+ letter-spacing: 0;
97	99	}
98	100
99	101	.high_rish_content_after {
100		- width: 75%;
101		- font-size: 12px;
102		- color: #888;
103		- letter-spacing: 0;
104		- text-align: left;
105		- display: flex;
106		- word-break: break-all;
	102	+ width: 75%;
	103	+ font-size: 12px;
	104	+ color: #888;
	105	+ letter-spacing: 0;
	106	+ text-align: left;
	107	+ display: flex;
	108	+ word-break: break-all;
107	109	}
108	110
109	111	.line {
110		- width: 100%;
111		- border: 0.5px solid #ececec;
112		- margin-top: 5px;
	112	+ width: 100%;
	113	+ border: 0.5px solid #ececec;
	114	+ margin-top: 5px;
113	115	}
114	116
115	117	.high_rish_date {
116		- width: 25%;
117		- font-size: 12px;
118		- color: #7b7883;
119		- letter-spacing: 0;
120		- margin-top: 5px;
121		- margin-bottom: 5px;
	118	+ width: 25%;
	119	+ font-size: 12px;
	120	+ color: #7b7883;
	121	+ letter-spacing: 0;
	122	+ margin-top: 5px;
	123	+ margin-bottom: 5px;
122	124	}
123	125
124	126	.high_rish_hospital_name {
125		- width: 75%;
126		- font-size: 12px;
127		- color: #7b7883;
128		- letter-spacing: 0;
129		- margin-top: 5px;
130		- text-align: right;
131		- margin-bottom: 5px;
	127	+ width: 75%;
	128	+ font-size: 12px;
	129	+ color: #7b7883;
	130	+ letter-spacing: 0;
	131	+ margin-top: 5px;
	132	+ text-align: right;
	133	+ margin-bottom: 5px;
132	134	}
	135	+
133	136	.other_three_main {
134		- margin-left: 10px;
135		- margin-right: 10px;
136		- margin-top: 10px;
137		- background: #fff;
138		-
139		- min-height: 128px;
	137	+ margin-left: 10px;
	138	+ margin-right: 10px;
	139	+ margin-top: 10px;
	140	+ background: #fff;
	141	+ min-height: 128px;
140	142	}
	143	+
141	144	.red_line {
142		- width: 100%;
143		- background: #f67272;
144		- height: 1px;
	145	+ width: 100%;
	146	+ background: #f67272;
	147	+ height: 1px;
145	148	}
	149	+
146	150	.green_line {
147		- width: 100%;
148		- background: #48C17B;
149		- height: 1px;
	151	+ width: 100%;
	152	+ background: #48c17b;
	153	+ height: 1px;
150	154	}
151		-.other_three_title{
152		- height: 40px;
153		- width: 100%;
154		- line-height: 40px;
155		- text-align: center;
156		- font-size: 14px;
157		- font-weight: bold;
158		- color: #333;
159		- letter-spacing: 0;
	155	+
	156	+.other_three_title {
	157	+ height: 40px;
	158	+ width: 100%;
	159	+ line-height: 40px;
	160	+ text-align: center;
	161	+ font-size: 14px;
	162	+ font-weight: bold;
	163	+ color: #333;
	164	+ letter-spacing: 0;
160	165	}
	166	+
161	167	.other_three_content {
162		-
163		- font-size: 12px;
164		- color: #888;
165		- letter-spacing: 0;
166		- text-align: left;
167		- margin-left: 10px;
168		- margin-right: 10px;
169		- min-height: 54px;
170		- display: flex;
171		- word-break: break-all;
	168	+ font-size: 12px;
	169	+ color: #888;
	170	+ letter-spacing: 0;
	171	+ text-align: left;
	172	+ margin-left: 10px;
	173	+ margin-right: 10px;
	174	+ min-height: 54px;
	175	+ display: flex;
	176	+ word-break: break-all;
172	177	}
	178	+
173	179	.other_three_date {
174		- width: 25%;
175		- font-size: 12px;
176		- color: #999999;
177		- letter-spacing: 0;
178		- margin-top: 5px;
179		- margin-bottom: 5px;
	180	+ width: 25%;
	181	+ font-size: 12px;
	182	+ color: #999;
	183	+ letter-spacing: 0;
	184	+ margin-top: 5px;
	185	+ margin-bottom: 5px;
180	186	}
181		-.other_three_hospital_name{
182		- width: 75%;
183		- font-size: 12px;
184		- color: #999999;
185		- letter-spacing: 0;
186		- margin-top: 5px;
187		- text-align: right;
188		- margin-bottom: 5px;
	187	+
	188	+.other_three_hospital_name {
	189	+ width: 75%;
	190	+ font-size: 12px;
	191	+ color: #999;
	192	+ letter-spacing: 0;
	193	+ margin-top: 5px;
	194	+ text-align: right;
	195	+ margin-bottom: 5px;
189	196	}
190	197
191	198	.icon_refresh {
192		- position: fixed;
193		- width: 50px;
194		- height: 50px;
195		- right: 20px;
196		- bottom: 30px;
	199	+ position: fixed;
	200	+ width: 50px;
	201	+ height: 50px;
	202	+ right: 20px;
	203	+ bottom: 30px;
	204	+}
	205	+
	206	+.visitorView {
	207	+ margin-top: 40px;
	208	+ background: #fff;
	209	+}
	210	+
	211	+.top_divider10 {
	212	+ background: #eee;
	213	+ height: 10px;
	214	+}
	215	+
	216	+.visitor_image_view {
	217	+ text-align: center;
	218	+ margin-top: 10px;
	219	+}
	220	+
	221	+.no_message_icon {
	222	+ width: 200px;
	223	+ height: 112px;
	224	+}
	225	+
	226	+.no_message_icon_text {
	227	+ font-size: 14px;
	228	+ color: #666;
	229	+ /* margin-top: 1px; */
	230	+}
	231	+
	232	+.divider1 {
	233	+ background: #eee;
	234	+ margin-left: 10px;
	235	+ margin-right: 10px;
	236	+ margin-top: 20px;
	237	+ height: 1px;
	238	+}
	239	+
	240	+.notice_view {
	241	+ margin-left: 10px;
	242	+ margin-right: 10px;
	243	+ margin-top: 20px;
	244	+ padding-bottom: 20px;
	245	+}
	246	+
	247	+.notice {
	248	+ font-size: 14px;
	249	+ color: #222;
	250	+}
	251	+
	252	+.notice_text {
	253	+ font-size: 13px;
	254	+ margin-top: 10px;
	255	+ color: #666;
197	256	}

4.64 KB

...	...	@@ -37,8 +37,17 @@
37	37	// 7niu
38	38	kApiQiNiuImageToken:'v1/tokens/qiniu',
39	39	// 改用户信息
40		- kApiModifyMyInfo:'v1/users',
	40	+ kApiModifyMyInfo: 'v1/users',
	41	+ // 获取附近的医院
	42	+ hospitals: 'baby/hospitals/position',
41	43	// 游客用户信息
42	44	kTourisInfo: 'baby/users/',
	45	+ // 获取医院信息/id
	46	+ hospital: 'v1/hospitals',
	47	+ //获取科室和医生{id}
	48	+ departments: 'baby/departments',
	49	+ //医生详情/id
	50	+ doctor: 'v1/doctors'
	51	+
43	52	}