1.社区讲坛列表bug修复

2.兴趣群删除占位项
3.兴趣群警民群删除群主删除群员功能
4.心理咨询页面增加强制换行

epdc-resident-mp-yushan/subpages/education/pages/class/class.js

@@ -65,11 +65,11 @@ Page({
   },
   onReachBottom () {
     if(!this.data.isLoading){
+      if (this.data.loadMoreType === 'more') {
         this.setData({
           loadMoreVisible: true,
           isLoading:true
         })
-      if (this.data.loadMoreType === 'more') {
         this.setData({
           loadMoreType:'loading'
         })

epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.js

@@ -130,12 +130,10 @@ Page({
   },
   onReachBottom () {
     if(!this.data.isLoading){
-      this.setData({
-        loadMoreVisible: true,
-        isLoading:true
-      })
       if (this.data.loadMoreType === 'more') {
         this.setData({
+          loadMoreVisible: true,
+          isLoading:true,
           loadMoreType:'loading'
         })
         this.data.pageNo += 1

epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml

@@ -20,11 +20,6 @@
         data-groupName="{{item.groupName}}" data-state="{{item.groupState}}" data-groupId="{{item.id}}" data-index="{{index}}" bindtap="joinGroup" class="item-join"></image>
     </view>
   </view>
-  <view class="item" >
-    <view style="width:100%">
-      <image src="../../images/collapse.png" class="collapse"></image>
-    </view>
-  </view> 
 </view>
 <view wx:if="{{noDataFlag}}" class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
   <view class="no-data">暂无兴趣群</view>

epdc-resident-mp-yushan/subpages/property/components/contact/contact.js

@@ -48,6 +48,10 @@ Component({
     groupCategory: {
       type: String,
       value: '1'
+    },
+    from:{
+      type:String,
+      value:''
     }
   },
   pageLifetimes: {

epdc-resident-mp-yushan/subpages/property/components/contact/contact.wxml

@@ -18,9 +18,9 @@
             </checkbox-group>
             <block wx:elif="{{pageType == 'delete'}}">
               <view class="lordFlag" wx:if="{{items.lordFlag == 1}}">群主</view>
-              <button bindtap="operationBtn" data-userid="{{items.userId}}" data-id="{{items.id}}" wx:elif="{{loadFlag == 1 && groupCategory != '0'}}" hover-class="hover-btn" type="default" size="mini">{{btnName}}</button>
+              <button bindtap="operationBtn" data-userid="{{items.userId}}" data-id="{{items.id}}" wx:elif="{{loadFlag == 1 && groupCategory != '0' && from !=='hobby'}}" hover-class="hover-btn" type="default" size="mini">{{btnName}}</button>
             </block>
-            <button bindtap="operationBtn" data-id="{{items.id}}" data-userid="{{items.userId}}" wx:else hover-class="hover-btn" type="default" size="mini">{{btnName}}</button>
+            <button bindtap="operationBtn" data-id="{{items.id}}" data-userid="{{items.userId}}" wx:elif="{{from !== 'hobby'}}" hover-class="hover-btn" type="default" size="mini">{{btnName}}</button>
           </view>
         </view>
       </view>

epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js

@@ -45,7 +45,7 @@ Page({
   // 跳转到 群成员
   navigateToMember () {
     wx.navigateTo({
-      url: `/subpages/property/pages/associationMember/associationMember?id=${this.data.userInfo.id}&groupCategory=${this.data.userInfo.groupCategory}`
+      url: `/subpages/property/pages/associationMember/associationMember?id=${this.data.userInfo.id}&groupCategory=${this.data.userInfo.groupCategory}&from=${this.data.from}`
     })
   },
   // 跳转到 邀请好友

epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.js

@@ -7,7 +7,8 @@ Page({
     groupId: '',
     id: '',
     dialogVisible: false,
-    groupCategory: '1'
+    groupCategory: '1',
+    from:''
   },
   onShow () {
   },
@@ -15,7 +16,8 @@ Page({
     this.getAssociationMember(options.id)
     this.setData({
       groupId: options.id,
-      groupCategory: options.groupCategory
+      groupCategory: options.groupCategory,
+      from:options.from
     })
   },
   getAssociationMember (groupId) {

epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.wxml

@@ -1,6 +1,6 @@
 <view class="association-member">
   
-  <contact groupCategory="{{groupCategory}}" scrollViewTop="{{0}}" scrollViewBottom="{{0}}" pageType="delete" dataList="{{associationMemberList}}" bind:operationBtn="deleteMember"></contact>
+  <contact groupCategory="{{groupCategory}}" scrollViewTop="{{0}}" scrollViewBottom="{{0}}" pageType="delete" dataList="{{associationMemberList}}" bind:operationBtn="deleteMember" from="{{from}}"></contact>
 
   <notice 
     dialogVisible="{{dialogVisible}}" 

epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.js

@@ -127,7 +127,7 @@ Page({
       }).exec();
       query.selectAll('#answerContent').boundingClientRect(function (rect) {
         rect.forEach((v, i) => {
-            if (v.height > 70) {
+            if (v.height > 65) {
               var set = "questionList[" + v.dataset.question + "].answerList[0].collapse";
               var set1 = "questionList[" + v.dataset.question + "].answerList[0].showCollapse";
               that.setData({

epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxss

@@ -195,11 +195,13 @@ button::after{
   font-size: 28rpx;
   line-height: 40rpx;
   display: block;
+  word-break: break-all;
 }
 .question-content text{
   font-size: 28rpx;
   line-height: 50rpx;
   display: block;
+  word-break: break-all;
 }
 
 .answer-content text.text-collapse{

epdc-resident-mp-yushan/subpages/safety/utils/api.js

@@ -254,3 +254,9 @@ export function getMyTopicList ({ pageIndex , pageSize , groupId}) {
   export function getConsultantInfo (id) {
     return request.get('property/psychology/psychologistInfo/'+id)
   }
+/**
+ * 入群接口（跳过申请流程）
+ */
+export function joinGroup (param) {
+  return request.post('property/group/join',param)
+}