Browse Source

fix:master代码合并丢失,重新处理

zhangsiya 10 tháng trước cách đây
mục cha
commit
b37311ea56
1 tập tin đã thay đổi với 10 bổ sung10 xóa
  1. 10 10
      apps/bigmember_pc/src/components/article-item/ArticleItem.vue

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

@@ -29,7 +29,7 @@
               v-html="calcTitle"
               class="a-i-left visited-hd"
               :class="config.push || config.bidding ? 'ellipsis-3' : 'ellipsis'"
-              @click="onClick"
+              @click.stop="onClick"
             ></div>
           </div>
           <div class="time-container">
@@ -59,6 +59,11 @@
             "
             >业主委托项目</span
           >
+          <span
+            v-if="config.gray && (article.ca_fileExists || article.fileExists)"
+            class="haveFile"
+            >有附件</span
+          >
           <span class="tag tag-own" v-if="buySubject && article.source === 1"
             >个人订阅</span
           >
@@ -95,11 +100,6 @@
           <span class="tag dpink" v-if="calcBudget && calcBudget !== '0元'">
             {{ calcBudget }}
           </span>
-          <span
-            v-if="config.gray && (article.ca_fileExists || article.fileExists)"
-            class="haveFile"
-            >有附件</span
-          >
         </div>
 
         <div style="display: flex; align-items: center">
@@ -198,7 +198,7 @@
             <em
               v-for="(buyer, b) in formatBuyer(article.buyer)"
               :key="b"
-              @click="goPortrayal('buyerDesc', buyer)"
+              @click.stop="goPortrayal('buyerDesc', buyer)"
               class="highlight-text pointer"
             >
               {{ buyer }}
@@ -213,7 +213,7 @@
             <em
               class="more-tel"
               v-if="article.buyerTel"
-              @click="goPortrayal('buyerDesc', article.buyer, 'contact')"
+              @click.stop="goPortrayal('buyerDesc', article.buyer, 'contact')"
               >获取更多</em
             >
           </span>
@@ -242,7 +242,7 @@
             <em
               v-for="(w, i) in article.winnerInfo"
               :key="w.winnerId"
-              @click="goPortrayal('entDesc', w.winnerId)"
+              @click.stop="goPortrayal('entDesc', w.winnerId)"
               class="highlight-text pointer"
             >
               {{ w.winner }}
@@ -259,7 +259,7 @@
             <em
               class="more-tel"
               v-if="article.winnerInfo && article.winnerInfo.length === 1"
-              @click="
+              @click.stop="
                 goPortrayal(
                   'entDesc',
                   article.winnerInfo[0].winnerId,