合并

dist/assets/home-layout-center.9cdcb3d6.js

@@ -1,19 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<<< HEAD:dist/assets/home-layout-center.9cdcb3d6.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.65a71d84.js";import"./auth.6ac00a50.js";import"./routes-common.ebe7bd84.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
-<<<<<<<< HEAD:dist/assets/home-layout-center.ef14b73c.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.95fc58b0.js";import{a,b as h}from"./index.e9056ae1.js";import"./auth.756cf4b4.js";import"./routes-common.9ed4db20.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.096808cc.js";import{a,b as h}from"./index.65a71d84.js";import"./auth.6ac00a50.js";import"./routes-common.ebe7bd84.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};
->>>>>>>> e93ea4b52 (更新):dist/assets/home-layout-center.9cdcb3d6.js
-<<<<<<< HEAD
->>>>>>>> iteration-tenant-album:dist/assets/home-layout-center.ef14b73c.js
-=======
->>>>>>> iteration-tenant-album
-=======
-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.65a71d84.js";import"./auth.6ac00a50.js";import"./routes-common.ebe7bd84.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/index.html

@@ -52,29 +52,10 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index.e9056ae1.js"></script>
-  <link rel="modulepreload" href="./assets/index.95fc58b0.js">
-  <link rel="modulepreload" href="./assets/auth.756cf4b4.js">
-  <link rel="modulepreload" href="./assets/routes-common.9ed4db20.js">
-=======
->>>>>>> iteration-tenant-album
-=======
->>>>>>> iteration-tenant-album
   <script type="module" crossorigin src="./assets/index.65a71d84.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.ebe7bd84.js">
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
->>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -86,23 +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
-<<<<<<< HEAD
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.21befa75.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.56baf7bd.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.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.46439f8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-tenant-album
 </body>
 
 </html>

dist/teacher.html

@@ -52,27 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/teacher.91df7aed.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.4304f1d7.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/teacher.40ebc1d9.js"></script>
-  <link rel="modulepreload" href="./assets/index.95fc58b0.js">
-  <link rel="modulepreload" href="./assets/routes-common.9ed4db20.js">
-=======
-  <script type="module" crossorigin src="./assets/teacher.91df7aed.js"></script>
-  <link rel="modulepreload" href="./assets/index.096808cc.js">
-  <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
-  <script type="module" crossorigin src="./assets/teacher.86ce739f.js"></script>
-  <link rel="modulepreload" href="./assets/index.096808cc.js">
-  <link rel="modulepreload" href="./assets/routes-common.ebe7bd84.js">
->>>>>>> iteration-tenant-album
   <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>
@@ -82,23 +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
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.5d9d36ec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.21befa75.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.3db60f1b.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.5d9d36ec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.6792251e.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.59a1affa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/tenant.html

@@ -52,27 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/tenant.95bfeb74.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.7dad9e5d.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/tenant.58f4f012.js"></script>
-  <link rel="modulepreload" href="./assets/index.95fc58b0.js">
-  <link rel="modulepreload" href="./assets/auth.756cf4b4.js">
-=======
-  <script type="module" crossorigin src="./assets/tenant.95bfeb74.js"></script>
-  <link rel="modulepreload" href="./assets/index.096808cc.js">
-  <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
-  <script type="module" crossorigin src="./assets/tenant.bde87011.js"></script>
-  <link rel="modulepreload" href="./assets/index.096808cc.js">
-  <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
->>>>>>> iteration-tenant-album
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -84,23 +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>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.54d8118b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.21befa75.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.97cb1952.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.54d8118b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> e93ea4b52 (更新)
->>>>>>> iteration-tenant-album
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f30a2c2c.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.d416aac0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-tenant-album
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.7e965e82.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>