Merge pull request '首页新增banner图' (#456) from durian/forgeplus-react:gitlink_server into gitlink_server

src/forge/Settings/Collaborator.js

@@ -37,7 +37,7 @@ function Collaborator(props){
           <span className="font-18 text-black">协作者管理</span>
         } */}
         <span>
-          <span style={{cursor:"pointer"}} className={nav === "1" ? "font-15 text-black color-blue":"font-15 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>协作者管理</span>
+          <span style={{cursor:"pointer"}} className={nav === "1" ? "font-15 text-black color-blue":"font-15 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>成员管理</span>
           <span style={{cursor:"pointer"}} className={nav === "3" ? "font-15 text-black color-blue ml30":"font-15 text-black ml30"} onClick={()=>{setNav("3");}}>邀请成员</span>
           {author && author.type === "Organization" && <span style={{cursor:"pointer"}} className={nav === "2" ? "font-15 text-black ml30 color-blue":"font-15 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined);setNewGroupId(undefined)}}>团队管理</span>}
         </span>

src/forge/Settings/Index.js

@@ -69,7 +69,7 @@ class Index extends Component {
               <p>
                 <Link to={`/${owner}/${projectsId}/settings/collaborators`} className="w-100">
                   <i className="iconfont icon-chengyuan font-15 mr10"></i>
-                  协作者管理
+                  成员管理
                 </Link>
               </p>
             </li>

src/forge/Settings/Setting.js

@@ -261,7 +261,7 @@ class Setting extends Component {
         <Spin spinning={loading}>
           <WhiteBack>
             <Title>基本设置</Title>
-            <Form className="baseForm">
+            <Form className="baseForm" style={{marginLeft: '30px'}}>
               <Form.Item label="项目名称">
                 {getFieldDecorator("project_name", {
                   rules: [

src/forge/Settings/new_tags.js

@@ -422,7 +422,7 @@ class NewTags extends Component {
           className="flex-a-center baseForm bbr"
           style={{ "justify-content": "space-between" }}
         >
-          <span className="font-18 text-black">项目标记</span>
+          <span className="font-18 text-black ml30">项目标记</span>
           {data && data.user_admin_or_member ? (
             <Button type="primary" ghost onClick={this.newshow}>
               <Icon type="plus"></Icon>

src/glcc/interimReview/studentSubmit.jsx

@@ -17,7 +17,7 @@ function StudentSubmit(props){
   // 学生提交信息之后按钮置灰（确保无重复提交）
   const [disabled, setDisabled] = useState(false);
   // 学生提交材料时间
-  const submitTime = new Date().getTime() < new Date('2022/10/14 24:0').getTime();
+  const submitTime = new Date().getTime() < new Date('2022/10/17 24:0').getTime();
   // 学生提醒导师评分时间
   const lookTime = new Date().getTime() > new Date('2022/10/15 0:0').getTime() && new Date().getTime() < new Date('2022/10/23 24:0').getTime();
 
@@ -59,6 +59,7 @@ function StudentSubmit(props){
             submitMedium(params).then(res=>{
               if(res && res.message === "success"){
                 if(!res.data){
+                  message.success("提交成功");
                   setReload(Math.random());
                 }else if(res.data.code === '-1'){
                   message.error('不可重复提交');

src/home/TopEdition.jsx

@@ -32,7 +32,7 @@ function TopEdition({register,current_user}) {
     const url = `/topics.json?topic_type=banner`;
     axios.get(url,{
       params:{
-        limit:4
+        limit:5
       }
     }).then(result=>{
       if(result){
@@ -48,7 +48,7 @@ function TopEdition({register,current_user}) {
           return(
             <div className={`regform`}>
               {/*  style={{backgroundImage:`url(${getImageUrl(i.image)})`}} */}
-              <div>
+              <div onClick={()=>{if(k === 3){window.location.href="https://forum.gitlink.org.cn/forums/7653/detail"}}} style={{cursor: k === 3 ? 'pointer' : ''}}>
                 <img src={getImageUrl(i.image)} alt="" height="100%"/>
                 {
                   k +1 === bannerList.length && (!(current_user && current_user.login)) ?