From 569821a359f5edac5fc51fa393522d4e375e2e0e Mon Sep 17 00:00:00 2001
From: amypeng <lucky1031@126.com>
Date: Fri, 12 Jun 2026 14:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

查询用户角色接口替换
---
 src/forge/Information/Pages/zoneUser.jsx | 33 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/forge/Information/Pages/zoneUser.jsx b/src/forge/Information/Pages/zoneUser.jsx
index d9c15482..7eba4e7e 100644
--- a/src/forge/Information/Pages/zoneUser.jsx
+++ b/src/forge/Information/Pages/zoneUser.jsx
@@ -1,6 +1,6 @@
 import React , { useState , useEffect } from 'react';
 import { Spin, Modal, Button } from 'antd';
-import { getMainInfos, getAuditStatus, getMemberInfo, applyJoin, updateSelfInfo, setZoneVisits } from '../api';
+import { getMainInfos, getAuditStatus, getMemberInfo, applyJoin, updateSelfInfo, setZoneVisits, getCurrentRole } from '../api';
 import { Link } from 'react-router-dom';
 import {getUniqueIdentifier,getUserName,getBrowserPlatform,getBrowserBrand} from '../utils';
 
@@ -35,7 +35,8 @@ import '../indexUser.scss';
 export const memberStatusEnum = { 
   applying: '0',
   isMember: '1',
-  notMember: '2'
+  notMember: '2',
+  isAdmin: '3'
 }
 function ZoneUser(props){
   const [ memberStatus , setMemberStatus] = useState(memberStatusEnum.notMember);
@@ -184,20 +185,37 @@ function ZoneUser(props){
 
   function getMemberStatus() {
     setLoading(true);
-    getAuditStatus(id).then(res => {
+    getCurrentRole(id).then(res => {
       if (res && res.data && res.data.code === 200) {
-        setMemberStatus(res.data.data)
+        if(res.data.data?.role === 'Member') {
+          setMemberStatus(memberStatusEnum.isMember)
+          getInfo();
+        } else if(res.data.data?.role === 'Manager') {
+          setMemberStatus(memberStatusEnum.isAdmin)
+        } 
       } else {
         setMemberStatus(memberStatusEnum.notMember)
       }
 
-      if(res.data.data == memberStatusEnum.isMember) {
-        getInfo();
-      }
     }).catch(() => { setMemberStatus(memberStatusEnum.notMember) })
     .finally(() => { 
       setLoading(false) 
     });
+    // getAuditStatus(id).then(res => {
+    //   if (res && res.data && res.data.code === 200) {
+    //     setMemberStatus(res.data.data)
+    //   } else {
+    //     setMemberStatus(memberStatusEnum.notMember)
+    //   }
+
+    //   if(res.data.data == memberStatusEnum.isMember) {
+    //     getInfo();
+    //   }
+    // }).catch(() => { setMemberStatus(memberStatusEnum.notMember) })
+    // .finally(() => { 
+    //   console.log('api-over', memberStatus);
+    //   setLoading(false) 
+    // });
   }
 
   function getZoneInfo() {
@@ -372,7 +390,6 @@ function ZoneUser(props){
       </div>
       }
       </Spin>
-
       <ScoreRlue {...props} />
 
       <MemberApply  visible={applyVisible}  onOk={ onOk } onCancel={() => setApplyVisible(!applyVisible)} current_user={props.current_user}/>