Merge branch 'abp' into digital-collectibles

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

@@ -1,10 +1,14 @@
 <style scoped lang="scss">
 
-::v-deep(.li-list){
-    list-style: inside !important;
-    //list-style: decimal !important;
-    
-}
+//::v-deep(ol .li-list){
+//  list-style: decimal;
+//}
+//::v-deep(ul .li-list){
+//  list-style: disc;
+//}
+
+
+
 ::v-deep(.pre-out)
 {
 padding: 0;

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

@@ -40,7 +40,8 @@
       <!-- 底部 -->
       <div class="item item-bottom">
         <div class="tag-list">
-          <el-tag v-for="i in 4" :key="i">教程</el-tag>
+          <el-tag v-if="discuss.lables.length===0">暂无标签</el-tag>
+          <el-tag v-for="item in discuss.lables" :key="item.id">{{item.name}}</el-tag>
         </div>
         <el-space :size="10" :spacer="spacer">
           <div class="item-description">
@@ -80,7 +81,8 @@ const discuss = reactive({
   agreeNum: 0,
   isAgree: false,
   cover: "",
-  isBan: false
+  isBan: false,
+  lables:[]
 });
 const router = useRouter();
 const spacer = h(ElDivider, { direction: "vertical" });
@@ -113,15 +115,6 @@ const agree = async () => {
   }
 };
 onMounted(() => {
-  // id:'',
-  // title:"",
-  // introduction:"",
-  // creationTime:"",
-  // user:{},
-  // color:"",
-  // seeNum:0,
-  // agreeNum:0,
-  // isAgree:""
   discuss.id = props.discuss.id;
   discuss.title = props.discuss.title;
   discuss.introduction = props.discuss.introduction;
@@ -133,8 +126,7 @@ onMounted(() => {
   discuss.agreeNum = props.discuss.agreeNum;
   discuss.isBan = props.discuss.isBan;
   discuss.cover = props.discuss.cover;
-  discuss.value = props.isAgree;
-  discuss.value = props.agreeNum;
+  discuss.lables=props.discuss.lables
 });
 </script>
 <style scoped lang="scss">