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

apps/bigmember_pc/src/components/zhima/report-guide-banner.vue

@@ -12,7 +12,7 @@ import { ajaxGetReportBtnStatus } from '@/api/modules'
 const that = getCurrentInstance().proxy
 
 const props = defineProps({
-  // 来源 ent: 企业画像；unit: 采购单位画像；detail: 标讯详情
+  // 来源 ent: 企业画像；unit: 采购单位画像；article: 标讯详情 detail: 项目详情
   source: {
     type: String,
     default: ''

apps/bigmember_pc/src/views/project/ProjectInfo.vue

@@ -133,6 +133,14 @@
           </div>
         </div>
       </div>
+      <ZhiMaReportBanner
+        v-if="projectInfo.projectname"
+        :buyerName="projectInfo.buyer"
+        :projectName="projectInfo.projectname"
+        :topType="projectInfo.bidstatus"
+        :bId="sid"
+        class="mt-16px"
+      />
       <div class="project-content">
         <el-card class="project-content">
           <div slot="header" class="p-h-title">项目摘要</div>
@@ -270,6 +278,7 @@ import ProjectForm from '@/views/project/components/ProjectForm.vue'
 import QuickPopoverChangeRecord from '@/components/popover-change-record/quick-popover-change-record.vue'
 import shareBox from '@/components/shareBox/index.vue'
 import BidrenewalDialog from '@/views/BidrenewalDialog/index.vue'
+import ZhiMaReportBanner from '@/components/zhima/report-guide-banner.vue'
 import {
   getFollowProjectDetail,
   followProjectAdd,
@@ -308,7 +317,8 @@ export default {
     noPass,
     shareBox,
     CommonDialog,
-    BidrenewalDialog
+    BidrenewalDialog,
+    ZhiMaReportBanner
   },
   data() {
     return {
@@ -445,7 +455,7 @@ export default {
       }
     })
     await this.getJoinBidInfo()
-    await this.getProjectReportStatus()
+    // await this.getProjectReportStatus()
   },
   beforeDestroy() {
     if (this.bidTimer) {

apps/bigmember_pc/src/views/reportDownload/ZhiMaAnalysis.vue

@@ -97,10 +97,11 @@ const getReportDetail = async () => {
   if (code === 0 && data) {
     loading.value = false
     h5Url.value = data.h5
-    setTimeout(() => {
-      // 延迟赋值，解决加载时资源还没有完全可用，出现“未能加载PDF文档”，需要手动点击重新加载才能正常预览的场景
-      pdfUrl.value = data.pdf + (data.pdf ? `?t=${Date.now()}` : '')
-    }, 500)
+    pdfUrl.value = data.pdf
+    // setTimeout(() => {
+    //   // 延迟赋值，解决加载时资源还没有完全可用，出现“未能加载PDF文档”，需要手动点击重新加载才能正常预览的场景
+    //   pdfUrl.value = data.pdf + (data.pdf ? `?t=${Date.now()}` : '')
+    // }, 500)
     downloadUrl.value = data.pdf
     reportMold.value = data.mold
     reportName.value = data.report_name
@@ -213,8 +214,8 @@ function onLoadH5() {
         v-else-if="showType === 'pdf'"
         class="iframe"
         :data="pdfUrl"
-        type="application/pdf"
         :key="pdfUrl"
+        type="application/pdf"
         :style="{ height: iframeHeight, width: '100%' }"
       >
         <p class="text-center" style="padding: 40px 0">

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

@@ -225,7 +225,7 @@ $height: 48px;
   justify-content: space-between;
   box-shadow: 0px -2px 8px 0px rgba(54, 147, 179, 0.05);
   border-top: 1px solid $border_color_3;
-  z-index: 3;
+  z-index: 2002;
 
   ::v-deep {
     .tab-action-item {