Merge remote-tracking branch 'origin/master'

src/views/user/Login.vue

@@ -231,7 +231,7 @@
             }else{
               setTimeout(function() {
                 that.loading = false;
-              },1000)
+              },500)
             }
           })
           // 使用手机号登陆
@@ -297,6 +297,7 @@
       stepCaptchaCancel() {
         this.Logout().then(() => {
           this.loginBtn = false
+          this.loading = false
           this.stepCaptchaVisible = false
         })
       },
@@ -315,6 +316,7 @@
           duration: 4
         })
         this.loginBtn = false
+        this.loading = false
       },
       validateMobile(rule, value, callback) {
         if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) {