From 6a117c8ed08ef6fb9e455822414801804bfdcbaa Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 15 一月 2026 17:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/login.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 29d691b..6217877 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -67,7 +67,7 @@
</template>
<script setup>
-import { getCodeImg } from "@/api/login"
+import {getCodeImg} from "@/api/login"
import Cookies from "js-cookie"
import { encrypt, decrypt } from "@/utils/jsencrypt"
import useUserStore from '@/store/modules/user'
@@ -79,11 +79,9 @@
const { proxy } = getCurrentInstance()
const loginForm = ref({
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
- // code: "",
- uuid: ""
})
const loginRules = {
@@ -109,18 +107,10 @@
if (valid) {
loading.value = true
// 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
- if (loginForm.value.rememberMe) {
- Cookies.set("username", loginForm.value.username, { expires: 30 })
- Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 })
- Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 })
- } else {
- // 鍚﹀垯绉婚櫎
- Cookies.remove("username")
- Cookies.remove("password")
- Cookies.remove("rememberMe")
- }
- // 璋冪敤action鐨勭櫥褰曟柟娉�
- userStore.login(loginForm.value).then(() => {
+ Cookies.set("username", loginForm.value.username, { expires: 30 })
+ Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 })
+ Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 })
+ userStore.loginCheckFactory(loginForm.value).then(res => {
const query = route.query
const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
if (cur !== "redirect") {
@@ -168,7 +158,7 @@
<style lang='scss' scoped>
.login {
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url("../assets/images/login-background.png");
background-size: cover;
position: relative;
}
@@ -183,7 +173,7 @@
.login-form {
position: absolute;
top: 50%;
- right: 19%;
+ right: 15%;
transform: translate(0, -50%);
border-radius: 6px;
background: #ffffff;
@@ -191,6 +181,7 @@
height: 500px;
padding: 40px;
z-index: 1;
+ box-shadow: 0 0 5px 1px #ccc;
.el-input {
height: 40px;
input {
--
Gitblit v1.9.3