Merge branch 'abp' into digital-collectibles

# Conflicts:
#	Yi.Bbs.Vue3/src/views/home/Index.vue

Yi.Bbs.Vue3/src/components/DisscussCard.vue

@@ -1,6 +1,7 @@
 <template>
   <el-badge class="box-card">
-    <el-card shadow="never" :style="{ 'border-color': discuss.color }">
+    <el-card shadow="never" :style="{ 'border-color': discuss.color }"
+    >
       <div class="card-header">
         <AvatarInfo :userInfo="discuss.user" />
       </div>
@@ -157,8 +158,8 @@ onMounted(() => {
   font-size: 14px;
   margin: 5px 0;
 }
-
 .box-card {
+
   position: relative;
   width: 100%;
   /* right: calc(1px + var(--el-badge-size)/ 2) !important; */

Yi.Bbs.Vue3/src/components/InfoCard.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from "vue";
 
-const props = defineProps(["items", "header", "text", "hideDivider", "height"]);
+const props = defineProps(["items", "header", "text", "hideDivider", "height","isPadding"]);
 const emit = defineEmits(['onClickText'])
 const height = ref(props.height + "px");
 
@@ -11,7 +11,7 @@ const onClickText=()=>{
 </script>
 
 <template>
-  <el-card class="box-card" shadow="never">
+  <el-card class="box-card" shadow="never"   :body-style="{padding: isPadding===false?'0px 20px':'20px 20px'}">
     <template #header>
       <div class="card-header">
         <span>{{ props.header }}</span>
@@ -50,7 +50,6 @@ const onClickText=()=>{
   justify-content: space-between;
   align-items: center;
 }
-
 .text {
   font-size: 14px;
 }

Yi.Bbs.Vue3/src/components/ScrollbarInfo.vue

@@ -2,16 +2,16 @@
   <el-scrollbar>
     <div class="scrollbar-flex-content">
       <div v-for="item in recommendList" :key="item.id" class="scrollbar-item">
-        <el-tooltip
-          class="box-item"
-          effect="dark"
-          :content="item.dictLabel"
-          placement="top"
-          v-if="item.dictLabel.length > 5"
-        >
-          {{ item.dictLabel.slice(0, 5) + "..." }}
-        </el-tooltip>
-        <span v-else>
+<!--        <el-tooltip-->
+<!--          class="box-item"-->
+<!--          effect="dark"-->
+<!--          :content="item.dictLabel"-->
+<!--          placement="top"-->
+<!--          v-if="item.dictLabel.length > 5"-->
+<!--        >-->
+<!--          {{ item.dictLabel.slice(0, 5) + "..." }}-->
+<!--        </el-tooltip>-->
+        <span >
           {{ item.dictLabel }}
         </span>
       </div>
@@ -35,12 +35,13 @@ onMounted(async () => {
   display: flex;
 }
 .scrollbar-item {
+  padding: 0 15px;
   cursor: pointer;
   flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 4rem;
+  //width: 4rem;
   height: 2.6rem;
   margin: 0 0.2rem;
   text-align: center;

Yi.Bbs.Vue3/src/components/TreeArticleInfo.vue

@@ -1,5 +1,6 @@
 <template>
-  <el-tree
+  <el-tree 
+      empty-text="无子文章"
     :data="props.data == '' ? [] : props.data"
     :props="defaultProps"
     @node-click="handleNodeClick"