Merge branch 'feature/v1.1.14' into hotfix/v1.1.13.1

apps/bigmember_pc/src/views/article-content/components/ContentSummary.vue

@@ -27,6 +27,7 @@ const tableConfig = ref({
 
 const sunPublishContent = computed(() => IsSunPublishContent.value)
 const showHeaderTip = computed(() => !sunPublishContent.value)
+const hasWaitWinnerState = computed(() => SummaryModel.value.hasWaitWinnerState)
 
 const contentSummaryTable = computed(() => {
   const list = SummaryModel.value.list.filter((v) => v.value) || []
@@ -266,7 +267,12 @@ function doOpenItem(item, type = '') {
       </el-table>
     </div>
 
-    <div class="table-footer-tip">
+    <div class="table-footer-tip" v-if='hasWaitWinnerState'>
+      *该信息为<span class='highlight-strong-label'>候选人公示</span>，具体<span class='highlight-strong-label'>中标信息未确认</span>，请以实际中标通知为准！如有误差，请
+      <span class="highlight-label" @click="doOpenCustomer">联系客服</span>
+      进行处理。
+    </div>
+    <div class="table-footer-tip" v-else>
       *以上摘要信息由剑鱼标讯智能提取。如有误差，请
       <span class="highlight-label" @click="doOpenCustomer">联系客服</span>
       进行处理。
@@ -288,7 +294,10 @@ function doOpenItem(item, type = '') {
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
-    line-height: normal;
+    line-height: normal;;
+    .highlight-strong-label {
+      color: #FF3A20;
+    }
     .highlight-label {
       cursor: pointer;
       color: #2abed1;

apps/mobile/src/views/article/components/ContentAbstract.vue

@@ -386,7 +386,7 @@
         </div>
       </section>
       <div v-if="summaryMap.bidAmount?.value" class="abstract-line">
-        <div class="abstract-line-label">中标金额（元）</div>
+        <div class="abstract-line-label">{{hasWaitWinnerState ? '投标' : '中标'}}金额（元）</div>
         <div class="abstract-line-value">
           <span class="abstract-line-value-text">
             {{ summaryMap.bidAmount?.value || ' ' }}
@@ -408,10 +408,13 @@
       class="abstract-bottom-desc"
       :class="{ transparent: IsSunPublishContent }"
     >
-      <span>*以上摘要信息由剑鱼标讯智能提取。如有误差，请</span>
+      <span v-if='hasWaitWinnerState'>*该信息为<span class='highlight-strong-label'>候选人公示</span>，具体<span class='highlight-strong-label'>中标信息未确认</span>，请以实际中标通知为准！如有误差，请</span>
+      <span v-else>*以上摘要信息由剑鱼标讯智能提取。如有误差，请</span>
+
       <span class="highlight-text underline" @click="concatKf">联系客服</span>
       <span>进行处理。</span>
     </div>
+
     <van-action-sheet
       v-model="sheet.telSelect"
       :actions="telSheetActions"
@@ -478,6 +481,9 @@ export default {
     IsSunPublishContent() {
       return this.content.IsSunPublishContent || false
     },
+    hasWaitWinnerState() {
+      return this.summary.hasWaitWinnerState || false
+    },
     yyszbContent() {
       return this.content.yyszbContent
     },
@@ -680,6 +686,9 @@ export default {
   .underline {
     white-space: nowrap;
   }
+  .highlight-strong-label {
+    color: #FF3A20;
+  }
 }
 .report-entry {
   color: $color_main;

data/data-models/modules/article/transform/summary2.js

@@ -74,6 +74,8 @@ class SummaryModel extends BaseModel {
     return {
       // 是否超前项目
       isProposed: false,
+      // 是否中标候选人
+      hasWaitWinnerState: false,
       // 原始数据
       originMap: {},
       list: [],
@@ -227,6 +229,7 @@ class SummaryModel extends BaseModel {
       if (Array.isArray(waitWinnerList) && waitWinnerList.length > 0) {
         // 有中标候选人，则循环中标候选人
         hasWaitWinner = true
+        result.hasWaitWinnerState = true
         circularList = waitWinnerList.slice(0, 1)
       }
       else {
@@ -281,7 +284,8 @@ class SummaryModel extends BaseModel {
       ? this.formatMoney(summary?.bidAmount)
       : ''
     this.formatMoney()
-    list.push(new SummaryItem('bidAmount', '中标金额（元）', bidAmountFormat))
+    const amountLabel = result.hasWaitWinnerState ? '投标金额（元）' : '中标金额（元）'
+    list.push(new SummaryItem('bidAmount', amountLabel, bidAmountFormat))
 
     // 项目地区
     const pArea = baseInfo?.area || ''