diff --git a/src/api/search.js b/src/api/search.js index 7ba274862d30793ddef402bbb1c37b4369f00932..69c8d577268ba64fe6e2220fd587eceb94e2c60b 100644 --- a/src/api/search.js +++ b/src/api/search.js @@ -1,13 +1,14 @@ import request from '@/util/request' -export function searchByKeyword(query){ +export function searchByKeyword(query,tab){ return request({ url: '/search/searchList', method: 'get', params:{ keyword: query.keyword, pageNum: query.pageNum, - pageSize: query.pageSize + pageSize: query.pageSize, + tab: tab } }) } diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index d66936be5e54f7a78309531eca19a38ad79aac8c..57a654d5f3316486716a4cd26dbf02e15a71f469 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -62,7 +62,12 @@ export default { changeBillboard: 'Change billboard', changeSentence: 'Change daliy sentence', promotion: 'Promotion', - detail: 'Not received related promotion!', + csdn: 'CSDN', + leetCode: 'LeetCode', + pta: 'PTA', + luoGu: 'LuoGu', + gitee: 'gitee', + github: 'github', sentence: 'Daily sentence' }, post: { @@ -89,7 +94,10 @@ export default { hot: 'Hot Topics', star: 'Favorites', like: 'Like and star', - starred: 'Starred' + starred: 'Starred', + postForSearch: 'Post', + user:'User', + tag:'Tag', }, user: { score: 'Score', diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 8c2468d1d6d5859634ba616be268238d57322944..332e5336870a6817824621003e2e45769a8b71c8 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -62,7 +62,12 @@ export default { changeBillboard: '修改公告栏', changeSentence: '修改每日一句', promotion: '推广', - detail: '未收到有关推广!', + csdn: 'CSDN', + leetCode: '力扣', + pta: '拼题A', + luoGu: '洛谷', + gitee: '码云', + github: 'github', sentence: '每日一句' }, post: { @@ -89,7 +94,10 @@ export default { hot: '热门主题', star: '收藏夹', like: '点赞并收藏', - starred: '已收藏' + starred: '已收藏', + postForSearch: '帖子', + user:'用户', + tag:'标签', }, user: { score: '积分', diff --git a/src/view/Search.vue b/src/view/Search.vue index 9a9a8683fac67a1a278eb8152508bf7b84c75d6b..020ac4304767084d06e8688266a3f17fbb0ccfc0 100644 --- a/src/view/Search.vue +++ b/src/view/Search.vue @@ -1,58 +1,170 @@ @@ -19,7 +79,7 @@ export default { }, methods: { - } + }, }