From 867d2de9b0705ddff7490cc624ab66aa7f5ca1d0 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Fri, 5 Jun 2020 10:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A41+1=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 5 +- pages/indexNew/indexNew.js | 2 +- pages/toRegister/toRegister.js | 2 +- project.config.json | 16 +- .../components/communityList/communityList.js | 27 +++ .../communityList/communityList.json | 3 + .../communityList/communityList.wxml | 13 ++ .../communityList/communityList.wxss | 43 +++++ .../components/membersList/membersList.js | 100 +++++++++++ .../components/membersList/membersList.json | 3 + .../components/membersList/membersList.wxml | 64 +++++++ .../components/membersList/membersList.wxss | 164 ++++++++++++++++++ subpages/associationNew/images/add.png | Bin 0 -> 7188 bytes subpages/associationNew/images/arrowd.png | Bin 0 -> 417 bytes subpages/associationNew/images/arrowd2.png | Bin 0 -> 402 bytes subpages/associationNew/images/btn1.png | Bin 0 -> 1558 bytes subpages/associationNew/images/btn2.png | Bin 0 -> 1476 bytes subpages/associationNew/images/call.png | Bin 0 -> 8161 bytes .../associationNew/images/leader-logo.png | Bin 0 -> 2767 bytes subpages/associationNew/images/next.png | Bin 0 -> 912 bytes .../pages/associationlist/associationlist.js | 64 +++++-- .../associationlist/associationlist.json | 5 +- .../associationlist/associationlist.wxml | 11 +- .../associationlist/associationlist.wxss | 8 +- .../pages/community/community.js | 66 +++++++ .../pages/community/community.json | 6 + .../pages/community/community.wxml | 13 ++ .../pages/community/community.wxss | 49 ++++++ .../pages/gMembersList/gMembersList.js | 124 +++++++++++++ .../pages/gMembersList/gMembersList.json | 7 + .../pages/gMembersList/gMembersList.wxml | 12 ++ .../pages/gMembersList/gMembersList.wxss | 7 + .../pages/gOfficialsList/gOfficialsList.js | 69 ++++++++ .../pages/gOfficialsList/gOfficialsList.json | 7 + .../pages/gOfficialsList/gOfficialsList.wxml | 9 + .../pages/gOfficialsList/gOfficialsList.wxss | 6 + subpages/associationNew/utils/api.js | 66 +++++++ subpages/associationNew/utils/filters.wxs | 41 +++++ utils/config.js | 3 +- 39 files changed, 997 insertions(+), 18 deletions(-) create mode 100644 subpages/associationNew/components/communityList/communityList.js create mode 100644 subpages/associationNew/components/communityList/communityList.json create mode 100644 subpages/associationNew/components/communityList/communityList.wxml create mode 100644 subpages/associationNew/components/communityList/communityList.wxss create mode 100644 subpages/associationNew/components/membersList/membersList.js create mode 100644 subpages/associationNew/components/membersList/membersList.json create mode 100644 subpages/associationNew/components/membersList/membersList.wxml create mode 100644 subpages/associationNew/components/membersList/membersList.wxss create mode 100644 subpages/associationNew/images/add.png create mode 100644 subpages/associationNew/images/arrowd.png create mode 100644 subpages/associationNew/images/arrowd2.png create mode 100644 subpages/associationNew/images/btn1.png create mode 100644 subpages/associationNew/images/btn2.png create mode 100644 subpages/associationNew/images/call.png create mode 100644 subpages/associationNew/images/leader-logo.png create mode 100644 subpages/associationNew/images/next.png create mode 100644 subpages/associationNew/pages/community/community.js create mode 100644 subpages/associationNew/pages/community/community.json create mode 100644 subpages/associationNew/pages/community/community.wxml create mode 100644 subpages/associationNew/pages/community/community.wxss create mode 100644 subpages/associationNew/pages/gMembersList/gMembersList.js create mode 100644 subpages/associationNew/pages/gMembersList/gMembersList.json create mode 100644 subpages/associationNew/pages/gMembersList/gMembersList.wxml create mode 100644 subpages/associationNew/pages/gMembersList/gMembersList.wxss create mode 100644 subpages/associationNew/pages/gOfficialsList/gOfficialsList.js create mode 100644 subpages/associationNew/pages/gOfficialsList/gOfficialsList.json create mode 100644 subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml create mode 100644 subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxss create mode 100644 subpages/associationNew/utils/api.js create mode 100644 subpages/associationNew/utils/filters.wxs diff --git a/app.json b/app.json index 55961f5..527d68e 100644 --- a/app.json +++ b/app.json @@ -60,7 +60,10 @@ "root": "subpages/associationNew", "name": "associationNew", "pages": [ - "pages/associationlist/associationlist" + "pages/associationlist/associationlist", + "pages/community/community", + "pages/gMembersList/gMembersList", + "pages/gOfficialsList/gOfficialsList" ] }, { diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 27165df..564cc5b 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -409,7 +409,7 @@ Page({ }, dqhd() { wx.navigateTo({ - url: `../association/association` + url: `../../subpages/associationNew/pages/associationlist/associationlist` }) }, // 积分排名 diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 374e3b2..5e9f8a7 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = '1.2.0' + const versionNum = '0.9.7.23' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index 0215a71..8534479 100644 --- a/project.config.json +++ b/project.config.json @@ -7,9 +7,23 @@ "urlCheck": false, "es6": true, "postcss": true, + "preloadBackgroundData": false, "minified": true, "newFeature": true, - "autoAudits": false + "coverView": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", "libVersion": "2.8.2", diff --git a/subpages/associationNew/components/communityList/communityList.js b/subpages/associationNew/components/communityList/communityList.js new file mode 100644 index 0000000..72daebb --- /dev/null +++ b/subpages/associationNew/components/communityList/communityList.js @@ -0,0 +1,27 @@ +Component({ + data: { + + }, + properties: { + associationList: { + type: Array, + value: [], + observer: function (value) { + if (value.length > 0) { + console.log(value) + } + } + } + }, + methods: { + navigateToAss (e) { + console.log('navigateToAss') + if (e.currentTarget.dataset.join === '0'){ + this.triggerEvent('joinGroupCallBack',{partyGroupId: e.currentTarget.dataset.code}) + } + wx.navigateTo({ + url: `/subpages/associationNew/pages/community/community?code=${e.currentTarget.dataset.code}` + }) + } + } +}) \ No newline at end of file diff --git a/subpages/associationNew/components/communityList/communityList.json b/subpages/associationNew/components/communityList/communityList.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/subpages/associationNew/components/communityList/communityList.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/subpages/associationNew/components/communityList/communityList.wxml b/subpages/associationNew/components/communityList/communityList.wxml new file mode 100644 index 0000000..993fc00 --- /dev/null +++ b/subpages/associationNew/components/communityList/communityList.wxml @@ -0,0 +1,13 @@ + + + + + {{item.partyGroupName}} + + + + \ No newline at end of file diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss new file mode 100644 index 0000000..9333ff2 --- /dev/null +++ b/subpages/associationNew/components/communityList/communityList.wxss @@ -0,0 +1,43 @@ +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); +} +.community-item{ + width: 690rpx; + height: 300rpx; + border-radius: 10rpx; + position: relative; + margin: 0 auto; + margin-top: 28rpx; +} +.community-item image{ + width: 100%; + height: 100%; + position: absolute; + border-radius: 10rpx; +} +.community-item .cover-image{ + width: 100%; + height: 100%; + position: absolute; + background: rgba(0, 0, 0, 0.6); + border-radius: 10rpx; + text-align: center; + display: flex; + flex-direction: column; + justify-content: center; +} +.community-item .cover-image .community-name{ + color: white; + font-size: 48rpx; +} +.community-item .cover-image .community-add{ + width: 150rpx; + height: 46rpx; + text-align: left; + padding: 0; + margin-top: 32rpx; +} +.community-item .cover-image .community-add image{ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/subpages/associationNew/components/membersList/membersList.js b/subpages/associationNew/components/membersList/membersList.js new file mode 100644 index 0000000..9d19060 --- /dev/null +++ b/subpages/associationNew/components/membersList/membersList.js @@ -0,0 +1,100 @@ +Component({ + data: { + }, + properties: { + currentUser: { + type: Object, + value: {} + }, + gMembersList: { + type: Array, + value: [], + observer: function (value) { + if (value.length > 0) { + console.log(value) + } + } + }, + gOfficialsList: { + type: Array, + value: [], + observer: function (value) { + if (value.length > 0) { + console.log(value) + } + } + } + }, + methods: { + onNoSpeak (e) { + var _this = this; + wx.showActionSheet({ + itemList: ['取消禁言','禁言1天', '禁言1周', '禁言1月', '永久禁言'], + success (res) { + console.log(e.currentTarget.dataset.userId,res.tapIndex) + let data = { + userId: e.currentTarget.dataset.userId, + bannedFlag: res.tapIndex.toString() + } + _this.triggerEvent('bannedChange',data) + }, + fail (res) { + console.log(e.currentTarget.dataset.userId,res.errMsg) + } + }) + }, + onPhone (e) { + if (this.getSysInfo()){ + wx.showModal({ + title: '拨打电话', + content: `您确定拨打${e.currentTarget.dataset.number}`, + cancelColor: '#29B9A5', + confirmColor: '#29B9A5', + success: (res) => { + if (res.confirm) { + console.log('用户点击确定') + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.number + }) + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } else { + wx.makePhoneCall({ + phoneNumber: e.currentTarget.dataset.number + }) + } + }, + getSysInfo () { + wx.getSystemInfo({ + success:function(res){ + if(res.platform == "devtools"){ +             return false + }else if(res.platform == "ios"){ +             return false + }else if(res.platform == "android"){ +             return true + } + } + }) + }, + gLevelUp (e) { + console.log(e.currentTarget.dataset.userId) + let parm = { + groupUserId: e.currentTarget.dataset.userId, + identityFlag: '2' + } + this.triggerEvent('modifyIdentity',parm) + }, + gLevelDown (e) { + console.log(e.currentTarget.dataset.userId) + let parm = { + groupUserId: e.currentTarget.dataset.userId, + identityFlag: '0' + } + this.triggerEvent('modifyIdentity',parm) + } + } +}) \ No newline at end of file diff --git a/subpages/associationNew/components/membersList/membersList.json b/subpages/associationNew/components/membersList/membersList.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/subpages/associationNew/components/membersList/membersList.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/subpages/associationNew/components/membersList/membersList.wxml b/subpages/associationNew/components/membersList/membersList.wxml new file mode 100644 index 0000000..4b7222a --- /dev/null +++ b/subpages/associationNew/components/membersList/membersList.wxml @@ -0,0 +1,64 @@ + + + + + + + {{item.nickname}} + + + + + + + + + + + + + + + + + + + + + {{item.name}} + {{item.mobile}} + + + + + + {{item.motto}} + + + + \ No newline at end of file diff --git a/subpages/associationNew/components/membersList/membersList.wxss b/subpages/associationNew/components/membersList/membersList.wxss new file mode 100644 index 0000000..13e200d --- /dev/null +++ b/subpages/associationNew/components/membersList/membersList.wxss @@ -0,0 +1,164 @@ +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); +} +.line { + width: 690rpx; + height: 2rpx; + margin: 0 auto; + background: rgba(240, 240, 240, 1); +} +.members-item{ + background: rgba(255, 255, 255, 1); + margin-top: 20rpx; + position: relative; +} +.members-item .item-top{ + width: 750rpx; + height: 130rpx; + display: flex; + flex-direction: row; + justify-content: left; + align-items: center; +} +.members-item .item-top .head-icon{ + width: 90rpx; + height: 90rpx; + border-radius: 50%; + margin-left: 29rpx; +} +.members-item .item-top .user-name{ + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: rgba(0, 0, 0, 1); + margin-left: 20rpx; +} +.members-item .item-top .leader-logo{ + width: 59rpx; + height: 28rpx; + margin-left: 8rpx; +} +.members-item .item-bottom{ + height: 100rpx; + width: 750rpx; + position: relative; +} +.members-item .item-bottom .levelup-btn{ + display: inline-block; + width: 180rpx; + height: 48rpx; + padding: 0; + position: relative; + border: none; + margin-left: 29rpx; + margin-top: 26rpx; +} +.members-item .item-bottom .takeout-btn{ + display: inline-block; + width: 140rpx; + height: 48rpx; + padding: 0; + position: relative; + border: none; + z-index: 0; + margin-left: 20rpx; +} +.members-item .item-bottom .forbidden-btn{ + display: inline-block; + width: 170rpx; + height: 48rpx; + padding: 0; + position: absolute; + z-index: 0; + margin-left: 20rpx; + right: 32rpx; + top: 26rpx; + border: 1rpx solid rgba(241, 86, 28, 1); + border-radius: 23rpx; +} +.levelup-btn image, .takeout-btn image, .forbidden-btn image, .call-btn image{ + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; +} +.forbidden-btn image{ + width: 24rpx; + height: 14rpx; + position: absolute; + left: 135rpx; + top: 18rpx; +} +.levelup-btn text, .takeout-btn text{ + font-size: 26rpx; + font-family: PingFang SC; + font-weight: bold; + color: rgba(255, 255, 255, 1); + z-index: 1; + position: absolute; + left: 25rpx; + top: 0; + height: 48rpx; + line-height: 48rpx; +} +.forbidden-btn text{ + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + color: rgba(242, 80, 27, 1); + z-index: 1; + position: absolute; + left: 28rpx; + top: 0; + height: 48rpx; + line-height: 48rpx; +} +.disForbidden-btn { + border: 1rpx solid rgba(170, 170, 170, 1) !important; +} +.disForbidden-btn text{ + color: rgba(170, 170, 170, 1) !important; +} + +.members-item .item-top .call-btn{ + width: 156rpx; + height: 56rpx; + padding: 0; + position: absolute; + border: none; + right: 31rpx; +} +.members-item .item-top .np-info{ + display: flex; + flex-direction: column; +} +.members-item .item-top .user-phone{ + font-size: 32rpx; + font-family: PingFang SC; + font-weight: 500; + color: rgba(240, 133, 38, 1); + margin-left: 20rpx; +} +.members-item .item-bottom2{ + height: 100rpx; + width: 750rpx; + position: relative; + display: flex; + align-items: center; +} +.member-label{ + margin-left: 30rpx; + margin-right: 37rpx; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: 500; + color: rgba(153, 153, 153, 1); + display: -webkit-box; + overflow: hidden; + text-overflow: ellipsis; + word-wrap: break-word; + white-space: normal !important; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +} diff --git a/subpages/associationNew/images/add.png b/subpages/associationNew/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a088e877c3ee77f34dd80e4a9eb6126e71c074 GIT binary patch literal 7188 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 WJ98MBDut>50000 literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/arrowd.png b/subpages/associationNew/images/arrowd.png new file mode 100644 index 0000000000000000000000000000000000000000..814bd49cdf82af4d9da870c850c11b68bed8fe48 GIT binary patch literal 417 zcmV;S0bc%zP)lb!f<`t)c#fsG+f~v8lnK(X(2jphXG_ni^Vy z;8aMEJQqvvjWY@p?auNYzTtbH_xJmFKbo3)AmkPXSt2iJFshsxkCat-t9A8+WNa`F zsaYaR6MFI1=FvVxoAQ|)&I6eHmqer?VA8J}r(c|wz^+O%81{W+}R zZr~zvt{8=Nu=mNlew_y=^9>QB> zOfMH49?`pPrUKKJ<-H*o?nqULX4IE0Jvgn=@gvQ6a8~HagH&2DL7mcE_T@@fPH?;L zD6m7X+DwdK4upq5+LtXHyMenFv?K|2lfbBwE$q96_a*2D+MfLYtVMDUZ(>st00000 LNkvXXu0mjf8?L&) literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/arrowd2.png b/subpages/associationNew/images/arrowd2.png new file mode 100644 index 0000000000000000000000000000000000000000..57e427d7e9f04cfa5fc6434ffdf7ae5a37878a29 GIT binary patch literal 402 zcmV;D0d4+?P)DsZNOKt<9QUoUpF0MMcIq1J2IykyHIyrQ3RwvQmQnZ-FE>avF zTpSz}ip1o~leB1my;%E(4B>p|d%59~@B4=UwlUuG5{6;fahyjIk%=G(&Hz-#;UJ=S z5m{p9JJm<((QG!STCG-1MCSh~`HbUu)wb>PcF(s!ogfJEB60&@c0`E~(WYftM?d+F zK)v*Rza%18M3fytvd_#r-P|uhB3T1aZI3Ud=$M%|`el0r$+&h!WG`j;MI6T~wrz*0 z1&O38BI_E-y=j_@g+k$NP_FM6sIcq0*<3Dn31FcgEFw=tRAT1mVV4*vP*9`Mn2Dn3 z7C^qMh($07*qoM6N<$f@7qv^Z)<= literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/btn1.png b/subpages/associationNew/images/btn1.png new file mode 100644 index 0000000000000000000000000000000000000000..e303889d89d3322ad0efba59ad669b1920d47a12 GIT binary patch literal 1558 zcmV+x2I={UP)-~>ibNvOB@s@zGU213N)aJw3B&;rBBy``i4U0) zDnf-2Mv6q}pa6*i2wVYDf)vRRJ|ukmqTM^MZ+B;RX70|!dpuY6-OSv1_Ba3izc;fp z!k9mLl5O0~qbPe2?gw@Q+kxAF*{peSe8?nU3u#MAh01j%`FBiPO=XAQi~YUa?@{#! zh3o3Lu4znJ=pkGK{SCN;%D2oU7fJYBI$RwGNf!#<_VgsTa1$MbW58Zut`=Max;mgk zFMbq+4&fNN{)Pix*C(r}UI1O<8Xw40{NshOR3HjyJ;7GCa~yaM*iregy4FGzbR6(Q z+Bbz>zg%9>Zy3-+Na+>Ovn0GJ9sUjlI~ZtP-~hrK2zS*sZb0|D#wks!gTv!&Wa z^|&12;}EF5Kxg)1j&lglW|yj|h5>CrhYaZWGK%sRe|zTS!Qqz;Xam{@;hE@6MqS!%oOE1h-JmGCRLG|ypNdi8Es+pGAnv_I_Z*q zw7$$yW?0Ja6QJ;K>tGED>>EK(j>$al_kmvEGhm+qJ!JiSDia#a`P3-19kU$u zF-rE1F3Y^`mux-r99QzS%jTi`9cMtt*@)1%V8axe9wa+OPjLj{!$MeUmcxKXBn7*l-I!p@6uP3d z&N+hN1f5xq8Y>k8a15j|Wew;!pe3~&78F)*uOYX@P`~PHE3}f3;x8lYLU#Ytv4rpIz*i<4gA4iYZg@==>9 zZ23%KfB9&78Et|8nCqWoQgJb5z1fKW{Wb!fAXZv zv(#7U{tlz|knAwg26T&nES^8qo_4Pa8F5!7*K)r}z82D! zJyYn&H`irJTB6X(dvZ7_uv$UEw$mM4_ZXFpNyWvKwX~gESJQq8-A*^N9=74RJtP}5 z@M6ol>_o_2Hn$uR8=mLZBR!HLVY#x4f5X!Pwcb1Q%Z^$uq@G!hDX|>dWk&bQo)wY z?BLDP4K7q!eHSmZo!9`e$=7<@+DuuF2_L*!fZC2mcKguSpr{V0u^^nbBPllcXygLe zc6j~h2hzvD?^V*NTWz=2Jvc07r1|C4T2W1Dst@#@3kSv7j z)*Sj;Nc)!M*i2cD9`GlUsxUvH@(r`em+3*T(&4H*`5gA@buQ~f4nS7x_y7O^07*qo IM6N<$g58+(vH$=8 literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/btn2.png b/subpages/associationNew/images/btn2.png new file mode 100644 index 0000000000000000000000000000000000000000..3769d788b3f6d123765e9bc5f9f01e4cd655efff GIT binary patch literal 1476 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 Hu0mjf9-w_& literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/leader-logo.png b/subpages/associationNew/images/leader-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a27b847e8c1c067ceeddfc92636f7ec996848b2b GIT binary patch literal 2767 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 VB{?#7f_DG_002ovPDHLkV1jn8H3R?v literal 0 HcmV?d00001 diff --git a/subpages/associationNew/images/next.png b/subpages/associationNew/images/next.png new file mode 100644 index 0000000000000000000000000000000000000000..470884b0096456c93c70d0cac44e2ab9ee929f8d GIT binary patch literal 912 zcmV;B18@9^P)G6sVx!SN09g!nu7$DK#6%kjofaBGVNA4wXom*z z4^SaA6q|XhotO|XV7C?^4JOPSbI2?KGqXESyv-JS_k6#-=icw0a|!=>km#$bdQDN3 z%gk(8mi6f%nMl*LM*zn6h)!&5Y*d$)mi`Gx>bJvaqnQnKr}@ zfQ2*tAS&;VXaE&`Afa4EnqB3pPQ01+(|3P!3=Ch{j#ll@svQ zG|kTfmKzxyzZ`!u~&F}j}E1+rGRRHgU z`Ux?lTrO9s)oQ;3H)EJP+h>kk#}5HK54w&4j9Qj8)~=(9yaHZ9BK6;`0C@5G;Y}Tsza|ph@y0|qobobKR>?}C9Q1%q%3b^sq&CfwJd8Qig0so zOMnoTx~3?~U?z=82uq#wHe33wS-a*`EVaA4dnEPdG>N6g$^X8)AdIDE_CS$_rN&+X z?~zK12j31Stfj^VX!T4NrN>JG@Z;a=Mare9mYM|M0RSl`nj@B_#s=`3iJix405#Jz mzr+m|=XY)If;d5={N^v1_>_>u&;vsN0000 { + console.log('获取党群列表', res) + this.setData({ + associationList: [...this.data.associationList, ...res.data], + loadMoreType: res.data.length === this.data.pageSize ? 'loading': 'none' + }) + }).catch(err => { + console.log(err) + this.setData({ + associationList: [], + loadMoreType: 'none' + }) + }) + }, + //加入党群 + getJoinGroup (pid) { + let parm = { + partyGroupId: pid + } + getJoinGroup(parm).then(res => { + console.log(res) + }).catch(err => { + console.log(err) + }) + }, + joinGroupCallBack (e) { + this.getJoinGroup(e.detail.partyGroupId); } -}) \ No newline at end of file +}) diff --git a/subpages/associationNew/pages/associationlist/associationlist.json b/subpages/associationNew/pages/associationlist/associationlist.json index ddf575b..1e1da6b 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.json +++ b/subpages/associationNew/pages/associationlist/associationlist.json @@ -1,4 +1,7 @@ { - "usingComponents": {}, + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore", + "community-list": "../../components/communityList/communityList" + }, "navigationBarTitleText": "党群列表" } \ No newline at end of file diff --git a/subpages/associationNew/pages/associationlist/associationlist.wxml b/subpages/associationNew/pages/associationlist/associationlist.wxml index 4ed0294..4401062 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.wxml +++ b/subpages/associationNew/pages/associationlist/associationlist.wxml @@ -1,2 +1,11 @@ -subpages/associationNew/pages/associationlist/associationlist.wxml + + + + + + \ No newline at end of file diff --git a/subpages/associationNew/pages/associationlist/associationlist.wxss b/subpages/associationNew/pages/associationlist/associationlist.wxss index 65bba42..575bdf7 100644 --- a/subpages/associationNew/pages/associationlist/associationlist.wxss +++ b/subpages/associationNew/pages/associationlist/associationlist.wxss @@ -1 +1,7 @@ -/* subpages/associationNew/pages/associationlist/associationlist.wxss */ \ No newline at end of file +/* subpages/associationNew/pages/associationlist/associationlist.wxss */ +page { + width:100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} \ No newline at end of file diff --git a/subpages/associationNew/pages/community/community.js b/subpages/associationNew/pages/community/community.js new file mode 100644 index 0000000..f8ba6ff --- /dev/null +++ b/subpages/associationNew/pages/community/community.js @@ -0,0 +1,66 @@ +import { getImageUrl} from '../../utils/api' +Page({ + + /** + * 页面的初始数据 + */ + data: { + partyGroupId: '', + imageUrlList: [], + pageNo: 1, + pageSize: 10 + }, + onLoad: function (options) { + this.data.partyGroupId = options.code + getImageUrl().then(res => { + this.setData({ + imageUrlList: [...res.data] + }) + }) + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + //跳转页面 + navToGroupMembers (e) { + console.log(this.data.partyGroupId) + wx.navigateTo({ + url: `/subpages/associationNew/pages/gMembersList/gMembersList?partyGroupId=${this.data.partyGroupId}` + }) + }, + navToNewPage (e) { + // console.log(e.currentTarget.dataset.page); + if (e.currentTarget.dataset.page === 'help') { + wx.navigateTo({ + url: `/subpages/associationNew/pages/gOfficialsList/gOfficialsList?partyGroupId=${this.data.partyGroupId}` + }) + } else if (e.currentTarget.dataset.page === 'gather') { + console.log('/subpages/associationNew/pages/community/community.js') + wx.navigateTo({ + url: `#/话对捧个场` + }) + } else if (e.currentTarget.dataset.page === 'applause') { + wx.navigateTo({ + url: `#/事好鼓个掌` + }) + } + } +}) diff --git a/subpages/associationNew/pages/community/community.json b/subpages/associationNew/pages/community/community.json new file mode 100644 index 0000000..a189f5f --- /dev/null +++ b/subpages/associationNew/pages/community/community.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore" + }, + "navigationBarTitleText": "党群 1+1" +} \ No newline at end of file diff --git a/subpages/associationNew/pages/community/community.wxml b/subpages/associationNew/pages/community/community.wxml new file mode 100644 index 0000000..6d856ed --- /dev/null +++ b/subpages/associationNew/pages/community/community.wxml @@ -0,0 +1,13 @@ + + + 群成员 + + + + + + diff --git a/subpages/associationNew/pages/community/community.wxss b/subpages/associationNew/pages/community/community.wxss new file mode 100644 index 0000000..1a59e2d --- /dev/null +++ b/subpages/associationNew/pages/community/community.wxss @@ -0,0 +1,49 @@ +page { + width:100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} +.hover-btn { + box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1); +} +.community .func-top{ + height: 94rpx; + width: 750rpx; + position: relative; + background: rgba(255, 255, 255, 1); +} +.community .func-top text{ + height: 94rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: rgba(51, 51, 51, 1); + line-height: 94rpx; + position: absolute; + left: 29rpx; +} +.community .func-top .top-right{ + width: 40rpx; + height: 94rpx; + padding: 0; + border: none; + position: absolute; + right: 34rpx; +} +.community .func-top .top-right image{ + width: 18rpx; + height: 24rpx; + margin: 0; + position: absolute; + top: 30rpx; +} +.community .func-item{ + width: 720rpx; + height: 270rpx; + margin: 0 auto; +} +.community .func-item image{ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.js b/subpages/associationNew/pages/gMembersList/gMembersList.js new file mode 100644 index 0000000..7b39c7e --- /dev/null +++ b/subpages/associationNew/pages/gMembersList/gMembersList.js @@ -0,0 +1,124 @@ +import { + getPartyUserList, + postUserBanned, + postModifyIdentity, + getCurrentUserInfo +} from '../../utils/api' +Page({ + + /** + * 页面的初始数据 + */ + data: { + currentUser: {}, + gMembersList: [], + loadMoreVisible: false, + loadMoreType: 'none', + preloadVisible: true, + pageNo: 1, + pageSize: 10, + partyGroupId: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.data.partyGroupId = options.partyGroupId + this.getCurrentUserInfo().then(res => { + if (res) { + this.getPartyUserList(); + } + }) + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === 'loading') { + this.setData({ + pageNo: this.data.pageNo + 1 + }) + this.getPartyUserList() + } + }, + //获取当前用户信息 + getCurrentUserInfo () { + return new Promise ((resolve,reject) => { + getCurrentUserInfo (this.data.partyGroupId).then(res => { + console.log('获取当前用户信息', res) + this.setData({ + currentUser: {...res.data} + }) + resolve(true) + }).catch(err =>{ + console.log(err) + this.data.currentUser = {} + reject(false) + }) + }) + }, + // 获取群成员列表 + getPartyUserList () { + const para = { + pageIndex: this.data.pageNo, + pageSize: this.data.pageSize, + partyGroupId: this.data.partyGroupId + } + getPartyUserList(para).then(res => { + console.log('获取群成员列表', res) + this.setData({ + // currentUser: {...res.data.currentUser}, + gMembersList: [...this.data.gMembersList, ...res.data], + loadMoreType: res.data.length === this.data.pageSize ? 'loading': 'none', + preloadVisible: false + }) + }).catch(err => { + console.log(err) + this.setData({ + gMembersList: [], + loadMoreType: 'none', + preloadVisible: false + }) + }) + }, + bannedChangeCallBack (e) { + console.log(e.detail) + const para = {...e.detail} + postUserBanned(para).then(res => { + console.log('用户禁言', res) + this.data.gMembersList = this.data.gMembersList.map( item => { + if (item.userId === e.detail.userId) { + item.bannedFlag = e.detail.bannedFlag + } + return item + }) + this.setData({ + gMembersList: this.data.gMembersList + }) + }).catch(err => { + console.log(err) + }) + }, + modifyIdentityCallBack (e) { + console.log(e.detail) + const para = {...e.detail} + postModifyIdentity(para).then(res => { + console.log('修改用户身份', res) + this.getPartyUserList(); + }).catch(err => { + console.log(err) + }) + } +}) diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.json b/subpages/associationNew/pages/gMembersList/gMembersList.json new file mode 100644 index 0000000..8c338b2 --- /dev/null +++ b/subpages/associationNew/pages/gMembersList/gMembersList.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore", + "members-list": "../../components/membersList/membersList" + }, + "navigationBarTitleText": "群成员" +} \ No newline at end of file diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.wxml b/subpages/associationNew/pages/gMembersList/gMembersList.wxml new file mode 100644 index 0000000..198fdc0 --- /dev/null +++ b/subpages/associationNew/pages/gMembersList/gMembersList.wxml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.wxss b/subpages/associationNew/pages/gMembersList/gMembersList.wxss new file mode 100644 index 0000000..575bdf7 --- /dev/null +++ b/subpages/associationNew/pages/gMembersList/gMembersList.wxss @@ -0,0 +1,7 @@ +/* subpages/associationNew/pages/associationlist/associationlist.wxss */ +page { + width:100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} \ No newline at end of file diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.js b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.js new file mode 100644 index 0000000..745e9d8 --- /dev/null +++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.js @@ -0,0 +1,69 @@ +import { getOfficialsList } from '../../utils/api' +Page({ + /** + * 页面的初始数据 + */ + data: { + partyGroupId: '', + gOfficialsList: [], + loadMoreVisible: false, + loadMoreType: 'none', + preloadVisible: true, + pageNo: 1, + pageSize: 10 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.data.partyGroupId = options.partyGroupId + this.getOfficialsList(); + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === 'loading') { + this.setData({ + pageNo: this.data.pageNo + 1 + }) + this.getOfficialsList() + } + }, + + // 官小带个长 列表 + getOfficialsList () { + const para = { + pageIndex: this.data.pageNo, + pageSize: this.data.pageSize, + partyGroupId: this.data.partyGroupId + } + getOfficialsList(para).then(res => { + console.log('获取官小带个长列表', res) + this.setData({ + gOfficialsList: [...this.data.gOfficialsList, ...res.data], + loadMoreType: res.data.length === this.data.pageSize ? 'loading': 'none', + preloadVisible: false + }) + }).catch(err => { + console.log(err) + this.setData({ + gOfficialsList: [], + loadMoreType: 'none', + preloadVisible: false + }) + }) + } +}) diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json new file mode 100644 index 0000000..8c338b2 --- /dev/null +++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "load-more": "../../../../components/loadMore/loadMore", + "members-list": "../../components/membersList/membersList" + }, + "navigationBarTitleText": "群成员" +} \ No newline at end of file diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml new file mode 100644 index 0000000..ebbdb96 --- /dev/null +++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxss b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxss new file mode 100644 index 0000000..70a5b21 --- /dev/null +++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxss @@ -0,0 +1,6 @@ +page { + width:100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} \ No newline at end of file diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js new file mode 100644 index 0000000..b22e0cc --- /dev/null +++ b/subpages/associationNew/utils/api.js @@ -0,0 +1,66 @@ +const request = require('../../../utils/request') +/** + *获取图片 + */ +export function getImageUrl() { + return request.get('imgConfig/getImgUrl/1') +} +/** + *进入党群 + */ +export function getJoinGroup({partyGroupId}) { + return request.get('partyGroup/group/join',{ + partyGroupId + }) +} +/** + *党群名称列表 + */ +export function getPartyGroupList() { + return request.get('partyGroup/group/list') +} +/** + * 群成员列表 + */ +export function getPartyUserList({pageIndex, pageSize, partyGroupId}) { + return request.get('partyGroup/user/list',{ + pageIndex, + pageSize, + partyGroupId + }) +} +/** + * 官小带个长列表 + */ +export function getOfficialsList({pageIndex, pageSize, partyGroupId}) { + return request.get('partyGroup/officials/list',{ + pageIndex, + pageSize, + partyGroupId + }) +} +/** + * 当前用户信息 + */ +export function getCurrentUserInfo(partyGroupId) { + return request.get('partyGroup/user/currentUserInfo/'+partyGroupId) +} +/** + * 用户身份修改 + */ +export function postModifyIdentity({groupUserId, identityFlag}) { + return request.post('partyGroup/user/modifyIdentity',{ + groupUserId, + identityFlag + }) +} +/** + * 用户禁言 + */ +export function postUserBanned({groupUserId, bannedFlag}) { + return request.post('partyGroup/user/banned',{ + groupUserId, + bannedFlag + }) +} + diff --git a/subpages/associationNew/utils/filters.wxs b/subpages/associationNew/utils/filters.wxs new file mode 100644 index 0000000..88accf4 --- /dev/null +++ b/subpages/associationNew/utils/filters.wxs @@ -0,0 +1,41 @@ +var GROUP_LEADER='0'; +var GROUP_LEADER_2='1'; +var GROUP_MEMBER='2'; + +var getIdentity = function (btnType,mypower,userpower) { + if (btnType === 0) { + if (mypower === GROUP_LEADER && userpower === GROUP_MEMBER) { + return true + } else { + return false + } + } else if (btnType === 1) { + if (mypower === GROUP_LEADER && userpower === GROUP_LEADER_2) { + return true + } else { + return false + } + } else { + if (mypower === GROUP_LEADER && userpower !== GROUP_LEADER) { + return true + } else if (mypower === GROUP_LEADER_2 && userpower === GROUP_MEMBER) { + return true + } else { + return false + } + } +} +var getBanned = function (code) { + var index = parseInt(code) + return [ + ' 未禁言', + '禁言1天', + '禁言1周', + '禁言1月', + '永久禁言' + ][index] +} +module.exports = { + getIdentity: getIdentity, + getBanned: getBanned +} \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index b705e92..66f23bc 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,13 +6,14 @@ module.exports = { }; function BASEURL() { + return 'https://eug-test.elinkit.com.cn/kc/epdc-api/api/' //党群1+1 // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return "http://219.146.91.110:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 } function WEBROOT() {