lex 1 rok temu
rodzic
commit
ba3905a7d4

Plik diff jest za duży
+ 0 - 2
dist/assets/auth-login-legacy.ef9e1780.js


Plik diff jest za duży
+ 0 - 2
dist/assets/auth-login.081389fb.js


Plik diff jest za duży
+ 0 - 2
dist/assets/cert-three-legacy.91672783.js


Plik diff jest za duży
+ 0 - 2
dist/assets/cert-three.9d4e4ec5.js


Plik diff jest za duży
+ 0 - 2
dist/assets/create-legacy.0ed6851c.js


Plik diff jest za duży
+ 0 - 2
dist/assets/create.db5a6bfc.js


+ 0 - 14
dist/assets/home-layout-center.8a507ff7.js

@@ -1,15 +1 @@
-<<<<<<< HEAD
-<<<<<<<< HEAD:dist/assets/home-layout-center.8a507ff7.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.a805e156.js";import"./auth.502d2fa7.js";import"./routes-common.aad7548d.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-upload-works
-<<<<<<<< HEAD:dist/assets/home-layout-center.b807abc1.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.95ce382c.js";import{a,b as h}from"./index.5f703804.js";import"./auth.27f1cea0.js";import"./routes-common.d5b4267c.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.4f40e5e1.js";import{a,b as h}from"./index.a805e156.js";import"./auth.502d2fa7.js";import"./routes-common.aad7548d.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};
->>>>>>>> ce24f30b8 (更新):dist/assets/home-layout-center.8a507ff7.js
-<<<<<<< HEAD
->>>>>>>> iteration-upload-works:dist/assets/home-layout-center.b807abc1.js
-=======
->>>>>>> iteration-upload-works

Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.057f34e5.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.2da28a45.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.61c8631d.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.9a35ba20.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.dbfcb81c.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index-legacy.e0e87061.js


Plik diff jest za duży
+ 0 - 0
dist/assets/index-share-legacy.05adad58.js


Plik diff jest za duży
+ 0 - 0
dist/assets/index-share.c38d43fc.css


Plik diff jest za duży
+ 0 - 2
dist/assets/index.39d4b0fb.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index.81ba77a2.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index.c0875f86.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index.c98f2455.js


Plik diff jest za duży
+ 0 - 2
dist/assets/index.f7b756f7.js


BIN
dist/assets/login-bg.0cfeca83.png


BIN
dist/assets/login-bg.7440b91c.png


Plik diff jest za duży
+ 0 - 2
dist/assets/login-legacy.f24e02c9.js


Plik diff jest za duży
+ 0 - 2
dist/assets/login.0aff9e22.js


Plik diff jest za duży
+ 0 - 0
dist/assets/polyfills-legacy.9d7739ea.js


Plik diff jest za duży
+ 0 - 0
dist/assets/routes-common.aad7548d.js


Plik diff jest za duży
+ 0 - 0
dist/assets/tenant.d03445f7.js


+ 1 - 24
dist/index.html

@@ -52,23 +52,10 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/index.5f703804.js"></script>
-  <link rel="modulepreload" href="./assets/index.95ce382c.js">
-  <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
-  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
-=======
->>>>>>> iteration-upload-works
   <script type="module" crossorigin src="./assets/index.a805e156.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.aad7548d.js">
-<<<<<<< HEAD
-=======
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -80,18 +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.c8e8477e.js"></script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.dbfcb81c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.dad21cc1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.dbfcb81c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
 </body>
 
 </html>

+ 1 - 23
dist/teacher.html

@@ -52,21 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.a7dfe69b.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/routes-common.aad7548d.js">
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/teacher.10277b1c.js"></script>
-  <link rel="modulepreload" href="./assets/index.95ce382c.js">
-  <link rel="modulepreload" href="./assets/routes-common.d5b4267c.js">
-=======
-  <script type="module" crossorigin src="./assets/teacher.a7dfe69b.js"></script>
-  <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
-  <link rel="modulepreload" href="./assets/routes-common.aad7548d.js">
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
   <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>
@@ -76,18 +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.c8e8477e.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.93c8f7a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.90c50844.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.93c8f7a2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
 </body>
 
 </html>

+ 1 - 23
dist/tenant.html

@@ -52,21 +52,9 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.d03445f7.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
-=======
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./assets/tenant.1032bcd6.js"></script>
-  <link rel="modulepreload" href="./assets/index.95ce382c.js">
-  <link rel="modulepreload" href="./assets/auth.27f1cea0.js">
-=======
-  <script type="module" crossorigin src="./assets/tenant.d03445f7.js"></script>
-  <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
-  <link rel="modulepreload" href="./assets/auth.502d2fa7.js">
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/tenant.d44cc3f0.css">
@@ -78,18 +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
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.7eefcbaa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-<<<<<<< HEAD
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.efb7d450.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.5d49d5b2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.7eefcbaa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> ce24f30b8 (更新)
->>>>>>> iteration-upload-works
 </body>
 
 </html>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików