Merge branch 'iteration-20231012'

src/tenant/music/train-list/index.tsx

@@ -189,8 +189,8 @@ export default defineComponent({
                                 </div>
                               </>
                             )}
-                          {searchObj.value.levels &&
-                            searchObj.value.levels.length > 0 && (
+                          {searchObj.value.levelList &&
+                            searchObj.value.levelList.length > 0 && (
                               <>
                                 <div class={styles.searchTitle}>级别</div>
                                 <div
@@ -200,9 +200,10 @@ export default defineComponent({
                                     styles['organ-radio']
                                   ]}
                                 >
-                                  {searchObj.value.levels.map(
+                                  {searchObj.value.levelList.map(
                                     (subject: any) => {
-                                      const isActive = subject === params.level
+                                      const isActive =
+                                        subject.id === params.level
                                       const type = isActive
                                         ? 'primary'
                                         : 'default'
@@ -213,10 +214,10 @@ export default defineComponent({
                                           type={type}
                                           round
                                           onClick={() => {
-                                            params.level = subject
+                                            params.level = subject.id
                                           }}
                                         >
-                                          {subject}
+                                          {subject.value}
                                         </Tag>
                                       )
                                     }
@@ -224,8 +225,8 @@ export default defineComponent({
                                 </div>
                               </>
                             )}
-                          {searchObj.value.types &&
-                            searchObj.value.types.length > 0 && (
+                          {searchObj.value.typeList &&
+                            searchObj.value.typeList.length > 0 && (
                               <>
                                 <div class={styles.searchTitle}>类型</div>
                                 <div
@@ -235,25 +236,28 @@ export default defineComponent({
                                     styles['organ-radio']
                                   ]}
                                 >
-                                  {searchObj.value.types.map((subject: any) => {
-                                    const isActive = subject === params.type
-                                    const type = isActive
-                                      ? 'primary'
-                                      : 'default'
-                                    return (
-                                      <Tag
-                                        size="large"
-                                        plain={isActive}
-                                        type={type}
-                                        round
-                                        onClick={() => {
-                                          params.type = subject
-                                        }}
-                                      >
-                                        {subject}
-                                      </Tag>
-                                    )
-                                  })}
+                                  {searchObj.value.typeList.map(
+                                    (subject: any) => {
+                                      const isActive =
+                                        subject.id === params.type
+                                      const type = isActive
+                                        ? 'primary'
+                                        : 'default'
+                                      return (
+                                        <Tag
+                                          size="large"
+                                          plain={isActive}
+                                          type={type}
+                                          round
+                                          onClick={() => {
+                                            params.type = subject.id
+                                          }}
+                                        >
+                                          {subject.value}
+                                        </Tag>
+                                      )
+                                    }
+                                  )}
                                 </div>
                               </>
                             )}

src/tenant/ranking-list/index.module.less

@@ -222,7 +222,7 @@
   border-radius: 20px 20px 0px 0px;
   border: 2px solid #FFFFFF;
   backdrop-filter: blur(6px);
-  min-height: 40vh;
+  min-height: calc(100vh - 220px - var(--header-height) - var(--bottom-height));
   margin: -62px 13px 0;
 
   .rankTitle {

src/views/tenantStudentRejest/index.tsx

@@ -44,13 +44,14 @@ export default defineComponent({
       subjectName: '',
       tenantGroupName: '',
       tenantGroupId: '',
-      birthdate: '',
+      birthdate: dayjs().format('YYYY-MM-DD'),
       code: '',
       genderName: '',
       tenantId: route.query.tenantId
     })
 
     const data = reactive({
+      birthdate: new Date(dayjs().year(), dayjs().month() + 1, dayjs().date()),
       schoolName: route.query.name || '',
       id: route.query.tenantId,
       userSchoolName: '',
@@ -472,7 +473,7 @@ export default defineComponent({
               min-date={data.minDate}
               max-date={data.maxDate}
               type="date"
-              v-model:value={forms.birthdate}
+              v-model={data.birthdate}
               onCancel={() => {
                 data.dateState = false
               }}