diff --git a/subpages/associationNew/images/speack.png b/subpages/associationNew/images/speack.png new file mode 100644 index 0000000..4d989ff Binary files /dev/null and b/subpages/associationNew/images/speack.png differ diff --git a/subpages/associationNew/images/story.png b/subpages/associationNew/images/story.png new file mode 100644 index 0000000..03a0f31 Binary files /dev/null and b/subpages/associationNew/images/story.png differ diff --git a/subpages/associationNew/pages/community/community.js b/subpages/associationNew/pages/community/community.js index c7debb8..545cef7 100644 --- a/subpages/associationNew/pages/community/community.js +++ b/subpages/associationNew/pages/community/community.js @@ -55,11 +55,11 @@ Page({ } else if (e.currentTarget.dataset.page === 'gather') { console.log('/subpages/associationNew/pages/community/community.js') wx.navigateTo({ - url:`/subpages/associationNew/pages/eventlist/eventlist` //`#/话对捧个场` + 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` //`#/事好鼓个掌` + url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType='0'` //`#/事好鼓个掌` }) } } diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js index 76b74c5..5db4504 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.js +++ b/subpages/associationNew/pages/eventlist/eventlist.js @@ -1,4 +1,8 @@ // subpages/associationNew/pages/eventlist/eventlist.js +import { topiclist} from '../../utils/api' +import { + getTimestamp +} from '../../../../utils/common' Page({ /** @@ -9,14 +13,41 @@ Page({ "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png", "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png", "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png" - ] + ], + topiclist:[], + timestamp: getTimestamp(), + pageIndex: 1, + pageSize: 10, + partyGroupId:'',//党群id + topicType:'',//0:事好儿鼓个掌 1:话对捧个场 }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { + this.setData({ + partyGroupId:options.partyGroupId, + topicType:options.topicType,//0:事好儿鼓个掌 1:话对捧个场 + }) + this.topiclist() + }, + topiclist(){ + const para = { + pageIndex: this.data.pageIndex, + pageSize: this.data.pageSize, + timestamp: this.data.timestamp, + topicType:this.data.topicType, + partyGroupId: this.data.partyGroupId, //党群id + } + topiclist(para).then(res => { + let that = this; + console.log(JSON.stringify(res)) + this.setData({ + topiclist: that.data.topiclist.concat(res.data), + }) + }) }, /** diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index d52a11a..057e4f9 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -31,6 +31,11 @@ + + + + +
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss index 5831e38..88abff9 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -179,3 +179,17 @@ page { 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; +} diff --git a/subpages/associationNew/utils/api.js b/subpages/associationNew/utils/api.js index e5507cd..5d45d8a 100644 --- a/subpages/associationNew/utils/api.js +++ b/subpages/associationNew/utils/api.js @@ -68,7 +68,7 @@ export function postUserBanned({groupUserId, bannedFlag}) { * 话题列表 */ export function topiclist({pageIndex,pageSize,timestamp,topicType,partyGroupId}) { - return request.post('partyGroup/topic/list',{ + return request.get('partyGroup/topic/list',{ pageIndex, pageSize, timestamp,