Merge branch 'feature-2025-1-10' of http://git.dayaedu.com/liushengqiang/classroom-app into feature-2025-1-10

src/views/fill-questionnaire/index.tsx

@@ -266,8 +266,15 @@ export default defineComponent({
         forms.provinceCode = data.provinceCode
         forms.cityCode = data.cityCode
         forms.districtCode = data.districtCode
-        forms.currentClass = data.currentClass
-        forms.currentGrade = data.currentGrade
+        const primarySchool = ['一年级','二年级','三年级','四年级','五年级','六年级',], juniorSchool = ['六年级','七年级','八年级','九年级'];
+        if (primarySchool.includes(forms.currentGrade) && (route.query.meetingType === 'primarySchoolNo' || route.query.meetingType === 'primarySchoolYes')) {
+          forms.currentClass = data.currentClass
+          forms.currentGrade = data.currentGrade
+        }
+        if (juniorSchool.includes(forms.currentGrade) && (route.query.meetingType === 'juniorSchoolNo' || route.query.meetingType === 'juniorSchool')) {
+          forms.currentClass = data.currentClass
+          forms.currentGrade = data.currentGrade
+        }
         forms.phone = data.phone
         forms.prePhone = data.phone
         forms.username = data.username

src/views/intention-questionnaire/initVideo.ts

@@ -96,6 +96,14 @@ export const _initVideo = (type: string, forms: any, videoRef: any) => {
 
       // 开始播放
       player.on('play', () => {
+          // 视频一播放
+          if (player.id() === 'register-video') {
+            forms.player2.pause()
+          }
+          // 视频二播放
+          if (player.id() === 'register-video2') {
+            forms.player1.pause()
+          }
         // console.log('play');
         // 判断视频计时器是否暂停，如果暂停则恢复
         videoRef.resume();

src/views/intention-questionnaire/show.tsx

@@ -56,6 +56,7 @@ export default defineComponent({
       videoLoading2: true,
       meetingType: 'primarySchoolNo' as 'primarySchoolNo' | 'primarySchoolYes' | 'juniorSchoolNo' | 'juniorSchool' | any,
       intentionInfo: null as any,
+      contentShow: false,
     });
 
     const showPopup = ref(false);
@@ -70,6 +71,7 @@ export default defineComponent({
 
     const getMessage = (ev: any) => {
       if (ev.data.api === 'parent-agenda') {
+        forms.contentShow = true
         // console.log('消息',ev.data)
         forms.contentA = ev.data.message.contentA || forms.contentA
         forms.contentB = ev.data.message.contentB || forms.contentB
@@ -82,6 +84,15 @@ export default defineComponent({
     onMounted(async () => {
       forms.meetingType = route.query.type || forms.meetingType;
       nextTick(() => {
+        // 是否加载完成
+        window.parent &&
+        window.parent.postMessage(
+          {
+            api: 'onLoad',
+            status: true
+          },
+          '*'
+        )
         const videoRef: any = document.querySelector('#register-video')
         const videoRef2: any = document.querySelector('#register-video2')
         if(videoRef) {
@@ -169,7 +180,7 @@ export default defineComponent({
     });
     return () => (
       <div class={styles['intention-page']}>
-        <div class={styles['content-box']}>
+        <div class={[styles['content-box'], !forms.contentShow && styles.hideContent]}>
           <div class={styles.contentBody} v-html={forms.contentA}></div>
           <div class={styles.contentBody}>
             <div class={styles.cbTitle}>一、什么是音乐（器乐）课堂数字化转型<span>（详见视频介绍）</span></div>