合并

dist/assets/home-layout-center-legacy.e47310f0.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,s,u){try{var a=t[s](u),c=a.value}catch(i){return void n(i)}a.done?e(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.26c2050f.js","./index-legacy.787d732c.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.a3fc46a0.js"],(function(e){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(t){n=t.d,r=t.g,o=t.t,s=t.p,u=t.i,a=t.j,c=t.C,i=t.F},function(t){f=t.a,l=t.b},function(){},function(){}],execute:function(){e("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var e,n=this;return(e=regeneratorRuntime.mark((function t(){var e,a,c;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.next=3,f.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:r.orchestraInfo.phone,token:r.orchestraInfo.token,isSurportRegister:!0}});case 3:return e=t.sent,a=e.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),t.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=t.sent,u(c.data),n.$router.push("/home"),t.next=17;break;case 14:t.prev=14,t.t0=t.catch(0),n.status=!0;case 17:case"end":return t.stop()}}),t,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=e.apply(n,r);function a(e){t(u,o,s,a,c,"next",e)}function c(e){t(u,o,s,a,c,"throw",e)}a(void 0)}))})()}},render:function(){return a(i,null,[this.status?a("div",{class:l.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.9b5c224e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.9b5c224e.js
 import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.096808cc.js";import{a,b as h}from"./index.199287a6.js";import"./auth.6ac00a50.js";import"./routes-common.e428afa9.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.ff6db5d6.js";import{a,b as h}from"./index.fa818c04.js";import"./auth.eb9bda32.js";import"./routes-common.b2342e12.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-tenant-album:dist/assets/home-layout-center.9c4ca71b.js

dist/assets/home-layout-center.9c4ca71b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.9b5c224e.js
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.096808cc.js";import{a,b as h}from"./index.199287a6.js";import"./auth.6ac00a50.js";import"./routes-common.e428afa9.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+========
+import{d as r,g as s,t as u,p as i,i as c,j as e,C as l,F as p}from"./index.ff6db5d6.js";import{a,b as h}from"./index.fa818c04.js";import"./auth.eb9bda32.js";import"./routes-common.b2342e12.js";var g=r({name:"home-layout-center",data(){return{status:!1}},mounted(){this.getUserInfo()},methods:{async getUserInfo(){try{const o=await a.post("/api-auth/smsLogin",{requestType:"form",data:{clientId:"student",clientSecret:"student",phone:s.orchestraInfo.phone,token:s.orchestraInfo.token,isSurportRegister:!0}}),{authentication:t}=o.data;u(t.token_type+" "+t.access_token),i({api:"setCache",content:{key:"h5-colexiu-token",value:t.token_type+" "+t.access_token}});const n=await a.get("/api-student/student/queryUserInfo",{initRequest:!0});c(n.data),this.$router.push("/home")}catch{this.status=!0}}},render(){return e(p,null,[this.status?e("div",{class:h.error},[e(l,{type:"notFond",classImgSize:"CERT",tips:"\u52A0\u8F7D\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",buttonText:"\u91CD\u65B0\u52A0\u8F7D",plain:!0,onClick:this.getUserInfo},null)]):e("div",null,null)])}});export{g as default};
+>>>>>>>> iteration-tenant-album:dist/assets/home-layout-center.9c4ca71b.js

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.199287a6.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
   <link rel="modulepreload" href="./assets/routes-common.e428afa9.js">
+=======
+  <script type="module" crossorigin src="./assets/index.fa818c04.js"></script>
+  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
+  <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
+  <link rel="modulepreload" href="./assets/routes-common.b2342e12.js">
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -68,7 +75,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.7ec72c9d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.787d732c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.9d7cec27.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/routes-common.e428afa9.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.8923f1ec.js"></script>
+  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
+  <link rel="modulepreload" href="./assets/routes-common.b2342e12.js">
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/teacher.ded4b243.css">
   <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
@@ -65,7 +71,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.63e4892b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.efda223d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.c46fb15c.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.5639ed09.js"></script>
+  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
+  <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
+>>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -67,7 +73,11 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.702cf5ec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b1d845a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tenant-album
 </body>
 
 </html>

src/teacher/music/upload/index.tsx

@@ -220,7 +220,8 @@ export default defineComponent({
 
         this.composer = res.data.composer
         this.musicSheetName = res.data.musicSheetName
-        this.audioType = res.data.audioType
+        // 固定MP3, MIDI 去掉了
+        this.audioType = 'MP3' // res.data.audioType
         this.notation = res.data.notation
         this.selectedSubjectList = {
           label: res.data.musicSubject,
@@ -247,19 +248,19 @@ export default defineComponent({
         this.accompanimentType = res.data.accompanimentType
         this.titleImg = res.data.titleImg
 
-        // this.audioType = res.data.mp3Type
-
-        if (this.audioType === 'MP3') {
-          this.hasBeat =
-            (res.data.audioType === 'MP3' &&
-              res.data.mp3Type === 'MP3_METRONOME') ||
-            res.data.audioType === 'MIDI'
-              ? 1
-              : 0
-          this.mp3Url = res.data.audioFileUrl || res.data.url //res.data.metronomeUrl || res.data.url
-        } else {
-          this.midiUrl = res.data.midiUrl
-        }
+        // if (this.audioType === 'MP3') {
+        //   this.hasBeat =
+        //     (res.data.audioType === 'MP3' &&
+        //       res.data.mp3Type === 'MP3_METRONOME') ||
+        //     res.data.audioType === 'MIDI'
+        //       ? 1
+        //       : 0
+        //   this.mp3Url = res.data.audioFileUrl || res.data.url //res.data.metronomeUrl || res.data.url
+        // } else {
+        //   this.midiUrl = res.data.midiUrl
+        // }
+        this.hasBeat = 0
+        this.mp3Url = res.data.audioFileUrl || res.data.url //res.data.metronomeUrl || res.data.url
 
         this.backgroundMp3s = (res.data.background || []).map((item, index) => {
           if (index === 0) {
@@ -279,7 +280,7 @@ export default defineComponent({
     },
     createSubmitData() {
       const beatType = this.hasBeat ? 'MP3_METRONOME' : 'MP3'
-      const mp3Type = this.audioType === 'MP3' ? beatType : 'MIDI'
+      const mp3Type = beatType //this.audioType === 'MP3' ? beatType : 'MIDI'
       return {
         audioType: this.audioType,
         sourceType: 'TEACHER',
@@ -550,7 +551,7 @@ export default defineComponent({
                 modelValue={this.audioType}
                 onUpdate:modelValue={val => (this.audioType = val)}
               >
-                {Object.keys(teachershowAudiType).map((item: string) => {
+                {/* {Object.keys(teachershowAudiType).map((item: string) => {
                   const isActive = item === this.audioType
                   const type = isActive ? 'primary' : 'default'
                   return (
@@ -560,7 +561,12 @@ export default defineComponent({
                       </Tag>
                     </Radio>
                   )
-                })}
+                })} */}
+                <Radio class={styles.radio} name={'MP3'}>
+                  <Tag size="large" plain type={'primary'}>
+                    MP3
+                  </Tag>
+                </Radio>
               </RadioGroup>
             </ColField>
             {this.audioType === 'MP3' ? (