zhangyuhan пре 1 година
родитељ
комит
8b852f5c94

+ 5 - 3
apps/bigmember_pc/src/composables/quick-monitor/use/client.js

@@ -153,11 +153,13 @@ function useClientQuickMonitorModel({ type, id }) {
           }
         } else {
           // 判断是否超出可监控项目个数
-          if (res.data?.limit_status) {
+          if (res.data?.limit_count) {
             if (HasPowerBigmemberOrEnt.value) {
-              doOpenDialog('max-monitor', { count: res.data?.limit_status })
+              return doOpenDialog('max-monitor', {
+                count: res.data?.limit_count
+              })
             } else {
-              doOpenCollectDialog('pc_buyer_monitor_limit')
+              return doOpenCollectDialog('pc_buyer_monitor_limit')
             }
           }
           that.$toast(res.msg)

+ 5 - 3
apps/bigmember_pc/src/composables/quick-monitor/use/ent.js

@@ -147,11 +147,13 @@ function useEntQuickMonitorModel({ type, id }) {
           }
         } else {
           // 判断是否超出可监控项目个数
-          if (res.data?.limit_status) {
+          if (res.data?.limit_count) {
             if (HasPowerBigmemberOrEnt.value) {
-              doOpenDialog('max-monitor', { count: res.data?.limit_status })
+              return doOpenDialog('max-monitor', {
+                count: res.data?.limit_count
+              })
             } else {
-              doOpenCollectDialog('pc_article_project_limit')
+              return doOpenCollectDialog('pc_article_project_limit')
             }
           }
           that.$toast(res.msg)

+ 5 - 3
apps/bigmember_pc/src/composables/quick-monitor/use/porject.js

@@ -147,11 +147,13 @@ function useProjectQuickMonitorModel({ type, id }) {
           }
         } else {
           // 判断是否超出可监控项目个数
-          if (res.data?.limit_status) {
+          if (res.data?.limit_count) {
             if (HasPowerBigmemberOrEnt.value) {
-              doOpenDialog('max-monitor', { count: res.data?.limit_status })
+              return doOpenDialog('max-monitor', {
+                count: res.data?.limit_count
+              })
             } else {
-              doOpenCollectDialog('pc_article_project_limit')
+              return doOpenCollectDialog('pc_article_project_limit')
             }
           }
           that.$toast(res.msg)

+ 0 - 2
apps/bigmember_pc/src/utils/globalDirectives.js

@@ -100,8 +100,6 @@ Vue.directive('event-listener', {
     const { value: eventFn, arg: eventName } = binding
     const selector = el.dataset?.eventSelector || '*'
 
-    console.log(eventName, eventFn, selector, binding)
-
     // 创建事件处理函数
     const eventHandler = (event) => {
       // 检查点击的目标是否匹配选择器

+ 11 - 0
apps/bigmember_pc/src/views/PotentialList.vue

@@ -390,6 +390,16 @@ export default {
         }
       })
       this.filters.industry = tempArr
+    },
+    doResetArticleCacheFilter() {
+      try {
+        const cacheFilter = JSON.parse(
+          sessionStorage.getItem('potential_cor_list_search') || '{}'
+        )
+        console.log(cacheFilter)
+      } catch (e) {
+        console.warn(e)
+      }
     }
   },
   computed: {
@@ -423,6 +433,7 @@ export default {
       await this.$store.dispatch('user/getKeywordsList')
     }
     this.filters.business_scope = this.scope
+    // 从缓存中获取详情页筛选项
   }
 }
 </script>

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

@@ -115,7 +115,7 @@ function doOpenItem(item) {
 
       <div
         class="summary-header-tip color-highlight flex flex-(row items-center)"
-        @click="doOpenCollectDialog"
+        @click="doOpenCollectDialog('pc_article_customization')"
       >
         最近5年招标采购数据均可导出下载,如需更多年份和行业字段您可申请数据定制
         <i class="iconfont icon-more"></i>

+ 6 - 0
apps/bigmember_pc/src/views/article-content/pages/Article.vue

@@ -220,6 +220,12 @@ function doOpenOriginLink() {
 function doOpenMore(key) {
   switch (key) {
     case 'recommendCustomers': {
+      sessionStorage.setItem(
+        'potential_cor_list_search',
+        JSON.stringify(
+          ContentExpandsModel.value.recommendCustomers?.search || {}
+        )
+      )
       doOpenCorListPage()
       break
     }

+ 7 - 1
apps/bigmember_pc/src/views/project/ProjectInfo.vue

@@ -177,7 +177,7 @@
             <UserClaimPopper ref="popperRef" @claimSuccess="claimSuccess" />
           </div>
         </el-card>
-        <el-card class="project-content">
+        <el-card class="project-content" ref="timeList">
           <div slot="header" class="p-h-title">项目公告</div>
           <div class="p-c-main">
             <TimeLine :stepList="timeLineList" />
@@ -433,6 +433,12 @@ export default {
   },
   mounted() {
     window.addEventListener('click', this.doClosePopover)
+    // 从详情页过来时,跳转定位到项目公告
+    if (document.referrer && document.referrer?.indexOf('/content/') !== -1) {
+      this.$nextTick(() => {
+        this.$refs.timeList.$el.scrollIntoView()
+      })
+    }
   },
   beforeMount() {
     window.removeEventListener('click', this.doClosePopover)

+ 2 - 2
apps/mobile/src/composables/quick-monitor/component/QuickMonitor.vue

@@ -358,9 +358,9 @@ export default {
           }
         } else {
           // 判断是否超出可监控项目个数
-          if (data?.limit_status) {
+          if (data?.limit_count) {
             if (this.isMemberOrBusiness) {
-              const count = data?.limit_status || 0
+              const count = data?.limit_count || 0
               this.concatKfDialog({
                 title: `监控${this.conf.key}个数已达上限`,
                 message: `您最多可监控${count}个${this.conf.key},可联系客服,申请监控更多${this.conf.key}`