Browse Source

Merge branch '2023-8-21_指法预览' into online

liushengqiang 1 year ago
parent
commit
cc8fde0cda

+ 4 - 0
src/views/attend-class/index.tsx

@@ -309,6 +309,10 @@ export default defineComponent({
         activeData.model =
           ev.data.show || (ev.data.playState == 'play' ? false : true);
       }
+      if (ev.data?.api === 'api_fingerPreView') {
+        clearInterval(activeData.timer);
+        activeData.model = !ev.data.state;
+      }
     };
 
     onMounted(() => {

+ 1 - 1
src/views/setting/components/schoolInfo/index.module.less

@@ -57,8 +57,8 @@
       }
 
       &.n-input--disabled {
+        background-color: #F5F6FA;
         .n-input__input-el {
-          background-color: #F5F6FA;
           color: rgba(0, 0, 0, 0.4);
         }
       }

+ 5 - 0
src/views/xiaoku-music/component/play-item/index.module.less

@@ -49,6 +49,11 @@
       opacity: 0;
       animation: rotateImg 6s linear infinite;
     }
+    &.imgRotate{
+      img {
+        animation-play-state: paused;
+      }
+    }
 
     img[data-loaded="true"] {
       opacity: 1;

+ 5 - 1
src/views/xiaoku-music/component/play-item/index.tsx

@@ -86,7 +86,11 @@ export default defineComponent({
     return () => (
       <div class={[styles.container, props.show ? styles.show : styles.hidden]}>
         <div class={[styles.item]}>
-          <div class={styles.img}>
+          <div
+            class={[
+              styles.img,
+              props.playState !== 'play' && styles.imgRotate
+            ]}>
             <NImage
               lazy
               objectFit="cover"

+ 15 - 1
src/views/xiaoku-music/index.tsx

@@ -5,6 +5,7 @@ import {
   defineComponent,
   nextTick,
   onMounted,
+  onUnmounted,
   reactive,
   ref
 } from 'vue';
@@ -70,7 +71,8 @@ export default defineComponent({
       showPlayer: false,
       previewModal: false,
       showPreivew: false,
-      previewUrl: ''
+      previewUrl: '',
+      showCloseBtn: true
     });
     const showGuide = ref(false);
     const userStore = useUserStore();
@@ -126,6 +128,13 @@ export default defineComponent({
       getList();
     };
 
+    // ifram事件处理
+    const iframeHandle = (ev: MessageEvent) => {
+      if (ev.data?.api === 'api_fingerPreView'){
+        data.showCloseBtn = !ev.data.state
+      }
+    };
+
     onMounted(async () => {
       getSubjects();
       await getList();
@@ -137,7 +146,11 @@ export default defineComponent({
       nextTick(() => {
         obv.observe(spinRef.value);
       });
+      window.addEventListener('message', iframeHandle);
     });
+    onUnmounted(() => {
+      window.removeEventListener('message', iframeHandle);
+    })
     /** 查看收藏状态 */
     const getFavitor = async (item: any) => {
       const res = await api_materialFavoriteStatus({
@@ -463,6 +476,7 @@ export default defineComponent({
           displayDirective="show">
           <NSpin show={data.showPreivew} style="--n-opacity-spinning: 1;">
             <img
+              style={{display: data.showCloseBtn ? '' : 'none'}}
               src={icon_close}
               class={styles.previewClose}
               onClick={() => {