Update index.tsx

src/views/student-register/index.tsx

@@ -160,7 +160,9 @@ export default defineComponent({
       registerExpireTime: null as any, // 结束时间
       instrumentCode: null as any, // 乐器编码
       activeOverTime: 0, // 活动结束时间
-      activeOverStatus: true // 活动是否结束 默认已结束
+      activeOverStatus: true, // 活动是否结束 默认已结束
+      gradePopupIndex: [] as any, // 年级下拉索引
+      classPopupIndex: [] as any // 班级下拉索引
     });
 
     const state = reactive({
@@ -180,9 +182,9 @@ export default defineComponent({
       client_secret: 'cooleshow-student',
       extra: {
         nickname: '',
-        currentGradeNum: '',
-        currentClass: '',
-        gender: 1,
+        currentGradeNum: '' as any,
+        currentClass: '' as any,
+        gender: 1 as any,
         registerType: null as any, // 报名类型
         giftVipDay: 0 // 赠送会员天数
       },
@@ -305,6 +307,11 @@ export default defineComponent({
               instrumentCode: item.instrumentCode
             });
           });
+          forms.gradeList.sort((a: any, b: any) => a.value - b.value);
+          console.log(
+            forms.gradeList.sort((a: any, b: any) => a.value - b.value),
+            'forms.gradeList.sort((a: any, b: any) => a.value - b.value)'
+          );
           forms.classList = classList;
         } else if (data.schoolInstrumentSetType === 'CLASS') {
           // 班级
@@ -339,9 +346,9 @@ export default defineComponent({
             });
             // 排序班级
             list.classList.sort((a: any, b: any) => a.value - b.value);
-
             lastGradeList.push(list);
           });
+          lastGradeList.sort((a: any, b: any) => a.value - b.value);
           forms.gradeList = lastGradeList;
           forms.classList = [];
         } else {
@@ -1110,7 +1117,10 @@ export default defineComponent({
                 readonly
                 clickable={false}
                 modelValue={forms.gradeNumText}
-                onClick={() => (forms.gradeStatus = true)}
+                onClick={() => {
+                  forms.gradePopupIndex = [studentInfo.extra.currentGradeNum];
+                  forms.gradeStatus = true;
+                }}
               />
               <Field
                 clearable={false}
@@ -1130,6 +1140,7 @@ export default defineComponent({
                     showToast('请先选择年级');
                     return;
                   }
+                  forms.classPopupIndex = [studentInfo.extra.currentClass];
                   forms.classStatus = true;
                 }}
               />
@@ -1381,6 +1392,7 @@ export default defineComponent({
           class={'popupBottomSearch'}>
           <Picker
             showToolbar
+            v-model={forms.gradePopupIndex}
             columns={forms.gradeList}
             onCancel={() => (forms.gradeStatus = false)}
             onConfirm={(val: any) => {
@@ -1410,6 +1422,7 @@ export default defineComponent({
           class={'popupBottomSearch'}>
           <Picker
             showToolbar
+            v-model={forms.classPopupIndex}
             columns={forms.classList}
             onCancel={() => (forms.classStatus = false)}
             onConfirm={(val: any) => {