From 1c8473a5dac1ad19fa4ddb69b6c2c1da7ba5bd18 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期四, 16 六月 2022 11:35:33 +0800
Subject: [PATCH] Merge pull request #54 from biubiaYang/patch-1

---
 src/views/login.vue |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index d69b165..d60e73f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,6 +6,7 @@
         <el-input
           v-model="loginForm.username"
           type="text"
+          size="large"
           auto-complete="off"
           placeholder="璐﹀彿"
         >
@@ -16,6 +17,7 @@
         <el-input
           v-model="loginForm.password"
           type="password"
+          size="large"
           auto-complete="off"
           placeholder="瀵嗙爜"
           @keyup.enter="handleLogin"
@@ -26,6 +28,7 @@
       <el-form-item prop="code" v-if="captchaOnOff">
         <el-input
           v-model="loginForm.code"
+          size="large"
           auto-complete="off"
           placeholder="楠岃瘉鐮�"
           style="width: 63%"
@@ -41,7 +44,7 @@
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
-          size="medium"
+          size="large"
           type="primary"
           style="width:100%;"
           @click.prevent="handleLogin"
@@ -56,7 +59,7 @@
     </el-form>
     <!--  搴曢儴  -->
     <div class="el-login-footer">
-      <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -65,8 +68,9 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
+import useUserStore from '@/store/modules/user'
 
-const store = useStore();
+const userStore = useUserStore()
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 
@@ -96,7 +100,7 @@
   proxy.$refs.loginRef.validate(valid => {
     if (valid) {
       loading.value = true;
-      // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪cookie涓缃浣忕敤鎴锋槑鍜屽悕鍛�
+      // 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
       if (loginForm.value.rememberMe) {
         Cookies.set("username", loginForm.value.username, { expires: 30 });
         Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
@@ -108,7 +112,7 @@
         Cookies.remove("rememberMe");
       }
       // 璋冪敤action鐨勭櫥褰曟柟娉�
-      store.dispatch("Login", loginForm.value).then(() => {
+      userStore.login(loginForm.value).then(() => {
         router.push({ path: redirect.value || "/" });
       }).catch(() => {
         loading.value = false;
@@ -167,15 +171,15 @@
   width: 400px;
   padding: 25px 25px 5px 25px;
   .el-input {
-    height: 38px;
+    height: 40px;
     input {
-      height: 38px;
+      height: 40px;
     }
   }
   .input-icon {
     height: 39px;
     width: 14px;
-    margin-left: 2px;
+    margin-left: 0px;
   }
 }
 .login-tip {
@@ -185,7 +189,7 @@
 }
 .login-code {
   width: 33%;
-  height: 38px;
+  height: 40px;
   float: right;
   img {
     cursor: pointer;
@@ -205,6 +209,7 @@
   letter-spacing: 1px;
 }
 .login-code-img {
-  height: 38px;
+  height: 40px;
+  padding-left: 12px;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3