Pārlūkot izejas kodu

Merge branch 'develop' into online

yuanliang 1 gadu atpakaļ
vecāks
revīzija
9d95a10b30

+ 2 - 2
src/views/music-library/music-sheet/modal/use-project.tsx

@@ -149,8 +149,8 @@ export default defineComponent({
       // 加载已经配置的APP
       const { data } = await musicSheetDetail({ id: props.id })
       state.musicSheetData = data
-      if (data && data.musicSheetExtend) {
-        forms.useApplicationIds = data.musicSheetExtend.useApplicationIds?.split(',') || []
+      if (data && data.musicSheetExtend && data.musicSheetExtend.useApplicationIds) {
+        forms.useApplicationIds = data.musicSheetExtend.useApplicationIds.split(',') || []
       }
 
       // 查询该曲目可以使用的app

+ 1 - 1
src/views/system-manage/system-apply/apply-operation.tsx

@@ -108,10 +108,10 @@ export default defineComponent({
             message.success('修改成功')
           }
 
-          btnLoading.value = false
           emit('close')
           emit('getList')
         } catch {}
+        btnLoading.value = false
       })
     }