Merge branch 'master' into jenkins

src/views/accompany/music-list.tsx

@@ -120,7 +120,8 @@ export default defineComponent({
             ...data.pagenation,
             keyword: data.keyword,
             musicSheetCategoriesId: data.value2 || data.value1
-          }
+          },
+          hideLoading: false
         })
         if (Array.isArray(res?.data?.rows)) {
           data.list = [].concat(data.list, res.data.rows)

src/views/coursewarePlay/index.tsx

@@ -293,8 +293,12 @@ export default defineComponent({
       getCourseSchedule()
       window.addEventListener('message', iframeHandle)
     })
+    const playRef = ref()
     // 返回
     const goback = () => {
+      try {
+        playRef.value?.handleOut()
+      } catch (error) {}
       if (route.query.source == 'my-course') {
         router.back()
       }
@@ -637,7 +641,7 @@ export default defineComponent({
               返回
             </div>
             <div class={styles.menu}>{popupData.tabName}</div>
-            {data.isCourse && data.isRecordPlay && <PlayRecordTime list={data.itemList} />}
+            {data.isCourse && data.isRecordPlay && <PlayRecordTime ref={playRef} list={data.itemList} />}
           </div>
 
           <Transition name="right">

src/views/coursewarePlay/playRecordTime.tsx

@@ -30,6 +30,9 @@ export default defineComponent({
       clearInterval(timerRecord.value)
       handleRecord(true)
     }
+    expose({
+      handleOut
+    })
     const route = useRoute()
     const saveModel = reactive({
       loading: true,