合并

dist/assets/home-layout-center-legacy.77e09534.js

@@ -1 +0,0 @@
-!function(){function e(e,t,n,r,o,s,u){try{var a=e[s](u),i=a.value}catch(c){return void n(c)}a.done?t(i):Promise.resolve(i).then(r,o)}System.register(["./index-legacy.1d96369d.js","./index-legacy.760faaa6.js","./auth-legacy.0d8e68e9.js","./routes-common-legacy.693df4a2.js"],(function(t){"use strict";var n,r,o,s,u,a,i,c,f,d;return{setters:[function(e){n=e.d,r=e.g,o=e.t,s=e.p,u=e.i,a=e.j,i=e.C,c=e.F},function(e){f=e.a,d=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,i;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:i=e.sent,u(i.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,i,"next",t)}function i(t){e(u,o,s,a,i,"throw",t)}a(void 0)}))})()}},render:function(){return a(c,null,[this.status?a("div",{class:d.error},[a(i,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.8fedff86.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center.c9dc897a.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.0bc69707.js";import"./auth.502d2fa7.js";import"./routes-common.94c909a7.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.7e1dcc9b.js";import"./auth.85fc1c66.js";import"./routes-common.e0bfd066.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:dist/assets/home-layout-center.8fedff86.js

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

@@ -1,5 +1 @@
-<<<<<<<< HEAD:dist/assets/home-layout-center.c9dc897a.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.0bc69707.js";import"./auth.502d2fa7.js";import"./routes-common.94c909a7.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.7e1dcc9b.js";import"./auth.85fc1c66.js";import"./routes-common.e0bfd066.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:dist/assets/home-layout-center.8fedff86.js

dist/assets/index.443a3469.css

@@ -1 +0,0 @@
-._cashProtocol_ifi2b_1{position:relative}._cashProtocol_ifi2b_1 ._submit_ifi2b_4{width:90%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;z-index:99}

dist/assets/index.a2c7439f.css

@@ -0,0 +1 @@
+._cashProtocol_12q0m_1{position:relative}._cashProtocol_12q0m_1 ._submit_12q0m_4{width:85%;margin-left:5%;margin-bottom:.4rem;position:absolute;bottom:0;height:1.17333rem;line-height:1.17333rem;z-index:99}

dist/assets/index.f137dcb1.js

@@ -1 +0,0 @@
-import{d as s,g as a,w as r,T as i,n as c,j as t,F as n,B as l,z as u}from"./index.4f40e5e1.js";import{U as m}from"./index.629aebdf.js";import{C as p}from"./index.41aa1fc7.js";import{T as h}from"./index.4b5981fc.js";import"./index.4e826412.js";import"./index.8a241fb6.js";import"./index.ccdfba8f.js";import"./index.d4a74c0c.js";import"./index.c4fa4795.js";import"./index.8e0ac410.js";import"./use-id.d72892eb.js";import"./icon_checkbox_default.2fe5d57e.js";import"./icon_checkbox-tenant.ecfa11df.js";import"./index.94ab113d.js";import"./index.10256463.js";const d="_cashProtocol_ifi2b_1",g="_submit_ifi2b_4";var o={cashProtocol:d,submit:g},A=s({name:"cash-protocol",data(){return{realStatus:!0,url:""}},async mounted(){try{console.log(a.user);const e=a.user.data;!e.realName||!e.idCardNo?this.realStatus=!1:this.getDetail()}catch{}},methods:{async getDetail(){try{const e=await r.get("/api-teacher/sysUserContractRecord/queryLatestContractTemplate",{params:{contractType:"WITHDRAW"}});this.url=window.location.origin+window.location.pathname+"/pdf/web/viewer.html?file="+encodeURIComponent(e.data.origanalFileUrl)+"&btn=1"}catch{}},async onSubmit(){try{await r.get("/api-teacher/sysUserContractRecord/sign",{params:{contractType:"WITHDRAW"}}),setTimeout(()=>{i("\u7B7E\u7F72\u6210\u529F")},100),setTimeout(()=>{c({api:"openPageSuccess",content:{page:"WITHDRAW"}})},1e3)}catch{}},onSuccess(){this.realStatus=!0,this.getDetail()}},render(){return t("div",{class:o.cashProtocol},[t(h,{position:"top"},{default:()=>[t(p,null,null)]}),this.realStatus?t(n,null,[t("iframe",{src:this.url,frameborder:"0",style:{width:"100%",height:"calc(100vh - var(--header-height))",border:"none"}},null),t(l,{type:"primary",size:"large",block:!0,round:!0,class:o.submit,onClick:this.onSubmit},{default:()=>[u("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")]})]):t(m,{onSuccess:this.onSuccess},null)])}});export{A as default};

dist/index.html

@@ -52,17 +52,10 @@
             _T_));
     })(Object);
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index.0bc69707.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.94c909a7.js">
-=======
-  <script type="module" crossorigin src="./assets/index.7e1dcc9b.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.e0bfd066.js">
->>>>>>> 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">
@@ -74,12 +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>
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
-<<<<<<< HEAD
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9524fb68.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.760faaa6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> iteration-upload-works
 </body>
 
 </html>

dist/teacher.html

@@ -52,7 +52,7 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.227b7bfe.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.cc92a51c.js"></script>
   <link rel="modulepreload" href="./assets/index.4f40e5e1.js">
   <link rel="modulepreload" href="./assets/routes-common.94c909a7.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
@@ -64,8 +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>
-  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.9d7739ea.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.0abe9658.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/teacher-legacy.f8964827.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/tenant.html

@@ -66,7 +66,7 @@
   
   <!-- <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>
+  <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.c8e8477e.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.f5c07b07.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>