diff --git a/src/api/platform/common/controller/pushConcernFan.ts b/src/api/platform/common/controller/pushConcernFan.ts index 9ac6cba..ccc8544 100644 --- a/src/api/platform/common/controller/pushConcernFan.ts +++ b/src/api/platform/common/controller/pushConcernFan.ts @@ -21,7 +21,7 @@ export const addPushConcernFan = (params: Partial) => defHttp.po export const editPushConcernFan = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); -export const getPushConcernFan = (id: string, onType?: string) => defHttp.get({ url: Api.get, params: { id, onType } }); +export const getPushConcernFan = (id: string, dynamicJoinType?: string) => defHttp.get({ url: Api.get, params: { id, dynamicJoinType } }); export const delPushConcernFan = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); diff --git a/src/enums/pushEnum.ts b/src/enums/pushEnum.ts index bdd66a5..ca65be8 100644 --- a/src/enums/pushEnum.ts +++ b/src/enums/pushEnum.ts @@ -25,7 +25,7 @@ export enum PushConcernType { } /** 关注粉丝连表查询切换类型 */ -export enum PushConcernJoinOnType { +export enum PushConcernDynamicJoinType { // 粉丝表示 FAN_TYPE = '0', // 关注表 diff --git a/src/views/common/push/pushConcern/ConcernModal.vue b/src/views/common/push/pushConcern/ConcernModal.vue index 9839ab9..59e1a5b 100644 --- a/src/views/common/push/pushConcern/ConcernModal.vue +++ b/src/views/common/push/pushConcern/ConcernModal.vue @@ -31,10 +31,10 @@ // 处理设置数据 tag.value = data._tag; const refId = data.record?.id; - const onType = data.onType; + const dynamicJoinType = data.dynamicJoinType; const props: Partial = { confirmLoading: false }; props.title = '查看关注用户'; - await setFieldsValue(await getPushConcernFan(refId, onType)); + await setFieldsValue(await getPushConcernFan(refId, dynamicJoinType)); // 尾部:设置处理后的最终配置数据 setModalProps(props); }); diff --git a/src/views/common/push/pushConcern/index.vue b/src/views/common/push/pushConcern/index.vue index b1b7ca4..033ce26 100644 --- a/src/views/common/push/pushConcern/index.vue +++ b/src/views/common/push/pushConcern/index.vue @@ -64,7 +64,7 @@ import { listPushConcernFanType } from '/@/api/platform/common/controller/pushConcernFanType'; import { searchFormSchema as pushTypeSearchFormSchema } from '/@/views/common/push/pushType/type.data'; import TypeModal from '../pushType/TypeModal.vue'; - import { PushConcernType, PushAuditStatus, PushConcernJoinOnType } from '/@/enums/pushEnum'; + import { PushConcernType, PushAuditStatus, PushConcernDynamicJoinType } from '/@/enums/pushEnum'; const userStore = useUserStore(); const userInfoStore = userStore.getUserInfo; @@ -109,7 +109,7 @@ fixed: false }, searchInfo: { - onType: PushConcernJoinOnType.CONCERN_TYPE, + dynamicJoinType: PushConcernDynamicJoinType.CONCERN_TYPE, status: PushAuditStatus.APPROVED, fanUserId: userInfoStore.id }, @@ -152,7 +152,7 @@ /** 查看按钮操作,行内查看 */ function handleViewEdit(record?: Recordable) { record = record || { id: getSelectRowKeys() }; - openModal(true, { _tag: 'view', record, onType: PushConcernJoinOnType.CONCERN_TYPE }); + openModal(true, { _tag: 'view', record, dynamicJoinType: PushConcernDynamicJoinType.CONCERN_TYPE }); } function handlePushTypeEdit(record?: Recordable) { diff --git a/src/views/common/push/pushFriend/index.vue b/src/views/common/push/pushFriend/index.vue index b79c4f1..6d7710f 100644 --- a/src/views/common/push/pushFriend/index.vue +++ b/src/views/common/push/pushFriend/index.vue @@ -22,7 +22,7 @@ label: '粉丝申请', icon: 'fa6-brands:battle-net', ifShow: userInfoStore.userType == SystemUserType.ENTERPRISE_USER, - disabled: !!(String(record?.cfStatus)) || !!record?.blId, + disabled: (record?.cfStatus != null && record?.cfStatus != '') || !!record?.blId, onClick: handleLaunchFanAudit.bind(null, record) }, { @@ -41,18 +41,18 @@