Browse Source

fix: bug修复

TIANYONG 2 months ago
parent
commit
bec7c5de92

+ 2 - 2
src/views/fill-questionnaire/index.tsx

@@ -662,7 +662,7 @@ export default defineComponent({
         </div>
 
         {/* 是否在微信中打开 */}
-        <OWxTip />
+        {/* <OWxTip /> */}
 
         {forms.imgCodeStatus ? (
           <MImgCode
@@ -680,7 +680,7 @@ export default defineComponent({
           <div class={styles.successPop}>
             <div class={styles.successBox}>
               <img class={styles.sTitle} src={forms.participationFlag ? signSusIcon : subSusIcon} />
-              <p>{forms.participationFlag ? '您已报名成功,感谢您的参与' : '感谢您的宝贵意见'}</p>
+              <p>{forms.participationFlag ? '感谢您的参与' : '感谢您的宝贵意见'}</p>
               <img class={styles.sDone} src={doneIcon} onClick={() => {
                 forms.successPopShow = false
               }} />

+ 15 - 6
src/views/intention-questionnaire/index.tsx

@@ -104,8 +104,9 @@ export default defineComponent({
       } catch {
         forms.contentShow = true
       }
-      _initVideo('one', forms, videoIntervalRef)
-      _initVideo('two', forms, videoIntervalRef2)
+      console.log('初始化视频',111)
+      forms.player1 = _initVideo('one', forms, videoIntervalRef)
+      forms.player2 = _initVideo('two', forms, videoIntervalRef2)
     });
 
     const getAppIdAndCode = async (url?: string) => {
@@ -115,6 +116,7 @@ export default defineComponent({
         );
         // 判断是否有微信appId
         if (data) {
+          sessionStorage.setItem('isWxcode', '1');
           closeToast();
           goWechatAuth(data, url);
         }
@@ -129,8 +131,9 @@ export default defineComponent({
       const openId = sessionStorage.getItem('active-open-id');
       forms.openId = openId;
       const code = getUrlCode();
-      console.log(code, 'code')
-      if (!code) {
+      const isWxcode = sessionStorage.getItem('isWxcode');
+      console.log(code, 'code', isWxcode)
+      if (!code || isWxcode !== '1') {
         const newUrl =
           getHttpOrigin() +
           window.location.pathname +
@@ -158,7 +161,7 @@ export default defineComponent({
     const onPageShow = () => {
       console.log(forms.isPageHide, 'showInfo');
       if (forms.isPageHide) {
-        window.location.reload();
+        //window.location.reload();
       }
     };
     // 处理监听页面返回不刷新的问题
@@ -173,6 +176,12 @@ export default defineComponent({
     onUnmounted(() => {
       window.removeEventListener('pageshow', onPageShow);
       window.removeEventListener('pagehide', onPageHide);
+      forms.player1?.pause();
+      forms.player1?.src('');
+      forms.player1?.dispose();
+      forms.player2?.pause();
+      forms.player2?.src('');
+      forms.player2?.dispose();
     });
     return () => (
       <div class={styles['intention-page']}>
@@ -208,7 +217,7 @@ export default defineComponent({
         </div>
 
         {/* 是否在微信中打开 */}
-        <OWxTip />
+        {/* <OWxTip /> */}
 
 
         <div class={styles.bottomBtn}>

+ 1 - 0
src/views/intention-questionnaire/initVideo.ts

@@ -124,5 +124,6 @@ export const _initVideo = (type: string, forms: any, videoRef: any) => {
           i && i.remove();
         }
       });
+      return player
     }
 }