lex-xin 6 місяців тому
батько
коміт
0d88c84892

+ 0 - 2
components.d.ts

@@ -15,7 +15,6 @@ declare module '@vue/runtime-core' {
     NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
     NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem']
     NButton: typeof import('naive-ui')['NButton']
-    NCheckbox: typeof import('naive-ui')['NCheckbox']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NCountdown: typeof import('naive-ui')['NCountdown']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
@@ -37,7 +36,6 @@ declare module '@vue/runtime-core' {
     NRadio: typeof import('naive-ui')['NRadio']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NSpace: typeof import('naive-ui')['NSpace']
-    NSpin: typeof import('naive-ui')['NSpin']
     NTooltip: typeof import('naive-ui')['NTooltip']
     Recharge: typeof import('./src/components/Lockscreen/Recharge.vue')['default']
     RouterError: typeof import('./src/components/RouterError/RouterError.vue')['default']

+ 12 - 1
src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -547,6 +547,7 @@ export default defineComponent({
 
           // 判断 伴唱 范唱 唱名只有上传一个都可以上传
           let existFSFile = false
+          console.log(forms.fSongList, 'forms.fSongList')
           for (let i = 0; i < forms.fSongList.length; i++) {
             let fSong = forms.fSongList[i]
             if (fSong.audioFileUrl || fSong.solmizationFileUrl || fSong.femaleSolmizationFileUrl) {
@@ -574,6 +575,7 @@ export default defineComponent({
           }
 
           // 判断是否有总谱
+          console.log(forms.scoreAudioFileUrl, 'forms.scoreAudioFileUrl')
           if (forms.scoreAudioFileUrl) {
             forms.musicSheetAccompanimentList.push({
               musicSheetId: props.data.id,
@@ -583,10 +585,17 @@ export default defineComponent({
                 forms.isScoreRender &&
                 forms.scoreAudioFileUrl
                   ? forms.scoreAudioFileUrl
-                  : null,
+                  : null, 
+              audioPlayType: 'SING'
+            })
+          } else {
+            forms.musicSheetAccompanimentList.push({
+              musicSheetId: props.data.id,
+              audioFileUrl: state.bSongFile,
               audioPlayType: 'SING'
             })
           }
+          
 
           if (state.musicSheetAccompanimentUrl) {
             forms.musicSheetAccompanimentList.push({
@@ -651,6 +660,8 @@ export default defineComponent({
             obj.musicSheetSoundList = []
           }
 
+          console.log(obj, 'obj')
+          // return
           btnLoading.value = true
           let resData: any
           if (props.type === 'add') {