Merge remote-tracking branch 'origin/feature/v1.0.45' into feature/v1.0.45

# Conflicts:
#	internal/service/bidDetail.go

resource/staticres/js/common.js

@@ -142,7 +142,12 @@ function replaceKeywordWithRichText (htmlString, keyword, richChar) {
       node.parentNode.replaceChild(frag, node)
     } else if (node.nodeType === Node.ELEMENT_NODE) {
       // 如果是元素节点，递归其子节点
-      Array.from(node.childNodes).forEach(replaceText)
+      var skipClassName = ['keyword', 'highlight-text']
+      var skip = skipClassName.some(sk => node.className.indexOf(sk) !== -1)
+      // 跳过已经高亮的元素子节点
+      if (!skip) {
+        Array.from(node.childNodes).forEach(replaceText)
+      }
     }
   }
 

resource/template/pc/detail.html

@@ -120,8 +120,8 @@
               {{if or (eq $bidData.toptype "采购意向") (eq $bidData.toptype "招标") (eq $bidData.toptype "预告") }}
               <div class="credit-report">
                 <div class="report-container">
-                  <div class="report-text">通过信用背书、风险预警、政策适配，赋能投标突围</div>
-                  <a href="/swordfish/page_big_pc/free/report/preview?source=bidCreditReportPreview" target="_blank" onclick="trackReportClick(event)" class="report-btn">下载投标企业信用报告</a>
+                  <div class="report-text">获取投标企业信用报告，展示投标实力</div>
+                  <a href="/swordfish/page_big_pc/free/report/preview?source=bidCreditReportPreview" target="_blank" onclick="trackReportClick(event)" class="report-btn">点击下载</a>
                 </div>
               </div>
               {{end}}