Merge branch 'master' of http://git.dayaedu.com/lex/h5-colexiu

dist/assets/home-layout-center-legacy.20dce619.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,s,u){try{var a=t[s](u),c=a.value}catch(i){return void n(i)}a.done?e(c):Promise.resolve(c).then(r,o)}System.register(["./index-legacy.15af8cfc.js","./index-legacy.161f5f83.js","./auth-legacy.561e85dd.js","./routes-common-legacy.c40293fd.js"],(function(e){"use strict";var n,r,o,s,u,a,c,i,f,l;return{setters:[function(t){n=t.d,r=t.g,o=t.t,s=t.p,u=t.i,a=t.j,c=t.C,i=t.F},function(t){f=t.a,l=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,c;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.prev=0,t.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 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,f.get("/api-student/student/queryUserInfo",{initRequest:!0});case 9:c=t.sent,u(c.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,c,"next",e)}function c(e){t(u,o,s,a,c,"throw",e)}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.f08a8f7c.js → dist/assets/home-layout-center.3d84b719.js

@@ -1,5 +1,9 @@
+<<<<<<< HEAD:dist/assets/home-layout-center.f08a8f7c.js
 <<<<<<<< HEAD:dist/assets/home-layout-center.f08a8f7c.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.6ef914f8.js";import"./auth.6ac00a50.js";import"./routes-common.5daa7b90.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.75cd7991.js";import"./auth.eb9bda32.js";import"./routes-common.9ab2dd22.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};
 >>>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047:dist/assets/home-layout-center.13283654.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.7d11e0af.js";import"./auth.6ac00a50.js";import"./routes-common.a3b02d79.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};
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb:dist/assets/home-layout-center.3d84b719.js

dist/index.html

@@ -53,6 +53,7 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.6ef914f8.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
@@ -63,6 +64,12 @@
   <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
   <link rel="modulepreload" href="./assets/routes-common.9ab2dd22.js">
 >>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
+=======
+  <script type="module" crossorigin src="./assets/index.7d11e0af.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.a3b02d79.js">
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
   <link rel="stylesheet" href="./assets/auth.f09b6d78.css">
   <link rel="stylesheet" href="./assets/index.820e7d12.css">
@@ -75,12 +82,17 @@
   <!-- <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.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.ac77ba14.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.43ae32b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.161f5f83.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
 </body>
 
 </html>

dist/teacher.html

@@ -53,6 +53,7 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/teacher.a6f5c11b.js"></script>
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/routes-common.5daa7b90.js">
@@ -61,6 +62,11 @@
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
   <link rel="modulepreload" href="./assets/routes-common.9ab2dd22.js">
 >>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
+=======
+  <script type="module" crossorigin src="./assets/teacher.09920186.js"></script>
+  <link rel="modulepreload" href="./assets/index.096808cc.js">
+  <link rel="modulepreload" href="./assets/routes-common.a3b02d79.js">
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
   <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>
@@ -71,12 +77,17 @@
   
   <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.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.37ff3a7a.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.da009fd5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.eb011e1a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
 </body>
 
 </html>

dist/tenant.html

@@ -53,7 +53,11 @@
     })(Object);
   </script>
 <<<<<<< HEAD
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/tenant.84f920fb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/tenant.8a30b04e.js"></script>
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
   <link rel="modulepreload" href="./assets/index.096808cc.js">
   <link rel="modulepreload" href="./assets/auth.6ac00a50.js">
 =======
@@ -73,12 +77,17 @@
   <!-- <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.f30a2c2c.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.6e86fb9d.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.4c47547e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 >>>>>>> b23ff98aa3a64b895000856ec2fd0662ea2b3047
+=======
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b8ce021b.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.074223d2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> 4a199ad0b89d648d442e2f7f1d1a650c1dde2bbb
 </body>
 
 </html>