Merge branch 'dev/v1.0.51_zsy' of jianyu/web into feature/v1.0.51

apps/bigmember_pc/src/components/collect-info/CollectInfo.vue

@@ -568,7 +568,8 @@ export default {
           '请留下联系方式，我们会尽快联系您！体验附件下载特权，挖掘更多项目情报！',
         member_freeuse: '请留下联系方式，我们会尽快联系您体验大会员全部功能！',
         jylab_see500_plus: '请留下联系方式，我们会尽快联系您！开通大会员可查看更多招标项目，实时监控更多潜在商机！',
-        pc_dzbg_fullreport: '请留下联系方式，我们会安排客户经理与您对接下载查看！'
+        pc_dzbg_fullreport: '请留下联系方式，我们会安排客户经理与您对接下载查看！',
+        pc_dzbgxzb_customizedquantity: '请留下联系方式，我们会安排客户经理与您对接，下载更多市场分析定制报告！'
       },
       sourceDescMap: {
         pc_buyer_monitor_more: '采购单位画像页-超级订阅用户申请监控更多业主',
@@ -590,7 +591,8 @@ export default {
         jyarticle_see3_plus_pc: '免费享无限次查看标讯体验',
         pc_article_original_one: '标讯详情页-免费用户获取1次查看原文链接机会',
         pc_article_original_more: '标讯详情页-获取更多查看原文链接机会',
-        pc_dzbg_fullreport: '申请免费体验-完整查看市场分析定制报告'
+        pc_dzbg_fullreport: '申请免费体验-完整查看市场分析定制报告',
+        pc_dzbgxzb_customizedquantity: '市场分析定制报告下载包-定制报告份数'
       },
       sourceTitleTopMap: {
         article_collection: '为给您匹配精准的推荐信息，请完善个人信息',
@@ -615,6 +617,7 @@ export default {
         pc_article_ent_limit: '申请监控更多企业',
         'certificateServices-pc-biddingDetailPage-content': '请留下您的信息，我们会尽快和您联系',
         pc_dzbg_fullreport: '体验市场分析定制报告',
+        pc_dzbgxzb_customizedquantity: '市场分析定制报告下载'
       },
       isRefresh: false
     }
@@ -699,6 +702,8 @@ export default {
         return '专业老师将尽快和您联系！'
       } else if (this.source === 'pc_dzbg_fullreport') {
         return '已收到您提交的市场分析定制报告体验申请，我们会尽快联系您。'
+      } else if (this.source === 'pc_dzbgxzb_customizedquantity') {
+        return '已收到您提交的市场分析定制报告下载申请，我们会尽快联系您。'
       } else {
         return '我们会尽快联系您并预约演示时间，请耐心等待～您将获得免费体验大会员全部功能！'
       }

apps/bigmember_pc/src/views/order/components/download-pack/buy-tip.vue

@@ -11,19 +11,11 @@
 export default {
   name: 'buy-tip',
   data () {
-    return {
-      typeObj: {
-        market: '市场分析定制报告',
-        prop: '业主采购分析报告',
-        ent: '企业中标分析报告'
-      }
-    }
+    return {}
   },
   computed: {
     typeText () {
-      const match = this.$route.path.match(/([^/]+)$/)
-      const type = match ? match[0] : 'market'
-      return this.typeObj[type]
+      return this.$route.meta?.pack
     }
   }
 }

apps/bigmember_pc/src/views/order/components/download-pack/info.vue

@@ -5,33 +5,42 @@
         选择报告份数
       </div>
       <div class="vip-sub-item-content" v-if="specActiveId">
-        <order-spec-list
-          :list="specList"
-          :active="specActiveId"
-          @activeChange="doChangeSpec"
-        ></order-spec-list>
+        <div class="item-con">
+          <order-spec-list
+            :list="specList"
+            :active="specActiveId"
+            @activeChange="doChangeSpec"
+          ></order-spec-list>
+          <div class="apply-box" v-if="isMarket">
+            <span class="top-t">定制报告份数</span>
+            <p>下载更多市场分析定制报告</p>
+            <el-button type="primary" @click="goApply">去申请</el-button>
+          </div>
+        </div>
         <div class="top-tip-banner">
           使用有效期: 3年
         </div>
       </div>
     </SelectorCard>
+    <!-- 留资弹窗 -->
+    <CollectInfo ref="collectRef"></CollectInfo>
   </div>
 </template>
 
 <script>
 import dayjs from 'dayjs'
 import { mapActions, mapGetters } from 'vuex'
-import { getSVIPBuyInfo } from '@/api/modules'
 import { getPureNumber } from '@/utils/format/number'
-
 import SelectorCard from '@/components/selector/SelectorCard.vue'
 import OrderSpecList from '@/views/order/ui/spec/list.vue'
+import CollectInfo from '@/components/collect-info/CollectInfo.vue'
 
 export default {
   name: 'download-pack-order-info',
   components: {
     OrderSpecList,
-    SelectorCard
+    SelectorCard,
+    CollectInfo
   },
   data() {
     return {
@@ -78,6 +87,10 @@ export default {
         dayjs(this.serviceExpirationTime).endOf('month').diff(dayjs(), 'day') +
         1
       )
+    },
+    // 是否是市场分析定制报告
+    isMarket () {
+      return this.$route.meta.title && this.$route.meta.title.indexOf('市场分析') > -1
     }
   },
   async created() {
@@ -105,7 +118,7 @@ export default {
       const extend = {
         id: this.specActiveId,
         extend: {
-          product: '附件下载包',
+          product: this.$route.meta?.pack ?  this.$route.meta?.pack + '下载包' : '企业中标分析报告下载包',
           spec: {
             num: getPureNumber(this.specActiveInfo.label)
           }
@@ -174,22 +187,62 @@ export default {
       }
       // 处理成功回调
       return true
+    },
+    // 去申请
+    goApply () {
+      this.$refs.collectRef.noCallApiFn('pc_dzbgxzb_customizedquantity')
     }
   }
 }
 </script>
 
-<style scoped>
-.download-pack-order-info .top-tip-banner {
-  margin-top: 12px;
-  width: 1012px;
-  height: 32px;
-  padding: 0 16px;
-  background: rgba(255, 58, 32, 0.06);
-  border-radius: 4px 4px 4px 4px;
-  font-size: 14px;
-  font-weight: 400;
-  color: #ff3a20;
-  line-height: 32px;
+<style lang="scss" scoped>
+.download-pack-order-info {
+  ::v-deep {
+    .spec-card {
+      height: 105px;
+    }
+  }
+  .item-con {
+    display: flex;
+  }
+  .top-tip-banner {
+    margin-top: 12px;
+    width: 1012px;
+    height: 32px;
+    padding: 0 16px;
+    background: rgba(255, 58, 32, 0.06);
+    border-radius: 4px 4px 4px 4px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #ff3a20;
+    line-height: 32px;
+  }
+  .apply-box {
+    width: 240px;
+    height: 105px;
+    background: linear-gradient(#DEFBFF, #FBFFFF);
+    border: 1px solid rgba(42, 190, 209, 0.12);
+    border-radius: 8px;
+    font-size:14px;
+    line-height: 22px;
+    text-align: center;
+    color: #686868;
+    padding: 8px 0;
+    margin-left: 16px;
+    .top-t {
+      font-weight: bold;
+      font-size:18px;
+      line-height: 28px;
+      color: #171826;
+      margin-bottom: 4px;
+    }
+    .el-button {
+      padding: 4px 29px;
+      font-size:14px;
+      line-height: 22px;
+      margin-top: 5px;
+    }
+  }
 }
 </style>

apps/bigmember_pc/src/views/order/components/download-pack/title.vue

@@ -6,19 +6,11 @@
 export default {
   name: 'order-title',
   data() {
-    return {
-      typeObj: {
-        market: '市场分析定制报告下载包充值',
-        prop: '业主采购分析报告下载包充值',
-        ent: '企业中标分析报告下载包充值'
-      }
-    }
+    return {}
   },
   computed: {
     titleText () {
-      const match = this.$route.path.match(/([^/]+)$/)
-      const type = match ? match[0] : 'market'
-      return this.typeObj[type]
+      return this.$route.meta.title || '报告下载包充值'
     }
   },
   created() {},