lex 2 years ago
parent
commit
0f239f1259

+ 1 - 1
src/school/App.tsx

@@ -28,7 +28,7 @@ export default defineComponent({
               message: () => (
                 <>
                   <Vue3Lottie class={'toastAnimate'} animationData={AstronautJSON}></Vue3Lottie>
-                  <p>加载中...</p>
+                  {/* <p>加载中...</p> */}
                 </>
               )
             }}

+ 1 - 1
src/student/App.tsx

@@ -28,7 +28,7 @@ export default defineComponent({
               message: () => (
                 <>
                   <Vue3Lottie class={'toastAnimate'} animationData={AstronautJSON}></Vue3Lottie>
-                  <p>加载中...</p>
+                  {/* <p>加载中...</p> */}
                 </>
               )
             }}

+ 9 - 3
src/styles/index.less

@@ -193,9 +193,15 @@ body {
 }
 
 .appRootToast {
-  // .van-overlay {
-  //   background: rgba(0, 0, 0, 0.4);
-  // }
+  .van-overlay {
+    // background: rgba(0, 0, 0, 0.4);
+    background: #fff;
+    // transition: all 0 ease;
+  }
+  .van-fade-enter-from,
+  .van-fade-enter-active {
+    animation: none;
+  }
   .van-toast__text {
     width: 100px;
     height: 100px;

+ 1 - 1
src/teacher/App.tsx

@@ -28,7 +28,7 @@ export default defineComponent({
               message: () => (
                 <>
                   <Vue3Lottie class={'toastAnimate'} animationData={AstronautJSON}></Vue3Lottie>
-                  <p>加载中...</p>
+                  {/* <p>加载中...</p> */}
                 </>
               )
             }}

+ 75 - 34
src/views/unit-test/model/play-question/index.tsx

@@ -12,6 +12,7 @@ import iconSong from '../../images/icon-song.png'
 import AnserTitle from '../anser-title'
 import { QuestionType } from '../../unit'
 import AnswerAnalysis from '../answer-analysis'
+import { browser } from '@/helpers/utils'
 
 // 单选和多选题
 export default defineComponent({
@@ -93,46 +94,86 @@ export default defineComponent({
 
       // 打开页面监听
       listenerMessage('webViewOnResume', () => {
-        promisefiyPostMessage({ api: 'getCache', content: { key: 'h5-orchestra-unit' } }).then(
-          (res: any) => {
-            const content = res.content
-            if (content.value) {
-              console.log(content.value, 'h5-orchestra-unit')
-              const result = content.value ? JSON.parse(content.value) : {}
-              console.log('🚀 ~ listenerMessage ~ result', result, props.data.questionId)
+        if (browser().android) {
+          const instance: any =
+            (window as any).ORCHESTRA || (window as any).webkit?.messageHandlers?.ORCHESTRA
 
-              if (result.questionId === props.data.id) {
-                const tempScore = result.score || 0
-                // 跟上一次分数对比
-                if (state.score < tempScore) {
-                  state.score = result.score || 0
-                }
-              }
+          console.log(instance, '-------------')
+          const result = instance.getCache2('h5-orchestra-unit')
+          if (result.questionId === props.data.id) {
+            const tempScore = result.score || 0
+            // 跟上一次分数对比
+            if (state.score < tempScore) {
+              state.score = result.score || 0
+            }
+          }
+          emit('update:value', [
+            {
+              answerId: '',
+              answer: state.score,
+              answerExtra: ''
+            }
+          ])
 
-              emit('update:value', [
-                {
-                  answerId: '',
-                  answer: state.score,
-                  answerExtra: ''
-                }
-              ])
+          // 置空,存的缓存
+          promisefiyPostMessage({
+            api: 'setCache',
+            content: {
+              key: 'h5-orchestra-unit',
+              value: ''
+            }
+          })
+
+          // 关闭页面监听
+          removeListenerMessage('webViewOnResume', () => {
+            //
+          })
+        } else {
+          promisefiyPostMessage({ api: 'getCache', content: { key: 'h5-orchestra-unit' } }).then(
+            (res: any) => {
+              const content = res.content
+              if (content.value) {
+                console.log(
+                  '🚀 ~ listenerMessage ~ content.value',
+                  content.value,
+                  '---------------'
+                )
+                const result = content.value ? JSON.parse(content.value) : {}
+                console.log('🚀 ~ listenerMessage ~ result', result, props.data.questionId)
 
-              // 置空,存的缓存
-              promisefiyPostMessage({
-                api: 'setCache',
-                content: {
-                  key: 'h5-orchestra-unit',
-                  value: ''
+                if (result.questionId === props.data.id) {
+                  const tempScore = result.score || 0
+                  // 跟上一次分数对比
+                  if (state.score < tempScore) {
+                    state.score = result.score || 0
+                  }
                 }
+
+                emit('update:value', [
+                  {
+                    answerId: '',
+                    answer: state.score,
+                    answerExtra: ''
+                  }
+                ])
+
+                // 置空,存的缓存
+                promisefiyPostMessage({
+                  api: 'setCache',
+                  content: {
+                    key: 'h5-orchestra-unit',
+                    value: ''
+                  }
+                })
+              }
+
+              // 关闭页面监听
+              removeListenerMessage('webViewOnResume', () => {
+                //
               })
             }
-
-            // 关闭页面监听
-            removeListenerMessage('webViewOnResume', () => {
-              //
-            })
-          }
-        )
+          )
+        }
       })
     }