diff --git a/app.json b/app.json index ea47c53..657d38a 100644 --- a/app.json +++ b/app.json @@ -18,7 +18,8 @@ "pages/user/myTopics/index", "pages/user/myInfo/index", "pages/topics/interactive/submitTopic/index", - "pages/topics/interactive/topicArticle/index" + "pages/topics/interactive/topicArticle/index", + "pages/billboards/park/park-category/index" ], "window": { "backgroundTextStyle": "light", diff --git a/components/card/index.wxml b/components/card/index.wxml index a8ea1cd..fee0881 100644 --- a/components/card/index.wxml +++ b/components/card/index.wxml @@ -1,5 +1,5 @@ - + {{title}} diff --git a/images/temp_1.png b/images/temp_1.png index 6ddf21b..9e369a9 100644 Binary files a/images/temp_1.png and b/images/temp_1.png differ diff --git a/pages/billboards/park/park-category/index.js b/pages/billboards/park/park-category/index.js new file mode 100644 index 0000000..2198a57 --- /dev/null +++ b/pages/billboards/park/park-category/index.js @@ -0,0 +1,74 @@ +// pages/billboards/park/park-category/index.js + +import { BillboardModel } from '../../../../models/billboard.js' + +let billboard = new BillboardModel() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + list: [] + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + fetchList() { + const { curCode } = this.data + const page = this.data.currPage + billboard.fetchBailList(curCode, page, res => { + console.log(res) + const datas = res.list + let tempDatas = [] + datas.forEach(item => { + tempDatas.push({ + id: item.id, + title: item.title, + image: item.titlePic + }) + }) + if (page == 1) { + this.setData({ + list: tempDatas + }) + } else { + if (tempDatas.length > 0) { + const list = [...this.data.list, ...tempDatas] + this.setData({ + list: list + }) + } else { + const page = this.data.currPage - 1 + this.setData({ + currPage: page + }) + wx.showToast({ + title: '已加载全部', + icon: 'none' + }) + } + } + wx.stopPullDownRefresh() + }) + }, + // 获取分类Tags + fetchTags() { + billboard.fetchTagsByCode('sc-zdqy', res => { + console.log(res) + const tags = res.result.records + const navs = tags.map(item => item.name) + this.setData({ + navs: navs, + tags: tags, + curCode: tags.length > 0 ? tags[0].code : '' + }) + this.fetchList() + }) + }, +}) \ No newline at end of file diff --git a/pages/billboards/park/park-category/index.json b/pages/billboards/park/park-category/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/billboards/park/park-category/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/billboards/park/park-category/index.wxml b/pages/billboards/park/park-category/index.wxml new file mode 100644 index 0000000..43a67fc --- /dev/null +++ b/pages/billboards/park/park-category/index.wxml @@ -0,0 +1,2 @@ + +pages/billboards/park/park-category/index.wxml diff --git a/pages/billboards/park/park-category/index.wxss b/pages/billboards/park/park-category/index.wxss new file mode 100644 index 0000000..05e611d --- /dev/null +++ b/pages/billboards/park/park-category/index.wxss @@ -0,0 +1 @@ +/* pages/billboards/park/park-category/index.wxss */ \ No newline at end of file diff --git a/pages/billboards/policy/policy-list/index.js b/pages/billboards/policy/policy-list/index.js index 61b0908..28e3d5a 100644 --- a/pages/billboards/policy/policy-list/index.js +++ b/pages/billboards/policy/policy-list/index.js @@ -63,17 +63,22 @@ Page({ this.fetchPolicyArtice() }, fetchPolicyArtice () { + wx.showLoading({ + title: '加载中...', + }) policy.fetchPolicyArtice(this.data.curCode, res => { - //console.log(res) + console.log(res) if (res.data) { this.setData({ - nodes: res.data.content || '' + readNum: res.data.readNum, + nodes: res.data.content || '', }) } else { this.setData({ nodes: '' }) } + wx.hideLoading() }) }, maskTouchMove () { diff --git a/pages/billboards/policy/policy-list/index.wxml b/pages/billboards/policy/policy-list/index.wxml index 5ce2553..0e6d6b3 100644 --- a/pages/billboards/policy/policy-list/index.wxml +++ b/pages/billboards/policy/policy-list/index.wxml @@ -2,11 +2,7 @@ - + @@ -14,13 +10,16 @@ + - - + + {{item}} - + \ No newline at end of file diff --git a/pages/billboards/policy/policy-list/index.wxss b/pages/billboards/policy/policy-list/index.wxss index d7e8fb8..bd75624 100644 --- a/pages/billboards/policy/policy-list/index.wxss +++ b/pages/billboards/policy/policy-list/index.wxss @@ -78,4 +78,16 @@ left: 0; right: 0; background-color: rgba(0, 0, 0, 0.6); +} + +/* // 阅读量 */ +.read_collectNum { + padding: 20rpx 0; + display: flex; + flex-direction: row; + justify-content: space-between; + font-size: 16px; +} +.read_num { + color: #999; } \ No newline at end of file