From 61b1a5ee0414ce51e86b034464ca79edb06029f9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 22 十一月 2024 15:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/page/login/userlogin.vue |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
index ccb8660..9a672e3 100644
--- a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
+++ b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -212,6 +212,10 @@
       done();
     },
     handleLogin() {
+      if (!this.loginForm.username) {
+        this.$message.error('璇疯緭鍏ョ敤鎴峰悕');
+        return;
+      }
       if (!this.loginForm.password) {
         this.$message.error('璇疯緭鍏ュ瘑鐮�');
         return;
@@ -227,6 +231,11 @@
           this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
             if (data.obj.failCode !== 'loginSuccess') {
               // console.log('data', data);
+              if (data.obj.failCode === 'userIsLocked') {
+                this.$message.error(`鐧诲綍閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾銆�${data.obj.failMsgArray[0]}銆戝垎閽焋);
+                loading.close();
+                return;
+              }
               this.$message.error(data.msg);
               if (data.obj.mustChangePassword) {
                 this.passwordVisible = true;
@@ -247,6 +256,7 @@
               }
             }
             ;
+
             this.$router.push({path: this.tagWel.value});
             loading.close();
           }).catch((err) => {

--
Gitblit v1.9.3