From 963e854c71dd62ba66109638bba51dcea8e5729f Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Mon, 10 Jun 2019 16:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=A0=E5=85=A5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js          | 13 +++++++++++--
 src/store/modules/user.js |  4 +++-
 src/views/login/index.vue | 39 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 1ba7cad..fd55a3b 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,12 +1,14 @@
 import request from '@/utils/request'
 
-export function login(username, password) {
+export function login(username, password, code, uuid) {
   return request({
     url: 'auth/login',
     method: 'post',
     data: {
       username,
-      password
+      password,
+      code,
+      uuid
     }
   })
 }
@@ -17,3 +19,10 @@ export function getInfo() {
     method: 'get'
   })
 }
+
+export function getCodeImg() {
+  return request({
+    url: 'auth/vCode',
+    method: 'get'
+  })
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index eac6178..bfac849 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -30,9 +30,11 @@ const user = {
     Login({ commit }, userInfo) {
       const username = userInfo.username
       const password = userInfo.password
+      const code = userInfo.code
+      const uuid = userInfo.uuid
       const rememberMe = userInfo.rememberMe
       return new Promise((resolve, reject) => {
-        login(username, password).then(res => {
+        login(username, password, code, uuid).then(res => {
           setToken(res.token, rememberMe)
           commit('SET_TOKEN', res.token)
           setUserInfo(res.user, commit)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 50b29e6..650a874 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -12,6 +12,12 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon" style="height: 39px;width: 13px;margin-left: 2px;" />
         </el-input>
       </el-form-item>
+      <el-form-item prop="code">
+        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 60%" @keyup.enter.native="handleLogin"/>
+        <div class="login-code">
+          <img :src="codeUrl" @click="getCode">
+        </div>
+      </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
@@ -19,26 +25,30 @@
           <span v-else>登 录 中...</span>
         </el-button>
       </el-form-item>
-      <p class="login-tip">系统默认用户名：admin，密码：123456</p>
     </el-form>
   </div>
 </template>
 
 <script>
 import Config from '@/config'
+import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 export default {
   name: 'Login',
   data() {
     return {
+      codeUrl: '',
       loginForm: {
         username: 'admin',
         password: '123456',
-        rememberMe: false
+        rememberMe: false,
+        code: '',
+        uuid: ''
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', message: '用户名不能为空' }],
-        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }]
+        password: [{ required: true, trigger: 'blur', message: '密码不能为空' }],
+        code: [{ required: true, trigger: 'change', message: '验证码不能为空' }]
       },
       loading: false,
       redirect: undefined
@@ -53,9 +63,16 @@ export default {
     }
   },
   created() {
+    this.getCode()
     this.getCookie()
   },
   methods: {
+    getCode() {
+      getCodeImg().then(res => {
+        this.codeUrl = 'data:image/gif;base64,' + res.img
+        this.loginForm.uuid = res.uuid
+      })
+    },
     getCookie() {
       const username = Cookies.get('username')
       let password = Cookies.get('password')
@@ -64,7 +81,8 @@ export default {
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password,
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+        code: ''
       }
     },
     handleLogin() {
@@ -86,6 +104,7 @@ export default {
             this.$router.push({ path: this.redirect || '/' })
           }).catch(() => {
             this.loading = false
+            this.getCode()
           })
         } else {
           console.log('error submit!!')
@@ -115,7 +134,7 @@ export default {
   .login-form {
     border-radius: 6px;
     background: #ffffff;
-    width: 365px;
+    width: 380px;
     padding: 25px 25px 5px 25px;
     .el-input {
       height: 38px;
@@ -129,4 +148,14 @@ export default {
     text-align: center;
     color: #bfbfbf;
   }
+  .login-code {
+    width: 33%;
+    display: inline-block;
+    height: 38px;
+    float: right;
+    img{
+      cursor: pointer;
+      vertical-align:middle
+    }
+  }
 </style>