Merge branch 'fine-music-score' into jenkins

src/views/music/music-detail/imageFunction.ts

@@ -4,7 +4,7 @@ export const imgToCanvas = async (url: string) => {
   const img = document.createElement('img')
   img.setAttribute('crossOrigin', 'anonymous')
   // 为了处理base64 和 连接加载不同的
-  if (url.includes('data:image')) {
+  if (url && url.includes('data:image')) {
     img.src = url
   } else {
     img.src = url + `?${new Date().getTime()}`
@@ -43,7 +43,7 @@ export const addWatermark = async (canvas, text) => {
     const img = document.createElement('img')
     img.setAttribute('crossOrigin', 'anonymous')
     // 为了处理base64 和 连接加载不同的
-    if (imgList.includes('data:image')) {
+    if (imgList && imgList.includes('data:image')) {
       img.src = imgList
     } else {
       img.src = imgList + `?${new Date().getTime()}`

src/views/music/music-detail/index.tsx

@@ -202,7 +202,7 @@ export default defineComponent({
         location.host.includes('192.168') ||
         location.host.includes('localhost')
       ) {
-        url = 'http://dev.colexiu.com'
+        url = 'https://dev.colexiu.com'
       }
       const music = musicDetail.value
       let subjectId = ''