From f3af7313453fc3c8583b882e5569c343c1d3de25 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Wed, 8 Jul 2020 17:23:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=A4=BE=E5=8C=BA=E8=AE=B2=E5=9D=9B=E5=88=97?= =?UTF-8?q?=E8=A1=A8bug=E4=BF=AE=E5=A4=8D=202.=E5=85=B4=E8=B6=A3=E7=BE=A4?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=A0=E4=BD=8D=E9=A1=B9=203.=E5=85=B4?= =?UTF-8?q?=E8=B6=A3=E7=BE=A4=E8=AD=A6=E6=B0=91=E7=BE=A4=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BE=A4=E4=B8=BB=E5=88=A0=E9=99=A4=E7=BE=A4=E5=91=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=204.=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subpages/education/pages/class/class.js | 8 ++++---- .../subpages/education/pages/healthyLife/healthyLife.js | 6 ++---- .../subpages/education/pages/hobby/hobby.wxml | 5 ----- .../subpages/property/components/contact/contact.js | 4 ++++ .../subpages/property/components/contact/contact.wxml | 4 ++-- .../property/pages/associationDetail/associationDetail.js | 2 +- .../property/pages/associationMember/associationMember.js | 6 ++++-- .../pages/associationMember/associationMember.wxml | 2 +- .../subpages/safety/pages/consultIndex/consultIndex.js | 2 +- .../subpages/safety/pages/consultIndex/consultIndex.wxss | 2 ++ epdc-resident-mp-yushan/subpages/safety/utils/api.js | 6 ++++++ 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/epdc-resident-mp-yushan/subpages/education/pages/class/class.js b/epdc-resident-mp-yushan/subpages/education/pages/class/class.js index 55c45dc..1fc8ee8 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/class/class.js +++ b/epdc-resident-mp-yushan/subpages/education/pages/class/class.js @@ -65,11 +65,11 @@ Page({ }, onReachBottom () { if(!this.data.isLoading){ - this.setData({ - loadMoreVisible: true, - isLoading:true - }) if (this.data.loadMoreType === 'more') { + this.setData({ + loadMoreVisible: true, + isLoading:true + }) this.setData({ loadMoreType:'loading' }) diff --git a/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.js b/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.js index 58e2880..22a4022 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/healthyLife/healthyLife.js +++ b/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 diff --git a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml b/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml index 25f7cb7..ced02ae 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.wxml +++ b/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"> - - - - - 暂无兴趣群 diff --git a/epdc-resident-mp-yushan/subpages/property/components/contact/contact.js b/epdc-resident-mp-yushan/subpages/property/components/contact/contact.js index 480d2f0..08074ca 100644 --- a/epdc-resident-mp-yushan/subpages/property/components/contact/contact.js +++ b/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: { diff --git a/epdc-resident-mp-yushan/subpages/property/components/contact/contact.wxml b/epdc-resident-mp-yushan/subpages/property/components/contact/contact.wxml index d343789..0cee222 100644 --- a/epdc-resident-mp-yushan/subpages/property/components/contact/contact.wxml +++ b/epdc-resident-mp-yushan/subpages/property/components/contact/contact.wxml @@ -18,9 +18,9 @@ 群主 - + - + diff --git a/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js b/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js index f61105b..3574a10 100644 --- a/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js +++ b/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}` }) }, // 跳转到 邀请好友 diff --git a/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.js b/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.js index 093a872..6506327 100644 --- a/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.js +++ b/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) { diff --git a/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.wxml b/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.wxml index 0a53362..fc540ff 100644 --- a/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.wxml +++ b/epdc-resident-mp-yushan/subpages/property/pages/associationMember/associationMember.wxml @@ -1,6 +1,6 @@ - + { - 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({ diff --git a/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxss b/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxss index 2ff2537..b7b25fb 100644 --- a/epdc-resident-mp-yushan/subpages/safety/pages/consultIndex/consultIndex.wxss +++ b/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{ diff --git a/epdc-resident-mp-yushan/subpages/safety/utils/api.js b/epdc-resident-mp-yushan/subpages/safety/utils/api.js index d8c60b4..97cedd2 100644 --- a/epdc-resident-mp-yushan/subpages/safety/utils/api.js +++ b/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) +}