Browse Source

Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

lifanagju_citu 6 months ago
parent
commit
058c7fa22e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/config/axios/config.js
  2. 2 2
      src/views/login/index.vue

+ 1 - 1
src/config/axios/config.js

@@ -11,7 +11,7 @@ const config = {
   /**
    * 接口请求超时时间
    */
-  request_timeout: 30000,
+  request_timeout: 60000,
 
   /**
    * 默认接口请求类型

+ 2 - 2
src/views/login/index.vue

@@ -51,7 +51,7 @@
             <span class="float-left color-666 cursor-pointer" v-if="tab === 2" @click="router.push(isEnterpriseLogin ? '/forgotPasswordEnt': '/forgotPassword')">忘记密码</span>
             <span class="float-right color-error cursor-pointer text-decoration-underline" @click="router.push('/register/selected')">还没有登录账户?去注册</span>
           </div>
-          <v-btn :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click="handleLogin">
+          <v-btn :loading="loginLoading" color="primary" class="white--text mt-5" min-width="350" @click.stop="handleLogin">
             {{ $t('login.login') }}
           </v-btn>
           <div class="login-tips mt-3">
@@ -171,7 +171,7 @@ const handleLogin = async () => {
     console.log(err)
     captchaStr.value = '' // 清空人机验证
     phoneRef.value.clearCaptcha() // 清空人机验证
-    if (!err.code) return
+    if (!err.code || err.message.includes('timeout')) return
     if (err.code === 1100017022) {
       // 密码不安全
       router.push('/forgotPassword?forgot=1')