Merge branch 'newVersion' into dev

src/components/col-header/index.tsx

@@ -17,7 +17,7 @@ export default defineComponent({
       navigator: [
         { name: '首页', href: '/home', current: false },
         { name: '谱库', href: '/musicLibrary', current: false },
-        { name: '视频课', href: '/videoDetailList', current: false },
+        // { name: '视频课', href: '/videoDetailList', current: false },
         // { name: '云教练', href: '#', current: false },
         // { name: '社区', href: '#', current: false },
         { name: '下载', href: '/downLoad', current: false }

src/views/home/index.tsx

@@ -180,7 +180,7 @@ export default defineComponent({
             </div>
           </div>
         </div>
-        <div class="bg-white">
+        {/* <div class="bg-white">
           <div class={styles.w1200}>
             <div class={[styles.section,styles.pt41]}>
               <div class={[styles.titleWrap]}>
@@ -203,7 +203,7 @@ export default defineComponent({
 
 
           </div>
-        </div>
+        </div> */}
       </div>
     )
   }

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

@@ -142,7 +142,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
         }
@@ -150,9 +150,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
             }
@@ -176,8 +177,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(','),
@@ -420,6 +422,7 @@ export default defineComponent({
                 bucket={'cloud-coach'}
                 accept={'.mp3'}
                 uploadType={'file'}
+                size={8}
                 extraTips="文件最大不能超过8MB"
               />
             </ElFormItem>