diff --git a/littleApp_child/pages/CheckReport/CheckReport.js b/littleApp_child/pages/CheckReport/CheckReport.js
index 2657c63..001387e 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.js
+++ b/littleApp_child/pages/CheckReport/CheckReport.js
@@ -38,7 +38,6 @@ Page({
isShowMore: function (e) {
var self = this
var index = e.currentTarget.dataset.index
- console.log(index)
if (index == 1) {
self.setData({
isShowOne: !self.data.isShowOne,
@@ -46,7 +45,7 @@ Page({
isShowThree: false,
})
} if (index == 2) {
- if (!self.data.wzInfo.handl_suggest){
+ if (!self.data.wzInfo.handlSuggest){
return
}
self.setData({
@@ -55,7 +54,7 @@ Page({
isShowThree: false,
})
} if (index == 3) {
- if (!self.data.wzInfo.guide_suggest) {
+ if (!self.data.wzInfo.guideSuggest) {
return
}
self.setData({
@@ -156,8 +155,10 @@ Page({
// 具体检查信息
networkUtil._get(api.wzXinxi, params, function (res) {
console.log('获取详细信息', res)
+ if (res.data.diagnose && res.data.diagnose.length > 0) {
+ res.data.diagnose = res.data.diagnose.split(",")
+ }
self.setData({
- list: res.data.list,
wzInfo: res.data
})
}, function (res) {
diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxml b/littleApp_child/pages/CheckReport/CheckReport.wxml
index 7b6e1c2..8fb8aca 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxml
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxml
@@ -85,10 +85,12 @@
-
-
-
-
+
+
+
+
+
+
@@ -96,9 +98,9 @@
-
+
-
+
@@ -106,10 +108,9 @@
-
+
-
-
+
diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxss b/littleApp_child/pages/CheckReport/CheckReport.wxss
index 319eaf8..7fd65ef 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxss
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxss
@@ -282,6 +282,12 @@
margin-top: 13px;
}
+.check_diagnosis_bg {
+ /* background: rebeccapurple; */
+ margin-right: 55px;
+ min-height: 25px;
+}
+
.check_diagnosis_content_1_line {
font-family: PingFangSC-Regular;
font-size: 13px;
@@ -294,7 +300,6 @@
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-
-webkit-box-orient: vertical;
}
@@ -305,7 +310,9 @@
margin-left: 10px;
padding-right: 10px;
width: calc(100% - 20px);
+
}
+
.high_risk_bg {
background: #e36767;
border-radius: 4px;
@@ -316,6 +323,7 @@
margin-right: 10px;
width: 40px;
height: 20px;
+ float: right;
}
diff --git a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js
index 6578785..2dec2fd 100644
--- a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js
+++ b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.js
@@ -88,6 +88,31 @@ Page({
})
},
-
-
+ // 文章点赞
+ articleLike() {
+ console.log(e)
+ var self = this
+ // 已经点赞
+ if (self.data.knowledge.isLike == 1) {
+ networkUtil.showErrorToast('您已经点过赞啦')
+ return;
+ }
+ networkUtil._post(api.articleLike, { id: articleId }, function (res) {
+ console.log(res)
+ var art = self.data.knowledge
+ art.likeCount++
+ art.isLike = 1
+ self.setData({
+ knowledge: art
+ })
+ if (categoryIndex) {
+ // 更新首页数据
+ event.emit('likeChanged', { categoryIndex: categoryIndex, articleIdIndex: articleIdIndex });
+ } else {
+ event.emit('listLikeChanged', { categoryIndex: categoryIndex, articleIdIndex: articleIdIndex });
+ }
+ }, function (res) {
+ console.log(res)
+ })
+ }
})
diff --git a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxml b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxml
index 58f81a4..bf13837 100644
--- a/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxml
+++ b/littleApp_child/pages/childcare_knowledge_detail/childcare_knowledge_detail.wxml
@@ -2,7 +2,7 @@
{{knowledge.title}}
-
+
{{knowledge.likeCount ? knowledge.likeCount : 0}}
diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js
index 4e05632..4f84f72 100644
--- a/littleApp_child/pages/home/home.js
+++ b/littleApp_child/pages/home/home.js
@@ -42,7 +42,7 @@ Page({
if (app.globalData.token == null || app.globalData.token == '') {
this.toLogin()
} else {
- networkUtil.showLoading()
+
this.homePage()
// 监听事件
event.on('likeChanged', this, function (data) {
@@ -139,36 +139,37 @@ Page({
},
// 获取用户信息
getUserInfo() {
- console.log(app.globalData.userId)
- var self = this
- var param = { 'token': app.globalData.token }
- networkUtil._get(api.userInfo + app.globalData.userId[0], {}, function (res) {
- console.log('获取用户信息',res)
- app.globalData.days = res.data.data.days
- app.globalData.userInfo = res.data.data
- self.getArticleInfo(res.data.data.days)
- self.setData({
- userData: res.data.data
- })
- }, function (res) {
- networkUtil.showErrorToast(res.errormsg)
+ networkUtil.showLoading()
+ var self = this
+ var param = { 'token': app.globalData.token }
+ networkUtil._get(api.userInfo + app.globalData.userId[0], {}, function (res) {
+ console.log('获取用户信息',res)
+ app.globalData.days = res.data.data.days
+ app.globalData.userInfo = res.data.data
+ self.getArticleInfo(res.data.data.days)
+ self.setData({
+ userData: res.data.data
})
+ }, function (res) {
+ networkUtil.showErrorToast(res.errormsg)
+ })
},
getArticleInfo(days) {
- var self = this
- // 文章列表
- networkUtil._get(api.homeArtList, { page: 0, limit: 100, days: days }, function (res) {
- console.log('获取文章信息', res.data.list)
- app.globalData.artList = res.data.list
- self.setData({
- list: res.data.list
- })
- }, function (res) {
- wx.stopPullDownRefresh()
+ var self = this
+ // 文章列表
+ networkUtil._get(api.homeArtList, { page: 0, limit: 100, days: days }, function (res) {
+ console.log('获取文章信息', res.data.list)
+ app.globalData.artList = res.data.list
+ self.setData({
+ list: res.data.list
})
+ }, function (res) {
+ wx.stopPullDownRefresh()
+ })
},
// 文章点赞
- articleLike() {
+ articleLike(e) {
+ console.log(e)
var self = this
// 已经点赞
if (self.data.articleDetail.isLike == 1) {
diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml
index d56bc4a..598fb43 100644
--- a/littleApp_child/pages/home/home.wxml
+++ b/littleApp_child/pages/home/home.wxml
@@ -71,8 +71,9 @@
-
-
+
+
+
diff --git a/littleApp_child/source/zanguo.png b/littleApp_child/source/zanguo.png
new file mode 100644
index 0000000000000000000000000000000000000000..902158e19985fa2cbc90c8687bbb2fce68860ebc
GIT binary patch
literal 1410
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8Nb`OS+@4BLl<6e(pbstPBi{k(nV8
zB@w}FfdWk9dNvV1jxdlLl3=B3ERzPNMYDuC(MQ%=Bu~mhw5?F;5kPQ;nS5g2g
zDap1~itr6kaLzAERWQ{v(KAr8<5EyiuqjGOvkG!?gK7uzY?U%fN(!v>^~=l4^~#O)
z@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6
ztE2?72o50bEXhnm*pycc^%l^B`XCv7Lp=k1xYc{bz#6h5dAYcTuuFeEf}
z_pV)024)vb-a73M3kxf|zQU#_uyKpU-Me>xJAM=B*mr2ga*b1S&z(EB_*UJj#SdE?
zi>wuo8k}KVet9S3W%C!)tE#Hru=sD)WqWv5!89Z)>ecD<=lPp{h_1;!m{8!pDy4J(
z!xq6}2W(@`0Cu&x$SaD;~#G;)s?+x@_?AIjT>iG39bNg-U
z?yfEu-r3nP28lIqBbyXV6hDNO%qv+j!}{shn|}|_J9yswwqNCMx3-FTKkK&r|H#1c
z{ZXSw?D6dQhx?cB*|SG~o}+i0$(tSC_+{D$C
zZ;N};W8N)ICA=KZ&u}eZR{4A}Qt)_rm9KAa@8b3ALUebfcC?WED@adZk)cc
zx8n5@j_Tia7CAc6XD)p%Rxb*tk4#T??CdGx-@^TR!DK?*JI&#RXRK3^iT%~G~$$%(_po6c|KSoz6g3+K6F
zZo3^`3HpmZ?tJDcSSGekT0G^Z?&?!9AC-R}(bG8jE+aWm8KBC$($GJ
zVpZ~Ry2OVS6K6NHT*^