diff --git a/src/api/group.ts b/src/api/group.ts
index ff24b7ef911f441098806a8a4fd4357e8407293b..446b8e78b7d42f3a0415e8026073363fe4be00e9 100644
--- a/src/api/group.ts
+++ b/src/api/group.ts
@@ -220,6 +220,15 @@ class GroupAPI {
       data,
     });
   }
+
+  /** 申请加入团队接口*/
+  static applyToJoinTeam(teamId: string) {
+    return request({
+      url: `/team/application`,
+      method: 'post',
+      params: { teamId },
+    });
+  }
 }
 
 export default GroupAPI;
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index e4b24970ea70c35a42da0052ab62d33da2ef8fd9..d0fc184ab1d1195efb7edb7c1412296594b150b2 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -78,6 +78,8 @@ export default {
     datasetManagement: 'Dataset',
     testingManagement: 'Testing',
     create: 'Create',
+    allTeams: 'All',
+    applyToJoin: 'Apply',
   },
   groupDetail: {
     memberPermission: 'Member Management',
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 3d5e895110ce188c3cdffe6248cd4a7244999377..51e3f8ae501c8add03dc0593fd774ec1802a37e0 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -84,6 +84,8 @@ export default {
     datasetManagement: '数据集管理',
     testingManagement: '评测管理',
     create: '创建',
+    allTeams: '全部',
+    applyToJoin: '申请加入',
   },
   groupDetail: {
     memberPermission: '成员管理',
diff --git a/src/styles/group.scss b/src/styles/group.scss
index b5bf4424e0db1129c477ac504318bcd67df297f5..1fb1ad55890671dc216df23df6d646edb7568644 100644
--- a/src/styles/group.scss
+++ b/src/styles/group.scss
@@ -178,6 +178,15 @@
                           }
                           button{
                             height: 16px;
+                            
+                            // 申请加入按钮样式
+                            &.el-button--primary.el-button--small {
+                              height: 24px;
+                              padding: 4px 12px;
+                              font-size: 12px;
+                              border-radius: 4px;
+                              min-width: 72px;
+                            }
                           }
                       }
                   }
@@ -281,6 +290,15 @@
                   .el-pagination .el-input__inner {
                     height: var(--el-input-inner-height) !important;
                   }
+
+                  // 表格中申请加入按钮样式
+                  .el-button--primary.el-button--small {
+                    height: 24px;
+                    padding: 4px 12px;
+                    font-size: 12px;
+                    border-radius: 4px;
+                    min-width: 72px;
+                  }
                 }
               }
               .group-pagination{
diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index 9d6b9b5c3e46b7d2ce5e5baf93de39c2638b1fa5..7884442ae3135d38bdc9d3c9041d93d64a84109b 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -5,12 +5,23 @@
         <div class="group-box">
             <el-tabs type="card" class="group-tabs" default-active="mycreated" v-model="activeName"
                 @tab-change="handleTabChange">
-                <el-tab-pane class="group-tabs-item" v-for="tab in groupTabs" :name="tab.name" :key="tab.name"
-                    :label="tab.label">
+                <el-tab-pane 
+                    class="group-tabs-item" 
+                    v-for="tab in groupTabs" 
+                    :name="tab.name" 
+                    :key="tab.name"
+                    :label="tab.label"
+                >
                     <div class="group-tab-header">
                         <div>
-                            <el-button v-if="tab.name === 'mycreated'" type="primary" class="group-btn"
-                                @click="handleCreateGroup(true)">{{ $t('group.createTeam') }}</el-button>
+                            <el-button 
+                                v-if="tab.name === 'mycreated'" 
+                                type="primary" 
+                                class="group-btn"
+                                @click="handleCreateGroup(true)"
+                            >
+                                {{ $t('group.createTeam') }}
+                            </el-button>
                         </div>
                         <div class="group-right-btn">
                             <div class="group-btn-search">
@@ -67,9 +78,27 @@
                                             {{ item.memberCount }}{{ $t('group.people') }}
                                         </span>
                                     </div>
+                                    <!-- 我创建的团队显示编辑按钮 -->
                                     <el-button v-if="tab.name === 'mycreated'" text @click.stop="handleEditKl(item)">
                                         {{ $t('btnText.edit') }}
                                     </el-button>
+                                    <!-- 全部团队tab中，已加入的显示编辑按钮，未加入的显示申请加入按钮 -->
+                                    <el-button 
+                                        v-else-if="tab.name === 'all' && item.isJoined" 
+                                        text 
+                                        @click.stop="handleEditKl(item)"
+                                    >
+                                        {{ $t('btnText.edit') }}
+                                    </el-button>
+                                    <el-button 
+                                        v-else-if="tab.name === 'all' && !item.isJoined" 
+                                        text
+                                        size="small"
+                                        :loading="item.applying"
+                                        @click.stop="handleApplyToJoin(item)"
+                                    >
+                                        {{ $t('group.applyToJoin') }}
+                                    </el-button>
                                 </div>
                             </div>
                         </div>
@@ -112,11 +141,29 @@
                                         {{ convertUTCToLocalTime(scope.row.createdTime)}}
                                     </template>
                                 </el-table-column>
-                                <el-table-column prop="action" :label="$t('btnText.operation')" width="100">
+                                <el-table-column prop="action" :label="$t('btnText.operation')" width="120">
                                     <template #default="scope">
-                                        <el-button text @click="handleEditKl(scope.row)">
+                                        <!-- 我创建的团队显示编辑按钮 -->
+                                        <el-button v-if="activeName === 'mycreated'" text @click="handleEditKl(scope.row)">
+                                            {{ $t('btnText.edit') }}
+                                        </el-button>
+                                        <!-- 全部团队tab中，已加入的显示编辑按钮，未加入的显示申请加入按钮 -->
+                                        <el-button 
+                                            v-else-if="activeName === 'all' && scope.row.isJoined" 
+                                            text 
+                                            @click="handleEditKl(scope.row)"
+                                        >
                                             {{ $t('btnText.edit') }}
                                         </el-button>
+                                        <el-button 
+                                            v-else-if="activeName === 'all' && !scope.row.isJoined" 
+                                            type="primary" 
+                                            size="small"
+                                            :loading="scope.row.applying"
+                                            @click="handleApplyToJoin(scope.row)"
+                                        >
+                                            {{ $t('group.applyToJoin') }}
+                                        </el-button>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -126,13 +173,19 @@
                         v-if="groupList?.length > 0" :current-page="currentPage" :page-size="currentPageSize"
                         :page-sizes="pagination.pageSizes" :layout="pagination.layout" :total="totalCount"
                         popper-class="fileLibraryPage" @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange" />
+                        @current-change="handleCurrentChange" 
+                    />
                 </el-tab-pane>
             </el-tabs>
         </div>
     </div>
-    <CreateGroup :createGroupVisible="createGroupVisible" :handlequeryTeamList="handlequeryTeamList"
-        :dialogueType="dialogueType" :currentRow="currentRow" :close="() => handleCreateGroup(false)" />
+    <CreateGroup 
+        :createGroupVisible="createGroupVisible" 
+        :handlequeryTeamList="handlequeryTeamList"
+        :dialogueType="dialogueType" 
+        :currentRow="currentRow" 
+        :close="() => handleCreateGroup(false)" 
+    />
 </template>
 <script lang="ts" setup>
 import UserHeaderBar from '@/components/UserHeaderBar/index.vue';
@@ -161,7 +214,7 @@ const { t, locale} = useI18n();
 const groupStore = useGroupStore();
 const { setCurTeamInfo } = groupStore;
 
-const activeName = ref('mycreated');
+const activeName = ref('all');
 const currentRow = ref({});
 const dialogueType = ref('create');
 let groupList = ref<any>([]);
@@ -213,6 +266,10 @@ const handleSizeChange = (pageSize: number) => {
 const { navGroup } = storeToRefs(useGroupStore());
 
 const groupTabs = ref([
+    {
+        label: t('group.allTeams'),
+        name: 'all',
+    },
     {
         label: t('group.myCreate'),
         name: 'mycreated',
@@ -224,6 +281,10 @@ const groupTabs = ref([
 ])
 watch(()=>t('') , () => {
     groupTabs.value = [
+        {
+            label: t('group.allTeams'),
+            name: 'all',
+        },
         {
             label: t('group.myCreate'),
             name: 'mycreated',
@@ -280,16 +341,92 @@ const handleToGroup = async (row: any) => {
     setCurTeamInfo(row);
 }
 
-const handlequeryTeamList = (param: { teamType: string, page: number, pageSize: number, teamName?: string }) => {
+const handlequeryTeamList = async (param: { teamType: string, page: number, pageSize: number, teamName?: string }) => {
     loading.value = true;
-    GroupAPI.teamList(param).then((res: any) => {
-        groupList.value = res.teams;
-        totalCount.value = res.total;
-    }).finally(() => {
+    try {
+        if (param.teamType === 'all') {
+            // 获取全部团队：公开团队 + 我加入的团队 + 我创建的团队
+            const [publicRes, joinedRes, createdRes] = await Promise.all([
+                GroupAPI.teamList({ teamType: 'public', page: 1, pageSize: 1000, teamName: param.teamName }),
+                GroupAPI.teamList({ teamType: 'myjoined', page: 1, pageSize: 1000, teamName: param.teamName }),
+                GroupAPI.teamList({ teamType: 'mycreated', page: 1, pageSize: 1000, teamName: param.teamName })
+            ]);
+            
+            const publicTeams = (publicRes as any)?.teams || [];
+            const joinedTeams = (joinedRes as any)?.teams || [];
+            const createdTeams = (createdRes as any)?.teams || [];
+            
+            // 合并已加入和创建的团队，标记为已加入
+            const myTeams = [...joinedTeams, ...createdTeams];
+            const myTeamIds = new Set(myTeams.map((team: any) => team.teamId));
+            
+            // 处理公开团队，标记是否已加入
+            const processedPublicTeams = publicTeams.map((team: any) => ({
+                ...team,
+                isJoined: myTeamIds.has(team.teamId),
+                applying: false
+            }));
+            
+            // 处理我的团队，标记为已加入
+            const processedMyTeams = myTeams.map((team: any) => ({
+                ...team,
+                isJoined: true,
+                applying: false
+            }));
+            
+            // 合并所有团队，去重
+            const allTeamsMap = new Map();
+            [...processedPublicTeams, ...processedMyTeams].forEach((team: any) => {
+                if (!allTeamsMap.has(team.teamId)) {
+                    allTeamsMap.set(team.teamId, team);
+                } else {
+                    // 如果团队已存在，优先保留已加入的状态
+                    const existingTeam = allTeamsMap.get(team.teamId);
+                    if (team.isJoined) {
+                        allTeamsMap.set(team.teamId, { ...existingTeam, isJoined: true });
+                    }
+                }
+            });
+            
+            const allTeams = Array.from(allTeamsMap.values()).sort((a: any, b: any) => 
+                new Date(b.createdTime).getTime() - new Date(a.createdTime).getTime()
+            );
+            
+            // 手动分页
+            const start = (param.page - 1) * param.pageSize;
+            const end = start + param.pageSize;
+            groupList.value = allTeams.slice(start, end);
+            totalCount.value = allTeams.length;
+        } else {
+            // 原有逻辑
+            const res = await GroupAPI.teamList(param) as any;
+            groupList.value = res.teams;
+            totalCount.value = res.total;
+        }
+    } catch (error) {
+        console.error('获取团队列表失败:', error);
+        groupList.value = [];
+        totalCount.value = 0;
+    } finally {
         loading.value = false;
-    })
+    }
 }
 
+// 申请加入团队
+const handleApplyToJoin = async (team: any) => {
+    try {
+        team.applying = true;
+        await GroupAPI.applyToJoinTeam(team.teamId);
+        ElMessage.success(`已成功申请加入团队"${team.teamName}"`);
+        // 可以选择刷新团队列表或更新团队状态
+    } catch (error) {
+        console.error('申请加入团队失败:', error);
+        ElMessage.error('申请加入团队失败，请重试');
+    } finally {
+        team.applying = false;
+    }
+};
+
 onMounted(() => {
     let param = {
         teamType: activeName.value,
diff --git a/src/views/groupDetail/index.vue b/src/views/groupDetail/index.vue
index d3a722c74876833650436c0ba0daba5198a4847c..a700d3bc7900725dc0ab466854fc45578dc47834 100644
--- a/src/views/groupDetail/index.vue
+++ b/src/views/groupDetail/index.vue
@@ -1516,6 +1516,7 @@ const loadMoreTeamMessages = async () => {
     await getTeamMessages(nextPage, teamMessagesPageSize.value, true);
 };
 
+
 watch(()=>groupMenu.value , (newVal) => {
     if(newVal=== 'detail'){
         queryGroupDetail();
@@ -1744,6 +1745,7 @@ onMounted(()=>{
         text-align: center;
     }
 
+
     // 团队动态样式
     .team-news-container {
         padding: 16px 0;