2 Commits 0d820a2048 ... df494a6285

Auteur SHA1 Message Date
  TIANYONG df494a6285 Merge branch 'feature-2025-1-10' into jenkins-test il y a 1 mois
  TIANYONG 93fc753bcd feat: 年级回显修改 il y a 1 mois

+ 1 - 1
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;

+ 10 - 8
src/views/fill-questionnaire/index.tsx

@@ -264,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