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

src/views/fill-questionnaire/index.tsx

@@ -262,16 +262,16 @@ export default defineComponent({
         const { data } = await request.get(
           '/edu-app/open/schoolMeetingQuestion/detail?openId=' + forms.openId
         );
-        // console.log(12222,data)
+        console.log(12222,data)
         forms.provinceCode = data.provinceCode
         forms.cityCode = data.cityCode
         forms.districtCode = data.districtCode
         const primarySchool = ['一年级','二年级','三年级','四年级','五年级','六年级',], juniorSchool = ['六年级','七年级','八年级','九年级'];
-        if (primarySchool.includes(forms.currentGrade) && (route.query.meetingType === 'primarySchoolNo' || route.query.meetingType === 'primarySchoolYes')) {
+        if (primarySchool.includes(data.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')) {
+        if (juniorSchool.includes(data.currentGrade) && (route.query.meetingType === 'juniorSchoolNo' || route.query.meetingType === 'juniorSchool')) {
           forms.currentClass = data.currentClass
           forms.currentGrade = data.currentGrade
         }
@@ -282,7 +282,7 @@ export default defineComponent({
         forms.schoolName = data.schoolName
         forms.supportFlag = data.supportFlag
         forms.participationFlag = data.participationFlag
-        forms.areaName = data.provinceName + ' ' + data.cityName + ' ' + data.districtName
+        forms.areaName = data.provinceName + ' ' + data.cityName + ' ' + data.districtName || ''
         const gradeIdx = gradeList.find(item => item.text === data.currentGrade)?.value || 1
         // @ts-ignore
         const classIdx = classList.find(item => item.text === data.currentClass)?.value || 1
@@ -551,7 +551,7 @@ export default defineComponent({
           <div class={styles.formItem}>
             <p>1. 学校</p>
             {
-              forms.areaName || forms.schoolName ?
+              forms.schoolName ?
               <div class={[styles.valDone, forms.schoolName && styles.valDone2, forms.schoolStatus && styles.openVal]} onClick={() => forms.schoolStatus = true}>
                 {forms.schoolName && <span class={styles.vdSchool}>{forms.schoolName}</span>}
                 <span class={styles.vdArea}>{forms.areaName}</span>
@@ -669,7 +669,7 @@ export default defineComponent({
         </div>
 
         {/* 是否在微信中打开 */}
-        <OWxTip />
+        {/* <OWxTip /> */}
 
         {forms.imgCodeStatus ? (
           <MImgCode
@@ -713,7 +713,7 @@ export default defineComponent({
             onConfirm={({ selectedOptions }) => {
               forms.provinceCode = selectedOptions[0].value;
               forms.cityCode = selectedOptions[1].value;
-              forms.districtCode = selectedOptions[2]?.value;
+              forms.districtCode = selectedOptions[2]?.value || null;
 
               forms.areaName = selectedOptions
                 .map((item: any) => item?.text)

src/views/intention-questionnaire/index.tsx

@@ -44,7 +44,7 @@ export default defineComponent({
       contentD: '<p style="text-align: left;"><strong style="font-size:15px; color: #0B8BFE;">五、事项说明</strong></p><p style="text-align: left;">1.学校不涉及任何费用收取。学生所需的自用工具在市面上均可购买到，家长可自行根据实际情况为学生准备。</p><p style="text-align: left;">2.如学生有参加数字化转型的意愿，但存在特殊或特困情况，可先向学校进行登记，学校将尽力寻求资源协助家长解决。</p><p style="text-align: left;">在您了解上述内容后，请点击下一步进行意见填写：</p>',
       introductionVideo: "https://oss.dayaedu.com/ktyq/02/1739345029052.mp4",
       introductionVideoTime: 117,
-      coverImg: "https://oss.dayaedu.com/ktyq/1739361914232.png",
+      coverImg: "https://oss.dayaedu.com/ktyq/02/1739362815061.png",
       introductionVideo2: "https://oss.dayaedu.com/ktyq/02/1739345326291.mp4",
       introductionVideoTime2: 111,
       coverImg2: "https://oss.dayaedu.com/ktyq/02/1739324215341.png",
@@ -225,7 +225,7 @@ export default defineComponent({
         </div>
 
         {/* 是否在微信中打开 */}
-        <OWxTip />
+        {/* <OWxTip /> */}
 
 
         <div class={styles.bottomBtn}>

src/views/intention-questionnaire/show.tsx

@@ -44,7 +44,7 @@ export default defineComponent({
       contentD: '<p style="text-align: left;"><strong style="font-size:15px; color: #0B8BFE;">五、事项说明</strong></p><p style="text-align: left;">1.学校不涉及任何费用收取。学生所需的自用工具在市面上均可购买到，家长可自行根据实际情况为学生准备。</p><p style="text-align: left;">2.如学生有参加数字化转型的意愿，但存在特殊或特困情况，可先向学校进行登记，学校将尽力寻求资源协助家长解决。</p><p style="text-align: left;">在您了解上述内容后，请点击下一步进行意见填写：</p>',
       introductionVideo: "https://oss.dayaedu.com/ktyq/02/1739345029052.mp4",
       introductionVideoTime: 117,
-      coverImg: "https://oss.dayaedu.com/ktyq/1739361914232.png",
+      coverImg: "https://oss.dayaedu.com/ktyq/02/1739362815061.png",
       introductionVideo2: "https://oss.dayaedu.com/ktyq/02/1739345326291.mp4",
       introductionVideoTime2: 111,
       coverImg2: "https://oss.dayaedu.com/ktyq/02/1739324215341.png",
@@ -93,18 +93,18 @@ export default defineComponent({
           },
           '*'
         )
-        const videoRef: any = document.querySelector('#register-video')
-        const videoRef2: any = document.querySelector('#register-video2')
-        if(videoRef) {
-          const rect = videoRef?.getBoundingClientRect()
-          console.log(rect)
-          videoRef.style.height = rect.width / 16 * 9 + 'px'
-        }
-        if(videoRef2) {
-          const rect = videoRef2?.getBoundingClientRect()
-          console.log(rect)
-          videoRef2.style.height = rect.width / 16 * 9 + 'px'
-        }
+        // const videoRef: any = document.querySelector('#register-video')
+        // const videoRef2: any = document.querySelector('#register-video2')
+        // if(videoRef) {
+        //   const rect = videoRef?.getBoundingClientRect()
+        //   console.log(rect)
+        //   videoRef.style.height = rect.width / 16 * 9 + 'px'
+        // }
+        // if(videoRef2) {
+        //   const rect = videoRef2?.getBoundingClientRect()
+        //   console.log(rect)
+        //   videoRef2.style.height = rect.width / 16 * 9 + 'px'
+        // }
       })
       _initVideo('one', forms, videoIntervalRef)
       _initVideo('two', forms, videoIntervalRef2)
@@ -184,29 +184,37 @@ export default defineComponent({
           <div class={styles.contentBody} v-html={forms.contentA}></div>
           <div class={styles.contentBody}>
             <div class={styles.cbTitle}>一、什么是音乐（器乐）课堂数字化转型<span>（详见视频介绍）</span></div>
-            <div class={[styles['video-content']]}>
-              <video
-                id="register-video"
-                class={styles['video']}
-                src={forms.introductionVideo}
-                playsinline={true}
-                poster={forms.coverImg}
-                preload="auto"></video>
-            </div> 
+            <div class={styles.videoBoxCon}>
+              <div class={styles.videoBox}>
+                <div class={[styles['video-content']]}>
+                  <video
+                    id="register-video"
+                    class={styles['video']}
+                    src={forms.introductionVideo}
+                    playsinline={true}
+                    poster={forms.coverImg}
+                    preload="auto"></video>
+                </div> 
+              </div>
+            </div>
           </div>
           <div class={styles.contentBody} v-html={forms.contentB}></div>
           <div class={styles.contentBody} v-html={forms.contentC}></div>
           <div class={styles.contentBody}>
-            <div class={styles.cbTitle}>四、什么是器乐数字 Ai<span>（详见视频介绍）</span></div>          
-            <div class={[styles['video-content']]}>
-              <video
-                id="register-video2"
-                class={styles['video']}
-                src={forms.introductionVideo2}
-                playsinline={true}
-                poster={forms.coverImg2}
-                preload="auto"></video>
-            </div>  
+            <div class={styles.cbTitle}>四、什么是器乐数字 Ai<span>（详见视频介绍）</span></div>   
+            <div class={styles.videoBoxCon}>
+              <div class={styles.videoBox}>       
+                <div class={[styles['video-content']]}>
+                  <video
+                    id="register-video2"
+                    class={styles['video']}
+                    src={forms.introductionVideo2}
+                    playsinline={true}
+                    poster={forms.coverImg2}
+                    preload="auto"></video>
+                </div>  
+              </div>
+            </div>
           </div>          
           <div class={styles.contentBody} v-html={forms.contentD}></div>
         </div>