Merge branch 'iteration-20241008' into online

src/views/pre-register-active/index.module.less

@@ -109,47 +109,3 @@
     margin: 6px auto 0;
   }
 }
-
-.wxPopupDialog {
-  // position: relative;
-  overflow: initial;
-  // margin-top: -160px;
-
-  &::before {
-    position: absolute;
-    content: ' ';
-    top: -73px;
-    left: 50%;
-    margin-left: -86px;
-    display: inline-block;
-    background: url('../music-group/pre-apply/images/wx-no-top.png') no-repeat top center;
-    background-size: contain;
-    width: 172px;
-    height: 154px;
-  }
-}
-
-.popupContainer {
-  background: url('../music-group/pre-apply/images/wx-no-bg.png') no-repeat top center;
-  background-size: cover;
-  border-radius: 20px;
-  overflow: hidden;
-  padding: 0 20px;
-
-  .title {
-    padding-top: 57px;
-    text-align: center;
-    font-size: 18px;
-    font-weight: 500;
-    color: #3b2300;
-  }
-
-  .popupTips {
-    padding-top: 12px;
-    padding-bottom: 47px;
-    text-align: center;
-    font-size: 15px;
-    color: #777777;
-    line-height: 21px;
-  }
-}

src/views/pre-register-active/index.tsx

@@ -205,7 +205,7 @@ export default defineComponent({
         const schoolInstrumentList = data.school?.schoolInstrumentList || [];
         if (forms.schoolInstrumentSetType === 'SCHOOL') {
           const instrumentCode = schoolInstrumentList[0]?.instrumentCode;
-          forms.gradeList = getGradeList(data.gradeYear, instrumentCode);
+          forms.gradeList = getGradeList(data.school?.gradeYear, instrumentCode);
           forms.classList = classList;
         } else if (forms.schoolInstrumentSetType === 'GRADE') {
           schoolInstrumentList.forEach((item: any) => {
@@ -257,7 +257,7 @@ export default defineComponent({
           forms.gradeList = lastGradeList;
           forms.classList = [];
         } else {
-          forms.gradeList = getGradeList(data.gradeYear);
+          forms.gradeList = getGradeList(data.school.gradeYear);
           forms.classList = classList;
         }
         // 判断是否获取微信code码