Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss

f/web-kboss/src/views/login/indexNew.vue

@@ -46,8 +46,7 @@
               <el-form ref="loginForm" :model="loginForm" :rules="rules" class="login-form-l" autocomplete="on"
                 label-position="left">
 
-                <el-form-item prop="username"
-                  style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
+                <el-form-item prop="username" style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
                   <div class="user-input">
                     <span class="svg-container icon-box">
                       <img src="../../assets/kyy/用户.svg" alt="">
@@ -57,8 +56,8 @@
                   </div>
                 </el-form-item>
 
-                <el-tooltip v-model="capsTooltip" style="margin-bottom: 7px"
-                  content="Caps lock is On" placement="right" manual>
+                <el-tooltip v-model="capsTooltip" style="margin-bottom: 7px" content="Caps lock is On" placement="right"
+                  manual>
                   <el-form-item prop="password" class="password-mobile"
                     style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
                     <div class="user-input">
@@ -76,8 +75,7 @@
                   </el-form-item>
                 </el-tooltip>
 
-                <el-form-item prop="mobile"
-                  style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
+                <el-form-item prop="mobile" style="background-color: white; border: 1px solid #d9d9d9;width: 300px;">
                   <div class="user-input">
                     <span class="svg-container icon-box">
                       <img src="../../assets/kyy/用户.svg" alt="">
@@ -435,7 +433,8 @@ export default {
     // 轮询获取微信登录授权码
     pollWxCode() {
       this.getCodeTimer = setInterval(async () => {
-        try {x          // 请求微信授权码x
+        try {
+          x          // 请求微信授权码x
           const res = await reqGetCodeAPI({ state: this.wxState });
           if (!res.status) return;
 
@@ -879,7 +878,7 @@ export default {
                     }
 
                     this.$message({
-                      message: "登录成功~",
+                      message: res.msg,
                       type: "success",
                     });
                   } else {
@@ -899,14 +898,16 @@ export default {
                 });
             } else {
               this.$message({
-                message: "登录失败~",
+                message: res.msg,
+
                 type: "error",
               });
             }
           })
         } else {
           this.$message({
-            message: "请查看登录信息格式",
+            message: res.msg,
+
             type: "error",
           });
           this.$refs.loginForm.resetFields();
@@ -1065,7 +1066,8 @@ $dark_gray: #889aa4;
 
 /* 统一表单项目样式 + 边距 */
 ::v-deep .el-form-item {
-  margin-bottom: 24px !important; /* 给错误提示预留空间 */
+  margin-bottom: 24px !important;
+  /* 给错误提示预留空间 */
 }
 
 /* 统一输入框外框 */
@@ -1188,6 +1190,7 @@ $dark_gray: #889aa4;
   top: 20px;
   left: 20px;
 }
+
 .logo-top1 {
   width: 260px !important;
   height: 80px !important;
@@ -1215,6 +1218,7 @@ $dark_gray: #889aa4;
     align-items: center;
     margin-bottom: 5px;
   }
+
   span {
     margin: 0 10px;
   }
@@ -1241,4 +1245,4 @@ $dark_gray: #889aa4;
     padding: 30px 20px;
   }
 }
-</style>
+</style>