TIANYONG 1 éve
szülő
commit
d3ed8ce7bc

+ 14 - 14
src/views/courseware-list/component/book/index.tsx

@@ -344,7 +344,6 @@ export default defineComponent({
         const url =
           location.origin + location.pathname + '#/courseware-play?' + query;
         console.log('🚀 ~ url:', url);
-        debounceSkip.value = false;
         postMessage({
           api: 'openWebView',
           content: {
@@ -354,19 +353,20 @@ export default defineComponent({
             c_orientation: 0 // 0 横屏 1 竖屏
           }
         });
-        router.push({
-          path: '/courseware-play',
-          query: {
-            id: item.id,
-            subjectId: props.subjectId,
-            lessonCoursewareId: item.lessonCoursewareId,
-            courseId: props.bookData.id,
-            lessonCoursewareDetailId: item.lessonCoursewareDetailId,
-            name: item.zjName,
-            tab: props.tab,
-            coursewareDetailKnowledgeId: item.coursewareDetailKnowledgeId
-          }
-        });
+        // router.push({
+        //   path: '/courseware-play',
+        //   query: {
+        //     id: item.id,
+        //     subjectId: props.subjectId,
+        //     lessonCoursewareId: item.lessonCoursewareId,
+        //     courseId: props.bookData.id,
+        //     lessonCoursewareDetailId: item.lessonCoursewareDetailId,
+        //     name: item.zjName,
+        //     tab: props.tab,
+        //     coursewareDetailKnowledgeId: item.coursewareDetailKnowledgeId
+        //   }
+        // });
+        debounceSkip.value = false;
       }
     };
 

+ 2 - 1
src/views/courseware-play/component/instrument-info/index.tsx

@@ -68,6 +68,7 @@ export default defineComponent({
           '<video class="video-music" style="width: 100% !important;" controlslist="nodownload" poster="https://oss.dayaedu.com/ktqy/1701759849244.png"'
         );
         forms.dataInfo = data || {};
+        
         forms.musicList = data.knowledgeWikiResources.map((item: any) => {
           return {
             id: item.id,
@@ -236,7 +237,7 @@ export default defineComponent({
               </>
             )}
 
-            {forms.musicList.length <= 0 && forms.loading && (
+            {forms.musicList.length <= 0 && (
               <div class={styles.emptyBox}>
                 <img src={emptyIcon} />
                 <span>暂无曲目~</span>

+ 25 - 21
src/views/courseware-play/index.tsx

@@ -1132,27 +1132,31 @@ export default defineComponent({
                       // />
                     )}
                     {m.type === 'THEORY' && <Theory id={m.bizId} />}
-                    {m.type === 'MUSIC_WIKI' && (
-                      <InstrumentInfo
-                        type={'wiki'}
-                        id={m.bizId}
-                        show={popupData.activeIndex === mIndex}
-                      />
-                    )}
-                    {m.type === 'INSTRUMENT' && (
-                      <InstrumentInfo
-                        type={'instrument'}
-                        id={m.bizId}
-                        show={popupData.activeIndex === mIndex}
-                      />
-                    )}
-                    {m.type === 'MUSICIAN' && (
-                      <InstrumentInfo
-                        type={'musician'}
-                        id={m.bizId}
-                        show={popupData.activeIndex === mIndex}
-                      />
-                    )}
+                    {popupData.activeIndex === mIndex && 
+                    <>
+                      {m.type === 'MUSIC_WIKI' && (
+                        <InstrumentInfo
+                          type={'wiki'}
+                          id={m.bizId}
+                          show={popupData.activeIndex === mIndex}
+                        />
+                      )}
+                      {m.type === 'INSTRUMENT' && (
+                        <InstrumentInfo
+                          type={'instrument'}
+                          id={m.bizId}
+                          show={popupData.activeIndex === mIndex}
+                        />
+                      )}
+                      {m.type === 'MUSICIAN' && (
+                        <InstrumentInfo
+                          type={'musician'}
+                          id={m.bizId}
+                          show={popupData.activeIndex === mIndex}
+                        />
+                      )}
+                    </>
+                    }
                   </div>
                 ) : (
                   <div