更新

dist/assets/home-layout-center-legacy.3a86635e.js

@@ -1 +0,0 @@
-!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.26c2050f.js","./index-legacy.dfa6f124.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.01df35d8.js"],(function(e){"use strict";var n,r,o,s,u,a,c,i,f,d;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,d=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:d.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center-legacy.d6810ad7.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.26c2050f.js","./index-legacy.6d2676e6.js","./auth-legacy.3e4dd113.js","./routes-common-legacy.c71c8d9f.js"],(function(t){"use strict";var n,r,o,s,u,a,c,i,f,d;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,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,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:d.error},[a(c,{type:"notFond",classImgSize:"CERT",tips:"加载失败，请稍后重试",buttonText:"重新加载",plain:!0,onClick:this.getUserInfo},null)]):a("div",null,null)])}}))}}}))}();

dist/assets/home-layout-center.02fdf7bc.js → dist/assets/home-layout-center.b1f4c045.js

@@ -1 +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.ff6db5d6.js";import{a,b as h}from"./index.65b3b748.js";import"./auth.eb9bda32.js";import"./routes-common.7f19c2d5.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.3cceaacc.js";import"./auth.eb9bda32.js";import"./routes-common.2f120901.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/index.html

@@ -52,10 +52,10 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/index.65b3b748.js"></script>
+  <script type="module" crossorigin src="./assets/index.3cceaacc.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.7f19c2d5.js">
+  <link rel="modulepreload" href="./assets/routes-common.2f120901.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">
@@ -68,7 +68,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.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.dfa6f124.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.6d2676e6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -52,9 +52,9 @@
             _T_));
     })(Object);
   </script>
-  <script type="module" crossorigin src="./assets/teacher.e4bab091.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.b5ab181c.js"></script>
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
-  <link rel="modulepreload" href="./assets/routes-common.7f19c2d5.js">
+  <link rel="modulepreload" href="./assets/routes-common.2f120901.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>
@@ -65,7 +65,7 @@
   
   <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.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.537571cb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.d3e03c5a.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.4ebc976e.js"></script>
+  <script type="module" crossorigin src="./assets/tenant.8daf134f.js"></script>
   <link rel="modulepreload" href="./assets/index.ff6db5d6.js">
   <link rel="modulepreload" href="./assets/auth.eb9bda32.js">
   <link rel="stylesheet" href="./assets/index.90dd4d0d.css">
@@ -67,7 +67,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.b8ce021b.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.1b2cbb1c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/tenant-legacy.afbf6e07.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/components/col-img-code/index.tsx

@@ -14,6 +14,10 @@ export default defineComponent({
       // (...args: any[]) => any) | undefined
       default: () => {}
     },
+    registerType: {
+      type: String,
+      default: 'LOGIN'
+    },
     onSendCode: {
       type: Function,
       default: () => {}
@@ -68,7 +72,7 @@ export default defineComponent({
           requestType: 'form',
           data: {
             mobile: this.phone,
-            type: 'LOGIN',
+            type: this.registerType,
             code: this.code
           }
         })

src/tenant/layout/login.tsx

@@ -1,4 +1,4 @@
-import { defineComponent } from 'vue'
+import { defineComponent, nextTick } from 'vue'
 import { CellGroup, Field, Button, CountDown, Row, Col, Toast } from 'vant'
 import ImgCode from '@/components/col-img-code'
 import { checkPhone } from '@/helpers/validate'
@@ -110,10 +110,7 @@ export default defineComponent({
         this.directNext()
       } catch (e: any) {
         // 说明用户不存在
-        if (e.message.indexOf('验证码校验失败') > -1) {
-          Toast('验证码校验失败')
-          return
-        }
+
         if (
           e.message.indexOf('409') > -1 &&
           this.isTrainGroup &&
@@ -138,7 +135,10 @@ export default defineComponent({
     },
     onCodeSend() {
       this.countDownStatus = false
-      this.countDownRef.start()
+      nextTick(() => {
+        console.log(this.countDownRef, 'this.countDownRef')
+        this.countDownRef.start()
+      })
     },
     onFinished() {
       this.countDownStatus = true
@@ -210,7 +210,7 @@ export default defineComponent({
                         </span>
                       ) : (
                         <CountDown
-                          ref={this.countDownRef}
+                          ref={(el: any) => (this.countDownRef = el)}
                           auto-start={false}
                           time={this.countDownTime}
                           onFinish={this.onFinished}

src/views/tenantStudentRejest/index.tsx

@@ -611,6 +611,7 @@ export default defineComponent({
             <ImgCode
               v-model:value={data.imgCodeStatus}
               phone={forms.phone}
+              registerType="REGISTER"
               onClose={() => {
                 data.imgCodeStatus = false
               }}