From 04ffef47da21d134915579e2229972e96c57d308 Mon Sep 17 00:00:00 2001
From: ZhangRuining <1049731766@qq.com>
Date: Tue, 11 Mar 2025 21:58:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Index.js     | 15 +++++++++++----
 src/forge/Main/IndexItem.js |  2 +-
 src/forge/Settings/Audit.js | 26 ++++++++++++++++++++------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 27bfe9a06..3a214919e 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Menu, Input , Spin, Pagination , Popover , Select , Button } from 'antd';
+import { Menu, Input , Spin, Pagination , Popover , Select , Button,Tabs  } from 'antd';
 import { getImageUrl } from 'educoder';
 import '../css/index.scss'
 import './list.css';
@@ -327,11 +327,18 @@ class Index extends Component {
           <div className="list-right boxShandow radius-2" style={{padding:0}}>
             <Spin spinning={isSpin}>
               <div style={{padding:'20px 30px 0px 30px'}}>
-                <Button size='large' onClick={()=>{this.changeFilter(undefined)}} type={this.state.filter == undefined ? 'primary':'default'}>全部</Button>
+                <Tabs size='large' type="card" onChange={(key)=>{
+                    this.changeFilter(key)
+                }}>
+                  <Tabs.TabPane tab="全部" key="undefined" />
+                  <Tabs.TabPane tab="我管理的" key="manage" />
+                  <Tabs.TabPane tab="我学习的" key="study" />
+                </Tabs>
+                {/* <Button size='large' onClick={()=>{this.changeFilter(undefined)}} type={this.state.filter == undefined ? 'primary':'default'}>全部</Button>
                 <Button size='large' onClick={()=>{this.changeFilter('manage')}} type={this.state.filter == 'manage' ? 'primary':'default'} className='ml10 mr10'>我管理的</Button>
-                <Button size='large' onClick={()=>{this.changeFilter('study')}} type={this.state.filter == 'study' ? 'primary':'default'}>我学习的</Button>
+                <Button size='large' onClick={()=>{this.changeFilter('study')}} type={this.state.filter == 'study' ? 'primary':'default'}>我学习的</Button> */}
               </div>
-              <div className="list-r-operation">
+              <div className="list-r-operation" style={{padding:'5px 30px 20px 30px'}}>
                 <div>
                   <Select 
                     showSearch
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 70e9356bd..27483bb93 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -239,7 +239,7 @@ class IndexItem extends Component {
                   </AlignCenter>
                   <AlignCenter>
                   {
-                  (item.is_manager && item.join_project_need_verify) && <span style={{position:'relative',display:'inline-block',width:'120px',textAlign:'center',background:'rgba(250,100,0,0.1)',borderRadius:'2px',border:'1px solid #FFDCC5'}}>
+                  (item.is_manager && item.join_project_need_verify && !!item.pending_verify_count) && <span style={{position:'relative',display:'inline-block',width:'120px',textAlign:'center',background:'rgba(250,100,0,0.1)',borderRadius:'2px',border:'1px solid #FFDCC5'}}>
                     <Badge dot offset={[-90,7]} style={{ backgroundColor: '#FA6400' }}><span style={{fontSize:'12px',color:'#FA6400'}}>待审核申请：{item.pending_verify_count}</span></Badge>
                   </span>}
                   <span className="p-r-tags">
diff --git a/src/forge/Settings/Audit.js b/src/forge/Settings/Audit.js
index a3143890f..a213cd04f 100644
--- a/src/forge/Settings/Audit.js
+++ b/src/forge/Settings/Audit.js
@@ -143,7 +143,7 @@ export default ((props) => {
     },
     {
       title: '操作',
-      dataIndex: 'operation',
+      dataIndex: 'operation1',
       width: "15%",
       align:'right',
       flex:'right',
@@ -161,7 +161,7 @@ export default ((props) => {
                 },
               });
             }}>同意</Button>
-            <Button type='link' style={{padding:'0 5px'}} onClick={() => {
+            <Button type='link' style={{padding:'0 5px',color:'#FF0000'}} onClick={() => {
               let rejectReason = '';
               Modal.confirm({
                 title: '拒绝申请',
@@ -170,7 +170,7 @@ export default ((props) => {
                 centered: true,
                 width: 500,
                 content: <div>
-                  <div className='mb10 mt10'><span style={{ color: "#ff4d4f" }}>*</span><span>拒绝原因:</span></div>
+                  <div className='mb10 mt15'><span style={{ color: "#ff4d4f" }}>*</span><span>拒绝原因:</span></div>
                   <div><Input.TextArea placeholder='请输入拒绝原因' rows={3} maxLength={200} onChange={(event) => {
                     rejectReason = event.target.value;
                   }} /></div>
@@ -184,8 +184,22 @@ export default ((props) => {
           </div>
         )
       }
+    },
+    {
+      title: '操作',
+      dataIndex: 'operation2',
+      width: "15%",
+      align:'right',
+      flex:'right',
+      render: (value, record) => <span style={{color:'#1991FF'}}>{record.status == 'accepted'? '已同意':'已拒绝'}</span>
     }
-  ]
+  ].filter(item => {
+    if (status == 1) {
+      return item.dataIndex != 'operation2' && item.dataIndex!= 'reason' 
+    }else{
+      return item.dataIndex != 'operation1' 
+    }
+  })
 
   return (
     <WhiteBack>
@@ -194,11 +208,11 @@ export default ((props) => {
       </Title>
       <FlexAJ className="padding20-30">
         <div>
-        <Button size='large' type={status == 1 ? 'primary' : 'default'} onClick={() => {
+        <Button size='default' type={status == 1 ? 'primary' : 'default'} onClick={() => {
           setStatus(1);
           getData(1, search)
         }}>待审核</Button>
-        <Button size='large' type={status == 2 ? 'primary' : 'default'} className='ml10' onClick={() => {
+        <Button size='default' type={status == 2 ? 'primary' : 'default'} className='ml10' onClick={() => {
           setStatus(2);
           getData(2, search)
         }}>已审核</Button>