From b21baf6a68e3c2faf6ba607e13d259aaf6fb9ab0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 5 Apr 2022 20:30:18 +0800
Subject: [PATCH] feat: There is no way the, bug #52284
---
.../pages/my-collection/components/CollectionLaws.vue | 7 +++----
.../pages/my-collection/components/CollectionStandard.vue | 3 ++-
.../foreignRegulationsDatabase/index.vue | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
index 3bdc668c4..cc5250942 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
@@ -42,7 +42,7 @@
- 所属板块:{{ item.collectType === 'INLAND_LAWS' ? '国内政策' : '国外政策' }}
+ 所属板块:{{ '国内外政策' }}
@@ -52,8 +52,7 @@
创建时间:{{getDate(item.creationTime)}}
- {{$t('m.cancelCollection')}}
-
+ 取消收藏
@@ -273,7 +272,7 @@ export default {
this.$http.get('person/personCollect/page', {
pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent,
- modeType: 'LAWS_STAND',
+ modeType: 'FOREIGN_LAWS',
collectTitle: this.search.collectionLaws,
userId: this.$store.getters.userInfo.userId
}, {
diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index eff67e633..dab85f964 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -139,7 +139,8 @@ export default {
pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
- collectTitle: this.search.name
+ collectTitle: this.search.name,
+ modeType: 'INLAND_STAND,FOREIGN_STAND,BUSINESS_STAND'
}, {
_this: this,
loading: 'loading'
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 9a2ec844d..1f9f3a9ac 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -3685,10 +3685,10 @@
formData.menuId = this.selectSarMenu.id
}
// 处理我的收藏和个性化标签传参
- if (this.selectSarMenu.id === 'qbwdsc') {
- formData.labelMenuId = undefined
- formData.menuId = 'qbwdsc'
- formData.collectMenuId = 'qbwdsc'
+ if (this.selectSarMenu.menuName === '我的收藏') {
+ formData.menuId = undefined
+ formData.labelMenuId = undefined
+ formData.collectMenuId = 'zcwdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
formData.menuId = undefined
formData.labelMenuId = this.selectSarMenu.id