lex 1 년 전
부모
커밋
413ba733f5

+ 1 - 1
src/tenant/music/music-detail/download.module.less

@@ -4,7 +4,7 @@
 
 .musicContainer {
   text-align: center;
-  max-height: 520px;
+  max-height: 420px;
   overflow: hidden;
   overflow-y: auto;
 

+ 1 - 0
src/tenant/music/music-detail/download.tsx

@@ -58,6 +58,7 @@ export default defineComponent({
         })
         const canvas = await addWatermark(titleCanvas, '酷乐秀')
         image.value = convasToImg(canvas)
+        console.log(image.value, 'image.value')
         await saveImg()
       }
     }

+ 6 - 3
src/tenant/music/music-detail/imageFunction.ts

@@ -7,13 +7,12 @@ export const imgToCanvas = async (url: string) => {
   if (url && typeof url == 'string' && url.includes('data:image')) {
     img.src = url
   } else {
-    img.src = url + `?${new Date().getTime()}`
+    img.src = url + `?t=${+new Date()}`
   }
 
   // 防止跨域引起的 Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported.
   await new Promise(resolve => (img.onload = resolve))
   // 创建canvas DOM元素,并设置其宽高和图片一样
-
   const canvas = document.createElement('canvas')
   canvas.width = img.width
   canvas.height = img.height
@@ -43,7 +42,11 @@ export const addWatermark = async (canvas, text) => {
     const img = document.createElement('img')
     img.setAttribute('crossOrigin', 'anonymous')
     // 为了处理base64 和 连接加载不同的
-    if (imgList && typeof imgList == 'string' && imgList.includes('data:image')) {
+    if (
+      imgList &&
+      typeof imgList == 'string' &&
+      imgList.includes('data:image')
+    ) {
       img.src = imgList
     } else {
       img.src = imgList + `?${new Date().getTime()}`

+ 2 - 2
src/tenant/music/music-detail/new-index.tsx

@@ -589,8 +589,8 @@ export default defineComponent({
     const osmdPreviewRef = ref()
     /** 渲染五线谱 */
     const renderStaff = () => {
-      // staffData.iframeSrc = `${location.origin}/osmd/index.html`
-      staffData.iframeSrc = `${location.origin}${location.pathname}osmd/index.html`
+      staffData.iframeSrc = `${location.origin}/osmd/index.html`
+      // staffData.iframeSrc = `${location.origin}${location.pathname}osmd/index.html`
       staffData.musicXml = musicDetail.value?.xmlFileUrl || ''
       staffData.partList = musicDetail.value?.background || []
       staffData.instrumentName = getInstrumentName(