diff --git a/epdc-resident-mp-yushan/images/home/heart.png b/epdc-resident-mp-yushan/images/home/heart.png
new file mode 100644
index 0000000..3825df2
Binary files /dev/null and b/epdc-resident-mp-yushan/images/home/heart.png differ
diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
index 0924af3..95409a6 100644
--- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
+++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml
@@ -12,9 +12,9 @@
平安榆山
-
-
- 我的物业
+
+
+ 互帮互助
diff --git a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss
index e34811d..8b08576 100644
--- a/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss
+++ b/epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxss
@@ -25,6 +25,13 @@
width: 124rpx;
height: 124rpx;
}
+.item.heart image {
+ width: 165rpx;
+ height: 165rpx;
+ transform: scale(0.65);
+ position: relative;
+ top: 8px;
+}
.item .name {
font-size: 26rpx;
color: #3f3f3f;
diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js
index a417493..993a7cf 100644
--- a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js
+++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.js
@@ -18,7 +18,8 @@ Page({
homeApi.contentDetail(this.data.detailId).then(res => {
console.log(res)
this.setData({
- detailObj: res.data
+ detailObj: res.data,
+ detailObjContent: res.data.noticeContent.replace(/\
{
console.log(err)
diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxml b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxml
index a3c460d..c26e961 100644
--- a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxml
+++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxml
@@ -15,7 +15,7 @@
-
+
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxss b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxss
index 7a8fe4d..6ba7970 100644
--- a/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxss
+++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxss
@@ -7,7 +7,6 @@
}
.selfContent {
width: 100%;
- display: table;
background: #ffffff;
border-radius: 16rpx;
box-sizing: border-box;
diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.js b/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.js
index 1b48d7b..5a21fa4 100644
--- a/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.js
@@ -13,17 +13,17 @@ Page({
},
onShow() {
wx.showLoading({
- title: '加载中,,,'
+ title: '加载中...'
})
this.contentList()
this.contentModuleList()
},
- onPageScroll() {
+ onReachBottom() {
this.setData({
loadMoreVisible: true
})
- if (this.loadMoreType === 'loading') {
- this.pageNo += 1
+ if (this.data.loadMoreType === 'loading') {
+ this.data.pageNo += 1
this.contentList()
}
},
@@ -36,8 +36,9 @@ Page({
newsList: [],
currentView: `item${tab}`
})
+ this.data.pageNo = 1
wx.showLoading({
- title: '加载中,,,'
+ title: '加载中...'
})
this.contentList()
},
@@ -51,7 +52,7 @@ Page({
homeApi.contentList(params).then(res => {
console.log('社区最新资讯', res)
this.setData({
- newsList: res.data,
+ newsList: [...this.data.newsList, ...res.data],
loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none'
})
wx.hideLoading()
diff --git a/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.wxss b/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.wxss
index 39b162d..bf2dafc 100644
--- a/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.wxss
+++ b/epdc-resident-mp-yushan/subpages/communityNews/pages/index/index.wxss
@@ -4,6 +4,14 @@ image {
float: left;
}
+
+::-webkit-scrollbar{
+ width: 0;
+ height: 0;
+ color: transparent;
+ display:none;
+}
+
.community-news {
width: 100%;
min-height: 100vh;
@@ -18,6 +26,7 @@ image {
position: fixed;
top: 0;
left: 0;
+ overflow: hidden;
}
.community-news scroll-view .tab-list {