修改分享

dist/assets/home-layout-center-legacy.0b02ee42.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.49b80075.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.15af8cfc.js","./index-legacy.1ea3eb35.js","./auth-legacy.561e85dd.js","./routes-common-legacy.90af5f3e.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.26c2050f.js","./index-legacy.64ad1b05.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.8f006e35.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)])}}))}}}))}();
->>>>>>>> iteration-tenant-album:dist/assets/home-layout-center-legacy.0b02ee42.js

dist/assets/home-layout-center-legacy.49b80075.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center-legacy.49b80075.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.15af8cfc.js","./index-legacy.1ea3eb35.js","./auth-legacy.561e85dd.js","./routes-common-legacy.90af5f3e.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.26c2050f.js","./index-legacy.64ad1b05.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.8f006e35.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)])}}))}}}))}();
->>>>>>>> iteration-tenant-album:dist/assets/home-layout-center-legacy.0b02ee42.js

dist/assets/home-layout-center-legacy.9b11ac62.js

@@ -0,0 +1 @@
+!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.15af8cfc.js","./index-legacy.d91a51e1.js","./auth-legacy.561e85dd.js","./routes-common-legacy.eccaccf4.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)])}}))}}}))}();

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

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center.c7148d13.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.096808cc.js";import{a,b as h}from"./index.e487bce8.js";import"./auth.6ac00a50.js";import"./routes-common.0ddf8a01.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.ff6db5d6.js";import{a,b as h}from"./index.108c25e9.js";import"./auth.eb9bda32.js";import"./routes-common.11ffc3e2.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-tenant-album:dist/assets/home-layout-center.e683167d.js

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

@@ -0,0 +1 @@
+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.096808cc.js";import{a,b as h}from"./index.037040e0.js";import"./auth.6ac00a50.js";import"./routes-common.2a206991.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/assets/home-layout-center.e683167d.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center.c7148d13.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.096808cc.js";import{a,b as h}from"./index.e487bce8.js";import"./auth.6ac00a50.js";import"./routes-common.0ddf8a01.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.ff6db5d6.js";import{a,b as h}from"./index.108c25e9.js";import"./auth.eb9bda32.js";import"./routes-common.11ffc3e2.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-tenant-album:dist/assets/home-layout-center.e683167d.js

dist/assets/index.8eadc23f.js

@@ -1 +0,0 @@
-import{d as r,n as o,w as p,f as a,j as t,M as d,z as i,B as l}from"./index.ff6db5d6.js";import{w as h}from"./wx_bg.2f1a3efe.js";const w="_inviteSuccess_101db_1",v="_backIcon_101db_6",b="_h2_101db_19",f="_tips_101db_25",g="_btnDownload_101db_31",_="_wxpopup_101db_35";var s={inviteSuccess:w,backIcon:v,h2:b,tips:f,btnDownload:g,wxpopup:_},m="./assets/success_tips.737b42b1.png",k=r({name:"inviteSuccess",data(){return{wxStatus:!1,androidUrl:"",navBarHeight:0}},async mounted(){o({api:"getNavHeight"},n=>{const{content:e}=n,u=e.dpi||2;if(e.navHeight){const c=e.navHeight/u;this.navBarHeight=c}});try{const{data:n}=await p.get("/api-student/open/appVersionInfo/queryLatestByPlatform",{params:{platform:"android-student",status:"history"}});this.androidUrl=n.downloadUrl}catch{}},methods:{onBack(){a().isApp?o({api:"goBack"}):this.$router.back()},onDownload(){if(a().weixin){this.wxStatus=!0;return}/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?window.location.href="https://itunes.apple.com/cn/app/id1626971695?mt=8":/(Android)/i.test(navigator.userAgent)?window.location.href=this.androidUrl:this.$toast("\u8BF7\u7528\u624B\u673A\u6216\u79FB\u52A8\u8BBE\u5907\u6253\u5F00")}},render(){return t("div",{class:s.inviteSuccess},[a().isApp&&t(d,{name:"arrow-left",class:s.backIcon,style:{top:`calc(${this.navBarHeight}px + 12px)`},onClick:this.onBack},null),t("img",{src:m},null),t("p",{class:s.h2},[i("\u606D\u559C\u4F60\u6CE8\u518C\u6210\u529F")]),t("p",{class:s.tips},[i("\u4E0B\u8F7D\u9177\u4E50\u79C0APP\u5F00\u542F\u5668\u4E50\u5B66\u4E60\u4E4B\u65C5\uFF01")]),!a().isApp&&t("div",{class:"btnGroup"},[t(l,{type:"primary",round:!0,class:s.btnDownload,onClick:this.onDownload},{default:()=>[i("\u4E0B\u8F7D\u9177\u4E50\u79C0")]})]),this.wxStatus&&t("div",{class:s.wxpopup,onClick:()=>{this.wxStatus=!1}},[t("img",{src:h,alt:""},null)])])}});export{k as default};

dist/index.html

@@ -52,17 +52,10 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index.e487bce8.js"></script>
+  <script type="module" crossorigin src="./assets/index.037040e0.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
-  <link rel="modulepreload" href="./assets/routes-common.0ddf8a01.js">
-=======
-  <script type="module" crossorigin src="./assets/index.108c25e9.js"></script>
-  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
-  <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
-  <link rel="modulepreload" href="./assets/routes-common.11ffc3e2.js">
->>>>>>> iteration-tenant-album
+  <link rel="modulepreload" href="./assets/routes-common.2a206991.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -74,13 +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>
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.1ea3eb35.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.64ad1b05.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-tenant-album
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.d91a51e1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -52,15 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/teacher.7000c903.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.b8fa7175.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
-  <link rel="modulepreload" href="./assets/routes-common.0ddf8a01.js">
-=======
-  <script type="module" crossorigin src="./assets/teacher.7d947699.js"></script>
-  <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
-  <link rel="modulepreload" href="./assets/routes-common.11ffc3e2.js">
->>>>>>> iteration-tenant-album
+  <link rel="modulepreload" href="./assets/routes-common.2a206991.js">
   <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>
@@ -70,13 +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>
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.25e4c579.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.565f5913.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-tenant-album
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.0035d5b1.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.1bf2da27.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.e7660363.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.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.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.b2776376.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.0fc457c9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>