From a026dac52be7f02f7a0783108fc8a6c154b57807 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 17 Jun 2020 10:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=82=B9=E8=B5=9E=E4=BA=BA?= =?UTF-8?q?=E5=91=98=EF=BC=9B=E6=98=BE=E7=A4=BA=E6=9C=AC=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 335 ++++++------- project.config.json | 2 +- .../communityList/communityList.wxss | 86 ++-- .../components/membersList/membersList.wxml | 113 ++--- .../components/membersList/membersList.wxss | 336 ++++++------- .../associationNew/images/leader-logo.png | Bin 2767 -> 0 bytes .../associationNew/images/leader-logo@2x.png | Bin 0 -> 7177 bytes .../associationNew/images/leader2-logo@2x.png | Bin 0 -> 8032 bytes .../associationNew/images/resident@2x.png | Bin 0 -> 12195 bytes .../pages/community/community.js | 137 +++--- .../pages/community/community.wxml | 30 +- .../pages/eventlist/eventlist.wxml | 121 ++--- .../pages/eventlist/eventlist.wxss | 447 +++++++++--------- .../pages/guideInfo/guideInfo.js | 15 + .../pages/guideInfo/guideInfo.json | 5 + .../pages/guideInfo/guideInfo.wxml | 5 + .../pages/guideInfo/guideInfo.wxss | 9 + subpages/associationNew/utils/api.js | 263 ++++++----- utils/config.js | 58 +-- 19 files changed, 1026 insertions(+), 936 deletions(-) delete mode 100644 subpages/associationNew/images/leader-logo.png create mode 100644 subpages/associationNew/images/leader-logo@2x.png create mode 100644 subpages/associationNew/images/leader2-logo@2x.png create mode 100644 subpages/associationNew/images/resident@2x.png create mode 100644 subpages/associationNew/pages/guideInfo/guideInfo.js create mode 100644 subpages/associationNew/pages/guideInfo/guideInfo.json create mode 100644 subpages/associationNew/pages/guideInfo/guideInfo.wxml create mode 100644 subpages/associationNew/pages/guideInfo/guideInfo.wxss diff --git a/app.json b/app.json index 9248edf..c1181b9 100644 --- a/app.json +++ b/app.json @@ -1,168 +1,169 @@ -{ - "pages": [ - "pages/start/start", - "pages/indexNew/indexNew", - "pages/index/index", - "pages/mine/mine", - "pages/association/association", - "pages/discussion/discussion", - "pages/toRegister/toRegister", - "pages/toScan/toScan", - "pages/complete/complete", - "pages/formid/formid", - "pages/register/register", - "pages/detail/detail", - "pages/accept/accept", - "pages/gridLeaderRegister/gridLeaderRegister", - "pages/heart/heart", - "pages/heartNew/heartNew" - ], - "subPackages": [ - { - "root": "subpages/home", - "name": "home", - "pages": [ - "pages/webview/webview", - "pages/agreement/agreement", - "pages/notice/notice", - "pages/noticeNew/noticeNew", - "pages/info/info", - "pages/noticeDetail/noticeDetail", - "pages/newsDetail/newsDetail", - "pages/newsList/newsList" - ] - }, - { - "root": "subpages/changegrid", - "name": "changeGrid", - "pages": [ - "pages/changeGrid/changeGrid" - ] - }, - { - "root": "subpages/association", - "name": "association", - "pages": [ - "pages/joinassociation/joinassociation", - "pages/createassociation/createassociation", - "pages/associationMember/associationMember", - "pages/associationDetail/associationDetail", - "pages/inviteFriend/inviteFriend", - "pages/incomingVerify/incomingVerify", - "pages/unpassAssociation/unpassAssociation", - "pages/topicList/topicList", - "pages/addTopic/addTopic", - "pages/topicDetail/topicDetail", - "pages/replyOrRemark/replyOrRemark", - "pages/changeToIssue/changeToIssue" - ] - }, - { - "root": "subpages/associationNew", - "name": "associationNew", - "pages": [ - "pages/associationlist/associationlist", - "pages/community/community", - "pages/gMembersList/gMembersList", - "pages/gOfficialsList/gOfficialsList", - "pages/talklist/talklist", - "pages/eventlist/eventlist", - "pages/addTopic/addTopic" - ] - }, - { - "root": "subpages/discussion", - "name": "discussion", - "pages": [ - "pages/addIssue/addIssue", - "pages/discussionDetail/discussionDetail", - "pages/publishEvaluation/publishEvaluation", - "pages/remarkOrReply/remarkOrReply", - "pages/searchDiscussion/searchDiscussion", - "pages/categoryList/categoryList" - ] - }, - { - "root": "subpages/mine", - "name": "mine", - "pages": [ - "pages/eventDetail/eventDetail", - "pages/inviteRecord/inviteRecord", - "pages/gridManage/gridManage" - ] - }, - { - "root": "subpages/integralCentre", - "name": "integralCentre", - "pages": [ - "pages/index/index" - ] - }, - { - "root": "subpages/heart", - "pages": [ - "pages/heartDetail/heartDetail", - "pages/leaderboard/leaderboard", - "pages/leaderboardNew/leaderboardNew", - "pages/myNews/myNews", - "pages/clockIn/clockIn", - "pages/volunteer/volunteer", - "pages/signed/signed", - "pages/refusedOrEndedDetail/refusedOrEndedDetail", - "pages/cancelDetail/cancelDetail" - ] - }, - { - "root": "subpages/understandJs", - "pages": [ - "pages/index/index", - "pages/impression/impression", - "pages/delicious/delicious", - "pages/sclerotia/sclerotia", - "pages/archives/archives", - "pages/noticeDetail/noticeDetail" - ] - } - ], - "preloadRule": { - "pages/indexNew/indexNew": { - "network": "all", - "packages": [ - "subpages/changegrid" - ] - }, - "pages/discussion/discussion": { - "network": "all", - "packages": [ - "discussion" - ] - }, - "pages/association/association": { - "network": "all", - "packages": [ - "subpages/association" - ] - }, - "pages/mine/mine": { - "network": "all", - "packages": [ - "mine" - ] - } - }, - "window": { - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "black" - }, - "networkTimeout": { - "request": 6000 - }, - "permission": { - "scope.userLocation": { - "desc": "e锦水将获取您的位置信息" - } - }, - "sitemapLocation": "sitemap84.json" +{ + "pages": [ + "pages/start/start", + "pages/indexNew/indexNew", + "pages/index/index", + "pages/mine/mine", + "pages/association/association", + "pages/discussion/discussion", + "pages/toRegister/toRegister", + "pages/toScan/toScan", + "pages/complete/complete", + "pages/formid/formid", + "pages/register/register", + "pages/detail/detail", + "pages/accept/accept", + "pages/gridLeaderRegister/gridLeaderRegister", + "pages/heart/heart", + "pages/heartNew/heartNew" + ], + "subPackages": [ + { + "root": "subpages/home", + "name": "home", + "pages": [ + "pages/webview/webview", + "pages/agreement/agreement", + "pages/notice/notice", + "pages/noticeNew/noticeNew", + "pages/info/info", + "pages/noticeDetail/noticeDetail", + "pages/newsDetail/newsDetail", + "pages/newsList/newsList" + ] + }, + { + "root": "subpages/changegrid", + "name": "changeGrid", + "pages": [ + "pages/changeGrid/changeGrid" + ] + }, + { + "root": "subpages/association", + "name": "association", + "pages": [ + "pages/joinassociation/joinassociation", + "pages/createassociation/createassociation", + "pages/associationMember/associationMember", + "pages/associationDetail/associationDetail", + "pages/inviteFriend/inviteFriend", + "pages/incomingVerify/incomingVerify", + "pages/unpassAssociation/unpassAssociation", + "pages/topicList/topicList", + "pages/addTopic/addTopic", + "pages/topicDetail/topicDetail", + "pages/replyOrRemark/replyOrRemark", + "pages/changeToIssue/changeToIssue" + ] + }, + { + "root": "subpages/associationNew", + "name": "associationNew", + "pages": [ + "pages/associationlist/associationlist", + "pages/community/community", + "pages/guideInfo/guideInfo", + "pages/gMembersList/gMembersList", + "pages/gOfficialsList/gOfficialsList", + "pages/talklist/talklist", + "pages/eventlist/eventlist", + "pages/addTopic/addTopic" + ] + }, + { + "root": "subpages/discussion", + "name": "discussion", + "pages": [ + "pages/addIssue/addIssue", + "pages/discussionDetail/discussionDetail", + "pages/publishEvaluation/publishEvaluation", + "pages/remarkOrReply/remarkOrReply", + "pages/searchDiscussion/searchDiscussion", + "pages/categoryList/categoryList" + ] + }, + { + "root": "subpages/mine", + "name": "mine", + "pages": [ + "pages/eventDetail/eventDetail", + "pages/inviteRecord/inviteRecord", + "pages/gridManage/gridManage" + ] + }, + { + "root": "subpages/integralCentre", + "name": "integralCentre", + "pages": [ + "pages/index/index" + ] + }, + { + "root": "subpages/heart", + "pages": [ + "pages/heartDetail/heartDetail", + "pages/leaderboard/leaderboard", + "pages/leaderboardNew/leaderboardNew", + "pages/myNews/myNews", + "pages/clockIn/clockIn", + "pages/volunteer/volunteer", + "pages/signed/signed", + "pages/refusedOrEndedDetail/refusedOrEndedDetail", + "pages/cancelDetail/cancelDetail" + ] + }, + { + "root": "subpages/understandJs", + "pages": [ + "pages/index/index", + "pages/impression/impression", + "pages/delicious/delicious", + "pages/sclerotia/sclerotia", + "pages/archives/archives", + "pages/noticeDetail/noticeDetail" + ] + } + ], + "preloadRule": { + "pages/indexNew/indexNew": { + "network": "all", + "packages": [ + "subpages/changegrid" + ] + }, + "pages/discussion/discussion": { + "network": "all", + "packages": [ + "discussion" + ] + }, + "pages/association/association": { + "network": "all", + "packages": [ + "subpages/association" + ] + }, + "pages/mine/mine": { + "network": "all", + "packages": [ + "mine" + ] + } + }, + "window": { + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#fff", + "navigationBarTitleText": "WeChat", + "navigationBarTextStyle": "black" + }, + "networkTimeout": { + "request": 6000 + }, + "permission": { + "scope.userLocation": { + "desc": "e锦水将获取您的位置信息" + } + }, + "sitemapLocation": "sitemap84.json" } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 1086aa5..8534479 100644 --- a/project.config.json +++ b/project.config.json @@ -22,7 +22,7 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": false, + "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss index eef74e0..8663950 100644 --- a/subpages/associationNew/components/communityList/communityList.wxss +++ b/subpages/associationNew/components/communityList/communityList.wxss @@ -1,44 +1,44 @@ -.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.1); - 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; - border: 0px; -} -.community-item .cover-image .community-add image{ - width: 100%; - height: 100%; +.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.2); + 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; + border: 0px; +} +.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.wxml b/subpages/associationNew/components/membersList/membersList.wxml index 5b82e93..e0a985b 100644 --- a/subpages/associationNew/components/membersList/membersList.wxml +++ b/subpages/associationNew/components/membersList/membersList.wxml @@ -1,56 +1,59 @@ - - - - - - - {{item.nickname}} - - - - - - - - - - - - - - - - {{item.name}} - {{item.mobile}} - - - - - - {{item.motto}} - - - + + + + + + + {{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 index 13e200d..aa0ca4f 100644 --- a/subpages/associationNew/components/membersList/membersList.wxss +++ b/subpages/associationNew/components/membersList/membersList.wxss @@ -1,164 +1,172 @@ -.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; -} +.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 .identity-logo{ + height: 28rpx; + margin-left: 8rpx; +} +.members-item .item-top .identity0{ + width: 59rpx; +} +.members-item .item-top .identity1{ + width: 76rpx; +} +.members-item .item-top .this-community{ + width: 116rpx; +} +.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/leader-logo.png b/subpages/associationNew/images/leader-logo.png deleted file mode 100644 index a27b847e8c1c067ceeddfc92636f7ec996848b2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2767 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 VB{?#7f_DG_002ovPDHLkV1jn8H3R?v diff --git a/subpages/associationNew/images/leader-logo@2x.png b/subpages/associationNew/images/leader-logo@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7870bc7589b0417218a183e6655a8e0102130eaf GIT binary patch literal 7177 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 { - 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:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=1` //`#/话对捧个场` - }) - } else if (e.currentTarget.dataset.page === 'applause') { - wx.navigateTo({ - url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=0` //`#/事好鼓个掌` - }) - } - } -}) +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}` + }) + }, + navToForumGuide (e) { + console.log('前往论坛指南') + wx.navigateTo({ + url: `/subpages/associationNew/pages/guideInfo/guideInfo?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') { + wx.navigateTo({ + url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=1` //`#/话对捧个场` + }) + } else if (e.currentTarget.dataset.page === 'applause') { + wx.navigateTo({ + url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=0` //`#/事好鼓个掌` + }) + } + } +}) diff --git a/subpages/associationNew/pages/community/community.wxml b/subpages/associationNew/pages/community/community.wxml index 6d856ed..bc8fc0a 100644 --- a/subpages/associationNew/pages/community/community.wxml +++ b/subpages/associationNew/pages/community/community.wxml @@ -1,13 +1,17 @@ - - - 群成员 - - - - - - + + + 群成员 + + + + 论坛指南 + + + + + + diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index 5dba400..7fdf802 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -1,58 +1,65 @@ - - - {{item.topicContent}} - - - - - - - - - - {{item.supportNum}} - - - - {{item.commentNum}} - - - - 评论 - - - - {{item_.username}}：{{item_.content}} - - - - - - - - - - - - - - - - - - - + + + {{item.topicContent}} + + + + + + + + + + {{item.supportNum}} + + + + {{item.commentNum}} + + + + 评论 + + + + + + {{item_.username}}：{{item_.content}} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss index 9689360..aed8c02 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -1,214 +1,235 @@ -page { - background: #f7f7f7; -} - -.item-list { - width: 100%; - padding: 40rpx 29rpx 20rpx 29rpx; - background: #fff; - margin-top: 20rpx; -} - -.user-info { - width: calc(100% - 58rpx); - height: 64rpx; - display: flex; - align-items: center; -} - -.user-info image { - border-radius: 50rpx; - width: 64rpx; - height: 64rpx; -} - -.user-info .name-date { - margin-left: 14rpx; - height: 100%; - display: flex; - flex-direction: column; -} - -.user-info .name-date .name { - font-size: 28rpx; - font-weight: bold; - color: rgba(51, 51, 51, 1); -} - -.user-info .name-date .date { - font-size: 20rpx; - font-weight: 500; - color: rgba(153, 153, 153, 1); -} - -.details-info { - width: calc(100% - 58rpx); - font-size: 36rpx; - font-weight: 500; - color: rgba(51, 51, 51, 1); - line-height: 54rpx; -} - -.image-list { - width: calc(100% - 58rpx); - margin-top: 30rpx; - display: grid; - grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr)); - grid-gap: 7rpx; -} - -.image-list .image-item { - width: 100%; - height: 100%; - object-fit: cover; - border-radius: 8rpx; -} - -.attitude { - width: calc(100% - 300rpx); - margin-top: 21rpx; - display: flex; - align-items: center; - justify-content: space-between; - /* justify-content: center; */ - height: 28rpx; - padding: 0 50rpx; -} - -.attitude .all { - display: flex; - align-items: center; -} - -.attitude .all image { - width: 28rpx; - height: 28rpx; -} - -.attitude .all .give-data { - font-size: 24rpx; - font-weight: 500; - color: rgba(51, 51, 51, 1); - margin-left: 9rpx; - /* width: 196rpx; */ -} - -.attitude .all .give-data.color { - color: #FFB103; -} - -.comment { - width: calc(100% - 98rpx); - padding: 26rpx 20rpx; - background: #F2F2F2; - border-radius: 8rpx; - margin-top: 25rpx; -} - -.comment .comment-list { - width: 100%; - margin-top: 11rpx; - font-size: 28rpx; - color: #999999; -} - -.comment .comment-list text { - color: #333333; -} - -/* 评论样式 */ -.release { - align-items: flex-end; - /*底部对齐*/ - box-sizing: border-box; - position: fixed; - left: 0; - bottom: 0; - width: 100%; - padding: 13rpx 20rpx; - background-color: #fff; - font-size: 28rpx; - z-index: 999; -} - -.replyinfo1 { - display: flex; - justify-content: space-between; - /*两端对齐*/ - font-size: 35rpx; -} - -.replyinfo2 { - display: flex; - justify-content: space-between; - /*两端对齐*/ -} - -.release textarea { - width: calc(100% - 200rpx); - min-height: 34rpx; - max-height: 102rpx; - /*最多显示三行*/ - border-width: 15rpx 20rpx; - /*使用padding与预期留白不一致，故使用border*/ - border-style: solid; - border-color: #F2F2F2; - line-height: 34rpx; - font-size: 28rpx; - background-color: #F2F2F2; - border-radius: 4rpx; -} - -.release .text { - font-size: 40rpx; - color: #c9c9c9; -} - -.cancel { - width: 240rpx; - height: 64rpx; - line-height: 64rpx; - text-align: center; - color: #6c0; - margin: 0 3px; - padding: 0; -} - -.release .submit { - width: 160rpx; - height: 60rpx; - line-height: 60rpx; - text-align: center; - margin: 0 3px; - padding: 0; - font-size: 32rpx; - font-weight: 500; - color: rgba(255, 255, 255, 1); - background: linear-gradient(to right, #e95027, #db1a1f); - border-radius: 50rpx; -} - - -.pro-box .info .text .delete { - color: #f68135; - border-radius: 50rpx; - border: 1px solid #f68135; - font-size: 28 rpx; - width: 150rpx; - height: 48rpx; - text-align: center; -} - -.addIssue { - width: 178rpx; - height: 178rpx; - position: fixed; - bottom: 30%; - right: 14rpx; -} - -.addIssue image { - width: 100%; - height: 100%; - object-fit: cover; +page { + background: #f7f7f7; +} + +.item-list { + width: 100%; + padding: 40rpx 29rpx 20rpx 29rpx; + background: #fff; + margin-top: 20rpx; +} + +.user-info { + width: calc(100% - 58rpx); + height: 64rpx; + display: flex; + align-items: center; +} + +.user-info image { + border-radius: 50rpx; + width: 64rpx; + height: 64rpx; +} + +.user-info .name-date { + margin-left: 14rpx; + height: 100%; + display: flex; + flex-direction: column; +} + +.user-info .name-date .name { + font-size: 28rpx; + font-weight: bold; + color: rgba(51, 51, 51, 1); +} + +.user-info .name-date .community-logo { + height: 28rpx; + width: 116rpx; + margin-left: 8rpx; +} + +.user-info .name-date .date { + font-size: 20rpx; + font-weight: 500; + color: rgba(153, 153, 153, 1); +} + +.details-info { + width: calc(100% - 58rpx); + font-size: 36rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); + line-height: 54rpx; +} + +.image-list { + width: calc(100% - 58rpx); + margin-top: 30rpx; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr)); + grid-gap: 7rpx; +} + +.image-list .image-item { + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 8rpx; +} + +.attitude { + width: calc(100% - 300rpx); + margin: 21rpx 0rpx; + display: flex; + align-items: center; + justify-content: space-between; + /* justify-content: center; */ + height: 28rpx; + padding: 0 50rpx; +} + +.attitude .all { + display: flex; + align-items: center; +} + +.attitude .all image { + width: 30rpx; + height: 30rpx; +} + +.attitude .all .give-data { + font-size: 26rpx; + font-weight: 500; + color: rgba(51, 51, 51, 1); + margin-left: 9rpx; + /* width: 196rpx; */ +} + +.attitude .all .give-data.color { + color: #FFB103; +} + +.likes { + width: calc(100% - 98rpx); + padding: 24rpx 20rpx 12rpx 20rpx; + background: #F2F2F2; + border-radius: 8rpx; + margin-top: 25rpx; + font-size: 28rpx; + color: #333333; +} +.line { + width: calc(100% - 60rpx); + height: 1px; + background-color: #999999; +} + +.comment { + width: calc(100% - 98rpx); + padding: 12rpx 20rpx 24rpx 20rpx; + background: #F2F2F2; + border-radius: 8rpx; + /* margin-top: 25rpx; */ +} + +.comment .comment-list { + width: 100%; + margin-top: 11rpx; + font-size: 28rpx; + color: #999999; +} + +.comment .comment-list text { + color: #333333; +} + +/* 评论样式 */ +.release { + align-items: flex-end; + /*底部对齐*/ + box-sizing: border-box; + position: fixed; + left: 0; + bottom: 0; + width: 100%; + padding: 13rpx 20rpx; + background-color: #fff; + font-size: 28rpx; + z-index: 999; +} + +.replyinfo1 { + display: flex; + justify-content: space-between; + /*两端对齐*/ + font-size: 35rpx; +} + +.replyinfo2 { + display: flex; + justify-content: space-between; + /*两端对齐*/ +} + +.release textarea { + width: calc(100% - 200rpx); + min-height: 34rpx; + max-height: 102rpx; + /*最多显示三行*/ + border-width: 15rpx 20rpx; + /*使用padding与预期留白不一致，故使用border*/ + border-style: solid; + border-color: #F2F2F2; + line-height: 34rpx; + font-size: 28rpx; + background-color: #F2F2F2; + border-radius: 4rpx; +} + +.release .text { + font-size: 40rpx; + color: #c9c9c9; +} + +.cancel { + width: 240rpx; + height: 64rpx; + line-height: 64rpx; + text-align: center; + color: #6c0; + margin: 0 3px; + padding: 0; +} + +.release .submit { + width: 160rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + margin: 0 3px; + padding: 0; + font-size: 32rpx; + font-weight: 500; + color: rgba(255, 255, 255, 1); + background: linear-gradient(to right, #e95027, #db1a1f); + border-radius: 50rpx; +} + + +.pro-box .info .text .delete { + color: #f68135; + border-radius: 50rpx; + border: 1px solid #f68135; + font-size: 28 rpx; + width: 150rpx; + height: 48rpx; + text-align: center; +} + +.addIssue { + width: 178rpx; + height: 178rpx; + position: fixed; + bottom: 30%; + right: 14rpx; +} + +.addIssue image { + width: 100%; + height: 100%; + object-fit: cover; } \ No newline at end of file diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.js b/subpages/associationNew/pages/guideInfo/guideInfo.js new file mode 100644 index 0000000..dfa88bb --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.js @@ -0,0 +1,15 @@ +import { getGuideInfo} from '../../utils/api' +Page({ + data: { + partyGroupId: '', + guideInfoData: '' + }, + onLoad: function (options) { + this.data.partyGroupId = options.partyGroupId + getGuideInfo(this.data.partyGroupId).then(res => { + this.setData({ + guideInfoData: res.data + }) + }) + } +}) diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.json b/subpages/associationNew/pages/guideInfo/guideInfo.json new file mode 100644 index 0000000..69f3c32 --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + }, + "navigationBarTitleText": "论坛指南" +} \ No newline at end of file diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxml b/subpages/associationNew/pages/guideInfo/guideInfo.wxml new file mode 100644 index 0000000..360b6e0 --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxml @@ -0,0 +1,5 @@ + + + {{guideInfoData}} + + diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxss b/subpages/associationNew/pages/guideInfo/guideInfo.wxss new file mode 100644 index 0000000..065f96f --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxss @@ -0,0 +1,9 @@ +page { + width:100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; +} +.guide-content { + font-size: 34rpx; +} \ No newline at end of file diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js index 6928dd2..1619e5a 100644 --- a/subpages/associationNew/utils/api.js +++ b/subpages/associationNew/utils/api.js @@ -1,128 +1,135 @@ -const request = require('../../../utils/request') -/** - *获取图片 - */ -export function getImageUrl() { - return request.get('imgConfig/getImgUrl/1') -} -/** - *获取图片党群列表首页 - */ -export function getImageUrl2() { - return request.get('imgConfig/getImgUrl/2') -} -/** - *进入党群 - */ -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 - }) -} - -/** - * 话题列表 - */ -export function topiclist({pageIndex,pageSize,timestamp,topicType,partyGroupId,partyTopicId}) { - return request.get('partyGroup/topic/list',{ - pageIndex, - pageSize, - timestamp, - topicType, - partyGroupId, - partyTopicId - }) -} - - -/** - * 发布话题 - */ - -export function addTopic({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) { - return request.post('partyGroup/topic/submit',{ - topicType, - topicContent, - topicAddress, - topicLatitude, - topicLongitude, - partyGroupId, - images - }) -} - -/** - * 话题评论 - */ - -export function commentSubmit({topicId, faCommentId,content}) { - return request.post('partyGroup/comment/submit',{ - topicId, - faCommentId, - content - }) -} - -/** - * 表态话题（赞/踩） - */ -export function statement({attitude, topicId}) { - return request.post('partyGroup/topic/statement',{ - topicId, - attitude - }) -} - - - - +const request = require('../../../utils/request') +/** + *获取图片 + */ +export function getImageUrl() { + return request.get('imgConfig/getImgUrl/1') +} +/** + *获取图片党群列表首页 + */ +export function getImageUrl2() { + return request.get('imgConfig/getImgUrl/2') +} +/** + *进入党群 + */ +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 + }) +} + +/** + * 话题列表 + */ +export function topiclist({pageIndex,pageSize,timestamp,topicType,partyGroupId,partyTopicId}) { + return request.get('partyGroup/topic/list',{ + pageIndex, + pageSize, + timestamp, + topicType, + partyGroupId, + partyTopicId + }) +} + + +/** + * 发布话题 + */ + +export function addTopic({topicType, topicContent,topicAddress,topicLatitude,topicLongitude,partyGroupId,images}) { + return request.post('partyGroup/topic/submit',{ + topicType, + topicContent, + topicAddress, + topicLatitude, + topicLongitude, + partyGroupId, + images + }) +} + +/** + * 话题评论 + */ + +export function commentSubmit({topicId, faCommentId,content}) { + return request.post('partyGroup/comment/submit',{ + topicId, + faCommentId, + content + }) +} + +/** + * 表态话题（赞/踩） + */ +export function statement({attitude, topicId}) { + return request.post('partyGroup/topic/statement',{ + topicId, + attitude + }) +} + +/** + * 获取论坛指南 + */ +export function getGuideInfo(partyGroupId) { + return request.get('partyGroup/group/guideInfo/'+partyGroupId) +} + + + + diff --git a/utils/config.js b/utils/config.js index c74543c..295d26d 100644 --- a/utils/config.js +++ b/utils/config.js @@ -1,29 +1,29 @@ -module.exports = { - BASEURL: BASEURL, - WEBROOT: WEBROOT, - Token: getToken, - userId: "" -}; - -function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/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/' // 锦水正式环境接口地址 -} - -function WEBROOT() { - // return "http://10.10.10.117:8080/#/" // 本地 h5前端地址 - return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址 - // return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址 - // return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址 - // return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址 -} - -function getToken() { - return wx.getStorageSync("token"); -} +module.exports = { + BASEURL: BASEURL, + WEBROOT: WEBROOT, + Token: getToken, + userId: "" +}; + +function BASEURL() { + // return 'https://eug-test.elinkit.com.cn/js/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/' // 锦水正式环境接口地址 +} + +function WEBROOT() { + // return "http://10.10.10.117:8080/#/" // 本地 h5前端地址 + return 'https://epdc-shibei.elinkit.com.cn/#/' // 测试环境 h5前端地址 + // return 'https://epdc.elinkservice.cn/#/' // 正式环境 h5前端地址 + // return 'https://epdc-app.qingdaoshibei.cn/#/' // 电政办 正式环境 前端地址 + // return 'https://epdc-shibei.elinkservice.cn/#/' // 电政办 正式环境 前端地址 +} + +function getToken() { + return wx.getStorageSync("token"); +}