diff --git a/src/forge/Information/Component/memberApply.jsx b/src/forge/Information/Component/memberApply.jsx
index 62e53a0a9..c5002398a 100644
--- a/src/forge/Information/Component/memberApply.jsx
+++ b/src/forge/Information/Component/memberApply.jsx
@@ -39,6 +39,7 @@ function MemberApply(props){
title="加入专区会员"
width="650px"
closable={false}
+ destroyOnClose
footer={
@@ -48,32 +49,30 @@ function MemberApply(props){
centered
>
-
- 若您未填写会员头像,会员名称,我们会将您的GitLink用户头像及昵称自动填入,请知悉
-
{getFieldDecorator("name", {
- initialValue: current_user.nickname
+ initialValue: current_user.nickname,
+ rules:[{ required:true,message:"请输入申请原因" }]
})(
-
+
)}
-
-
+
+
{getFieldDecorator("introduction",{
rules:[{ required:true,message:"请输入会员简介" }]
})(
-
+
)}
{getFieldDecorator("remark",{
rules:[{ required:true,message:"请输入申请原因" }]
})(
-
+
)}
diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx
index 76ad49d9a..2707a6f82 100644
--- a/src/forge/Information/Pages/zoneVIP.jsx
+++ b/src/forge/Information/Pages/zoneVIP.jsx
@@ -2,7 +2,7 @@ import React , { useState , useEffect } from 'react';
import Crown from '../img/crown.png';
import Nodata from '../../Nodata';
import { Link } from 'react-router-dom';
-import { Spin, Button } from 'antd';
+import { Spin, Button, Alert } from 'antd';
import { tempConfig } from '../tempInfo'
import MemberApply from '../Component/memberApply';
import { getVIPLists, getAuditStatus, applyJoin } from '../api';
@@ -52,15 +52,16 @@ function ZoneVIP(props){
}
function onOk(e) {
- applyJoin(id, e).then(res => {
- if (res) {
- showNotification(res.msg)
- setApplyVisible(!applyVisible)
- if (res.code === 200) {
- setMemberStatus(memberStatusEnum.applying)
- }
- }
- })
+ console.log(e)
+ // applyJoin(id, e).then(res => {
+ // if (res) {
+ // showNotification(res.msg)
+ // setApplyVisible(!applyVisible)
+ // if (res.code === 200) {
+ // setMemberStatus(memberStatusEnum.applying)
+ // }
+ // }
+ // })
}
function apply() {
@@ -76,7 +77,7 @@ function ZoneVIP(props){
{ tempConfig[temp].member }
{ tempConfig[temp].vipDesc }
{ memberStatus === memberStatusEnum.notMember && }
- { memberStatus === memberStatusEnum.applying && }
+ { memberStatus === memberStatusEnum.applying && }
setApplyVisible(!applyVisible)} current_user={props.current_user}/>
diff --git a/src/forge/Team/Component/UploadImage.jsx b/src/forge/Team/Component/UploadImage.jsx
index 6b7ef8e68..87ab70929 100644
--- a/src/forge/Team/Component/UploadImage.jsx
+++ b/src/forge/Team/Component/UploadImage.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Upload , Icon , message } from "antd";
import { getUploadActionUrl } from 'educoder';
-function UploadImage({ getImage , url, getImageId }){
+function UploadImage({ getImage , url, getImageId, maxSize = 2 }){
const [ imageUrl , setImageUrl ] = useState(undefined);
useEffect(()=>{
setImageUrl(url);
@@ -22,9 +22,9 @@ function UploadImage({ getImage , url, getImageId }){
if (!isJpgOrPng) {
message.error('上传的图片只能是JPG或者PNG格式!');
}
- const isLt2M = file.size / 1024 / 1024 < 2;
+ const isLt2M = file.size / 1024 / 1024 < maxSize;
if (!isLt2M) {
- message.error('上传的图片不能超过2MB!');
+ message.error(`上传的图片不能超过${maxSize}MB!`);
}
return isJpgOrPng && isLt2M;
}
@@ -46,8 +46,8 @@ function UploadImage({ getImage , url, getImageId }){
action={getUploadActionUrl()}
beforeUpload={beforeUpload}
onChange={handleChange}
- accept="image/*"
- >
+ accept=".png,.jpg,.jpeg"
+ >
{
imageUrl ?