Merge branch 'refs/heads/wang' into test

src/views/system/login/api.ts

@@ -25,12 +25,6 @@ export function getUserInfo() {
   })
 }
 
-export function getWorkWeChatCode() {
-  return request({
-    url: '/api/system/wechat/start_oauth',
-    method: 'get',
-  })
-}
 export function postWorkWeChatCode(body) {
   return request({
     url: '/api/system/wechat/login',
@@ -40,7 +34,7 @@ export function postWorkWeChatCode(body) {
 }
 export function WeComLogin(query: any) {
   return request({
-    url: '/api/system/wechat/login/test',
+    url: '/api/system/wechat/login/',
     method: 'get',
     params: query,
   });

src/views/system/login/component/account.vue

@@ -164,9 +164,9 @@ export default defineComponent({
       SystemConfigStore().getSystemConfigs()
     })
 
-    onUnmounted(() => {
-      console.log('卸载了')
-    })
+    // onUnmounted(() => {
+    //   console.log('卸载了')
+    // })
 
     return {
       refreshCaptcha,
@@ -186,6 +186,7 @@ export default defineComponent({
   <el-form ref="formRef" size="large" class="login-content-form" :model="state.ruleForm" :rules="rules">
     <el-form-item class="login-animation1" prop="username">
       <el-input
+        @keydown.enter="loginClick"
         type="text"
         :placeholder="$t('message.account.accountPlaceholder1')"
         v-model="ruleForm.username"
@@ -200,6 +201,7 @@ export default defineComponent({
     </el-form-item>
     <el-form-item class="login-animation2" prop="password">
       <el-input
+        @keydown.enter="loginClick"
         :type="isShowPassword ? 'text' : 'password'"
         :placeholder="$t('message.account.accountPlaceholder2')"
         v-model="ruleForm.password">
@@ -245,7 +247,7 @@ export default defineComponent({
         type="primary"
         class="login-content-submit"
         round
-        @keyup.enter="loginClick"
+        @keydown.enter="loginClick"
         @click="loginClick"
         :loading="loading.signIn">
         <span>{{ $t('message.account.accountBtnText') }}</span>