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..b3a3d9b 100644 --- a/project.config.json +++ b/project.config.json @@ -4,7 +4,7 @@ "ignore": [] }, "setting": { - "urlCheck": false, + "urlCheck": true, "es6": true, "postcss": true, "preloadBackgroundData": false, 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/copy@2x.png b/subpages/associationNew/images/copy@2x.png new file mode 100644 index 0000000..9b12595 Binary files /dev/null and b/subpages/associationNew/images/copy@2x.png differ diff --git a/subpages/associationNew/images/fire@2x.png b/subpages/associationNew/images/fire@2x.png new file mode 100644 index 0000000..645be23 Binary files /dev/null and b/subpages/associationNew/images/fire@2x.png differ diff --git a/subpages/associationNew/images/huatizhinan@2x.png b/subpages/associationNew/images/huatizhinan@2x.png new file mode 100644 index 0000000..594ddb9 Binary files /dev/null and b/subpages/associationNew/images/huatizhinan@2x.png differ diff --git a/subpages/associationNew/images/leader-logo.png b/subpages/associationNew/images/leader-logo.png deleted file mode 100644 index a27b847..0000000 Binary files a/subpages/associationNew/images/leader-logo.png and /dev/null differ diff --git a/subpages/associationNew/images/leader-logo@2x.png b/subpages/associationNew/images/leader-logo@2x.png new file mode 100644 index 0000000..7870bc7 Binary files /dev/null and b/subpages/associationNew/images/leader-logo@2x.png differ diff --git a/subpages/associationNew/images/leader2-logo@2x.png b/subpages/associationNew/images/leader2-logo@2x.png new file mode 100644 index 0000000..49e2e97 Binary files /dev/null and b/subpages/associationNew/images/leader2-logo@2x.png differ diff --git a/subpages/associationNew/images/resident@2x.png b/subpages/associationNew/images/resident@2x.png new file mode 100644 index 0000000..9d9a47e Binary files /dev/null and b/subpages/associationNew/images/resident@2x.png differ diff --git a/subpages/associationNew/pages/community/community.js b/subpages/associationNew/pages/community/community.js index bdbd22c..1e51dd9 100644 --- a/subpages/associationNew/pages/community/community.js +++ b/subpages/associationNew/pages/community/community.js @@ -1,66 +1,65 @@ -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:`/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}` + }) + }, + 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..b5ca792 100644 --- a/subpages/associationNew/pages/community/community.wxml +++ b/subpages/associationNew/pages/community/community.wxml @@ -1,13 +1,13 @@ - - - 群成员 - - - - - - + + + 群成员 + + + + + + diff --git a/subpages/associationNew/pages/community/community.wxss b/subpages/associationNew/pages/community/community.wxss index 1a59e2d..9a0cff7 100644 --- a/subpages/associationNew/pages/community/community.wxss +++ b/subpages/associationNew/pages/community/community.wxss @@ -1,49 +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%; +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/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js index ce307f8..898055d 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.js +++ b/subpages/associationNew/pages/eventlist/eventlist.js @@ -1,318 +1,349 @@ -// subpages/associationNew/pages/eventlist/eventlist.js -const app = getApp() -import { topiclist, commentSubmit, statement } from '../../utils/api' -import { - getTimestamp -} from '../../../../utils/common' -Page({ - - /** - * 页面的初始数据 - */ - data: { - topiclist: [], - timestamp: '', - pageIndex: 1, - pageSize: 10, - partyGroupId: '',//党群id - topicType: '',//0:事好儿鼓个掌 1:话对捧个场 - nodata: false, - loadMoreType: 'none', - loadMoreVisible: false, - bannedFlag: '',//是否禁言 0:否 1:是 - ifcomment: false,//是否显示评论 - focus: false, - topicId: '',//被评论的话题ID - commentContent: '', - index: 0,//点击的第几条数据,用于评论的局部刷新用 - infoCompleted: 0, - completeInfoDialogVisible: false, - ifpreviewImage:false,//解决图片放大刷新列表的问题 - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ - partyGroupId: options.partyGroupId, - topicType: options.topicType,//0:事好儿鼓个掌 1:话对捧个场 - infoCompleted: app.globalData.infoCompleted - }) - if (options.topicType == 0) { - wx.setNavigationBarTitle({ - title: '事好鼓个掌' - }) - } else { - wx.setNavigationBarTitle({ - title: '话对捧个场' - }) - } - - - }, - // 查列表 - topiclist() { - let that = this; - const para = { - pageIndex: this.data.pageIndex, - pageSize: this.data.pageSize, - timestamp: getTimestamp(), - topicType: this.data.topicType, - partyGroupId: this.data.partyGroupId, //党群id - partyTopicId:'' - } - topiclist(para).then(res => { - wx.stopPullDownRefresh(); - that.setData({ - bannedFlag: res.data.bannedFlag, - nodata: false, - topiclist: that.data.topiclist.concat(res.data.topicList), - loadMoreType: res.data.topicList.length === that.data.pageSize ? 'loading' : 'none', - loadMoreVisible: res.data.topicList.length === that.data.pageSize ? false : true - }) - if (that.data.topiclist.length == 0) {//没有值 - that.setData({ - nodata: true, - loadMoreType: 'none', - loadMoreVisible: false, - }) - } - }).catch(err => { - wx.stopPullDownRefresh(); - that.setData({ - topiclist: [], - nodata: true, - loadMoreType: 'none', - loadMoreVisible: false, - }) - console.log(err) - }) - }, - // 跳转 发布话题 - navigateToAddTopic() { - if (this.verifyCompleteInfo()) { - return false - } - wx.navigateTo({ - url: `/subpages/associationNew/pages/addTopic/addTopic?partyGroupId=${this.data.partyGroupId}&topicType=${this.data.topicType}` - }) - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - if(this.data.ifpreviewImage){ - this.setData({ - ifpreviewImage:false - }) - } else { - this.setData({ - pageIndex: 1, - pageSize: 10, - nodata: false, - loadMoreType: 'none', - loadMoreVisible: false, - topiclist: [], - }) - this.topiclist() - } - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - this.setData({ - pageIndex: 1, - pageSize: 10, - nodata: false, - loadMoreType: 'none', - loadMoreVisible: false, - topiclist: [], - }) - this.topiclist() - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - this.setData({ - loadMoreVisible: true - }) - if (this.data.loadMoreType === 'loading') { - this.setData({ - pageIndex: this.data.pageIndex + 1, - pageSize: this.data.pageSize, - }) - this.topiclist() - } - }, - - //点赞 - clicklike(e) { - if (this.verifyCompleteInfo()) { - return false - } - let index = e.currentTarget.dataset.index - // - if (this.data.bannedFlag == '1') {//被禁言 - wx.showToast({ - title: '您已经被禁言', - icon: 'none', - duration: 2000 - }) - return false - } - let attitude = "" - if (e.currentTarget.dataset.likeflag == '0') {//点赞 - attitude = 0 - } else { - attitude = 2 - } - let that = this; - const para = { - topicId: e.currentTarget.dataset.id,//被评论的话题ID - attitude: attitude,//表态 0赞;1踩;2取消赞;3取消踩 - } - statement(para).then(res => { - // 点赞成功以后实现局部刷新功能 - var obj = that.data.topiclist[index] - // - obj.likeFlag = obj.likeFlag == '0' ? '1' : '0' - obj.supportNum = obj.likeFlag == '1' ? obj.supportNum + 1 : obj.supportNum - 1 - that.setData({ - ["topiclist[" + index + "]"]: obj - }) - }).catch(err => { - console.log(err) - }) - }, - // Textarea获取焦点 - clickTextarea(e) { - if (this.verifyCompleteInfo()) { - return false - } - let index = e.currentTarget.dataset.index - if (this.data.bannedFlag == '1') {//被禁言 - wx.showToast({ - title: '您已经被禁言', - icon: 'none', - duration: 2000 - }) - return false - } - this.setData({ - ifcomment: true, - focus: true, - topicId: e.currentTarget.dataset.id, - index: index - }) - }, - - // 失去焦点 - bindAddressInput(e) { - this.setData({ //失去焦点以后view隐藏 - ifcomment: false, - commentContent: '' - }) - }, - // 双向绑定 - bindIdentity(e) { - this.setData({ - commentContent: e.detail.value - }) - }, - // 评论按钮点击事件 - commentSubmit() { - let that = this; - const para = { - topicId: that.data.topicId,//被评论的话题ID - faCommentId: '',//父评论(被评论)ID - content: that.data.commentContent,//评论内容 - } - commentSubmit(para).then(res => { - // 评论成功以后,调用接口比对出当前评论列表的数据,对已有列表数据进行替换 - that.NowTopiclist() - }).catch(err => { - console.log(err) - }) - }, - - // 列表内当前操作的数据 - NowTopiclist() { - let that = this; - const para = { - pageIndex: 1, - pageSize: 1, - timestamp: getTimestamp(), - topicType: that.data.topicType, - partyGroupId: that.data.partyGroupId, //党群id - partyTopicId: that.data.topicId - } - topiclist(para).then(res => { - console.log(JSON.stringify(res)) - // 评论成功以后实现局部刷新功能 - var obj = that.data.topiclist[that.data.index] - // 评论成功以后评论数量加1 - // obj.commentNum = obj.commentNum + 1 - // obj.comments.splice(0, 0, {username:obj.nickname,content:para.content}); - obj = res.data.topicList[0] - that.setData({ - ["topiclist[" + that.data.index + "]"]: obj - }) - }).catch(err => { - console.log(err) - }) - }, - //列表照片的放大查看 - previewImage(e) { - this.setData({ - ifpreviewImage:true - }) - app.globalData.previewImage = true - wx.previewImage({ - urls: e.currentTarget.dataset.imgarry, - current: e.currentTarget.dataset.src - }) - }, - // 检查 是否完善信息 - verifyCompleteInfo() { - if (this.data.infoCompleted == 0) { - this.setData({ - completeInfoDialogVisible: !this.data.completeInfoDialogVisible - }) - return true - } else { - return false - } - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } +// subpages/associationNew/pages/eventlist/eventlist.js +const app = getApp() +import { topiclist, commentSubmit, statement } from '../../utils/api' +import { + getTimestamp +} from '../../../../utils/common' +Page({ + + /** + * 页面的初始数据 + */ + data: { + topiclist: [], + timestamp: '', + pageIndex: 1, + pageSize: 10, + partyGroupId: '',//党群id + topicType: '',//0:事好儿鼓个掌 1:话对捧个场 + nodata: false, + loadMoreType: 'none', + loadMoreVisible: false, + bannedFlag: '',//是否禁言 0:否 1:是 + ifcomment: false,//是否显示评论 + focus: false, + topicId: '',//被评论的话题ID + commentContent: '', + index: 0,//点击的第几条数据,用于评论的局部刷新用 + infoCompleted: 0, + completeInfoDialogVisible: false, + ifpreviewImage:false,//解决图片放大刷新列表的问题 + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + partyGroupId: options.partyGroupId, + topicType: options.topicType,//0:事好儿鼓个掌 1:话对捧个场 + infoCompleted: app.globalData.infoCompleted + }) + if (options.topicType == 0) { + wx.setNavigationBarTitle({ + title: '事好鼓个掌' + }) + } else { + wx.setNavigationBarTitle({ + title: '话对捧个场' + }) + } + + + }, + // 查列表 + topiclist() { + let that = this; + const para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + timestamp: getTimestamp(), + topicType: this.data.topicType, + partyGroupId: this.data.partyGroupId, //党群id + partyTopicId:'' + } + topiclist(para).then(res => { + wx.stopPullDownRefresh(); + that.setData({ + bannedFlag: res.data.bannedFlag, + nodata: false, + topiclist: that.data.topiclist.concat(res.data.topicList), + loadMoreType: res.data.topicList.length === that.data.pageSize ? 'loading' : 'none', + loadMoreVisible: res.data.topicList.length === that.data.pageSize ? false : true + }) + if (that.data.topiclist.length == 0) {//没有值 + that.setData({ + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + } + }).catch(err => { + wx.stopPullDownRefresh(); + that.setData({ + topiclist: [], + nodata: true, + loadMoreType: 'none', + loadMoreVisible: false, + }) + console.log(err) + }) + }, + // 跳转 发布话题 + navigateToAddTopic() { + if (this.verifyCompleteInfo()) { + return false + } + wx.navigateTo({ + url: `/subpages/associationNew/pages/addTopic/addTopic?partyGroupId=${this.data.partyGroupId}&topicType=${this.data.topicType}` + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + if(this.data.ifpreviewImage){ + this.setData({ + ifpreviewImage:false + }) + } else { + this.setData({ + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: 'none', + loadMoreVisible: false, + topiclist: [], + }) + this.topiclist() + } + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + this.setData({ + pageIndex: 1, + pageSize: 10, + nodata: false, + loadMoreType: 'none', + loadMoreVisible: false, + topiclist: [], + }) + this.topiclist() + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.setData({ + loadMoreVisible: true + }) + if (this.data.loadMoreType === 'loading') { + this.setData({ + pageIndex: this.data.pageIndex + 1, + pageSize: this.data.pageSize, + }) + this.topiclist() + } + }, + + //点赞 + clicklike(e) { + if (this.verifyCompleteInfo()) { + return false + } + this.setData({ + index: e.currentTarget.dataset.index + }) + // + if (this.data.bannedFlag == '1') {//被禁言 + wx.showToast({ + title: '您已经被禁言', + icon: 'none', + duration: 2000 + }) + return false + } + let attitude = "" + if (e.currentTarget.dataset.likeflag == '0') {//点赞 + attitude = 0 + } else { + attitude = 2 + } + let that = this; + const para = { + topicId: e.currentTarget.dataset.id,//被评论的话题ID + attitude: attitude,//表态 0赞;1踩;2取消赞;3取消踩 + } + statement(para).then(res => { + // 点赞成功以后实现局部刷新功能 + that.nowLikesList(e.currentTarget.dataset.id); + }).catch(err => { + console.log(err) + }) + }, + // Textarea获取焦点 + clickTextarea(e) { + if (this.verifyCompleteInfo()) { + return false + } + let index = e.currentTarget.dataset.index + if (this.data.bannedFlag == '1') {//被禁言 + wx.showToast({ + title: '您已经被禁言', + icon: 'none', + duration: 2000 + }) + return false + } + this.setData({ + ifcomment: true, + focus: true, + topicId: e.currentTarget.dataset.id, + index: index + }) + }, + + // 失去焦点 + bindAddressInput(e) { + this.setData({ //失去焦点以后view隐藏 + ifcomment: false, + commentContent: '' + }) + }, + // 双向绑定 + bindIdentity(e) { + this.setData({ + commentContent: e.detail.value + }) + }, + // 评论按钮点击事件 + commentSubmit() { + let that = this; + const para = { + topicId: that.data.topicId,//被评论的话题ID + faCommentId: '',//父评论(被评论)ID + content: that.data.commentContent,//评论内容 + } + commentSubmit(para).then(res => { + // 评论成功以后,调用接口比对出当前评论列表的数据,对已有列表数据进行替换 + that.NowTopiclist() + }).catch(err => { + console.log(err) + }) + }, + + // 列表内当前操作的数据 + NowTopiclist() { + let that = this; + const para = { + pageIndex: 1, + pageSize: 1, + timestamp: getTimestamp(), + topicType: that.data.topicType, + partyGroupId: that.data.partyGroupId, //党群id + partyTopicId: that.data.topicId + } + topiclist(para).then(res => { + console.log(JSON.stringify(res)) + // 评论成功以后实现局部刷新功能 + var obj = that.data.topiclist[that.data.index] + // 评论成功以后评论数量加1 + // obj.commentNum = obj.commentNum + 1 + // obj.comments.splice(0, 0, {username:obj.nickname,content:para.content}); + obj = res.data.topicList[0] + that.setData({ + ["topiclist[" + that.data.index + "]"]: obj + }) + }).catch(err => { + console.log(err) + }) + }, + //列表照片的放大查看 + previewImage(e) { + this.setData({ + ifpreviewImage:true + }) + app.globalData.previewImage = true + wx.previewImage({ + urls: e.currentTarget.dataset.imgarry, + current: e.currentTarget.dataset.src + }) + }, + // 检查 是否完善信息 + verifyCompleteInfo() { + if (this.data.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible + }) + return true + } else { + return false + } + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + /** + * 点赞后局部更新内容 + */ + nowLikesList (topicId) { + let that = this; + const para = { + pageIndex: 1, + pageSize: 10, + timestamp: getTimestamp(), + topicType: this.data.topicType, + partyGroupId: this.data.partyGroupId, //党群id + partyTopicId: topicId + } + topiclist(para).then(res => { + var obj = that.data.topiclist[that.data.index] + obj = res.data.topicList[0] + // + // obj.likeFlag = obj.likeFlag == '0' ? '1' : '0' + // obj.supportNum = obj.likeFlag == '1' ? obj.supportNum + 1 : obj.supportNum - 1 + that.setData({ + ["topiclist[" + that.data.index + "]"]: obj + }) + }).catch(err => { + console.log(err) + }) + }, + /* + * 前往论坛指南页面 + */ + navToForumGuide (e) { + console.log('前往论坛指南') + wx.navigateTo({ + url: `/subpages/associationNew/pages/guideInfo/guideInfo?partyGroupId=${this.data.partyGroupId}` + }) + } }) \ No newline at end of file diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index 5dba400..1a4f7ec 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -1,58 +1,69 @@ - - - {{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..35e2f53 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -1,214 +1,272 @@ -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; + box-sizing: border-box; +} + +.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); + display: flex; + align-items: center; +} + +.user-info .name-date .community-logo { + height: 28rpx; + width: 116rpx; + margin-left: 8rpx; + border-radius: 0px; +} + +.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); */ + width: 100%; + 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: 0.5px; + background-color: #dddddd; +} + +.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; +} + +.func-top{ + height: 94rpx; + width: 750rpx; + position: relative; + background: rgba(255, 255, 255, 1); +} +.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; +} +.func-top .top-right{ + width: 40rpx; + height: 94rpx; + padding: 0; + border: none; + position: absolute; + right: 34rpx; +} +.func-top .top-right image{ + width: 18rpx; + height: 24rpx; + margin: 0; + position: absolute; + top: 30rpx; } \ 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..a781649 --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.js @@ -0,0 +1,21 @@ +import { getGuideInfo} from '../../utils/api' +Page({ + data: { + partyGroupId: '', + todayTopic: {}, + guideInfoData: [] + }, + onLoad: function (options) { + this.data.partyGroupId = options.partyGroupId + getGuideInfo(this.data.partyGroupId).then(res => { + if (res.data.length > 0) { + this.todayTopic = {...res.data[0]} + res.data.shift() + this.setData({ + todayTopic: this.todayTopic, + 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..bae1a50 --- /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..be61d40 --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxml @@ -0,0 +1,13 @@ + + + + + {{todayTopic.showTime}} + {{todayTopic.content}} + + + {{item.showTime}} + {{item.content}} + + + \ No newline at end of file diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxss b/subpages/associationNew/pages/guideInfo/guideInfo.wxss new file mode 100644 index 0000000..63f19af --- /dev/null +++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxss @@ -0,0 +1,78 @@ +page { + width:100%; + height: auto; + min-height:100vh; + overflow-y: auto; + background: linear-gradient(to bottom, #db1a1f 0%,#e95027 50%,#db1a1f 100%); +} +.guide-info { + position: relative; +} +.topic-img{ + width: 750rpx; + height: 306rpx; + position: absolute; +} +.guide-content { + display: flex; + flex-direction: column; + position: absolute; + top: 243rpx; + margin: 16rpx 30rpx; +} + +.today-top { + position: relative; +} +.today-top image{ + width: 232rpx; + height: 50rpx; +} +.today-top text{ + height: 50rpx; + line-height: 50rpx; + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: rgba(255,255,255,1); + position: absolute; + left: 76rpx; + z-index: 999; +} +.topic-item, .today-item { + background-color: #ffffff; + border-radius: 10rpx; + display: flex; + flex-direction: column; + margin-bottom: 16rpx; + width: 690rpx; +} +.item-top { + position: relative; + display: flex; + align-items: center; + padding-left: 31rpx; + margin-top: 39rpx; +} +.item-top image{ + width: 32rpx; + height: 32rpx; +} +.item-top text{ + font-size: 32rpx; + font-family: PingFang SC; + font-weight: bold; + color: #BF1F1F; + margin-left: 18rpx; +} +.item-content, .today-content{ + padding: 28rpx 32rpx; +} +.item-content text,.today-content text{ + font-size:34rpx; + font-family:PingFang SC; + font-weight:500; + color:rgba(51,51,51,1); + line-height:52rpx; + height: 52rpx; +} \ No newline at end of file diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js index 6928dd2..16ffc7e 100644 --- a/subpages/associationNew/utils/api.js +++ b/subpages/associationNew/utils/api.js @@ -1,128 +1,136 @@ -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) +} + + + + +