Merge branch 'newVersion' into online

src/views/user-info/music-operation/index.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
         accompanimentType: 'HOMEMODE',
         audioType: 'MP3',
         xmlFileUrl: '',
-        hasBeat: 0,
+
         mp3Url: '',
         bgmp3Url: '',
         midiUrl: '',
@@ -58,7 +58,8 @@ export default defineComponent({
         composer: '',
         musicSubject: null as any,
         tags: [] as string[],
-        notation: 0,
+        hasBeat: 0,
+        notation: 1,
         canEvaluate: 1,
         showFingering: 1,
         chargeType: 0,
@@ -139,7 +140,7 @@ export default defineComponent({
 
         if (this.form.audioType === 'MP3') {
           this.form.hasBeat = res.data.hasBeat || 0
-          this.form.mp3Url = res.data.metronomeUrl || res.data.url
+          this.form.mp3Url =res.data.audioFileUrl|| res.data.metronomeUrl || res.data.url
         } else {
           this.form.midiUrl = res.data.midiUrl
         }
@@ -147,9 +148,10 @@ export default defineComponent({
         this.form.backgroundMp3s = (res.data.background || []).map(
           (item: any, index: any) => {
             if (index === 0) {
-              this.form.bgmp3Url = item.metronomeUrl || item.audioFileUrl
+              this.form.bgmp3Url =item.audioFileUrl || item.metronomeUrl
             }
             return {
+
               url: this.form.hasBeat ? item.metronomeUrl : item.audioFileUrl,
               track: item.track
             }
@@ -173,8 +175,9 @@ export default defineComponent({
         accompanimentType: form.accompanimentType,
         titleImg: form.titleImg,
         hasBeat: Number(form.hasBeat),
-        url: form.hasBeat ? '' : form.mp3Url,
-        metronomeUrl: form.hasBeat ? form.mp3Url : '',
+        // url: form.hasBeat ? '' : form.mp3Url,
+        // metronomeUrl: form.hasBeat ? form.mp3Url : '',
+        audioFileUrl:form.mp3Url ,
         showFingering: Number(form.showFingering),
         notation: Number(form.notation),
         musicTag: form.tags.join(','),
@@ -319,7 +322,7 @@ export default defineComponent({
 
           {this.form.audioType === 'MP3' ? (
             <>
-              <ElFormItem
+              {/* <ElFormItem
                 label="是否带节拍器"
                 prop="hasBeat"
                 rules={[{ required: true, message: '请选择是否带节拍器' }]}
@@ -332,7 +335,7 @@ export default defineComponent({
                     是
                   </ElRadioButton>
                 </ElRadioGroup>
-              </ElFormItem>
+              </ElFormItem> */}
               <ElFormItem
                 label="伴奏类型"
                 prop="accompanimentType"
@@ -412,6 +415,7 @@ export default defineComponent({
                 bucket={'cloud-coach'}
                 accept={'.mp3'}
                 uploadType={'file'}
+                size={8}
                 extraTips="文件最大不能超过8MB"
               />
             </ElFormItem>
@@ -533,7 +537,7 @@ export default defineComponent({
               </ElSelect>
             </div>
           </ElFormItem>
-          <ElFormItem
+          {/* <ElFormItem
             label="支持简谱"
             prop="notation"
             rules={[{ required: true, message: '请选择是否支持简谱' }]}
@@ -546,8 +550,8 @@ export default defineComponent({
                 是
               </ElRadioButton>
             </ElRadioGroup>
-          </ElFormItem>
-          <ElFormItem
+          </ElFormItem> */}
+          {/* <ElFormItem
             label="是否评测"
             prop="canEvaluate"
             rules={[{ required: true, message: '请选择是否评测' }]}
@@ -560,8 +564,8 @@ export default defineComponent({
                 是
               </ElRadioButton>
             </ElRadioGroup>
-          </ElFormItem>
-          <ElFormItem
+          </ElFormItem> */}
+          {/* <ElFormItem
             label="指法展示"
             prop="showFingering"
             rules={[{ required: true, message: '请选择指法展示' }]}
@@ -574,7 +578,7 @@ export default defineComponent({
                 是
               </ElRadioButton>
             </ElRadioGroup>
-          </ElFormItem>
+          </ElFormItem> */}
           <ElFormItem
             label="是否收费"
             prop="chargeType"