fix: bug修改

src/views/fill-questionnaire/index.module.less

@@ -54,6 +54,7 @@
       border-radius: 4px;
       min-height: 37px;
       padding: 0 10px;
+      position: relative;
       >i {
         position: absolute;
         right: 10px;
@@ -68,11 +69,21 @@
       .vdArea {
         font-size: 13px;
         color: #777777;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        word-break: break-all;
+        white-space: nowrap;
+        padding-right: 20px;
       }
       .vdSchool {
         font-size: 15px;
         color: #000000;
         margin-bottom: 4px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        word-break: break-all;
+        white-space: nowrap;
+        padding-right: 20px;
       }
     }
     .openVal {
@@ -127,13 +138,14 @@
 }
 
 .successPop {
-  position: absolute;
+  position: fixed;
   left: 0;
   top: 0;
   width: 100vw;
-  height: 100vh;
+  height: 100%;
   z-index: 8;
   background: rgba(0, 0, 0, 0.7);
+  overflow: hidden;
 }
 .successBox {
   position: fixed;

src/views/fill-questionnaire/index.tsx

@@ -169,7 +169,7 @@ export default defineComponent({
       countDownStatus: true,
       countDownTime: 1000 * 120, // 倒计时时间
       imgCodeStatus: false,
-      successPopShow: true, // 提交结果弹窗
+      successPopShow: false, // 提交结果弹窗
       schoolStatus: false,
       schoolPopupShow: false,
       schoolLoading: false,
@@ -413,7 +413,7 @@ export default defineComponent({
     };
     const openAreaPop = () => {
       console.log(11111)
-      forms.schoolStatus = true
+      // forms.schoolStatus = true
       // 如果没有选省市区，默认打开省市区弹窗
       if (!forms.areaName) {
         forms.showPicker = true
@@ -429,7 +429,7 @@ export default defineComponent({
             testFlag: true,
             provinceCode: forms.provinceCode,
             cityCode: forms.cityCode,
-            districtCode: forms.districtCode
+            regionCode: forms.districtCode
           }
         });
         forms.schoolAreaList = data;
@@ -545,7 +545,7 @@ export default defineComponent({
             <p>1. 学校</p>
             {
               forms.areaName || forms.schoolName ? 
-              <div class={[styles.valDone, forms.schoolName && styles.valDone2]} onClick={() => forms.schoolStatus = true}>
+              <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>
                 <i></i>
@@ -698,7 +698,12 @@ export default defineComponent({
             visibleOptionNum={9}
             optionHeight={46}
             areaList={forms.areaList}
-            onCancel={() => (forms.showPicker = false)}
+            onCancel={() => { 
+              forms.showPicker = false 
+              // if (!forms.areaName) {
+              //   forms.schoolStatus = false
+              // }
+            }}
             onConfirm={({ selectedOptions }) => {
               forms.provinceCode = selectedOptions[0].value;
               forms.cityCode = selectedOptions[1].value;
@@ -709,6 +714,9 @@ export default defineComponent({
                 .join(' ');
 
               forms.showPicker = false;
+              // if (!forms.areaName) {
+              //   forms.schoolStatus = false
+              // }              
               forms.schoolAreaId = null;
               forms.schoolName = '';
               forms.gradeNumText = '';
@@ -717,6 +725,7 @@ export default defineComponent({
               forms.currentClassText = '';
               // console.log('地址1')
               getSchoolAreaList();
+              forms.schoolStatus = true
             }}
           />
         </Popup>

src/views/intention-questionnaire/index.module.less

@@ -92,6 +92,10 @@
   }
 }
 
+.hideContent {
+  opacity: 0;
+}
+
 .video-content {
   margin-top: 10px;
   min-height: 170px;
@@ -190,6 +194,7 @@
     font-size: 13px;
     color: #777777;
     text-align: center;
+    margin-bottom: 6px;
     i {
       font-weight: 500;
       color: #FF5A56;

src/views/intention-questionnaire/index.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);
@@ -87,7 +88,7 @@ export default defineComponent({
       })
       try {
         // 判断是否获取微信code码
-        if (!forms.code) return;
+        if (!forms.code && browser().weixin) return;
         const { data } = await request.get(
           '/edu-app/open/meetingQuestionSetting/detail?type=' + forms.meetingType + '&weChatCode=' + forms.code
         );
@@ -99,9 +100,9 @@ export default defineComponent({
           forms.openId = data.openId || forms.openId
           sessionStorage.setItem('active-open-id', forms.openId);
         }
-        
+        forms.contentShow = true
       } catch {
-        //
+        forms.contentShow = true
       }
       _initVideo('one', forms, videoIntervalRef)
       _initVideo('two', forms, videoIntervalRef2)
@@ -175,7 +176,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>