Merge branch 'feature-2025-1-10' into jenkins-test

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;
     };
 

src/views/intention-questionnaire/index.tsx

@@ -17,12 +17,13 @@ export default defineComponent({
   name: 'intention-questionnaire',
   setup() {
     const route = useRoute();
-    const shareTitle =
-      route.query.type === 'primarySchoolNo'
-        ? '关于开展课堂乐器数字化互通互联登记的通知'
-        : route.query.type === 'juniorSchoolNo'
-        ? '（初中）关于开展课堂乐器数字化互通互联登记的通知'
-        : '关于开展课堂乐器数字化互通互联登记的通知';
+    // const shareTitle =
+    //   route.query.type === 'primarySchoolNo'
+    //     ? '关于开展课堂乐器数字化互通互联登记的通知'
+    //     : route.query.type === 'juniorSchoolNo'
+    //     ? '（初中）关于开展课堂乐器数字化互通互联登记的通知'
+    //     : '关于开展课堂乐器数字化互通互联登记的通知';
+    const shareTitle = '关于开展课堂乐器数字化互通互联登记的通知'
     const weChatShare = useWeChatShare(
       shareTitle,
       '科学的教育改变世界，科技的力量让音乐传播更远，让孩子奏响心中的乐章',