更新

dist/assets/home-layout-center-legacy.41df48bf.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,s,a){try{var u=t[s](a),c=u.value}catch(i){return void n(i)}u.done?e(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.2562bdba.js","./index-legacy.62a1eaaf.js","./auth-legacy.291d9f1d.js","./routes-common-legacy.a9a11b1c.js"],(function(e){"use strict";var n,r,o,s,a,u,c,i,f,l;return{setters:[function(t){n=t.d,r=t.g,o=t.t,s=t.p,a=t.i,u=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,u,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,u=e.data.authentication,o(u.token_type+" "+u.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:u.token_type+" "+u.access_token}}),t.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=t.sent,a(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 a=e.apply(n,r);function u(e){t(a,o,s,u,c,"next",e)}function c(e){t(a,o,s,u,c,"throw",e)}u(void 0)}))})()}},render:function(){return u(i,null,[this.status?u("div",{class:l.error},[u(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):u("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.8c4f9c54.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.8c4f9c54.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.3bfa6a0e.js";import{a,b as h}from"./index.8616de7f.js";import"./auth.37c81a49.js";import"./routes-common.e99ae211.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.3bfa6a0e.js";import{a,b as h}from"./index.e901838d.js";import"./auth.37c81a49.js";import"./routes-common.e99ae211.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};
+>>>>>>>> ponline:dist/assets/home-layout-center.ee340582.js

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

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.8c4f9c54.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.3bfa6a0e.js";import{a,b as h}from"./index.8616de7f.js";import"./auth.37c81a49.js";import"./routes-common.e99ae211.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.3bfa6a0e.js";import{a,b as h}from"./index.e901838d.js";import"./auth.37c81a49.js";import"./routes-common.e99ae211.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};
+>>>>>>>> ponline:dist/assets/home-layout-center.ee340582.js

dist/index.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.8616de7f.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index.e901838d.js"></script>
+>>>>>>> ponline
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/auth.37c81a49.js">
   <link rel="modulepreload" href="./assets/routes-common.e99ae211.js">
@@ -68,7 +72,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.e2059479.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.5f456ef6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.62a1eaaf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

dist/teacher.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.c6e88c0c.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/teacher.00102c5b.js"></script>
+>>>>>>> ponline
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/routes-common.e99ae211.js">
   <link rel="stylesheet" href="./assets/index.d06f6378.css">
@@ -65,7 +69,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.e2059479.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.405a5dce.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.c7f2bae0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

src/tenant/music/train-tool/index.tsx

@@ -202,6 +202,12 @@ export default defineComponent({
         albumId: state.details.id || null,
         subjectType: state.activeTab,
         ...params
+      } as any
+
+      // 老师端默认查询声部
+      if (baseState.platformType === 'TEACHER') {
+        const users = baseState.user.data
+        tempParams.subjectId = users.defaultSubject || null
       }
 
       try {