Merge pull request #7 from xixiIBN5100/main

src/components/team/CreateTeam.vue

@@ -109,38 +109,16 @@ routeOptions.value = [
     label: '屏峰全程',
     value: '3',
   },
-  {
-    label: '莫干山半程',
-    value: '4',
-  },
+  // {
+  //   label: '莫干山半程',
+  //   value: '4',
+  // },
   {
     label: '莫干山全程',
     value: '5',
   },
 ]
 
-routeOptions.value = [
-  {
-    label: '朝晖全程',
-    value: '1',
-  },
-  {
-    label: '屏峰半程',
-    value: '2',
-  },
-  {
-    label: '屏峰全程',
-    value: '3',
-  },
-  {
-    label: '莫干山半程',
-    value: '4',
-  },
-  {
-    label: '莫干山全程',
-    value: '5',
-  },
-]
 
 function createTeam() {
   formRef.value?.validate((errors: any) => {

src/components/team/UpdateTeam.vue

@@ -95,10 +95,10 @@ routeOptions.value = [
     label: '屏峰全程',
     value: 3,
   },
-  {
-    label: '莫干山半程',
-    value: 4,
-  },
+  // {
+  //   label: '莫干山半程',
+  //   value: 4,
+  // },
   {
     label: '莫干山全程',
     value: 5,

src/components/team/join/JoinTeam.vue

@@ -6,7 +6,7 @@ import RandomMatch from './RandomJoin.vue'
 </script>
 
 <template>
-  <n-collapse style="margin-top: 15px" default-expanded-names="1" arrow-placement="right" accordion>
+  <n-collapse style="margin-top: 15px"  arrow-placement="right" accordion :default-expanded-names="['1', '2']" >
     <n-collapse-item title="🏊 &nbsp;&nbsp;通过团队密码加入团队" name="1">
       <password-join></password-join>
     </n-collapse-item>

src/components/team/join/RandomJoin.vue

@@ -14,7 +14,7 @@ const routeOptions = ref([
   { label: '朝晖全程', value: 1 },
   { label: '屏峰半程', value: 2 },
   { label: '屏峰全程', value: 3 },
-  { label: '莫干山半程', value: 4 },
+  // { label: '莫干山半程', value: 4 },
   { label: '莫干山全程', value: 5 },
 ])
 
@@ -55,7 +55,7 @@ async function refreshList() {
 
   isWaiting.value = true
   randomTeamList.value = await getRandomList()
-  
+
   // 让动画晚结束一些
   setTimeout(() => {
     isWaiting.value = false

src/components/team/show/BasicInfo.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { NCard, NTable, NButton, useMessage, useDialog } from 'naive-ui'
+import { NCard, NTable, NButton, useMessage, useDialog, NTag } from 'naive-ui'
 import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { getTeamData, getUserData } from '../../../utility'
@@ -55,6 +55,7 @@ function jumpToUpdateTeam() {
   router.push('/info/team/updateteam')
 }
 
+
 </script>
 
 <template>

src/components/team/show/MemberInfo.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { NCard, NButton } from 'naive-ui'
+import { NCard, NButton, NTag } from 'naive-ui'
 import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import MemberCard from './MemberCard.vue'
@@ -10,6 +10,7 @@ const router = useRouter()
 // 展示用的数据
 const teamData = ref(getTeamData())
 
+
 // 是否是队长
 const isLeader = computed(() => {
   const userData = getUserData()
@@ -19,14 +20,38 @@ const isLeader = computed(() => {
 function jumpToManageMember() {
   router.push('/info/team/managemember')
 }
+
+
+const isAllTeacher = computed(() => {
+  for(const member in teamData['member']) {
+    if(member['type'] != 2) return false
+  }
+  return true
+})
+
+const teamName = computed(() => {
+  if(teamData.value['leader']['type'] === 3){
+    return "校友队"
+  } else if (teamData.value['leader']['type'] === 1) {
+    return "学生队"
+  } else if (teamData.value['leader']['type'] === 2 && isAllTeacher.value) {
+    return "老师队"
+  } else {
+    return "师生队"
+  }
+})
 </script>
 
 <template>
   <n-card title="🧑‍🎓 &nbsp; 队员信息" embedded :bordered="false" size="small">
     <template #header-extra>
+      <n-tag
+        style="margin-right: 10px"
+        size="small"
+        type="success"
+      >{{ teamName }}</n-tag>
       <n-button v-if="isLeader && !teamData['submitted']" @click="jumpToManageMember" size="small" round
-        >管理团队</n-button
-      >
+        >管理团队</n-button>
     </template>
     <!-- 领队信息 -->
     <member-card

src/components/user/register/RegisterStudentInfo.vue

@@ -248,7 +248,7 @@ function submit() {
         .then(function (response: AxiosResponse) {
           const responseData: any = response.data;
           if (responseData['code'] == 200) {
-            message.success('注册成功');
+            message.success('注册成功,中午12点队长开始抢名额');
             setTimeout(() => router.push('/loading'), 1000); // 跳转到加载信息页面
           } else {
             message.error(responseData['msg']); // 报错信息

src/components/user/register/RegisterTeacherInfo.vue

@@ -40,6 +40,11 @@ const rules = ref({
     message: '请选择性别',
     trigger: ['input', 'blur'],
   },
+  stu_id: {
+    required: true,
+    message: '请输入工号',
+    trigger: ['input', 'blur'],
+  },
   home: {
     required: true,
     message: '请选择故乡',

src/pages/Register.vue

@@ -140,13 +140,12 @@ function onPositiveClick() {
         <n-tab-pane name="student" tab="学生报名">
           <register-student-info></register-student-info>
         </n-tab-pane>
-
         <n-tab-pane name="teacher" tab="教职工报名">
           <register-teacher-info></register-teacher-info>
         </n-tab-pane>
-        <n-tab-pane name="alumni" tab="校友登录" >
-          <register-alumni-info></register-alumni-info>
-        </n-tab-pane>
+<!--        <n-tab-pane name="alumni" tab="校友登录" >-->
+<!--          <register-alumni-info></register-alumni-info>-->
+<!--        </n-tab-pane>-->
 
       </n-tabs>
     </n-card>