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

@@ -59,7 +59,7 @@ const btnList = [
   },
   {
     type: 'competitor',
-    text: '竞争对手分析报告',
+    text: '供应商分析报告',
     icon: 'icon-img-download-white',
     url: '/swordfish/page_big_pc/order/analysis-report/competitor',
     visible: false,

apps/bigmember_pc/src/components/zhima/select-example.vue

@@ -52,7 +52,7 @@ export default {
       const typeList = [
         null,
         '项目分析报告',
-        '竞争对手分析报告',
+        '供应商分析报告',
         '采购单位分析报告'
       ]
       const index = typeList.findIndex((v) => type.indexOf(v) !== -1)

apps/bigmember_pc/src/views/order/components/analysis-report/buy-tip.vue

@@ -1,8 +1,8 @@
 <template>
   <p class="buy-tip">
     购买须知：
-    <br>1.您当前购买的是“{{pageInfo.title}}”。
-    <br>2.剑鱼平台产品与服务属于虚拟数字产品，鉴于服务的特殊性，成功购买后不支持退款，请确认无误后进行支付。
+    <br />1.您当前购买的是“{{ pageInfo.title }}”。
+    <br />2.剑鱼平台产品与服务属于虚拟数字产品，鉴于服务的特殊性，成功购买后不支持退款，请确认无误后进行支付。
   </p>
 </template>
 
@@ -10,7 +10,7 @@
 const titleMaps = {
   project: '项目分析报告',
   unit: '采购单位分析报告',
-  competitor: '竞争对手分析报告'
+  competitor: '供应商分析报告'
 }
 
 export default {

apps/bigmember_pc/src/views/order/components/analysis-report/model/fomat.js

@@ -1,4 +1,4 @@
-export function formatZhimaInfoSubmitParamsOfType ({ type, name, id, buyer }) {
+export function formatZhimaInfoSubmitParamsOfType({ type, name, id, buyer }) {
   const result = {
     bidding_id: id
   }
@@ -22,7 +22,7 @@ export function formatZhimaInfoSubmitParamsOfType ({ type, name, id, buyer }) {
   }
   return result
 }
-export function formatZhimaInfo (item) {
+export function formatZhimaInfo(item) {
   const result = {
     ...item
   }
@@ -34,7 +34,7 @@ export function formatZhimaInfo (item) {
       break
     }
     case 2: {
-      result.type = '竞争对手分析报告'
+      result.type = '供应商分析报告'
       result.before = '目标企业'
       result.name = item.ent_name
       break

apps/bigmember_pc/src/views/order/components/analysis-report/title.vue

@@ -34,7 +34,7 @@ import ReportExample from '@/components/zhima/select-example.vue'
 const titleMaps = {
   project: '项目分析报告',
   unit: '采购单位分析报告',
-  competitor: '竞争对手分析报告'
+  competitor: '供应商分析报告'
 }
 const descMaps = {
   project: '项目名称',

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

@@ -33,7 +33,7 @@ const apiTimer = ref(null)
 
 const reportTypeMap = {
   1: '项目分析报告',
-  2: '竞争对手分析报告',
+  2: '供应商分析报告',
   3: '采购单位分析报告'
 }
 

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

@@ -464,7 +464,7 @@ export default {
         3: '市场分析定制报告',
         4: '投标企业信用报告',
         5: '项目分析报告',
-        6: '竞争对手分析报告',
+        6: '供应商分析报告',
         7: '采购单位分析报告'
       }
     }
@@ -587,7 +587,7 @@ export default {
           result = '芝麻信用共建分析报告<br>【项目分析报告】'
           break
         case 6:
-          result = '芝麻信用共建分析报告<br>【竞争对手分析报告】'
+          result = '芝麻信用共建分析报告<br>【供应商分析报告】'
           break
         case 7:
           result = '芝麻信用共建分析报告<br>【采购单位分析报告】'
@@ -627,7 +627,7 @@ export default {
           result = '芝麻信用共建分析报告<br>【项目分析报告】'
           break
         case 6:
-          result = '芝麻信用共建分析报告<br>【竞争对手分析报告】'
+          result = '芝麻信用共建分析报告<br>【供应商分析报告】'
           break
         case 7:
           result = '芝麻信用共建分析报告<br>【采购单位分析报告】'

apps/mobile/src/api/modules/article.js

@@ -1,5 +1,5 @@
-import request from '@/api'
 import qs from 'qs'
+import request from '@/api'
 
 // 三级页前置接口
 export function getArticlePreAgentInfo(params) {
@@ -61,7 +61,6 @@ export function getArticleOriginalText(data) {
   })
 }
 
-
 // 三级页分享相关接口
 export function getContentShareEncrypt(data) {
   return request({
@@ -71,7 +70,7 @@ export function getContentShareEncrypt(data) {
   })
 }
 
-// 下载报告按钮是否展示（竞争对手分析、采购单位分析、项目分析）
+// 下载报告按钮是否展示（供应商分析、采购单位分析、项目分析）
 export function getArticleDownloadReportBtn(data) {
   return request({
     url: '/subscribepay/bidCreditReport/getButton',

apps/mobile/src/components/select-report-example/index.vue

@@ -64,7 +64,7 @@ export default {
       const typeList = [
         null,
         '项目分析报告',
-        '竞争对手分析报告',
+        '供应商分析报告',
         '采购单位分析报告'
       ]
       const index = typeList.findIndex((v) => type.indexOf(v) !== -1)

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

@@ -22,9 +22,19 @@
           class="action-monitor"
           @click.native.stop="changePopoverState"
         >
-          <van-icon slot="icon" name="custom-report"></van-icon>
+          <van-icon
+            slot="icon"
+            :name="showPopover ? 'custom-report-active' : 'custom-report'"
+          ></van-icon>
+          <!-- <AppIcon
+            slot="icon"
+            name="xiazaixiangmubaogao"
+            :color="showPopover ? '#2ABED1' : '#9B9CA3'"
+            svg
+            size="20"
+          ></AppIcon> -->
           <template #text>
-            <span class="highlight-text">下载报告</span>
+            <span :class="{ 'highlight-text': showPopover }">下载报告</span>
           </template>
         </TabActionItem>
       </template>
@@ -71,9 +81,6 @@ import TabActionItem from '@/views/article/ui/TabActionItem.vue'
 import ReportDownloadCard from '@/views/article/ui/ReportDownloadCard.vue'
 import { Popover, Dialog, Icon } from 'vant'
 import { AppIcon } from '@/ui'
-import { mapGetters, mapState } from 'vuex'
-import { LINKS } from '@/data'
-import { openAppOrWxPage } from '@/utils/'
 
 export default {
   name: 'ActionReport',
@@ -214,11 +221,10 @@ export default {
           break
         case 'unit':
           // 采购单位分析
-          console.log('采购单位名称', buyerName)
           this.onReportRedirect('unit')
           break
         case 'competitor':
-          // 竞争对手分析
+          // 供应商分析
           if (this.winners && this.winners.length > 1) {
             this.showDialog = true
           } else {
@@ -280,13 +286,17 @@ export default {
     height: 100%;
   }
   .van-icon.van-icon-custom-report {
-    //width: 18px;
-    //height: 18px;
     width: 1em;
     height: 1em;
     background-image: url('@/assets/image/icon/report@2x.png');
     background-size: cover;
   }
+  .van-icon.van-icon-custom-report-active {
+    width: 1em;
+    height: 1em;
+    background-image: url('@/assets/image/icon/report-active@2x.png');
+    background-size: cover;
+  }
 }
 </style>
 <style lang="scss">

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

@@ -320,7 +320,7 @@
                 svg
                 size="20"
               ></AppIcon>
-              <span>竞争对手分析报告</span>
+              <span>供应商分析报告</span>
               <van-icon name="arrow" />
             </div>
           </div>

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

@@ -94,7 +94,7 @@ export default {
     },
     winners() {
       const { ent_crn } = this.reportBtn
-      // 当中标企业有1个以上时，需要根据crn是否有值处理竞争对手分析报告中标企业名称是否可点击
+      // 当中标企业有1个以上时，需要根据crn是否有值处理供应商分析报告中标企业名称是否可点击
       const arr = this.content?._summary?.winners || []
       if (arr.length > 0) {
         const formatArr = arr.map((v) => {

apps/mobile/src/views/article/ui/ReportDownloadCard.vue

@@ -17,7 +17,7 @@
         class="menu-action-item-content clickable"
         @click="toClickReport('competitor')"
       >
-        竞争对手分析报告
+        供应商分析报告
       </p>
       <p
         v-if="showProject"

apps/mobile/src/views/create-order/components/analysis-report/HeaderAdsense.vue

@@ -18,7 +18,7 @@ import SelectReportExample from '@/components/select-report-example/index.vue'
 const titleMaps = {
   project: '项目分析报告',
   unit: '采购单位分析报告',
-  competitor: '竞争对手分析报告'
+  competitor: '供应商分析报告'
 }
 
 export default {

apps/mobile/src/views/create-order/components/analysis-report/model/format.js

@@ -1,4 +1,4 @@
-export function formatZhimaInfoSubmitParamsOfType ({ type, name, id, buyer }) {
+export function formatZhimaInfoSubmitParamsOfType({ type, name, id, buyer }) {
   const result = {
     bidding_id: id
   }
@@ -22,7 +22,7 @@ export function formatZhimaInfoSubmitParamsOfType ({ type, name, id, buyer }) {
   }
   return result
 }
-export function formatZhimaInfo (item) {
+export function formatZhimaInfo(item) {
   const result = {
     ...item
   }
@@ -34,7 +34,7 @@ export function formatZhimaInfo (item) {
       break
     }
     case 2: {
-      result.type = '竞争对手分析报告'
+      result.type = '供应商分析报告'
       result.before = '目标企业'
       result.name = item.ent_name
       break

apps/mobile/src/views/report/ZhiMaAnalysis.vue

@@ -70,7 +70,7 @@ import PDF from '@/views/article/components/PDF.vue'
 
 const reportTypeMap = {
   1: '项目分析报告',
-  2: '竞争对手分析报告',
+  2: '供应商分析报告',
   3: '采购单位分析报告'
 }
 

apps/mobile/src/views/reportAnalysis/components/listItem.vue

@@ -151,7 +151,7 @@
           </p>
         </div>
       </div>
-      <!-- 项目分析5、竞争对手分析6、采购单位分析7 -->
+      <!-- 项目分析5、供应商分析6、采购单位分析7 -->
       <div v-if="data.type === '5' || data.type === '6' || data.type === '7'">
         <img
           class="jy-zhima-logo"
@@ -230,7 +230,7 @@ export default {
       } else if (val === '5') {
         return '项目分析报告'
       } else if (val === '6') {
-        return '竞争对手分析报告'
+        return '供应商分析报告'
       } else if (val === '7') {
         return '采购单位分析报告'
       }

apps/mobile/src/views/reportAnalysis/reportDownload.vue

@@ -384,7 +384,7 @@ export default {
         } else if (item.type === '5') {
           defaultName = `项目分析报告(${item.projectname})`
         } else if (item.type === '6') {
-          defaultName = `竞争对手分析报告(${item.ent})`
+          defaultName = `供应商分析报告(${item.ent})`
         } else if (item.type === '7') {
           defaultName = `采购单位分析报告(${item.buyer})`
         }