diff --git a/littleApp_child/pages/checkTabList/checkTabList.js b/littleApp_child/pages/checkTabList/checkTabList.js
index fa0d656..eee295e 100644
--- a/littleApp_child/pages/checkTabList/checkTabList.js
+++ b/littleApp_child/pages/checkTabList/checkTabList.js
@@ -192,6 +192,21 @@ Page({
networkUtil._get(api.checksub, param, function (res) {
console.log(res)
var result = res.data.list[0]
+ var whiteCell
+ if (result.whiteCell=="无"){
+ whiteCell = result.whiteCell
+ }else{
+ whiteCell = result.whiteCell +"×10^9/L"
+ }
+
+
+ var platelet
+ if (result.platelet == "无") {
+ platelet = result.platelet
+ } else {
+ platelet = result.platelet + "×10^9/L"
+ }
+
self.setData({
bonez: result.bonez,
@@ -199,8 +214,8 @@ Page({
hipJoint: result.hipJoint,
heartAction: result.heartAction,
hemoglobin: result.hemoglobin,
- whiteCell: result.whiteCell,
- platelet: result.platelet,
+ whiteCell: whiteCell,
+ platelet: platelet,
otherBlood: result.otherBlood,
urineProtein: result.urineProtein,
urineSugar: result.urineSugar,
diff --git a/littleApp_child/pages/checkTabList/checkTabList.wxml b/littleApp_child/pages/checkTabList/checkTabList.wxml
index c9a90d8..97f4abe 100644
--- a/littleApp_child/pages/checkTabList/checkTabList.wxml
+++ b/littleApp_child/pages/checkTabList/checkTabList.wxml
@@ -287,16 +287,16 @@
血红蛋白:
{{hemoglobin}}
-
+
-
+
-
+
-
+
diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.js b/littleApp_child/pages/system_notifacations/system_notifacations.js
index 125c6a8..78b1732 100644
--- a/littleApp_child/pages/system_notifacations/system_notifacations.js
+++ b/littleApp_child/pages/system_notifacations/system_notifacations.js
@@ -26,7 +26,8 @@ Page({
titles: [],
category: '',
current_index: 0,
- hasMore:''
+ hasMore:'',
+
},
onLoad: function (e) {
@@ -47,10 +48,11 @@ Page({
return
}
page ++
+ networkUtil.showLoading()
this.requestData()
},
- refesh: function() {
+ refesh: function () {
page = 1;
hasMore = true
this.setData({
@@ -60,6 +62,8 @@ Page({
networkUtil.showLoading()
// 网络请求,重新请求一遍数据
this.requestData();
+
+
},
myScroll:function(e){
// if(e.detail.scrollTop >= e.detail.scrollHeight-wx.getSystemInfoSync().windowHeight - 3){
@@ -67,6 +71,7 @@ Page({
// }
},
titleClick:function(e){
+
var self = this
var current_index = e.currentTarget.dataset.index
var categoryid = e.currentTarget.dataset.categoryid
@@ -77,7 +82,10 @@ Page({
})
page = 1;
hasMore = true
+ networkUtil.showLoading()
this.requestData()
+
+
},
getTitles(){
var self = this
@@ -104,9 +112,10 @@ Page({
requestData(){
var self = this
isRefresh = true
- networkUtil.showLoading()
+ // networkUtil.showLoading()
var param = { page: page, limit: pageLimit, typeid: self.data.category}
console.log(param)
+
networkUtil._get(api.messageList,param,function(res){
// console.log("messageList:"+res)
isRefresh = false
@@ -125,8 +134,13 @@ Page({
list:arr,
hasMore : hasMore,
})
+ wx.hideToast()
+ // wx.pageScrollTo({
+ // scrollTop: 0,
+ // })
},function(res){
isRefresh = false
+ wx.hideToast()
})
},
diff --git a/littleApp_child/pages/system_notifacations/system_notifacations.wxml b/littleApp_child/pages/system_notifacations/system_notifacations.wxml
index c9079ff..3971432 100644
--- a/littleApp_child/pages/system_notifacations/system_notifacations.wxml
+++ b/littleApp_child/pages/system_notifacations/system_notifacations.wxml
@@ -1,13 +1,14 @@
+
+
+
+
+
+
-
-
-
- {{item.title}}
-
-
-
@@ -50,7 +51,6 @@
+
-
-
-
\ No newline at end of file
+
\ 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 9c65d07..e441531 100644
--- a/littleApp_child/pages/system_notifacations/system_notifacations.wxss
+++ b/littleApp_child/pages/system_notifacations/system_notifacations.wxss
@@ -1,7 +1,7 @@
.main {
background: #fff;
width: 100%;
- margin-top: 40px;
+ /* margin-top: 40px; */
}
.title_top_view {
width: 100%;
@@ -43,12 +43,15 @@
}
.title_text {
+ line-height: 40px;
+ height: 40px;
font-size: 13px;
padding-top: 10px;
padding-bottom: 7px;
}
.list_scroll {
- height: 100vh;
+ height: calc(100vh-40px);
+ margin-top: 40px;
background: rgb(244, 244, 244);
/* background: rebeccapurple */
}