更新

dist/assets/home-layout-center-legacy.057d3e0e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.057d3e0e.js
 !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(["./index-legacy.77fd7daf.js","./index-legacy.b7cad55e.js","./auth-legacy.52a59e00.js","./routes-common-legacy.119cb362.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.t,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)])}}))}}}))}();
+========
+!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(["./index-legacy.1d96369d.js","./index-legacy.0dc74db5.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.3e89333c.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,d,f;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){d=e.a,f=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,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 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,d.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:f.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-20240102:dist/assets/home-layout-center-legacy.38ea1f41.js

dist/assets/home-layout-center-legacy.38ea1f41.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.057d3e0e.js
+!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(["./index-legacy.77fd7daf.js","./index-legacy.b7cad55e.js","./auth-legacy.52a59e00.js","./routes-common-legacy.119cb362.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.t,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)])}}))}}}))}();
+========
+!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(["./index-legacy.1d96369d.js","./index-legacy.0dc74db5.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.3e89333c.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,d,f;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,c=e.C,i=e.F},function(e){d=e.a,f=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,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 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,d.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:f.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();
+>>>>>>>> iteration-20240102:dist/assets/home-layout-center-legacy.38ea1f41.js

dist/assets/home-layout-center.2230e451.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.c0d6dd20.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.4f40e5e1.js";import{a,b as h}from"./index.1d3d64f3.js";import"./auth.502d2fa7.js";import"./routes-common.393bf1c6.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.65bb5fc0.js";import{a,b as h}from"./index.20e29f43.js";import"./auth.85fc1c66.js";import"./routes-common.fa8c521c.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-20240102:dist/assets/home-layout-center.2230e451.js

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

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/home-layout-center.c0d6dd20.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.4f40e5e1.js";import{a,b as h}from"./index.1d3d64f3.js";import"./auth.502d2fa7.js";import"./routes-common.393bf1c6.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.65bb5fc0.js";import{a,b as h}from"./index.20e29f43.js";import"./auth.85fc1c66.js";import"./routes-common.fa8c521c.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-20240102:dist/assets/home-layout-center.2230e451.js

dist/assets/member-active-legacy.04d86cda.js

@@ -0,0 +1 @@
+System.register(["./index-legacy.1d96369d.js","./member-active.module-legacy.dcad3b40.js"],(function(n){"use strict";var e,t,c,s,a,i,u,r,l;return{setters:[function(n){e=n.d,t=n.P,c=n.S,s=n.U,a=n.n,i=n.j,u=n.M,r=n.f},function(n){l=n.s}],execute:function(){n("default",e({setup:function(){var n=t(),e=c(0),o=function(){n.push("/memberCenter")},f=function(){r().isApp?a({api:"goBack"}):n.back()};return s((function(){a({api:"getNavHeight"},(function(n){var t=n.content,c=t.dpi||2;if(t.navHeight){var s=t.navHeight/c;e.value=s}}))})),function(){return i("div",{class:l.memberActive},[i(u,{name:"arrow-left",class:l.backIcon,style:{top:"calc(".concat(e.value,"px + 12px)")},onClick:f},null),i("img",{src:"./assets/1.31b016a2.png"},null),i("img",{src:"./assets/2.66fac122.png"},null),i("img",{src:"./assets/3.dc63c4a5.png"},null),i("div",{class:l.memberBtn},[i("img",{src:"./assets/btn.8f04e514.png",onClick:o},null)])])}}}))}}}));

dist/assets/member-active-o-legacy.1659aa68.js

@@ -0,0 +1 @@
+System.register(["./index-legacy.1d96369d.js","./member-active.module-legacy.dcad3b40.js","./index-legacy.6c42bef5.js"],(function(n){"use strict";var e,t,c,i,a,s,r,o,u,l,m;return{setters:[function(n){e=n.d,t=n.P,c=n.S,i=n.U,a=n.n,s=n.j,r=n.M,o=n.g,u=n.f},function(n){l=n.s},function(n){m=n.C}],execute:function(){n("default",e({setup:function(){var n=t(),e=c(0),f=function(){o.user.data.tenantId>0?window.location.href=location.origin+"/tenant/#/memberCenter":n.push("/memberCenter")},d=function(){u().isApp?a({api:"goBack"}):n.back()};return i((function(){a({api:"getNavHeight"},(function(n){var t=n.content,c=t.dpi||2;if(t.navHeight){var i=t.navHeight/c;e.value=i}}))})),function(){return s("div",{class:[l.memberActive,l.memberActiveO]},[s(r,{name:"arrow-left",class:l.backIcon,style:{top:"calc(".concat(e.value,"px + 12px)")},onClick:d},null),s("img",{src:"./assets/1.a2309d83.png",style:{"margin-bottom":"-1px"}},null),s("img",{src:"./assets/2.66c90ffe.png"},null),s("img",{src:"./assets/3.05d6dcdc.png"},null),s(m,{position:"bottom"},{default:function(){return[s("div",{class:l.memberBtn},[s("img",{src:"./assets/btn.42931669.png",onClick:f},null)])]}})])}}}))}}}));

dist/assets/member-active-o.91a6eefd.js

@@ -0,0 +1 @@
+import{d as p,P as g,S as d,U as u,n as o,j as e,M as v,g as f,f as b}from"./index.65bb5fc0.js";import{s as t}from"./member-active.module.6c3bcaa4.js";import{C as h}from"./index.244f0905.js";var k="./assets/1.a2309d83.png",C="./assets/2.66c90ffe.png",H="./assets/3.05d6dcdc.png",w="./assets/btn.42931669.png",B=p({setup(){const a=g(),n=d(0),r=()=>{f.user.data.tenantId>0?window.location.href=location.origin+"/tenant/#/memberCenter":a.push("/memberCenter")},i=()=>{b().isApp?o({api:"goBack"}):a.back()};return u(()=>{o({api:"getNavHeight"},c=>{const{content:s}=c,l=s.dpi||2;if(s.navHeight){const m=s.navHeight/l;n.value=m}})}),()=>e("div",{class:[t.memberActive,t.memberActiveO]},[e(v,{name:"arrow-left",class:t.backIcon,style:{top:`calc(${n.value}px + 12px)`},onClick:i},null),e("img",{src:k,style:{"margin-bottom":"-1px"}},null),e("img",{src:C},null),e("img",{src:H},null),e(h,{position:"bottom"},{default:()=>[e("div",{class:t.memberBtn},[e("img",{src:w,onClick:r},null)])]})])}});export{B as default};

dist/assets/member-active.c7e1df7b.js

@@ -0,0 +1 @@
+import{d as m,P as g,S as v,U as u,n as c,j as s,M as f,f as b}from"./index.65bb5fc0.js";import{s as a}from"./member-active.module.6c3bcaa4.js";var d="./assets/1.31b016a2.png",h="./assets/2.66fac122.png",k="./assets/3.dc63c4a5.png",H="./assets/btn.8f04e514.png",x=m({setup(){const t=g(),n=v(0),o=()=>{t.push("/memberCenter")},r=()=>{b().isApp?c({api:"goBack"}):t.back()};return u(()=>{c({api:"getNavHeight"},i=>{const{content:e}=i,l=e.dpi||2;if(e.navHeight){const p=e.navHeight/l;n.value=p}})}),()=>s("div",{class:a.memberActive},[s(f,{name:"arrow-left",class:a.backIcon,style:{top:`calc(${n.value}px + 12px)`},onClick:r},null),s("img",{src:d},null),s("img",{src:h},null),s("img",{src:k},null),s("div",{class:a.memberBtn},[s("img",{src:H,onClick:o},null)])])}});export{x as default};

dist/index.html

@@ -52,10 +52,17 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.1d3d64f3.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
   <link rel="modulepreload" href="./assets/routes-common.393bf1c6.js">
+=======
+  <script type="module" crossorigin src="./assets/index.20e29f43.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
+  <link rel="modulepreload" href="./assets/routes-common.fa8c521c.js">
+>>>>>>> iteration-20240102
   <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.9d7739ea.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.b7cad55e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.0dc74db5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240102
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.9b9ba9a8.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/routes-common.393bf1c6.js">
+=======
+  <script type="module" crossorigin src="./assets/teacher.02c85af8.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/routes-common.fa8c521c.js">
+>>>>>>> iteration-20240102
   <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.9d7739ea.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.a11cd656.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.e6aaf6e1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240102
 </body>
 
 </html>

dist/tenant.html

@@ -52,9 +52,15 @@
             _T_));
     })(Object);
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.9e96c7fb.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
+=======
+  <script type="module" crossorigin src="./assets/tenant.708eab54.js"></script>
+  <link rel="modulepreload" href="./assets/index.65bb5fc0.js">
+  <link rel="modulepreload" href="./assets/auth.85fc1c66.js">
+>>>>>>> iteration-20240102
   <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.9d7739ea.js"></script>
+<<<<<<< HEAD
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b4692fad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.6ecf8292.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20240102
 </body>
 
 </html>

src/components/col-img-code/index.tsx

@@ -1,130 +1,132 @@
-import { defineComponent } from 'vue'
-import { Col, Popup, Row, Image as VanImage, Loading, Field, Toast } from 'vant'
-import styles from './index.module.less'
-import request from '@/helpers/request'
-import { state } from '@/state'
-
-export default defineComponent({
-  name: 'imgCode',
-  props: {
-    value: Boolean,
-    phone: [String, Number],
-    onClose: {
-      type: Function,
-      // (...args: any[]) => any) | undefined
-      default: () => {}
-    },
-    onSendCode: {
-      type: Function,
-      default: () => {}
-    }
-  },
-  data() {
-    let origin = window.location.origin
-    let suffix =
-      state.platformType === 'STUDENT' ? '/api-student' : '/api-teacher'
-    return {
-      isSuffix: suffix,
-      showStatus: false,
-      identifyingCode:
-        origin + suffix + '/code/getImageCode?phone=' + this.phone,
-      code: null
-    }
-  },
-  mounted() {
-    this.showStatus = this.value
-  },
-  watch: {
-    value(val: any) {
-      this.showStatus = val
-    },
-    code(val: any) {
-      if (val.length >= 4) {
-        this.checkVerifyLoginImage()
-      }
-    }
-  },
-  methods: {
-    async updateIdentifyingCode() {
-      // 刷新token
-      let origin = window.location.origin
-      this.identifyingCode = `${origin}${
-        this.isSuffix
-      }/code/getImageCode?phone=${this.phone}&token=${Math.random()}`
-    },
-    async checkVerifyLoginImage() {
-      try {
-        if ((this as any).code.length < 4) {
-          return
-        }
-        await request.post(`${this.isSuffix}/code/verifyImageCode`, {
-          requestType: 'form',
-          data: {
-            phone: this.phone,
-            code: this.code
-          }
-        })
-        await request.post(`${this.isSuffix}/code/sendSmsCode`, {
-          requestType: 'form',
-          data: {
-            mobile: this.phone,
-            type: 'LOGIN'
-          }
-        })
-        Toast('验证码已发送')
-        this.onClose()
-        this.onSendCode()
-      } catch {
-        this.updateIdentifyingCode()
-      }
-    }
-  },
-  render() {
-    return (
-      // @ts-ignore
-      <Popup
-        show={this.showStatus}
-        class={styles.imgCodePopup}
-        closeOnClickOverlay={false}
-        onClose={() => {
-          this.onClose()
-        }}
-        closeable
-        closeIcon="close"
-      >
-        <div class={styles.imgCode}>
-          <p class={styles.codeTitle}>输入图形验证码</p>
-          <Row>
-            <Col span="14">
-              <Field
-                placeholder="请输入验证码"
-                v-model={this.code}
-                class={styles.field}
-              />
-            </Col>
-            <Col span="10" class={styles.img}>
-              <VanImage
-                src={this.identifyingCode}
-                onClick={() => this.updateIdentifyingCode()}
-                // @ts-ignore
-                vSlots={{
-                  loading: () => <Loading type="spinner" size="20" />
-                }}
-              />
-            </Col>
-          </Row>
-          <Row style={{ display: 'flex', justifyContent: 'end' }}>
-            <Col span="10">
-              <span
-                class={styles.imgChange}
-                onClick={() => this.updateIdentifyingCode()}
-              >
-                看不清？换一换
-              </span>
-            </Col>
-          </Row>
-        </div>
-      </Popup>
-    )
-  }
-})
+import { defineComponent } from 'vue'
+import { Col, Popup, Row, Image as VanImage, Loading, Field, Toast } from 'vant'
+import styles from './index.module.less'
+import request from '@/helpers/request'
+import { state } from '@/state'
+
+export default defineComponent({
+  name: 'imgCode',
+  props: {
+    value: Boolean,
+    phone: [String, Number],
+    onClose: {
+      type: Function,
+      // (...args: any[]) => any) | undefined
+      default: () => {}
+    },
+    onSendCode: {
+      type: Function,
+      default: () => {}
+    }
+  },
+  data() {
+    const origin = window.location.origin
+    const suffix =
+      state.platformType === 'STUDENT' ? '/api-student' : '/api-teacher'
+    return {
+      isSuffix: suffix,
+      showStatus: false,
+      identifyingCode:
+        origin + suffix + '/code/getImageCode?phone=' + this.phone,
+      code: null
+    }
+  },
+  mounted() {
+    this.showStatus = this.value
+  },
+  watch: {
+    value(val: any) {
+      this.showStatus = val
+    },
+    code(val: any) {
+      if (val.length >= 4) {
+        this.checkVerifyLoginImage()
+      }
+    }
+  },
+  methods: {
+    async updateIdentifyingCode() {
+      // 刷新token
+      const origin = window.location.origin
+      this.identifyingCode = `${origin}${
+        this.isSuffix
+      }/code/getImageCode?phone=${this.phone}&token=${Math.random()}`
+    },
+    async checkVerifyLoginImage() {
+      try {
+        if ((this as any).code.length < 4) {
+          return
+        }
+        // await request.post(`${this.isSuffix}/code/verifyImageCode`, {
+        //   requestType: 'form',
+        //   data: {
+        //     phone: this.phone,
+        //     code: this.code
+        //   }
+        // })
+        await request.post(`${this.isSuffix}/code/sendSmsCode`, {
+          requestType: 'form',
+          data: {
+            mobile: this.phone,
+            type: 'LOGIN',
+            code: this.code
+          }
+        })
+        Toast('验证码已发送')
+        this.onClose()
+        this.onSendCode()
+      } catch {
+        this.updateIdentifyingCode()
+      }
+    }
+  },
+  render() {
+    return (
+      // @ts-ignore
+      <Popup
+        show={this.showStatus}
+        class={styles.imgCodePopup}
+        closeOnClickOverlay={false}
+        onClose={() => {
+          this.onClose()
+        }}
+        closeable
+        closeIcon="close"
+      >
+        <div class={styles.imgCode}>
+          <p class={styles.codeTitle}>输入图形验证码</p>
+          <Row>
+            <Col span="14">
+              <Field
+                placeholder="请输入验证码"
+                v-model={this.code}
+                class={styles.field}
+                autocomplete="off"
+              />
+            </Col>
+            <Col span="10" class={styles.img}>
+              <VanImage
+                src={this.identifyingCode}
+                onClick={() => this.updateIdentifyingCode()}
+                // @ts-ignore
+                vSlots={{
+                  loading: () => <Loading type="spinner" size="20" />
+                }}
+              />
+            </Col>
+          </Row>
+          <Row style={{ display: 'flex', justifyContent: 'end' }}>
+            <Col span="10">
+              <span
+                class={styles.imgChange}
+                onClick={() => this.updateIdentifyingCode()}
+              >
+                看不清？换一换
+              </span>
+            </Col>
+          </Row>
+        </div>
+      </Popup>
+    )
+  }
+})

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

@@ -896,7 +896,7 @@ export default defineComponent({
                         (i: any) => i.track === item?.track
                       )
                       musicBuy(musicDetail.value, () => {}, {
-                        'part-index': staffData.partIndex || 0,
+                        'part-index': index || 0,
                         sett: staff.radio,
                         // 1：忽略系统节拍器
                         ignoreSysMetronome:

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

@@ -1001,7 +1001,7 @@ export default defineComponent({
                         (i: any) => i.track === item?.track
                       )
                       musicBuy(musicDetail.value, () => {}, {
-                        'part-index': staffData.partIndex || 0,
+                        'part-index': index || 0,
                         sett: staff.radio
                       })
                     }}