Merge branch 'liyangzheng'

src/router/index.js

@@ -7,6 +7,12 @@ import Layout from '@/layout'
 import Login from "@/views/login/Login.vue"
 const routes = [
   {
+    path: "/login",
+    component: Login,
+    name: "login",
+    meta: { title: '登录', icon: "el-icon-user-solid", affix: true },
+  },
+  {
     path: '/',
     component: Layout,
     redirect: '/dashboard',
@@ -19,12 +25,6 @@ const routes = [
       }
     ]
   },
-  {
-    path: "/login",
-    component: Login,
-    name: "login",
-    meta: { title: '登录', icon: "el-icon-user-solid", affix: true },
-  }
 ]
 
 const router = new VueRouter({

src/utils/login/login.js

@@ -1,3 +1,15 @@
 import request from "../request"
-export function login(){
+export function loginOut(data) {
+    request({
+        url: '/api/logout',
+        method: "post",
+        data
+    })
+}
+export function login(data) {
+    request({
+        url: "",
+        method: "post",
+        data
+    })
 }

src/views/login/Login.vue

@@ -13,7 +13,8 @@
                     </el-form-item>
                     <el-form-item class="loginItem">
                         <p class="loginItemP">密码</p>
-                        <input class="loginInput" v-model="form.password" @blur="passRule" placeholder="请输入密码" type="password">
+                        <input class="loginInput" v-model="form.password" @blur="passRule" placeholder="请输入密码" :type="inputType">
+                        <img class="imgEyes" src="../../assets/font/fluent：eye-20-regular.png" alt="" @click="changeType">
                         <p class="blurP" v-if="passBlur">密码不能为空</p>
                     </el-form-item>
                     <el-form-item class="loginItem">
@@ -37,6 +38,7 @@ export default {
             rememberUser: false,//是否记住账号
             userBlur: false,//用户名验证
             passBlur: false,//密码验证
+            inputType:"password",//密码输入框性质
         }
     },
     methods: {
@@ -91,6 +93,14 @@ export default {
                 user = JSON.parse(user)
                 this.form.username = user
             }
+        },
+        // ，密码框小眼睛
+        changeType(){
+            if(this.inputType === 'password'){
+                this.inputType = 'text'
+            }else{
+                this.inputType = 'password'
+            }
         }
     },
     created() {
@@ -135,8 +145,14 @@ export default {
     border: 1px solid #dbdbdb;
     background-color: transparent;
     color: white;
+    position: relative;
+}
+/* 密码框小眼睛css */
+.imgEyes{
+    position: absolute;
+    top: 50px;
+    right: 0px;
 }
-
 /* 表单内标题p标签css */
 .loginTitleP {
     width: 210px;