diff --git a/src/api/platform/common/controller/pushConcernFan.ts b/src/api/platform/common/controller/pushConcernFan.ts index 85bae86..5a7b0d9 100644 --- a/src/api/platform/common/controller/pushConcernFan.ts +++ b/src/api/platform/common/controller/pushConcernFan.ts @@ -8,6 +8,7 @@ enum Api { add = '/common_proxy/common/pushConcernFan/save', edit = '/common_proxy/common/pushConcernFan/update', del = '/common_proxy/common/pushConcernFan/remove', + audit = '/common_proxy/common/pushConcernFan/audit', } export const listPushConcernFan = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); @@ -21,3 +22,5 @@ export const editPushConcernFan = (params: Partial) => defHttp.p export const getPushConcernFan = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); export const delPushConcernFan = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); + +export const auditPushConcernFan = (id: string) => defHttp.get({ url: `${Api.audit}`, params: { id } }); diff --git a/src/views/common/push/pushConcern/index.vue b/src/views/common/push/pushConcern/index.vue index 55c17d4..0ed6c9e 100644 --- a/src/views/common/push/pushConcern/index.vue +++ b/src/views/common/push/pushConcern/index.vue @@ -112,6 +112,7 @@ fixed: false }, searchInfo: { + onType: '1', status: '1', fanUserId: userInfoStore.id }, diff --git a/src/views/common/push/pushFan/index.vue b/src/views/common/push/pushFan/index.vue index 02bd5b8..2960118 100644 --- a/src/views/common/push/pushFan/index.vue +++ b/src/views/common/push/pushFan/index.vue @@ -24,6 +24,7 @@ label: '移除', icon: 'ant-design:delete-outlined', color: 'error', + disabled: record?.cfType == 1, onClick: handleDel.bind(null, record) }]" /> diff --git a/src/views/common/push/pushFriend/index.vue b/src/views/common/push/pushFriend/index.vue index f269fab..765d719 100644 --- a/src/views/common/push/pushFriend/index.vue +++ b/src/views/common/push/pushFriend/index.vue @@ -92,8 +92,8 @@ content: `是否关注用户为${record?.nickName}?`, onOk: async () => { await addPushConcernFan({ - concernUserId: userInfoStore.id, - fanUserId: record?.id + concernUserId: record?.id, + fanUserId: userInfoStore.id }); createMessage.success('申请成功!'); handleRefreshTable(); diff --git a/src/views/common/push/pushFriendAudit/FriendAuditModal.vue b/src/views/common/push/pushFriendAudit/FriendAuditModal.vue index cb782e6..6f4ee93 100644 --- a/src/views/common/push/pushFriendAudit/FriendAuditModal.vue +++ b/src/views/common/push/pushFriendAudit/FriendAuditModal.vue @@ -16,7 +16,7 @@