From 0be0ff73fc16b1b09b5a14a530abda5a779e0f19 Mon Sep 17 00:00:00 2001
From: MiraiMagician <158348508@qq.com>
Date: Thu, 10 Jun 2021 23:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=8A=9F=E8=83=BD=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=9E=E7=8E=B0=20&=20=E6=90=9C=E7=B4=A2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD=E5=89=8D=E7=AB=AF=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/search.js           |   5 +-
 src/i18n/lang/en.js         |  12 +-
 src/i18n/lang/zh.js         |  12 +-
 src/view/Search.vue         | 216 ++++++++++++++++++++++++++++--------
 src/view/card/Promotion.vue |  66 ++++++++++-
 5 files changed, 253 insertions(+), 58 deletions(-)

diff --git a/src/api/search.js b/src/api/search.js
index 7ba2748..69c8d57 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 d66936b..57a654d 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 8c2468d..332e533 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 9a9a868..020ac43 100644
--- a/src/view/Search.vue
+++ b/src/view/Search.vue
@@ -1,58 +1,170 @@
 <template>
   <div>
     <el-card shadow="never">
-      <div slot="header" class="clearfix">
-        检索到 <code>{{ query.total }}</code>
-        条关于 <code class="has-text-info">{{ query.keyword }}</code> 的记录
-      </div>
       <div>
-        <article v-for="(item, index) in list" :key="index" class="media">
-          <div class="media-left">
-            <figure class="image is-48x48">
-              <img 
-              :src="item.avatar"
-              style="border-radius: 5px"
-              > 
-            </figure>
-          </div>
-          <div class="media-content">
-            <div class="">
-              <p class="ellipsis is-ellipsis-1">
-                <el-tooltip class="item" effect="dark" :content="item.title" placement="top">
-                  <router-link :to="{name:'post-detail',params:{id:item.id}}">
-                    <span class="is-size-6">{{ item.title }}</span>
-                  </router-link>
-                </el-tooltip>
-              </p>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane :label="$t('post.postForSearch')" name="post">
+            <div class="clearfix" style="padding-bottom:25px">
+              检索到 <code>{{ query.total }}</code>
+              条关于 <code class="has-text-info">{{ query.keyword }}</code> 的记录
+            </div>
+            <article v-for="(item, index) in list" :key="index" class="media">
+              <div class="media-left">
+                <figure class="image is-48x48">
+                  <img 
+                  :src="item.avatar"
+                  style="border-radius: 5px"
+                  > 
+                </figure>
+              </div>
+              <div class="media-content">
+                <div class="">
+                  <p class="ellipsis is-ellipsis-1">
+                    <el-tooltip class="item" effect="dark" :content="item.title" placement="top">
+                      <router-link :to="{name:'post-detail',params:{id:item.id}}">
+                        <span class="is-size-6">{{ item.title }}</span>
+                      </router-link>
+                    </el-tooltip>
+                  </p>
+                </div>
+                <nav class="level has-text-grey is-mobile  is-size-7 mt-2">
+                  <div class="level-left">
+                    <div class="level-left">
+                      <router-link class="level-item" :to="{ path: `/member/${item.username}/home` }">
+                        {{ item.alias }}
+                      </router-link>
+
+                      <span class="mr-1">
+                        发布于:{{ dayjs(item.createTime).format("YYYY/MM/DD") }}
+                      </span>
+
+                      <span
+                        v-for="(tag, index) in item.tags"
+                        :key="index"
+                        class="tag is-hidden-mobile is-success is-light mr-1"
+                      >
+                        <span @click="search(tag.name)" style="cursor:pointer;">
+                              {{ "#" + tag.name }}
+                        </span>
+                      </span>
+
+                      <span class="is-hidden-mobile">浏览:{{ item.view }}</span>
+                    </div>
+                  </div>
+                </nav>
+              </div>
+              <div class="media-right" />
+            </article>
+          </el-tab-pane>
+
+          <el-tab-pane :label="$t('post.user')" name="user">
+            <div class="clearfix" style="padding-bottom:25px">
+              检索到 <code>{{ query.total }}</code>
+              条关于 <code class="has-text-info">{{ query.keyword }}</code> 的记录
+            </div>
+            <article v-for="(item, index) in list" :key="index" class="media">
+              <div class="media-left">
+                <figure class="image is-48x48">
+                  <img 
+                  :src="item.avatar"
+                  style="border-radius: 5px"
+                  > 
+                </figure>
+              </div>
+              <div class="media-content">
+                <div class="">
+                  <p class="ellipsis is-ellipsis-1">
+                    <el-tooltip class="item" effect="dark" :content="item.title" placement="top">
+                      <router-link :to="{name:'post-detail',params:{id:item.id}}">
+                        <span class="is-size-6">{{ item.title }}</span>
+                      </router-link>
+                    </el-tooltip>
+                  </p>
+                </div>
+                <nav class="level has-text-grey is-mobile  is-size-7 mt-2">
+                  <div class="level-left">
+                    <div class="level-left">
+                      <router-link class="level-item" :to="{ path: `/member/${item.username}/home` }">
+                        {{ item.alias }}
+                      </router-link>
+
+                      <span class="mr-1">
+                        发布于:{{ dayjs(item.createTime).format("YYYY/MM/DD") }}
+                      </span>
+
+                      <span
+                        v-for="(tag, index) in item.tags"
+                        :key="index"
+                        class="tag is-hidden-mobile is-success is-light mr-1"
+                      >
+                        <span @click="search(tag.name)" style="cursor:pointer;">
+                              {{ "#" + tag.name }}
+                        </span>
+                      </span>
+
+                      <span class="is-hidden-mobile">浏览:{{ item.view }}</span>
+                    </div>
+                  </div>
+                </nav>
+              </div>
+              <div class="media-right" />
+            </article>
+          </el-tab-pane>
+
+          <el-tab-pane :label="$t('post.tag')" name="tag">
+            <div class="clearfix" style="padding-bottom:25px">
+              检索到 <code>{{ query.total }}</code>
+              条关于 <code class="has-text-info">{{ query.keyword }}</code> 的记录
             </div>
-            <nav class="level has-text-grey is-mobile  is-size-7 mt-2">
-              <div class="level-left">
-                <div class="level-left">
-                  <router-link class="level-item" :to="{ path: `/member/${item.username}/home` }">
-                    {{ item.alias }}
-                  </router-link>
-
-                  <span class="mr-1">
-                    发布于:{{ dayjs(item.createTime).format("YYYY/MM/DD") }}
-                  </span>
-
-                  <span
-                    v-for="(tag, index) in item.tags"
-                    :key="index"
-                    class="tag is-hidden-mobile is-success is-light mr-1"
-                  >
-                    <span @click="search(tag.name)" style="cursor:pointer;">
-                          {{ "#" + tag.name }}
-                    </span>
-                  </span>
-
-                  <span class="is-hidden-mobile">浏览:{{ item.view }}</span>
+            <article v-for="(item, index) in list" :key="index" class="media">
+              <div class="media-left">
+                <figure class="image is-48x48">
+                  <img 
+                  :src="item.avatar"
+                  style="border-radius: 5px"
+                  > 
+                </figure>
+              </div>
+              <div class="media-content">
+                <div class="">
+                  <p class="ellipsis is-ellipsis-1">
+                    <el-tooltip class="item" effect="dark" :content="item.title" placement="top">
+                      <router-link :to="{name:'post-detail',params:{id:item.id}}">
+                        <span class="is-size-6">{{ item.title }}</span>
+                      </router-link>
+                    </el-tooltip>
+                  </p>
                 </div>
+                <nav class="level has-text-grey is-mobile  is-size-7 mt-2">
+                  <div class="level-left">
+                    <div class="level-left">
+                      <router-link class="level-item" :to="{ path: `/member/${item.username}/home` }">
+                        {{ item.alias }}
+                      </router-link>
+
+                      <span class="mr-1">
+                        发布于:{{ dayjs(item.createTime).format("YYYY/MM/DD") }}
+                      </span>
+
+                      <span
+                        v-for="(tag, index) in item.tags"
+                        :key="index"
+                        class="tag is-hidden-mobile is-success is-light mr-1"
+                      >
+                        <span @click="search(tag.name)" style="cursor:pointer;">
+                              {{ "#" + tag.name }}
+                        </span>
+                      </span>
+
+                      <span class="is-hidden-mobile">浏览:{{ item.view }}</span>
+                    </div>
+                  </div>
+                </nav>
               </div>
-            </nav>
-          </div>
-          <div class="media-right" />
-        </article>
+              <div class="media-right" />
+            </article>
+          </el-tab-pane>
+        </el-tabs>
       </div>
 
       <!--分页-->
@@ -84,6 +196,7 @@ export default {
   },
   data() {
     return {
+      activeName: "post",
       list: [],
       query: {
         keyword: this.$route.query.key,
@@ -98,7 +211,7 @@ export default {
   },
   methods: {
     fetchList() {
-      searchByKeyword(this.query).then(value => {
+      searchByKeyword(this.query, this.activeName).then(value => {
         const { data } = value
         this.list = data.records
         this.query.total = data.total
@@ -106,6 +219,11 @@ export default {
         this.query.pageNum = data.current
       })
     },
+    handleClick(tab) {
+      this.query.pageNum = 1;
+      this.fetchList();
+      this.activeName = tab.name
+    },
     search(tagName) {
       this.$router.push({ path: '/tag?key=' + tagName })
     }
diff --git a/src/view/card/Promotion.vue b/src/view/card/Promotion.vue
index a9e20d1..7268fd1 100644
--- a/src/view/card/Promotion.vue
+++ b/src/view/card/Promotion.vue
@@ -3,8 +3,68 @@
         <div slot="header">
             <span>🎁 {{ $t('card.promotion') }}</span>
         </div>
-        <div>
-          {{ $t('card.detail') }}
+        <div style="line-height:30px">
+          <span 
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a
+            target="_blank"
+            href="https://www.csdn.net/"
+          >
+          {{ $t('card.csdn') }}
+          </a>
+          
+          </span>
+          <span
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a 
+          target="_blank"
+            href="https://leetcode-cn.com/"
+          >
+          {{ $t('card.leetCode') }}
+          </a>
+          </span>
+          <span
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a
+            target="_blank"
+            href="https://pintia.cn/"
+          >
+          {{ $t('card.pta') }}
+          </a>
+          </span>
+          <span
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a
+            target="_blank"
+            href="https://www.luogu.com.cn/"
+          >
+          {{ $t('card.luoGu') }}
+          </a>
+          </span>
+          <span
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a
+            target="_blank"
+            href="https://gitee.com/"
+          >
+          {{ $t('card.gitee') }}
+          </a>
+          </span>
+          <span
+            class="tag is-hidden-mobile is-success is-light mr-3"
+          >
+          <a
+            target="_blank"
+            href="https://github.com/"
+          >
+          {{ $t('card.github') }}
+          </a>
+          </span>
         </div>
     </el-card>
 </template>
@@ -19,7 +79,7 @@ export default {
   },
   methods: {
 
-  }
+  },
 }
 </script>
 
-- 
Gitee