Merge branch 'startLogin'

src/components/timerMeter/components/countdown.tsx

@@ -108,10 +108,12 @@ export default defineComponent({
       timer.value = setInterval(() => {
         // 获取当前时间
         const lastStr = getSecond(count.value)
-        count.value--
-        if( count.value == 0){
+        if( count.value <= 0){
           onReset()
+          return
         }
+        count.value--
+
         const str = getSecond(count.value)
         for (let i = 0; i < flipObjs.value.length; i++) {
           if (lastStr[i] === str[i]) {

src/views/login/components/pwdLogin.tsx

@@ -68,7 +68,6 @@ export default defineComponent({
 
           try {
             await userStore.login(params);
-            // return;
             message.destroyAll();
             //  判断是否勾选自动登录
             if (autoLogin.value) {
@@ -130,7 +129,8 @@ export default defineComponent({
               inputProps={{ autocomplete: 'off' }}
               class={[showPwd.value ? '' : styles['no-pwd']]}
               onKeydown={(e: KeyboardEvent) => {
-                if (e.code === 'Enter') {
+                console.log(e.code)
+                if (e.code === 'Enter' || e.code === 'NumpadEnter') {
                   handleSubmit();
                 }
               }}>