修改首页和社区资讯bug

epdc-resident-mp-yushan/pages/index/components/sudoku/sudoku.wxml

@@ -12,9 +12,9 @@
       <image src="../../../../images/home/safe-yushan.png" />
       <view class="name">平安榆山</view>
     </view>
-    <view class="item" hover-stay-time="150" bindtap="navigateToProperty">
-      <image src="../../../../images/home/service-company.png" />
-      <view class="name">我的物业</view>
+    <view class="item heart" hover-stay-time="150" bindtap="navigateToHeart">
+      <image src="../../../../images/home/heart.png" />
+      <view class="name">互帮互助</view>
     </view>
     <view class="item" hover-stay-time="150" bindtap="navigateToIntegral">
       <image src="../../../../images/home/point-ranking.png" />

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;

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(/\<img/gi, '<img style="max-width:100%;height:auto"')
       })
     }).catch(err => {
       console.log(err)

epdc-resident-mp-yushan/subpages/communityNews/pages/detail/detail.wxml

@@ -15,7 +15,7 @@
       </view>
     </view>
     <view class="richContent">
-      <rich-text nodes="{{detailObj.noticeContent}}"></rich-text>
+      <rich-text nodes="{{detailObjContent}}"></rich-text>
     </view>
   </view>
 </view>

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;

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()

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 {