diff --git a/src/forge/Information/Component/memberApply.jsx b/src/forge/Information/Component/memberApply.jsx
index 824e638fc..62e53a0a9 100644
--- a/src/forge/Information/Component/memberApply.jsx
+++ b/src/forge/Information/Component/memberApply.jsx
@@ -1,5 +1,5 @@
import React , {forwardRef, useEffect, useState} from 'react';
-import { Modal , Form , Input , Button } from 'antd';
+import { Modal , Form , Input , Button, Icon } from 'antd';
import UploadImage from '../../Team/Component/UploadImage';
import { getImageUrl } from 'educoder';
@@ -49,7 +49,7 @@ function MemberApply(props){
>
- 若您未填写会员头像,会员名称,我们会将您的GitLink用户头像及昵称自动填入,请知悉
+ 若您未填写会员头像,会员名称,我们会将您的GitLink用户头像及昵称自动填入,请知悉
diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx
index 5b60f4147..19e167ae3 100644
--- a/src/forge/Information/Pages/zoneVIP.jsx
+++ b/src/forge/Information/Pages/zoneVIP.jsx
@@ -9,13 +9,19 @@ import { getVIPLists, getAuditStatus, applyJoin } from '../api';
import '../indexZone1.scss';
+const memberStatusEnum = {
+ notMember: 0,
+ isMember: 1,
+ applying: 2
+}
function ZoneVIP(props){
const { deptId } = props.match.params;
const [ vipLists , setVIPLists ] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true);
const [ applyVisible , setApplyVisible ] = useState(false);
- const { id } = props;
+ const [ memberStatus , setMemberStatus] = useState(memberStatusEnum.notMember);
+ const { id, showNotification } = props;
const temp = props.pathName
useEffect(()=>{
@@ -37,13 +43,23 @@ function ZoneVIP(props){
function getMemberStatus() {
getAuditStatus(id).then(res => {
- console.log(res)
- })
+ if (res && res.code === 200) {
+ setMemberStatus(res.data)
+ } else {
+ setMemberStatus(memberStatusEnum.notMember)
+ }
+ }).catch(() => { setMemberStatus(memberStatusEnum.notMember) })
}
function onOk(e) {
applyJoin(id, e).then(res => {
- console.log(res)
+ if (res) {
+ showNotification(res.msg)
+ setApplyVisible(!applyVisible)
+ if (res.code === 200) {
+ setMemberStatus(memberStatusEnum.applying)
+ }
+ }
})
}
@@ -51,8 +67,9 @@ function ZoneVIP(props){
{ tempConfig[temp].member }
{ tempConfig[temp].vipDesc }
-
-
setApplyVisible(!applyVisible)} current_user={props.current_user}/>
+ { memberStatus === memberStatusEnum.notMember && }
+ { memberStatus === memberStatusEnum.applying && }
+ setApplyVisible(!applyVisible)} current_user={props.current_user}/>
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index 6a739b321..69a290fc8 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -94,7 +94,7 @@ export function getAuditStatus(id){
/**会员申请状态 */
export function applyJoin(id,data) {
return fetch({
- url: '/zone/member/applyToJoin/zone/${id}',
+ url: `/zone/member/applyToJoin/zone/${id}`,
method: 'post',
data: data
});