合并

dist/assets/home-layout-center-legacy.fefff363.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.19a69a6b.js","./index-legacy.6db99c8f.js","./auth-legacy.918bd481.js","./routes-common-legacy.c6b73ffc.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.893c0396.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.fbe1bfb1.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.86c49983.js";import{a,b as h}from"./index.5af93079.js";import"./auth.631d0a27.js";import"./routes-common.b393d404.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.b4531198.js";import{a,b as h}from"./index.db47fb0b.js";import"./auth.212f30c4.js";import"./routes-common.e1a74471.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-1011:dist/assets/home-layout-center.893c0396.js

dist/assets/home-layout-center.fbe1bfb1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.fbe1bfb1.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.86c49983.js";import{a,b as h}from"./index.5af93079.js";import"./auth.631d0a27.js";import"./routes-common.b393d404.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.b4531198.js";import{a,b as h}from"./index.db47fb0b.js";import"./auth.212f30c4.js";import"./routes-common.e1a74471.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-1011:dist/assets/home-layout-center.893c0396.js

dist/index.html

@@ -36,10 +36,17 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.5af93079.js"></script>
   <link rel="modulepreload" href="./assets/index.86c49983.js">
   <link rel="modulepreload" href="./assets/auth.631d0a27.js">
   <link rel="modulepreload" href="./assets/routes-common.b393d404.js">
+=======
+  <script type="module" crossorigin src="./assets/index.db47fb0b.js"></script>
+  <link rel="modulepreload" href="./assets/index.b4531198.js">
+  <link rel="modulepreload" href="./assets/auth.212f30c4.js">
+  <link rel="modulepreload" href="./assets/routes-common.e1a74471.js">
+>>>>>>> iteration-1011
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -52,7 +59,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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.0277dae9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.6db99c8f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1011
 </body>
 
 </html>

dist/teacher.html

@@ -36,9 +36,15 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.ade1350c.js"></script>
   <link rel="modulepreload" href="./assets/index.86c49983.js">
   <link rel="modulepreload" href="./assets/routes-common.b393d404.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.789757a3.js"></script>
+  <link rel="modulepreload" href="./assets/index.b4531198.js">
+  <link rel="modulepreload" href="./assets/routes-common.e1a74471.js">
+>>>>>>> iteration-1011
   <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>
@@ -49,7 +55,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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.34280fb2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.89e1f2aa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1011
 </body>
 
 </html>

dist/tenant.html

@@ -36,9 +36,15 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.691f7047.js"></script>
   <link rel="modulepreload" href="./assets/index.86c49983.js">
   <link rel="modulepreload" href="./assets/auth.631d0a27.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.7a7db7f9.js"></script>
+  <link rel="modulepreload" href="./assets/index.b4531198.js">
+  <link rel="modulepreload" href="./assets/auth.212f30c4.js">
+>>>>>>> iteration-1011
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -51,7 +57,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.55192e1f.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.fd1fbfa5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.12b9f876.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-1011
 </body>
 
 </html>

src/tenant/music/album-detail/index.module.less

@@ -280,6 +280,7 @@
 
 .alumnContainer {
   position: relative;
+
   padding: 0;
   z-index: 12;
 
@@ -288,6 +289,7 @@
     border-radius: 18px !important;
     background-color: #fff;
     margin-bottom: 16px;
+    min-height: 40vh;
   }
 
   .alumnTitle {
@@ -446,4 +448,4 @@
       color: #FFFFFF;
     }
   }
-}
+}

src/tenant/music/music-detail/new-index.tsx

@@ -685,6 +685,10 @@ export default defineComponent({
           {musicDetail.value?.notation ? (
             <span
               class={styles.iconTransfer}
+              style={{
+                display:
+                  musicDetail.value?.musicSheetType === 'SINGLE' ? '' : 'none'
+              }}
               onClick={() => {
                 staff.status = true
               }}
@@ -692,6 +696,18 @@ export default defineComponent({
               转谱
             </span>
           ) : null}
+          <span
+            class={styles.iconTransfer}
+            style={{
+              display:
+                musicDetail.value?.musicSheetType === 'CONCERT' ? '' : 'none'
+            }}
+            onClick={() => {
+              staffData.open = true
+            }}
+          >
+            切换乐器
+          </span>
 
           <p class={styles.musicTitle}>
             {(musicDetail.value?.musicSheetName