lex 8 ماه پیش
والد
کامیت
8f139f01d9

+ 7 - 7
src/tenant/music/component/song/index.module.less

@@ -32,8 +32,7 @@
       height: 50px;
       border-radius: 8px;
       margin-right: 10px;
-      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAAASFBMVEXq6ur29vbIyMjFxcW2tra9vb3Pz8/Dw8PKysrR0dG/v7+4uLi6urrMzMzT09PY2Njb29vn5+fe3t7k5OTh4eHV1dXz8/Pw8PBVXjwWAAACtUlEQVRo3u3WS7LjIAxAUSIFJD7mY+Nk/zttESduu3uW4Bln8OpldEuCoqyGYRiGYRiGYbhcKUudc65FXeZVSAbI6aAhVnWFpeY6G9IvIcgfmLtHypznHNE5985477Xn0nmUXFMyzu0Z6Yjg+m6u1pyStbx1QnNvvO69uJqEbRVISxswsW6d3jchp3VdUU/l9vHM7u5d3/OZ1xgjuHw7eiTvTddLEKON7OrtH4ruHddWpGKNS7f/PBE7HsxqjEF47NtSj73T71YXI/jvwTwp4PPzYzHdhrGTMUDq9pa89vnVW7JlUt87PcLRTNN02Fn2wdeW03fhy/c3i6d1XvadTcxM/PciG2elae+b75+CmSdjjZS2pgDix23X/lXtYWvTpO9PY+IWiq1UCoNAeN5O8t379rqF9etMahk5d2PXuCZokMo5s9594GS1Tj9koGWEtTEBIkpmPWeS19BWSj+cjWT4nZHV4UadMrPf5ijl+/v8yuwdJCJE4tPplKDzr08lAxwyhhrpHOd5OpnmR5YR/mZWpm2e6XaAOv6ayQYJ9ky05JwjJHPMGG1+zRQGItgybRxwAimebrSe1K/yJAPgvrVJt3HOmay5w+MP5LTj9zRGCyLbO6MqoNPBazByNqvVwuHpbJIs7XczkGTaVxIh4paBx+lsrOrRQdKS2QRB54fA6qR6qOz0J+MFAeVDhrt9dCYKwe8ZhOPWHtTvW7Bkdp/FaQA8jFMcq56WeU4t5SSDWPYb4LLqLErGwysD6vMhSKVzZWk3geDVIayvTHRJdQZBVsZbBomsLG4h7l2xXs6fGfYO8Yq0XFBxfMqIufO5sFRwOmSkg9j7ls1aDoamY4cAZtXbYkK4a5j2DICp6gLVBB8cbPMwTFldZInkvUNpcJyLutCSVxtTLWoYhmEYhmEYhiv9Aca9JZ3n1bdkAAAAAElFTkSuQmCC')
-        no-repeat;
+      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAABmCAMAAAAOARRQAAAASFBMVEXq6ur29vbIyMjFxcW2tra9vb3Pz8/Dw8PKysrR0dG/v7+4uLi6urrMzMzT09PY2Njb29vn5+fe3t7k5OTh4eHV1dXz8/Pw8PBVXjwWAAACtUlEQVRo3u3WS7LjIAxAUSIFJD7mY+Nk/zttESduu3uW4Bln8OpldEuCoqyGYRiGYRiGYbhcKUudc65FXeZVSAbI6aAhVnWFpeY6G9IvIcgfmLtHypznHNE5985477Xn0nmUXFMyzu0Z6Yjg+m6u1pyStbx1QnNvvO69uJqEbRVISxswsW6d3jchp3VdUU/l9vHM7u5d3/OZ1xgjuHw7eiTvTddLEKON7OrtH4ruHddWpGKNS7f/PBE7HsxqjEF47NtSj73T71YXI/jvwTwp4PPzYzHdhrGTMUDq9pa89vnVW7JlUt87PcLRTNN02Fn2wdeW03fhy/c3i6d1XvadTcxM/PciG2elae+b75+CmSdjjZS2pgDix23X/lXtYWvTpO9PY+IWiq1UCoNAeN5O8t379rqF9etMahk5d2PXuCZokMo5s9594GS1Tj9koGWEtTEBIkpmPWeS19BWSj+cjWT4nZHV4UadMrPf5ijl+/v8yuwdJCJE4tPplKDzr08lAxwyhhrpHOd5OpnmR5YR/mZWpm2e6XaAOv6ayQYJ9ky05JwjJHPMGG1+zRQGItgybRxwAimebrSe1K/yJAPgvrVJt3HOmay5w+MP5LTj9zRGCyLbO6MqoNPBazByNqvVwuHpbJIs7XczkGTaVxIh4paBx+lsrOrRQdKS2QRB54fA6qR6qOz0J+MFAeVDhrt9dCYKwe8ZhOPWHtTvW7Bkdp/FaQA8jFMcq56WeU4t5SSDWPYb4LLqLErGwysD6vMhSKVzZWk3geDVIayvTHRJdQZBVsZbBomsLG4h7l2xXs6fGfYO8Yq0XFBxfMqIufO5sFRwOmSkg9j7ls1aDoamY4cAZtXbYkK4a5j2DICp6gLVBB8cbPMwTFldZInkvUNpcJyLutCSVxtTLWoYhmEYhmEYhiv9Aca9JZ3n1bdkAAAAAElFTkSuQmCC') no-repeat;
       background-size: 100% 100%;
 
       img {
@@ -102,7 +101,7 @@
       .tags {
         margin-right: 6px;
 
-        & > span {
+        &>span {
           display: inline-block;
           background: #ffeaf2;
           border-radius: 4px;
@@ -167,6 +166,7 @@
   width: 15px;
   height: 16px;
   margin-right: 6px;
+  flex-shrink: 0;
 }
 
 .musicInfo {
@@ -186,7 +186,7 @@
     margin-right: 14px;
     word-break: break-all;
 
-    > h4 {
+    >h4 {
       font-size: 16px;
       font-weight: bold;
       color: #1a1a1a;
@@ -194,7 +194,7 @@
       padding-bottom: 3px;
     }
 
-    > p {
+    >p {
       font-size: 12px;
       color: #999;
       line-height: 17px;
@@ -237,14 +237,14 @@
     margin-right: 14px;
     word-break: break-all;
 
-    > h4 {
+    >h4 {
       color: var(--music-list-item-title-color);
       font-size: 14px;
       font-weight: 600;
       width: 200px;
     }
 
-    > p {
+    >p {
       color: var(--music-list-item-mate-color);
       line-height: 17px;
     }

+ 5 - 1
src/tenant/music/component/song/index.tsx

@@ -131,7 +131,11 @@ export default defineComponent({
 
                   <span class={[styles.name]}>
                     {/* {n.addName ? `上传者:${n.addName}` : `作曲:${n.composer}`} */}
-                    {n.composer ? `${n.composer}` : `${n.addName}`}
+                    {n.composer
+                      ? `${n.composer}`
+                      : n.addName
+                      ? `${n.addName}`
+                      : ''}
                   </span>
                 </div>
               </div>

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

@@ -687,12 +687,12 @@ export default defineComponent({
           staffData.xmlPartList = partList
         }
 
-        // staffData.iframeSrc = `${
-        //   location.origin
-        // }/osmd/index.html?t=${new Date().getTime()}`
-        staffData.iframeSrc = `${location.origin}${
-          location.pathname
-        }osmd/index.html?t=${new Date().getTime()}`
+        staffData.iframeSrc = `${
+          location.origin
+        }/osmd/index.html?t=${new Date().getTime()}`
+        // staffData.iframeSrc = `${location.origin}${
+        //   location.pathname
+        // }osmd/index.html?t=${new Date().getTime()}`
         staffData.musicXml = musicDetail.value?.xmlFileUrl || ''
         const tempList = musicDetail.value?.background || []
         const tempPartList = [] as any

+ 1 - 1
vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.colexiu.com/'
-const proxyUrl = 'https://dev.colexiu.com/'
+const proxyUrl = 'https://test.colexiu.com/'
 // const proxyUrl = 'http://192.168.3.14:8000/'
 export default defineConfig({
   base: './',