修改登录

src/App.vue

@@ -17,7 +17,7 @@
             <el-form-item prop="pwd">
               <el-input show-password placeholder="请输入密码" tabindex="1" v-model="form.pwd"></el-input>
             </el-form-item>
-            <div v-if="Number(errorNum) >= 2" class="flex-wrap">
+            <div v-if="Number(errorNum) >= 3" class="flex-wrap">
               <el-form-item class="flex1" prop="identify">
                 <el-input ref="identify" v-model.trim="form.identify" placeholder="请输入验证码" name="identify" tabindex="1" />
               </el-form-item>
@@ -96,7 +96,7 @@ export default {
   },
   mounted () {
     const num = Number(this.errorNum);
-    if (this.dialog && num >= 2) {
+    if (this.dialog && num >= 3) {
       // this.flag = true;
       this.getCheckCode();
     }
@@ -227,7 +227,7 @@ export default {
           LoginName: this.name,
           LoginPwd: this.form.pwd,
         }
-        if (Number(this.errorNum) >= 2) {
+        if (Number(this.errorNum) >= 3) {
           obj.CheckCode = this.form.identify;
         }
         const res = await SsoLogin(obj);
@@ -245,7 +245,7 @@ export default {
         } else {
           const num = Number(res.returnData);
           this.$store.dispatch("app/getErrorNum", num);
-          if (num >= 2) {
+          if (num >= 3) {
             this.getCheckCode();
           }
           if (num >= 5) {

src/api/login.js

@@ -5,8 +5,8 @@ export function GetCheckCode (params) {
     return request({
         url: '/api/fs4a/GetCheckCode/v1',
         method: 'post',
-        islogin: true
-        // data: params
+        islogin: true,
+        data: params
     })
 }
 

src/store/modules/user.js

@@ -51,24 +51,28 @@ const actions = {
   // user login
   login ({ commit }, userInfo) {
     return new Promise((resolve, reject) => {
-      login(userInfo).then(response => {
-        const { returnData } = response
-        commit('SET_TOKEN', returnData.Token)
-        commit('SET_UserType', returnData.UserType)
-        commit('SET_UserId', returnData.UserId)
-        commit('SET_LOGIN', returnData.FirstLogin)
-        sessionStorage.setItem("userName", userInfo.LoginName);
-        sessionStorage.setItem("token", returnData.Token);
-        setToken(TokenKey, returnData.Token);
-        setToken('FirstLogin', returnData.FirstLogin);
-        setUserId(returnData.UserId)
-        let nowDate = new Date();
-        let oldDate = new Date(returnData.ValidTime);
-        let diffTime = oldDate - nowDate;
-        setTimeout(function () {
-          resetToken()
-        }, diffTime)
-        resolve()
+      login(userInfo).then(res => {
+        if (res.code == 0) {
+          const { returnData } = res
+          commit('SET_TOKEN', returnData.Token)
+          commit('SET_UserType', returnData.UserType)
+          commit('SET_UserId', returnData.UserId)
+          commit('SET_LOGIN', returnData.FirstLogin)
+          sessionStorage.setItem("userName", userInfo.LoginName);
+          sessionStorage.setItem("token", returnData.Token);
+          setToken(TokenKey, returnData.Token);
+          setToken('FirstLogin', returnData.FirstLogin);
+          setUserId(returnData.UserId)
+          let nowDate = new Date();
+          let oldDate = new Date(returnData.ValidTime);
+          let diffTime = oldDate - nowDate;
+          setTimeout(function () {
+            resetToken()
+          }, diffTime)
+          resolve()
+        } else {
+          reject(res)
+        }
       }).catch(error => {
         reject(error)
       })

src/views/login/index.vue

@@ -59,7 +59,7 @@ import Identify from './identify.vue';
 import Dialog from "@/layout/components/Dialog/index.vue";
 import { GetCheckCode, getToken } from '@/api/login';
 import { GetSystemSet } from "@/api/systemConfiguration";
-import { setCodeToken, setToken } from '@/utils/auth';
+import { setCodeToken, getCodeToken } from '@/utils/auth';
 import { getAuthListByUser } from '@/api/Account';
 export default {
   name: 'Login',
@@ -132,7 +132,8 @@ export default {
           const params = {
             LoginName: this.loginForm.username,
             LoginPwd: this.loginForm.password,
-            CheckCode: this.loginForm.identify
+            CheckCode: this.loginForm.identify,
+            token: getCodeToken()
           }
           this.$store
             .dispatch("user/login", params)
@@ -178,7 +179,10 @@ export default {
               }, 100);
               this.loading = false;
             })
-            .catch(() => {
+            .catch((res) => {
+              if (res.message) {
+                this.$message.error(res.message);
+              }
               this.getCheckCode();
               this.loginForm.password = '';
               this.loginForm.identify = '';
@@ -198,7 +202,9 @@ export default {
     },
     //获取动态验证码
     async getCheckCode () {
-      const res = await GetCheckCode({});
+      const res = await GetCheckCode({
+        token: getCodeToken()
+      });
       if (res.code === 0) {
         this.loginForm.CheckCode = res.returnData;
       } else {