Showing
5 changed files
with
4 additions
and
85 deletions
@@ -19,17 +19,9 @@ module.exports = { | @@ -19,17 +19,9 @@ module.exports = { | ||
19 | }); | 19 | }); |
20 | }, | 20 | }, |
21 | 21 | ||
22 | - /* 获取资讯分类 */ | ||
23 | - getNewsCate: (req, res, next) => { | ||
24 | - listModel.newsCate().then(result => { | ||
25 | - res.json(result); | ||
26 | - }).catch(next); | ||
27 | - }, | ||
28 | - | ||
29 | /* 获取资讯列表数据 */ | 22 | /* 获取资讯列表数据 */ |
30 | getNewsList: (req, res, next) => { | 23 | getNewsList: (req, res, next) => { |
31 | let params = { | 24 | let params = { |
32 | - sortId: req.body.sortId, | ||
33 | page: req.body.page, | 25 | page: req.body.page, |
34 | limit: req.body.limit, | 26 | limit: req.body.limit, |
35 | gender: req.body.gender, | 27 | gender: req.body.gender, |
@@ -10,17 +10,10 @@ const serviceAPI = global.yoho.ServiceAPI; | @@ -10,17 +10,10 @@ const serviceAPI = global.yoho.ServiceAPI; | ||
10 | 10 | ||
11 | module.exports = { | 11 | module.exports = { |
12 | 12 | ||
13 | - /* 资讯分类数据获取 */ | ||
14 | - getNewsCateData() { | ||
15 | - return serviceAPI.get('guang/api/v2/category/get', { | ||
16 | - app_type: '1' | ||
17 | - }); | ||
18 | - }, | ||
19 | - | ||
20 | /* 资讯列表页数据获取 */ | 13 | /* 资讯列表页数据获取 */ |
21 | getNewsListData(params) { | 14 | getNewsListData(params) { |
22 | return serviceAPI.get('guang/api/v2/article/getList', { | 15 | return serviceAPI.get('guang/api/v2/article/getList', { |
23 | - sort_id: params.sortId, | 16 | + sort_id: '', |
24 | gender: params.gender, | 17 | gender: params.gender, |
25 | uid: params.uid || '0', | 18 | uid: params.uid || '0', |
26 | page: params.page, | 19 | page: params.page, |
@@ -12,26 +12,6 @@ const newsListApi = require('./list-api'); | @@ -12,26 +12,6 @@ const newsListApi = require('./list-api'); | ||
12 | const camelCase = global.yoho.camelCase; | 12 | const camelCase = global.yoho.camelCase; |
13 | 13 | ||
14 | /** | 14 | /** |
15 | - * 资讯分类 | ||
16 | - * @returns {*|Promise.<TResult>} | ||
17 | - */ | ||
18 | -const newsCate = () => { | ||
19 | - let finalResult = {}; | ||
20 | - | ||
21 | - return api.all([ | ||
22 | - newsListApi.getNewsCateData() | ||
23 | - ]).then(result => { | ||
24 | - if (result[0].code === 200) { | ||
25 | - Object.assign(finalResult, result[0].data); | ||
26 | - } else { | ||
27 | - logger.error('getNewsListData api code no 200 or allList is null'); | ||
28 | - } | ||
29 | - | ||
30 | - return finalResult; | ||
31 | - }); | ||
32 | -}; | ||
33 | - | ||
34 | -/** | ||
35 | * 资讯列表数据 | 15 | * 资讯列表数据 |
36 | * @param params | 16 | * @param params |
37 | * @returns {*|Promise.<TResult>} | 17 | * @returns {*|Promise.<TResult>} |
@@ -53,6 +33,5 @@ const newsList = params => { | @@ -53,6 +33,5 @@ const newsList = params => { | ||
53 | }; | 33 | }; |
54 | 34 | ||
55 | module.exports = { | 35 | module.exports = { |
56 | - newsList, | ||
57 | - newsCate | 36 | + newsList |
58 | }; | 37 | }; |
@@ -19,7 +19,6 @@ router.get(/news_(\d+)\.json/, detail.news); | @@ -19,7 +19,6 @@ router.get(/news_(\d+)\.json/, detail.news); | ||
19 | const news = require(`${cRoot}/index`); | 19 | const news = require(`${cRoot}/index`); |
20 | 20 | ||
21 | router.get('', news.index); // 首页 | 21 | router.get('', news.index); // 首页 |
22 | -router.get('/get-news-cate', news.getNewsCate); // 获取资讯分类 | ||
23 | router.post('/get-news-list', news.getNewsList); // 获取资讯数据 | 22 | router.post('/get-news-list', news.getNewsList); // 获取资讯数据 |
24 | 23 | ||
25 | module.exports = router; | 24 | module.exports = router; |
1 | <template> | 1 | <template> |
2 | - <ul class="new-cate clearfix"> | ||
3 | - <li v-for="cate in newsCate" v-bind:class='{"current" : cate.id === crntCateId}' @click="changeCate(cate.id)">{{cate.name}}</li> | ||
4 | - </ul> | ||
5 | <resources v-bind:content-code.sync="contentCode"></resources> | 2 | <resources v-bind:content-code.sync="contentCode"></resources> |
6 | <div v-for="news in newsList" class="news-box"> | 3 | <div v-for="news in newsList" class="news-box"> |
7 | - <span class="tag">{{news.categoryName}}</span> | 4 | + <span v-if='news.categoryName !== "最新"' class="tag">{{news.categoryName}}</span> |
8 | <div class="img"> | 5 | <div class="img"> |
9 | <a href='{{"/news/" + news.id}}'> | 6 | <a href='{{"/news/" + news.id}}'> |
10 | <img v-lazy="news.src | resize 750 470" alt="" /> | 7 | <img v-lazy="news.src | resize 750 470" alt="" /> |
@@ -23,23 +20,6 @@ | @@ -23,23 +20,6 @@ | ||
23 | </div> | 20 | </div> |
24 | </template> | 21 | </template> |
25 | <style> | 22 | <style> |
26 | - .new-cate { | ||
27 | - color: #b0b0b0; | ||
28 | - width: 100%; | ||
29 | - height: 90px; | ||
30 | - | ||
31 | - li { | ||
32 | - width: 20%; | ||
33 | - float: left; | ||
34 | - text-align: center; | ||
35 | - padding: 28px 0; | ||
36 | - } | ||
37 | - | ||
38 | - .current { | ||
39 | - color: #000; | ||
40 | - } | ||
41 | - } | ||
42 | - | ||
43 | .news-box { | 23 | .news-box { |
44 | background: #f6f6f6; | 24 | background: #f6f6f6; |
45 | 25 | ||
@@ -105,8 +85,6 @@ | @@ -105,8 +85,6 @@ | ||
105 | data() { | 85 | data() { |
106 | return { | 86 | return { |
107 | contentCode: contentCode.news[qs.cate || 'new'], | 87 | contentCode: contentCode.news[qs.cate || 'new'], |
108 | - crntCateId: -1, | ||
109 | - newsCate: [], | ||
110 | newsList: [], | 88 | newsList: [], |
111 | gender: qs.gender, | 89 | gender: qs.gender, |
112 | page: 1, | 90 | page: 1, |
@@ -114,34 +92,12 @@ | @@ -114,34 +92,12 @@ | ||
114 | }; | 92 | }; |
115 | }, | 93 | }, |
116 | watch: { | 94 | watch: { |
117 | - crntCateId() { | ||
118 | - this.getNewsList(); | ||
119 | - }, | ||
120 | gender() { | 95 | gender() { |
121 | this.getNewsList(); | 96 | this.getNewsList(); |
122 | } | 97 | } |
123 | }, | 98 | }, |
124 | methods: { | 99 | methods: { |
125 | 100 | ||
126 | - /* 获取资讯分类 */ | ||
127 | - getNewsCate() { | ||
128 | - $.get({ | ||
129 | - url: '/news/get-news-cate' | ||
130 | - }).done(result => { | ||
131 | - if (result) { | ||
132 | - this.newsCate = result; | ||
133 | - this.crntCateId = result[0].id; | ||
134 | - } else { | ||
135 | - tip('服务端无数据返回'); | ||
136 | - } | ||
137 | - }).fail(); | ||
138 | - }, | ||
139 | - | ||
140 | - /* 改变分类 */ | ||
141 | - changeCate(cateId) { | ||
142 | - this.crntCateId = cateId; | ||
143 | - }, | ||
144 | - | ||
145 | /* 获取资讯列表数据 */ | 101 | /* 获取资讯列表数据 */ |
146 | getNewsList() { | 102 | getNewsList() { |
147 | $.post({ | 103 | $.post({ |
@@ -175,7 +131,7 @@ | @@ -175,7 +131,7 @@ | ||
175 | resources | 131 | resources |
176 | }, | 132 | }, |
177 | created() { | 133 | created() { |
178 | - this.getNewsCate(); | 134 | + this.getNewsList(); |
179 | } | 135 | } |
180 | }; | 136 | }; |
181 | </script> | 137 | </script> |
-
Please register or login to post a comment