From 6debf25162b99c906ad57677acfe31088ce99a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com>
Date: Fri, 19 Jan 2024 10:43:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E8=B4=A2=E5=AF=8C=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E6=98=BE=E7=A4=BA=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=BB=E9=A2=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/views/discuss/index.vue        |  7 ++++---
 Yi.Bbs.Vue3/src/views/home/Index.vue           |  9 +++++----
 .../home/components/PointsRanking/index.vue    |  7 ++++---
 Yi.Bbs.Vue3/src/views/profile/Index.vue        | 18 +++++++++++++++++-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Yi.Bbs.Vue3/src/views/discuss/index.vue b/Yi.Bbs.Vue3/src/views/discuss/index.vue
index 43386a57..c2e7136f 100644
--- a/Yi.Bbs.Vue3/src/views/discuss/index.vue
+++ b/Yi.Bbs.Vue3/src/views/discuss/index.vue
@@ -48,11 +48,11 @@
       </el-form>
     </div>
     <Tabs v-model="activeName" :tabList="tabList" @tab-change="handleClick" />
-    <div class="div-item" v-for="i in topDiscussList">
+    <div class="div-item" v-for="i in topDiscussList" :key="i.id">
       <DisscussCard :discuss="i" badge="置顶" />
     </div>
     <template v-if="isDiscussFinished">
-      <div class="div-item" v-for="i in discussList">
+      <div class="div-item" v-for="i in discussList" :key="i.id">
         <DisscussCard :discuss="i" />
       </div>
     </template>
@@ -102,7 +102,7 @@ const { getToken, clearStorage } = useAuths();
 //数据定义
 const route = useRoute();
 const router = useRouter();
-const activeName = ref("suggest");
+const activeName = ref("new");
 //主题内容
 const discussList = ref([]);
 const isDiscussFinished = ref(false);
@@ -203,6 +203,7 @@ watch(
 const tabList = ref([
   { label: "全部文章", name: "suggest", position: "left" },
   { label: "最新", name: "new", position: "right" },
+  { label: "推荐", name: "suggest", position: "right" },
   { label: "最热", name: "host", position: "right" },
 ]);
 </script>
diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue
index 0b164707..f6848efe 100644
--- a/Yi.Bbs.Vue3/src/views/home/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/home/Index.vue
@@ -9,6 +9,7 @@
           <el-col
             :span="8"
             v-for="i in plateList"
+            :key="i.id"
             class="plate"
             :style="{
               'padding-left': i % 3 == 1 ? 0 : 0.2 + 'rem',
@@ -23,7 +24,7 @@
             />
           </el-col>
           <template v-if="isDiscussFinished">
-            <el-col :span="24" v-for="i in discussList">
+            <el-col :span="24" v-for="i in discussList" :key="i.id">
               <DisscussCard :discuss="i" />
             </el-col>
           </template>
@@ -31,7 +32,7 @@
             <Skeleton :isBorder="true" />
           </template>
           <template v-if="isAllDiscussFinished">
-            <el-col :span="24" v-for="i in allDiscussList">
+            <el-col :span="24" v-for="i in allDiscussList" :key="i.id">
               <DisscussCard :discuss="i" />
             </el-col>
           </template>
@@ -44,7 +45,7 @@
         <el-row class="right-div">
           <el-col :span="24">
             <el-carousel trigger="click" height="150px">
-              <el-carousel-item v-for="item in bannerList">
+              <el-carousel-item v-for="item in bannerList" :key="item.id">
                 <div class="carousel-font" :style="{ color: item.color }">
                   {{ item.name }}
                 </div>
@@ -268,7 +269,7 @@ onMounted(async () => {
     await getAllDiscussList({
       Type: 0,
       skipCount: 1,
-      maxResultCount: 5,
+      maxResultCount: 30,
     });
   isAllDiscussFinished.value = allDiscussConfig.isFinish;
   allDiscussList.value = allDiscussData.items;
diff --git a/Yi.Bbs.Vue3/src/views/home/components/PointsRanking/index.vue b/Yi.Bbs.Vue3/src/views/home/components/PointsRanking/index.vue
index 8bd8e749..d61f17f6 100644
--- a/Yi.Bbs.Vue3/src/views/home/components/PointsRanking/index.vue
+++ b/Yi.Bbs.Vue3/src/views/home/components/PointsRanking/index.vue
@@ -5,11 +5,12 @@
     </div>
     <div class="center">
       <div class="top">
-        <el-tag effect="light" :type="userLimit.type">
+    
+        <!-- <el-tag effect="light" :type="userLimit.type">
           {{ userLimit.label }}
-        </el-tag>
+        </el-tag> -->
         <el-tag effect="light" type="success"
-          >等级{{ pointsData.level }}</el-tag
+          >{{pointsData.money }} 钱钱</el-tag
         >
       </div>
       <div class="bottom">
diff --git a/Yi.Bbs.Vue3/src/views/profile/Index.vue b/Yi.Bbs.Vue3/src/views/profile/Index.vue
index e3b826c9..8302663e 100644
--- a/Yi.Bbs.Vue3/src/views/profile/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/profile/Index.vue
@@ -75,7 +75,19 @@
             </div>
             <div class="user-info">
               <div class="user-nick">
-                <div class="user-nick-left">{{ state.user.nick }}</div>
+                <div class="user-nick-left">{{ state.user.nick }} 
+                
+                  <el-tag effect="light" type="success"
+          >{{state.user.level }} 等级</el-tag
+        >
+        <el-tag effect="light" type="success">
+          {{ state.user.userLimit }} 限制
+        </el-tag>
+
+        <el-tag effect="light" type="success"
+          >{{state.user.money }} 钱钱</el-tag
+        >
+                </div>
                 <div class="user-nick-right">
                   
                   其他
@@ -303,6 +315,10 @@ $remarkHeight: $topHeight - $userHeight;
           color:#222226;
           font-size: 23px;
           font-weight: 800;
+          .el-tag{
+
+            margin-right: 10px;
+          }
         }
         &-right{
             margin-right: 30px;