浏览代码

Merge branch 'dev/v1.0.67_yf' of jianyu/web into feature/v1.0.67

yangfeng 9 月之前
父节点
当前提交
5ac7be18e4
共有 1 个文件被更改,包括 0 次插入9 次删除
  1. 0 9
      apps/bigmember_pc/src/components/article-item/ArticleItem.vue

+ 0 - 9
apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -456,11 +456,7 @@ export default {
       if (inFile) {
       if (inFile) {
         const keyword = keywords[0]
         const keyword = keywords[0]
         if (keyword?.length > 3) {
         if (keyword?.length > 3) {
-<<<<<<< HEAD
           return `(<span class="highlight-text-orange-bd">${keyword.substring(
           return `(<span class="highlight-text-orange-bd">${keyword.substring(
-=======
-          return `(<span class="highlight-text">${keyword.substring(
->>>>>>> main
             0,
             0,
             3
             3
           )}</span>...在附件中)`
           )}</span>...在附件中)`
@@ -774,12 +770,7 @@ $border-color: #ececec;
   }
   }
   .a-i-detail {
   .a-i-detail {
     width: calc(100% - 84px);
     width: calc(100% - 84px);
-<<<<<<< HEAD
     padding: 6px 40px 0 0;
     padding: 6px 40px 0 0;
-=======
-    max-width: 920px;
-    padding: 6px 40px 0 30px;
->>>>>>> main
     font-size: 14px;
     font-size: 14px;
     line-height: 22px;
     line-height: 22px;
     color: #686868;
     color: #686868;