Browse Source

fix: bug修改

TIANYONG 4 months ago
parent
commit
d360dae0a7

+ 9 - 2
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

+ 9 - 0
src/views/intention-questionnaire/show.tsx

@@ -82,6 +82,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) {