diff --git a/src/forge/Information/Pages/zoneUser.jsx b/src/forge/Information/Pages/zoneUser.jsx
index d9c154828..7eba4e7ea 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){
}
-
setApplyVisible(!applyVisible)} current_user={props.current_user}/>