luoye / littleApp_child

Commit 0020cfe910c55b7cfc526d96640176b2823ce5a2

Authored by xianghenggang almost 8 years ago

Exists in master and in 2 other branches

no message

Showing 5 changed files with 53 additions and 21 deletions

littleApp_child/pages/checkTabList/checkTabList.js
littleApp_child/pages/checkTabList/checkTabList.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

...	...	@@ -192,6 +192,21 @@
192	192	networkUtil._get(api.checksub, param, function (res) {
193	193	console.log(res)
194	194	var result = res.data.list[0]
	195	+ var whiteCell
	196	+ if (result.whiteCell=="无"){
	197	+ whiteCell = result.whiteCell
	198	+ }else{
	199	+ whiteCell = result.whiteCell +"×10^9/L"
	200	+ }
	201	+
	202	+
	203	+ var platelet
	204	+ if (result.platelet == "无") {
	205	+ platelet = result.platelet
	206	+ } else {
	207	+ platelet = result.platelet + "×10^9/L"
	208	+ }
	209	+
195	210	self.setData({
196	211
197	212	bonez: result.bonez,
...	...	@@ -199,8 +214,8 @@
199	214	hipJoint: result.hipJoint,
200	215	heartAction: result.heartAction,
201	216	hemoglobin: result.hemoglobin,
202		- whiteCell: result.whiteCell,
203		- platelet: result.platelet,
	217	+ whiteCell: whiteCell,
	218	+ platelet: platelet,
204	219	otherBlood: result.otherBlood,
205	220	urineProtein: result.urineProtein,
206	221	urineSugar: result.urineSugar,

...	...	@@ -287,16 +287,16 @@
287	287	<view class="content_front" style="min-width: 60px;">血红蛋白:</view>
288	288	<view class="content_after">{{hemoglobin}}</view>
289	289	</view>
290		- <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="白细胞计数" data-content="{{whiteCell}}×10^9/L">
	290	+ <view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="白细胞计数" data-content="{{whiteCell}}">
291	291	<label class="content_front" style="min-width: 80px;">白细胞计数:</label>
292		- <label class="content_after">{{whiteCell}}×10^9/L</label>
	292	+ <label class="content_after">{{whiteCell}}</label>
293	293	</view>
294	294
295	295	</view>
296	296	<view class="content_line">
297		- <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="血小板计数" data-content="{{platelet}}×10^9/L">
	297	+ <view style="display:flex;width:50%" bindtap="showMoreContent" data-title="血小板计数" data-content="{{platelet}}">
298	298	<label class="content_front" style="min-width: 80px;">血小板计数:</label>
299		- <label class="content_after">{{platelet}}×10^9/L</label>
	299	+ <label class="content_after">{{platelet}}</label>
300	300	</view>
301	301	<view style="display:flex;width:50%;" bindtap="showMoreContent" data-title="其他" data-content="{{otherBlood}}">
302	302	<label class="content_front" style="min-width: 35px;">其他:</label>

...	...	@@ -26,7 +26,8 @@
26	26	titles: [],
27	27	category: '',
28	28	current_index: 0,
29		- hasMore:''
	29	+ hasMore:'',
	30	+
30	31
31	32	},
32	33	onLoad: function (e) {
33	34
...	...	@@ -47,10 +48,11 @@
47	48	return
48	49	}
49	50	page ++
	51	+ networkUtil.showLoading()
50	52	this.requestData()
51	53
52	54	},
53		- refesh: function() {
	55	+ refesh: function () {
54	56	page = 1;
55	57	hasMore = true
56	58	this.setData({
...	...	@@ -60,6 +62,8 @@
60	62	networkUtil.showLoading()
61	63	// 网络请求，重新请求一遍数据
62	64	this.requestData();
	65	+
	66	+
63	67	},
64	68	myScroll:function(e){
65	69	// if(e.detail.scrollTop >= e.detail.scrollHeight-wx.getSystemInfoSync().windowHeight - 3){
...	...	@@ -67,6 +71,7 @@
67	71	// }
68	72	},
69	73	titleClick:function(e){
	74	+
70	75	var self = this
71	76	var current_index = e.currentTarget.dataset.index
72	77	var categoryid = e.currentTarget.dataset.categoryid
73	78
...	...	@@ -77,7 +82,10 @@
77	82	})
78	83	page = 1;
79	84	hasMore = true
	85	+ networkUtil.showLoading()
80	86	this.requestData()
	87	+
	88	+
81	89	},
82	90	getTitles(){
83	91	var self = this
84	92
...	...	@@ -104,9 +112,10 @@
104	112	requestData(){
105	113	var self = this
106	114	isRefresh = true
107		- networkUtil.showLoading()
	115	+ // networkUtil.showLoading()
108	116	var param = { page: page, limit: pageLimit, typeid: self.data.category}
109	117	console.log(param)
	118	+
110	119	networkUtil._get(api.messageList,param,function(res){
111	120	// console.log("messageList:"+res)
112	121	isRefresh = false
113	122
...	...	@@ -125,8 +134,13 @@
125	134	list:arr,
126	135	hasMore : hasMore,
127	136	})
	137	+ wx.hideToast()
	138	+ // wx.pageScrollTo({
	139	+ // scrollTop: 0,
	140	+ // })
128	141	},function(res){
129	142	isRefresh = false
	143	+ wx.hideToast()
130	144	})
131	145	},
132	146

	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>
1	8	<view style="height:100%;background:#eee">
	9	+
2	10	<view class="main">
3		- <view class="title_top_view">
4		- <scroll-view class="title_scroll" scroll-x="true" scroll-y="false">
5		- <label class="scroll_title_label " wx:for="{{titles}}">
6		- <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>
7	11
8		- </label>
9		- </scroll-view>
10		- </view>
11	12	<scroll-view class="list_scroll" scroll-y="true" bindscrolltolower="myScroll">
12	13
13	14	<view>
14	15
...	...	@@ -50,8 +51,7 @@
50	51	</view>
51	52	</scroll-view>
52	53	</view>
53		-
54		- <image class="icon_refresh" src="../../source/group2.png" bindtap="refesh"></image>
55		-
56	54	</view>
	55	+
	56	+<image class="icon_refresh" src="../../source/group2.png" bindtap="refesh"></image>

1	1	.main {
2	2	background: #fff;
3	3	width: 100%;
4		- margin-top: 40px;
	4	+ /* margin-top: 40px; */
5	5	}
6	6	.title_top_view {
7	7	width: 100%;
8	8
...	...	@@ -43,12 +43,15 @@
43	43	}
44	44
45	45	.title_text {
	46	+ line-height: 40px;
	47	+ height: 40px;
46	48	font-size: 13px;
47	49	padding-top: 10px;
48	50	padding-bottom: 7px;
49	51	}
50	52	.list_scroll {
51		- height: 100vh;
	53	+ height: calc(100vh-40px);
	54	+ margin-top: 40px;
52	55	background: rgb(244, 244, 244);
53	56	/* background: rebeccapurple */
54	57	}