From 8957e28898763dae9f4064d5b4522cc737305d9b Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao@zte-its.com>
Date: Fri, 9 Aug 2019 14:39:11 +0800
Subject: [PATCH] 停车服务登录 重复发送验证码 bug修复

---
 src/utils/request.js      | 16 ++++++++++------
 src/views/login/index.vue | 37 +++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index d1a1772..3f3be7a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -46,13 +46,17 @@ service.interceptors.response.use(
     const res = response.data;
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !='8888') {
-      Message({
-        message: res.msg || 'Error',
-        type: 'error',
-        duration: 5 * 1000
-      })
+      if(res.code!='1011'){
+        Message({
+          message: res.msg || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+        return Promise.reject(res.msg || 'error')
+      }else{
+        return res
+      }
 
-      return Promise.reject(res.msg)
     } else {
       return res
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8bcd0b2..655b588 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -39,7 +39,7 @@
           onkeyup = "value=value.replace(/[^\d]/g,'')"
           @keyup.enter.native="handleLogin"
         />
-        <el-button type="primary" @click="getVerifyCode" :disabled="disabled" style="float:right;margin-top:6px;margin-right:10px;">{{btnTitle}}</el-button>
+        <el-button type="primary" @click="getVerifyCode" :disabled="isDisable" style="float:right;margin-top:6px;margin-right:10px;">{{btnTitle}}</el-button>
       </el-form-item>
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
@@ -85,7 +85,7 @@ export default {
         password: [{ required: true, trigger: 'blur', validator: validatePassword }]
       },
       loading: false,
-      disabled: false,
+      isDisable: false,
       btnTitle: '发送验证码',
       redirect: undefined
     }
@@ -100,13 +100,16 @@ export default {
   },
   methods: {
     getVerifyCode(){
+      this.isDisable = true;
       let phone = this.loginForm.phone;
       if (!this.loginForm.phone) {
+        this.isDisable = false;
         this.$message({
           type: 'error',
           message: '请输入正确的手机号！'
         });
       } else if(!/^1[345678]\d{9}$/.test(this.loginForm.phone)) {
+        this.isDisable = false;
         this.$message({
           type: 'error',
           message: '请输入正确的手机号！'
@@ -114,39 +117,53 @@ export default {
       }
       //获取验证码
       else {
+
         sendValidatorCode(phone).then(response =>{
           let data = response;
             if(data.code=='8888'){
+              console.log(111);
+              this.validateBtn();
               this.$message({
                 type: 'success',
                 message: '验证码发送成功！'
               });
-              this.validateBtn();
             }else{
+              this.isDisable = false;
               this.$message({
                 type: 'error',
                 message: data.msg
               });
             }
         });
-
-
       }
     },
     validateBtn(){
       //倒计时
+      let that = this, time = 60;
+      let sendTimer = setInterval(function(){
+        that.isDisable = true;
+        time--;
+        that.btnTitle = time + '秒后重试';
+        if(time <=0){
+          that.isDisable = false;
+          clearInterval(sendTimer);
+          that.btnTitle = "获取验证码";
+        }
+      },1000)
+
+    /*
       let time = 60;
       let timer = setInterval(() => {
         if(time == 0) {
           clearInterval(timer);
-          this.disabled = false;
-          this.btnTitle = "获取验证码";
+          that.disabled = false;
+          that.btnTitle = "获取验证码";
         } else {
-          this.btnTitle =time + '秒后重试';
-          this.disabled = true;
+          that.btnTitle =time + '秒后重试';
+          that.disabled = true;
           time--
         }
-      },1000)
+      },1000)*/
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
--
libgit2 0.21.4