合并

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

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

dist/assets/home-layout-center.6c4d70aa.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.7bdc6c23.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.c989d35b.js";import"./auth.37c81a49.js";import"./routes-common.fec36607.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.1de65f40.js";import"./auth.37c81a49.js";import"./routes-common.fec36607.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.6c4d70aa.js

dist/assets/home-layout-center.7bdc6c23.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.7bdc6c23.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.c989d35b.js";import"./auth.37c81a49.js";import"./routes-common.fec36607.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.1de65f40.js";import"./auth.37c81a49.js";import"./routes-common.fec36607.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.6c4d70aa.js

dist/index.html

@@ -52,7 +52,11 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.c989d35b.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index.1de65f40.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.fec36607.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.4049d960.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d131b7b3.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.817f27be.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/teacher.c73d5e1d.js"></script>
+>>>>>>> ponline
   <link rel="modulepreload" href="./assets/index.3bfa6a0e.js">
   <link rel="modulepreload" href="./assets/routes-common.fec36607.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.054ab264.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7a635d84.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> ponline
 </body>
 
 </html>

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

@@ -707,6 +707,7 @@ export default defineComponent({
             part.index = item.value
           }
         })
+        console.log(staffData.partList, '-staffData.partList')
         staffData.tempPartList = JSON.parse(JSON.stringify(staffData.partList))
         staffData.partList = instrumentSort(staffData.partList)
         staffData.partXmlIndex = staffData.partList[0].index || 0
@@ -1113,11 +1114,11 @@ export default defineComponent({
                         const item: any = partColumns.value.find(
                           (c: any) => c.value === staffData.partIndex
                         )
-                        const index = staffData.tempPartList.findIndex(
-                          (i: any) => i.track === item?.track
-                        )
+                        // const index = staffData.tempPartList.findIndex(
+                        //   (i: any) => i.track === item?.track
+                        // )
                         musicBuy(musicDetail.value, () => {}, {
-                          'part-index': index || 0,
+                          'part-index': item.value || 0,
                           sett: staff.radio,
                           // 1：忽略系统节拍器
                           ignoreSysMetronome: