From cbca983d72dc83c8e7a8d67b3e58b4e74552662c Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 21 Apr 2023 20:23:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A1=E6=A0=B8=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/platform/common/controller/pushConcernFan.ts       | 2 +-
 src/views/common/push/pushFriendAudit/FriendAuditModal.vue | 3 ++-
 src/views/common/push/pushFriendAudit/index.vue            | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/platform/common/controller/pushConcernFan.ts b/src/api/platform/common/controller/pushConcernFan.ts
index ccc8544..f95ca97 100644
--- a/src/api/platform/common/controller/pushConcernFan.ts
+++ b/src/api/platform/common/controller/pushConcernFan.ts
@@ -25,7 +25,7 @@ export const getPushConcernFan = (id: string, dynamicJoinType?: string) => defHt
 
 export const delPushConcernFan = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
 
-export const updateAuditStatus = (id: string, status: number) => defHttp.put({ url: `${Api.updateAuditStatus}`, params: { id, status } });
+export const updateAuditStatus = (id: string, status: number) => defHttp.put({ url: `${Api.updateAuditStatus}/${id}/${status}` });
 
 export const rejectAuthPushConcernFan = (ids: string) => defHttp.put({ url: `${Api.rejectAuth}/${ids}` });
 
diff --git a/src/views/common/push/pushFriendAudit/FriendAuditModal.vue b/src/views/common/push/pushFriendAudit/FriendAuditModal.vue
index b0669bd..30457b1 100644
--- a/src/views/common/push/pushFriendAudit/FriendAuditModal.vue
+++ b/src/views/common/push/pushFriendAudit/FriendAuditModal.vue
@@ -37,10 +37,11 @@
     await clearValidate();
     // 处理设置数据
     id.value = data.record?.id;
+    const dynamicJoinType = data.dynamicJoinType;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
     props.title = '好友审核';
-    await setFieldsValue(await getPushConcernFan(id.value));
+    await setFieldsValue(await getPushConcernFan(id.value, dynamicJoinType));
     await setProps({ disabled: true });
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
diff --git a/src/views/common/push/pushFriendAudit/index.vue b/src/views/common/push/pushFriendAudit/index.vue
index b98e318..65e1a67 100644
--- a/src/views/common/push/pushFriendAudit/index.vue
+++ b/src/views/common/push/pushFriendAudit/index.vue
@@ -43,7 +43,7 @@
   import { columns, searchFormSchema } from '../pushConcern/concern.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
-  import { PushAuditStatus } from '/@/enums/pushEnum';
+  import {PushAuditStatus, PushConcernDynamicJoinType} from '/@/enums/pushEnum';
 
   const userStore = useUserStore();
   const userInfoStore = userStore.getUserInfo;
@@ -87,6 +87,7 @@
       fixed: false
     },
     searchInfo: {
+      dynamicJoinType: PushConcernDynamicJoinType.CONCERN_TYPE,
       status: PushAuditStatus.UNDER_REVIEW,
       fanUserId: userInfoStore.id
     },
@@ -103,7 +104,7 @@
   /** 查看按钮操作,行内查看 */
   function handleViewEdit(record?: Recordable) {
     record = record || { id: getSelectRowKeys() };
-    openModal(true, { _tag: 'view', record });
+    openModal(true, { _tag: 'view', record, dynamicJoinType: PushConcernDynamicJoinType.CONCERN_TYPE });
   }
 
   async function handleAudit(record?: Recordable) {