Merge branch 'ponline' into iteration-20241011

dist/assets/home-layout-center-legacy.388769a2.js

@@ -1 +0,0 @@
-!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),c=a.value}catch(i){return void n(i)}a.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.8d60aee1.js","./index-legacy.1ff34718.js","./auth-legacy.f1aaf922.js","./routes-common-legacy.76f5912c.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,a,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.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 t=e.sent,a=t.data.authentication,o(a.token_type+" "+a.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:a.token_type+" "+a.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,u(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var u=t.apply(n,r);function a(t){e(u,o,s,a,c,"next",t)}function c(t){e(u,o,s,a,c,"throw",t)}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-legacy.9070be8a.js

@@ -0,0 +1 @@
+!function(){function e(e,t,n,r,o,s,a){try{var u=e[s](a),c=u.value}catch(i){return void n(i)}u.done?t(c):Promise.resolve(c).then(r,o)}System.register(["./ResizeObserver.es-legacy.8d60aee1.js","./index-legacy.1ac7a05b.js","./auth-legacy.f1aaf922.js","./routes-common-legacy.1abfed3a.js"],(function(t){"use strict";var n,r,o,s,a,u,c,i,f,l;return{setters:[function(e){n=e.d,r=e.g,o=e.u,s=e.p,a=e.i,u=e.j,c=e.C,i=e.F},function(e){f=e.a,l=e.b},function(){},function(){}],execute:function(){t("default",n({name:"home-layout-center",data:function(){return{status:!1}},mounted:function(){this.getUserInfo()},methods:{getUserInfo:function(){var t,n=this;return(t=regeneratorRuntime.mark((function e(){var t,u,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.prev=0,e.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 t=e.sent,u=t.data.authentication,o(u.token_type+" "+u.access_token),s({api:"setCache",content:{key:"h5-colexiu-token",value:u.token_type+" "+u.access_token}}),e.next=9,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=e.sent,a(c.data),n.$router.push("/home"),e.next=17;break;case 14:e.prev=14,e.t0=e.catch(0),n.status=!0;case 17:case"end":return e.stop()}}),e,null,[[0,14]])})),function(){var n=this,r=arguments;return new Promise((function(o,s){var a=t.apply(n,r);function u(t){e(a,o,s,u,c,"next",t)}function c(t){e(a,o,s,u,c,"throw",t)}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.464efc4f.js → dist/assets/home-layout-center.8f371536.js

@@ -1 +1 @@
-import{d as r,g as s,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.39b48a47.js";import{a,b as h}from"./index.aa5f7050.js";import"./auth.6996b3a7.js";import"./routes-common.7e5b5ec4.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,u,p as i,i as c,j as e,C as l,F as p}from"./ResizeObserver.es.39b48a47.js";import{a,b as h}from"./index.3445a823.js";import"./auth.6996b3a7.js";import"./routes-common.bf40b4c7.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};

dist/index.html

@@ -52,10 +52,10 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/index.aa5f7050.js"></script>
+  <script type="module" crossorigin src="./assets/index.3445a823.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.39b48a47.js">
   <link rel="modulepreload" href="./assets/auth.6996b3a7.js">
-  <link rel="modulepreload" href="./assets/routes-common.7e5b5ec4.js">
+  <link rel="modulepreload" href="./assets/routes-common.bf40b4c7.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.a84186f5.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -67,8 +67,8 @@
   
   <!-- <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.5747c6e2.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.1ff34718.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.ba67f781.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.1ac7a05b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,9 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.6dfd0360.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.db4beae6.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.39b48a47.js">
-  <link rel="modulepreload" href="./assets/routes-common.7e5b5ec4.js">
+  <link rel="modulepreload" href="./assets/routes-common.bf40b4c7.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.a84186f5.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>
@@ -64,8 +64,8 @@
   <div id="app"></div>
   
   <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.5747c6e2.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.de51cea6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.ba67f781.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.59b7e5c3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/tenant.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/tenant.5e9e2b17.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.b2c9a153.js"></script>
   <link rel="modulepreload" href="./assets/ResizeObserver.es.39b48a47.js">
   <link rel="modulepreload" href="./assets/auth.6996b3a7.js">
   <link rel="stylesheet" href="./assets/ResizeObserver.es.a84186f5.css">
@@ -66,8 +66,8 @@
   
   <!-- <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.5747c6e2.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b886b29b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.ba67f781.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.f2a516ce.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

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

@@ -618,7 +618,7 @@ export default defineComponent({
         if(partIndex === 999) {
           href += `&part-index=${partIndex}`
         } else {
-          href += `&part-name=${track}`
+          href += `&part-name=${encodeURIComponent(track || "")}`
         }
       // if (location.pathname.includes("accompany-teacher")) {
       //   href += `&systemType=teacher`;
@@ -1048,7 +1048,7 @@ export default defineComponent({
                         }
                         let extraParam: any = {
                           // 'part-index': currentColumn.value.xmlIndex || 0,
-                          'part-name': currentColumn.value.track?.trim(),
+                          'part-name': encodeURIComponent(currentColumn.value.track?.trim() || ''),
                           musicRenderType,
 
                           albumId: route.query.tenantAlbumId || '', // 专辑编号

src/views/music/music-detail/index.tsx

@@ -715,7 +715,7 @@ export default defineComponent({
     if(partIndex === 999) {
       href += `&part-index=${partIndex}`
     } else {
-      href += `&part-name=${track}`
+      href += `&part-name=${encodeURIComponent(track || '')}`
     }
     //   musicRenderType
     //   /** 五线谱 */
@@ -1134,9 +1134,9 @@ export default defineComponent({
                         }
                         let extraParam: any = {
                           // 'part-index': currentColumn.value.track || 0,
-                          'part-name': currentColumn.value?.track?.trim(),
+                          'part-name': encodeURIComponent(currentColumn.value?.track?.trim() || ''),
                           musicRenderType,
-                          instrumentId: staffData.instrumentId
+                          instrumentId: route.query.instrumentId
                         }
                         // 有专辑id
                         if (route.query.tenantAlbumId) {