Browse Source

Merge branch 'iteraion-20240914-pdf'

lex-xin 9 months ago
parent
commit
b7a919d3cf

+ 3 - 5
src/tenant/music/music-detail/new-index.tsx

@@ -118,11 +118,9 @@ export default defineComponent({
         const tempPdf = musicDetail.value?.jianPdfUrl
         initIframe(tempPdf, 'first', staffData.musicXml)
       } else {
-        if (!defaultImgs.value.staff) {
-          loading.value = false
-          const tempPdf = musicDetail.value?.musicPdfUrl
-          initIframe(tempPdf, 'first', staffData.musicXml)
-        }
+        loading.value = false
+        const tempPdf = musicDetail.value?.musicPdfUrl
+        initIframe(tempPdf, 'first', staffData.musicXml)
       }
     }
     watch(

+ 3 - 5
src/views/music/music-detail/index.tsx

@@ -148,11 +148,9 @@ export default defineComponent({
         const tempPdf = musicDetail.value?.jianPdfUrl
         initIframe(tempPdf, 'fixed', staffData.musicXml)
       } else {
-        if (!defaultImgs.value.staff) {
-          loading.value = false
-          const tempPdf = musicDetail.value?.musicPdfUrl
-          initIframe(tempPdf, 'staff', staffData.musicXml)
-        }
+        loading.value = false
+        const tempPdf = musicDetail.value?.musicPdfUrl
+        initIframe(tempPdf, 'staff', staffData.musicXml)
       }
     }