diff --git a/models/topic.js b/models/topic.js index 7f5ce6d..dcc5a77 100644 --- a/models/topic.js +++ b/models/topic.js @@ -324,11 +324,11 @@ class TopicModel extends HTTP { //促招引 getAttractList(typeCode, page, pageSize, success) { let params = { - url: TopicBaseUrl.attract_list_url + "?pageNo=" + page, + url: TopicBaseUrl.attract_list_url + "?pageNo=" + page+"&pageSize="+pageSize, method: Method.POST, data: { typeCode: typeCode, - pageSize: pageSize + // pageSize: pageSize }, success: success } diff --git a/pages/article/index.wxml b/pages/article/index.wxml index b3c1794..b1cd4d4 100644 --- a/pages/article/index.wxml +++ b/pages/article/index.wxml @@ -21,8 +21,7 @@ 收藏:{{collectNum}} - - + diff --git a/pages/home/index.js b/pages/home/index.js index 45365a0..d9086e2 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -82,6 +82,7 @@ Page({ image: item.titlePic, showTop: item.isTop == 1 ? true : false, time: dayjs(item.createTime).toNow(), + type:item.type, readed: item.isRead == 0 ? false : true }) }) @@ -172,17 +173,31 @@ Page({ //点击列表cell获取id,进入页面 clickListItem (e) { //console.log(e.detail) - const {id, index} = e.detail + console.log('点击---',e) + const {id, index,type} = e.detail this.setData({ [`list[${index}].readed`]: true }) + //type 文章/活动标识0-文章,1-活动 + if(type==0){ this.gotoArticePage(id) + } + else{ + this.gotoActivityPage(id) + } }, + //文章 0 gotoArticePage (id) { wx.navigateTo({ url: `/pages/article/index?id=${id}`, }) }, + //活动 1 + gotoActivityPage (id) { + wx.navigateTo({ + url: `/pages/topics/activity/activityDetail/index?activityId=${id}`, + }) + }, onClose(){ this.setData({ show:false diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 82c752d..21ca326 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -11,6 +11,7 @@ title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" + type="{{item.type}}" bind:clickListItem="clickListItem"/> diff --git a/pages/topics/activity/activityDetail/index.wxml b/pages/topics/activity/activityDetail/index.wxml index da546d9..6a904c9 100644 --- a/pages/topics/activity/activityDetail/index.wxml +++ b/pages/topics/activity/activityDetail/index.wxml @@ -53,9 +53,9 @@ + - diff --git a/pages/topics/activity/activityDetail/index.wxss b/pages/topics/activity/activityDetail/index.wxss index da98cc7..25d19c9 100644 --- a/pages/topics/activity/activityDetail/index.wxss +++ b/pages/topics/activity/activityDetail/index.wxss @@ -213,4 +213,11 @@ } .read_num, .collect_num { color: #999; +} + + +/* 占位view */ +.standView{ + width: 100%; + height: 160rpx; } \ No newline at end of file diff --git a/pages/topics/activity/cell/index.js b/pages/topics/activity/cell/index.js index 46626f2..71de894 100644 --- a/pages/topics/activity/cell/index.js +++ b/pages/topics/activity/cell/index.js @@ -12,6 +12,10 @@ Component({ time: String, commentNum: Number, dataIndex:Number, + readed: { + type:Boolean, + value: false, + }, }, /** diff --git a/pages/topics/attract/index.js b/pages/topics/attract/index.js index 4cd5420..7d1bfde 100644 --- a/pages/topics/attract/index.js +++ b/pages/topics/attract/index.js @@ -40,7 +40,8 @@ Component({ image: item.titlePic, showTop: item.isTop == 1 ? true : false, time: item.createTime, - readed: item.isRead == 0 ? false : true + readed: item.isRead == 0 ? false : true, + type: item.type }) }) th.setData({ @@ -58,41 +59,43 @@ Component({ image: item.titlePic, showTop: item.isTop == 1 ? true : false, time: item.createTime, - readed: item.isRead == 0 ? false : true + readed: item.isRead == 0 ? false : true, + type: item.type }) }) th.setData({ - spaceList:tempDatas, + spaceList: tempDatas, }) }) }, //海洋人才赋能中心详情 clickListItem(e) { - //console.log(e.detail) - const { - id, - index - } = e.detail - this.setData({ - [`oceanList[${index}].readed`]: true - }) - this.goOceanDetail(id) - }, - clickListItemSpace(e) { const { id, - index + index, + type } = e.detail this.setData({ [`oceanList[${index}].readed`]: true }) - this.goOceanDetail(id) + //type 文章/活动标识0-文章,1-活动 + if (type == 0) { + this.goOceanDetail(id) + } else { + this.gotoActivityPage(id) + } }, goOceanDetail(id) { wx.navigateTo({ url: `/pages/topics/attract/oceanDetail/index?id=${id}`, }) }, + //活动 1 + gotoActivityPage(id) { + wx.navigateTo({ + url: `/pages/topics/activity/activityDetail/index?activityId=${id}`, + }) + }, //海洋人才赋能中心更多 goOceanMore() { wx.navigateTo({ @@ -105,12 +108,18 @@ Component({ //console.log(e.detail) const { id, - index + index, + type } = e.detail this.setData({ [`spaceList[${index}].readed`]: true }) - this.goSpacenDetail(id) + //type 文章/活动标识0-文章,1-活动 + if (type == 0) { + this.goSpacenDetail(id) + } else { + this.gotoActivityPage(id) + } }, goSpacenDetail(id) { wx.navigateTo({ diff --git a/pages/topics/attract/index.wxml b/pages/topics/attract/index.wxml index c1aa844..cb0e5a2 100644 --- a/pages/topics/attract/index.wxml +++ b/pages/topics/attract/index.wxml @@ -8,7 +8,7 @@ 更多> - + @@ -21,7 +21,7 @@ 更多> - + diff --git a/pages/topics/attract/ocean/index.js b/pages/topics/attract/ocean/index.js index b459ea5..c6a5a16 100644 --- a/pages/topics/attract/ocean/index.js +++ b/pages/topics/attract/ocean/index.js @@ -94,7 +94,8 @@ Page({ image: item.titlePic, showTop: item.isTop == 1 ? true : false, time: item.createTime, - readed: item.isRead == 0 ? false : true + readed: item.isRead == 0 ? false : true, + type:item.type }) }) if (page == 1) { @@ -120,19 +121,32 @@ Page({ }, //海洋人才赋能中心点击列表cell获取id,进入页面 clickListItem(e) { - console.log(e) + console.log('海洋人才赋能中心点击-->',e) const { id, - index + index, + type } = e.detail this.setData({ [`list[${index}].readed`]: true }) - this.goOceanDetail(id) + // this.goOceanDetail(id) + //type 文章/活动标识0-文章,1-活动 + if (type == 0) { + this.goOceanDetail(id) + } else { + this.gotoActivityPage(id) + } }, goOceanDetail(id) { wx.navigateTo({ url: `/pages/topics/attract/oceanDetail/index?id=${id}`, }) }, + //活动 1 + gotoActivityPage(id) { + wx.navigateTo({ + url: `/pages/topics/activity/activityDetail/index?activityId=${id}`, + }) + }, }) \ No newline at end of file diff --git a/pages/topics/attract/ocean/index.wxml b/pages/topics/attract/ocean/index.wxml index f1b3157..ceb77a4 100644 --- a/pages/topics/attract/ocean/index.wxml +++ b/pages/topics/attract/ocean/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/topics/attract/space/index.js b/pages/topics/attract/space/index.js index 701f634..927462e 100644 --- a/pages/topics/attract/space/index.js +++ b/pages/topics/attract/space/index.js @@ -94,7 +94,8 @@ Page({ image: item.titlePic, showTop: item.isTop == 1 ? true : false, time: item.createTime, - readed: item.isRead == 0 ? false : true + readed: item.isRead == 0 ? false : true, + type:item.type }) }) if (page == 1) { @@ -114,7 +115,6 @@ Page({ }) } } - console.log(res) wx.stopPullDownRefresh() }) }, @@ -123,16 +123,29 @@ Page({ //console.log(e.detail) const { id, - index + index, + type } = e.detail this.setData({ [`list[${index}].readed`]: true }) - this.goSpacenDetail(id) + // this.goSpacenDetail(id) + //type 文章/活动标识0-文章,1-活动 + if (type == 0) { + this.goSpacenDetail(id) + } else { + this.gotoActivityPage(id) + } }, goSpacenDetail(id) { wx.navigateTo({ url: `/pages/topics/attract/spaceDetail/index?id=${id}`, }) }, + //活动 1 + gotoActivityPage(id) { + wx.navigateTo({ + url: `/pages/topics/activity/activityDetail/index?activityId=${id}`, + }) + }, }) \ No newline at end of file diff --git a/pages/topics/attract/space/index.wxml b/pages/topics/attract/space/index.wxml index da1387c..1e4b1bb 100644 --- a/pages/topics/attract/space/index.wxml +++ b/pages/topics/attract/space/index.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/topics/index.js b/pages/topics/index.js index 95a82f6..d21edfa 100644 --- a/pages/topics/index.js +++ b/pages/topics/index.js @@ -405,7 +405,7 @@ Page({ page: page - 1 }) } - + console.log('活动列表封装--->',th.data.activityList) }) }, changeActivityStatus:function(e){