From 2e4133d2bbb0f4626cf336f3e456783b9fb7867e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 04 八月 2022 02:40:08 +0800
Subject: [PATCH] 优化部分样式

---
 src/views/login/components/loginForm.vue |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/login/components/loginForm.vue b/src/views/login/components/loginForm.vue
index 4d36a4e..ca53a63 100644
--- a/src/views/login/components/loginForm.vue
+++ b/src/views/login/components/loginForm.vue
@@ -12,22 +12,22 @@
           >
             <el-form-item prop="loginName">
               <el-input
-                v-model="user.loginName"
+                v-model.trim="user.loginName"
                 placeholder="璇疯緭鍏ユ墜鏈哄彿 / 鐢ㄦ埛鍚�"
               >
                 <i slot="prefix" class="iconfont">&#xe603;</i>
               </el-input>
             </el-form-item>
             <el-form-item prop="password" class="password-form-item">
-              <el-input
+              <PwInput v-model="user.password" :showPreIcon="true"> </PwInput>
+              <!--   <el-input
                 show-password
                 @keyup.enter.native="userLogin"
                 v-model="user.password"
                 autocomplete="off"
                 placeholder="璇疯緭鍏ュ瘑鐮�"
               >
-                <i slot="prefix" class="iconfont">&#xe608;</i>
-              </el-input>
+              </el-input> -->
             </el-form-item>
             <el-form-item>
               <el-button
@@ -104,7 +104,12 @@
 </template>
 
 <script>
-import { tologin, getLoginUserData, getVerifyCode } from "@/api/login";
+import {
+  tologin,
+  getLoginUserData,
+  makeVerifyCode,
+  getMenuPermission,
+} from "@/api/login";
 import { isPhone } from "@/scripts/validate";
 
 export default {
@@ -234,11 +239,12 @@
           this.codeDisabled = true;
           this.getValidStr();
           this.timer = setInterval(this.getValidStr, 1000);
-          getVerifyCode({ phoneNum: this.phone.phoneNum })
+          makeVerifyCode({ phoneNum: this.phone.phoneNum, type: 0 })
             .then(() => {
               this.gotCode = true;
             })
             .catch((err) => {
+              console.log(this.$refs[formName].fields);
               this.$refs[formName].fields[0].validateState = "error";
               setTimeout(() => {
                 if (document.querySelector(".el-form-item__error")) {
@@ -263,7 +269,6 @@
     async testLogin(param) {
       tologin(param)
         .then((res) => {
-          console.log("--------");
           const data = res.data;
           const loginedInfo = {
             access_token: data.token_type + " " + data.access_token,
@@ -271,10 +276,13 @@
           };
           sessionStorage.setItem("expires_in", data.expires_in);
           sessionStorage.setItem("loginedInfo", JSON.stringify(loginedInfo));
-          sessionStorage.setItem("userInfo", JSON.stringify(data.userInfo));
-          this.loading.close();
 
-          this.$router.push("/");
+          getMenuPermission().then((rep) => {
+            data.userInfo.permissions = rep.data.permissions;
+            sessionStorage.setItem("userInfo", JSON.stringify(data.userInfo));
+            this.$router.push("/");
+          });
+          this.loading.close();
         })
         .catch((err) => {
           this.loading.close();
@@ -371,7 +379,7 @@
   width: 660px;
   height: 454px;
   left: 240px;
-  top: 313px;
+  top: 25vh;
   box-sizing: border-box;
   background-color: #fff;
 

--
Gitblit v1.8.0