Merge branch 'feature-2025-1-10' into online

src/views/fill-questionnaire/index.module.less

@@ -92,7 +92,7 @@
       }
       .vdSchool {
         font-size: 15Px;
-        color: #000000;
+        color: #333;
         // margin-bottom: 4px;
         text-overflow: ellipsis;
         overflow: hidden;

src/views/fill-questionnaire/index.tsx

@@ -41,7 +41,7 @@ export default defineComponent({
     for (let i = 1; i <= 40; i++) {
       classList.push({ text: i + '班', value: i });
     }
-    const gradeList = route.query.meetingType === 'primarySchoolNo' || route.query.meetingType === 'primarySchoolYes' ? [
+    const gradeList = [
       {
         text: '一年级',
         value: 1
@@ -66,11 +66,6 @@ export default defineComponent({
         text: '六年级',
         value: 6
       },
-    ] : [
-      {
-        text: '六年级',
-        value: 6
-      },
       {
         text: '七年级',
         value: 7
@@ -82,8 +77,8 @@ export default defineComponent({
       {
         text: '九年级',
         value: 9
-      },
-    ]
+      }
+    ];
 
     const GRADE_ENUM = {
       '1': '一年级',
@@ -122,6 +117,7 @@ export default defineComponent({
       } else {
         tempList.push(...[...five, ...one, ...three]);
       }
+      // console.log('年级111',tempList)
       return tempList;
     };
 
@@ -268,14 +264,16 @@ export default defineComponent({
         forms.areaPopupIndex = data.districtCode || data.cityCode || data.provinceCode
         forms.areaPopupIndex = forms.areaPopupIndex ? String(forms.areaPopupIndex) : null
         const primarySchool = ['一年级','二年级','三年级','四年级','五年级','六年级',], juniorSchool = ['六年级','七年级','八年级','九年级'];
-        if (primarySchool.includes(data.currentGrade) && (route.query.meetingType === 'primarySchoolNo' || route.query.meetingType === 'primarySchoolYes')) {
-          forms.currentClass = data.currentClass
-          forms.currentGrade = data.currentGrade
-        }
-        if (juniorSchool.includes(data.currentGrade) && (route.query.meetingType === 'juniorSchoolNo' || route.query.meetingType === 'juniorSchool')) {
-          forms.currentClass = data.currentClass
-          forms.currentGrade = data.currentGrade
-        }
+        // if (primarySchool.includes(data.currentGrade) && (route.query.meetingType === 'primarySchoolNo' || route.query.meetingType === 'primarySchoolYes')) {
+        //   forms.currentClass = data.currentClass
+        //   forms.currentGrade = data.currentGrade
+        // }
+        // if (juniorSchool.includes(data.currentGrade) && (route.query.meetingType === 'juniorSchoolNo' || route.query.meetingType === 'juniorSchool')) {
+        //   forms.currentClass = data.currentClass
+        //   forms.currentGrade = data.currentGrade
+        // }
+        forms.currentClass = data.currentClass
+        forms.currentGrade = data.currentGrade
         forms.phone = data.phone
         forms.prePhone = data.phone
         forms.username = data.username