Skip to content

phsl / client

Go to a project
Commit 0860c6c6 by 赵月辉
Options

修改登录注册页面样式

parent 48b9bec6
Showing with 229 additions and 181 deletions
src/views/index.vue
...@@ -167,7 +167,6 @@ const bannerImgList = ref([]) ...@@ -167,7 +167,6 @@ const bannerImgList = ref([])
function getBanner () { function getBanner () {
banner().then(res => { banner().then(res => {
bannerImgList.value = res.data bannerImgList.value = res.data
console.log(res)
}) })
} }
...@@ -205,9 +204,6 @@ getInformation() ...@@ -205,9 +204,6 @@ getInformation()
function openAssembly (data) { function openAssembly (data) {
window.open(data.url) window.open(data.url)
} }
function openPartnership () {
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
......
src/views/login.vue
...@@ -4,163 +4,170 @@ ...@@ -4,163 +4,170 @@
<h3 class="title">先进计算公共服务平台</h3> <h3 class="title">先进计算公共服务平台</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
type="text" type="text"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号">
> <template #prefix>
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <svg-icon icon-class="user" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input
v-model="loginForm.password" v-model="loginForm.password"
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
@keyup.enter="handleLogin" @keyup.enter="handleLogin">
> <template #prefix>
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <svg-icon icon-class="password" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaEnabled"> <el-form-item prop="code" v-if="captchaEnabled">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
style="width: 63%" style="width: 64%"
@keyup.enter="handleLogin" @keyup.enter="handleLogin">
> <template #prefix>
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template> <svg-icon icon-class="validCode" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/> <img :src="codeUrl" @click="getCode" class="login-code-img"/>
</div> </div>
</el-form-item> </el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<div class="flex-align-center flex-space-between mb20">
<el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
<div v-if="register">
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</div>
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button <el-button
:loading="loading" :loading="loading"
size="large" size="large"
type="primary" type="primary"
style="width:100%;" style="width:100%;"
@click.prevent="handleLogin" @click.prevent="handleLogin">
>
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</el-button> </el-button>
<div style="float: right;" v-if="register">
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 底部 --> <!-- 底部 -->
<div class="el-login-footer"> <div class="el-login-footer">
<span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span> <!-- <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>-->
</div> </div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { getCodeImg } from "@/api/login"; import { getCodeImg } from '@/api/login'
import Cookies from "js-cookie"; import Cookies from 'js-cookie'
import { encrypt, decrypt } from "@/utils/jsencrypt"; import { encrypt, decrypt } from '@/utils/jsencrypt'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
const userStore = useUserStore() const userStore = useUserStore()
const route = useRoute(); const route = useRoute()
const router = useRouter(); const router = useRouter()
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance()
const loginForm = ref({ const loginForm = ref({
username: "admin", username: 'admin',
password: "admin123", password: 'admin123',
rememberMe: false, rememberMe: false,
code: "", code: '',
uuid: "" uuid: ''
}); })
const loginRules = { const loginRules = {
username: [{ required: true, trigger: "blur", message: "请输入您的账号" }], username: [{required: true, trigger: 'blur', message: '请输入您的账号'}],
password: [{ required: true, trigger: "blur", message: "请输入您的密码" }], password: [{required: true, trigger: 'blur', message: '请输入您的密码'}],
code: [{ required: true, trigger: "change", message: "请输入验证码" }] code: [{required: true, trigger: 'change', message: '请输入验证码'}]
}; }
const codeUrl = ref(""); const codeUrl = ref('')
const loading = ref(false); const loading = ref(false)
// 验证码开关 // 验证码开关
const captchaEnabled = ref(true); const captchaEnabled = ref(true)
// 注册开关 // 注册开关
const register = ref(false); const register = ref(true)
const redirect = ref(undefined); const redirect = ref(undefined)
watch(route, (newRoute) => { watch(route, (newRoute) => {
redirect.value = newRoute.query && newRoute.query.redirect; redirect.value = newRoute.query && newRoute.query.redirect
}, { immediate: true }); }, {immediate: true})
function handleLogin() { function handleLogin () {
proxy.$refs.loginRef.validate(valid => { proxy.$refs.loginRef.validate(valid => {
if (valid) { if (valid) {
loading.value = true; loading.value = true
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码 // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
if (loginForm.value.rememberMe) { if (loginForm.value.rememberMe) {
Cookies.set("username", loginForm.value.username, { expires: 30 }); Cookies.set('username', loginForm.value.username, {expires: 30})
Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 }); Cookies.set('password', encrypt(loginForm.value.password), {expires: 30})
Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 }); Cookies.set('rememberMe', loginForm.value.rememberMe, {expires: 30})
} else { } else {
// 否则移除 // 否则移除
Cookies.remove("username"); Cookies.remove('username')
Cookies.remove("password"); Cookies.remove('password')
Cookies.remove("rememberMe"); Cookies.remove('rememberMe')
} }
// 调用action的登录方法 // 调用action的登录方法
userStore.login(loginForm.value).then(() => { userStore.login(loginForm.value).then(() => {
const query = route.query; const query = route.query
const otherQueryParams = Object.keys(query).reduce((acc, cur) => { const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
if (cur !== "redirect") { if (cur !== 'redirect') {
acc[cur] = query[cur]; acc[cur] = query[cur]
} }
return acc; return acc
}, {}); }, {})
router.push({ path: redirect.value || "/", query: otherQueryParams }); router.push({path: redirect.value || '/', query: otherQueryParams})
}).catch(() => { }).catch(() => {
loading.value = false; loading.value = false
// 重新获取验证码 // 重新获取验证码
if (captchaEnabled.value) { if (captchaEnabled.value) {
getCode(); getCode()
} }
}); })
} }
}); })
} }
function getCode() { function getCode () {
getCodeImg().then(res => { getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled
if (captchaEnabled.value) { if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img; codeUrl.value = 'data:image/gif;base64,' + res.img
loginForm.value.uuid = res.uuid; loginForm.value.uuid = res.uuid
} }
}); })
} }
function getCookie() { function getCookie () {
const username = Cookies.get("username"); const username = Cookies.get('username')
const password = Cookies.get("password"); const password = Cookies.get('password')
const rememberMe = Cookies.get("rememberMe"); const rememberMe = Cookies.get('rememberMe')
loginForm.value = { loginForm.value = {
username: username === undefined ? loginForm.value.username : username, username: username === undefined ? loginForm.value.username : username,
password: password === undefined ? loginForm.value.password : decrypt(password), password: password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe) rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
}; }
} }
getCode(); getCode()
getCookie(); getCookie()
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
...@@ -169,46 +176,58 @@ getCookie(); ...@@ -169,46 +176,58 @@ getCookie();
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("../assets/images/login-background.jpg"); background-image: url("../assets/images/login-background.png");
background-size: cover; background-size: cover;
} }
.title { .title {
margin: 0px auto 30px auto; margin: 0px auto 30px auto;
text-align: center; text-align: center;
color: #707070; color: #2E77E3;
font-size: 30px;
font-family: YouSheBiaoTiHei, system-ui;
} }
.login-form { .login-form {
border-radius: 6px; border-radius: 2px;
background: #ffffff; background: #ffffff;
width: 400px; width: 400px;
padding: 25px 25px 5px 25px; margin-left: 18%;
padding: 35px 35px 15px 35px;
box-shadow: 0 0 10px 0 rgba(209, 224, 251, 0.79);
.el-input { .el-input {
height: 40px; height: 40px;
input { input {
height: 40px; height: 40px;
} }
} }
.input-icon { .input-icon {
height: 39px; height: 39px;
width: 14px; width: 14px;
margin-left: 0px; margin-left: 0px;
} }
} }
.login-tip { .login-tip {
font-size: 13px; font-size: 13px;
text-align: center; text-align: center;
color: #bfbfbf; color: #bfbfbf;
} }
.login-code { .login-code {
width: 33%; width: 33%;
height: 40px; height: 40px;
float: right; float: right;
img { img {
cursor: pointer; cursor: pointer;
vertical-align: middle; vertical-align: middle;
} }
} }
.el-login-footer { .el-login-footer {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
...@@ -221,8 +240,15 @@ getCookie(); ...@@ -221,8 +240,15 @@ getCookie();
font-size: 12px; font-size: 12px;
letter-spacing: 1px; letter-spacing: 1px;
} }
.login-code-img { .login-code-img {
height: 40px; height: 40px;
padding-left: 12px; padding-left: 12px;
} }
.link-type {
font-size: 14px;
font-weight: 500;
color: var(--el-color-primary);
}
</style> </style>
src/views/register.vue
...@@ -4,154 +4,160 @@ ...@@ -4,154 +4,160 @@
<h3 class="title">先进计算公共服务平台</h3> <h3 class="title">先进计算公共服务平台</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="registerForm.username" v-model="registerForm.username"
type="text" type="text"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号">
> <template #prefix>
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <svg-icon icon-class="user" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input
v-model="registerForm.password" v-model="registerForm.password"
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
@keyup.enter="handleRegister" @keyup.enter="handleRegister">
> <template #prefix>
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <svg-icon icon-class="password" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="confirmPassword"> <el-form-item prop="confirmPassword">
<el-input <el-input
v-model="registerForm.confirmPassword" v-model="registerForm.confirmPassword"
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="确认密码" placeholder="确认密码"
@keyup.enter="handleRegister" @keyup.enter="handleRegister">
> <template #prefix>
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <svg-icon icon-class="password" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaEnabled"> <el-form-item prop="code" v-if="captchaEnabled">
<el-input <el-input
size="large" size="large"
v-model="registerForm.code" v-model="registerForm.code"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
style="width: 63%" style="width: 64%"
@keyup.enter="handleRegister" @keyup.enter="handleRegister">
> <template #prefix>
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template> <svg-icon icon-class="validCode" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
<div class="register-code"> <div class="register-code">
<img :src="codeUrl" @click="getCode" class="register-code-img"/> <img :src="codeUrl" @click="getCode" class="register-code-img"/>
</div> </div>
</el-form-item> </el-form-item>
<div class="flex-justify-end mb20">
<router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
</div>
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button <el-button
:loading="loading" :loading="loading"
size="large" size="large"
type="primary" type="primary"
style="width:100%;" style="width:100%;"
@click.prevent="handleRegister" @click.prevent="handleRegister">
>
<span v-if="!loading">注 册</span> <span v-if="!loading">注 册</span>
<span v-else>注 册 中...</span> <span v-else>注 册 中...</span>
</el-button> </el-button>
<div style="float: right;">
<router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 底部 --> <!-- 底部 -->
<div class="el-register-footer"> <div class="el-register-footer">
<span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span> <!-- <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>-->
</div> </div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { ElMessageBox } from "element-plus"; import { ElMessageBox } from 'element-plus'
import { getCodeImg, register } from "@/api/login"; import { getCodeImg, register } from '@/api/login'
const router = useRouter(); const router = useRouter()
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance()
const registerForm = ref({ const registerForm = ref({
username: "", username: '',
password: "", password: '',
confirmPassword: "", confirmPassword: '',
code: "", code: '',
uuid: "" uuid: ''
}); })
const equalToPassword = (rule, value, callback) => { const equalToPassword = (rule, value, callback) => {
if (registerForm.value.password !== value) { if (registerForm.value.password !== value) {
callback(new Error("两次输入的密码不一致")); callback(new Error('两次输入的密码不一致'))
} else { } else {
callback(); callback()
} }
}; }
const registerRules = { const registerRules = {
username: [ username: [
{ required: true, trigger: "blur", message: "请输入您的账号" }, {required: true, trigger: 'blur', message: '请输入您的账号'},
{ min: 2, max: 20, message: "用户账号长度必须介于 2 和 20 之间", trigger: "blur" } {min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur'}
], ],
password: [ password: [
{ required: true, trigger: "blur", message: "请输入您的密码" }, {required: true, trigger: 'blur', message: '请输入您的密码'},
{ min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'},
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" } {pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur'}
], ],
confirmPassword: [ confirmPassword: [
{ required: true, trigger: "blur", message: "请再次输入您的密码" }, {required: true, trigger: 'blur', message: '请再次输入您的密码'},
{ required: true, validator: equalToPassword, trigger: "blur" } {required: true, validator: equalToPassword, trigger: 'blur'}
], ],
code: [{ required: true, trigger: "change", message: "请输入验证码" }] code: [{required: true, trigger: 'change', message: '请输入验证码'}]
}; }
const codeUrl = ref(""); const codeUrl = ref('')
const loading = ref(false); const loading = ref(false)
const captchaEnabled = ref(true); const captchaEnabled = ref(true)
function handleRegister() { function handleRegister () {
proxy.$refs.registerRef.validate(valid => { proxy.$refs.registerRef.validate(valid => {
if (valid) { if (valid) {
loading.value = true; loading.value = true
register(registerForm.value).then(res => { register(registerForm.value).then(res => {
const username = registerForm.value.username; const username = registerForm.value.username
ElMessageBox.alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", "系统提示", { ElMessageBox.alert('<font color=\'red\'>恭喜你，您的账号 ' + username + ' 注册成功！</font>', '系统提示', {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
type: "success", type: 'success'
}).then(() => { }).then(() => {
router.push("/login"); router.push('/login')
}).catch(() => {}); }).catch(() => {
})
}).catch(() => { }).catch(() => {
loading.value = false; loading.value = false
if (captchaEnabled) { if (captchaEnabled) {
getCode(); getCode()
} }
}); })
} }
}); })
} }
function getCode() { function getCode () {
getCodeImg().then(res => { getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled; captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled
if (captchaEnabled.value) { if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img; codeUrl.value = 'data:image/gif;base64,' + res.img
registerForm.value.uuid = res.uuid; registerForm.value.uuid = res.uuid
} }
}); })
} }
getCode(); getCode()
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
...@@ -160,46 +166,58 @@ getCode(); ...@@ -160,46 +166,58 @@ getCode();
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("../assets/images/login-background.jpg"); background-image: url("../assets/images/login-background.png");
background-size: cover; background-size: cover;
} }
.title { .title {
margin: 0px auto 30px auto; margin: 0px auto 30px auto;
text-align: center; text-align: center;
color: #707070; color: #2E77E3;
font-size: 30px;
font-family: YouSheBiaoTiHei, system-ui;
} }
.register-form { .register-form {
border-radius: 6px; border-radius: 2px;
background: #ffffff; background: #ffffff;
width: 400px; width: 400px;
padding: 25px 25px 5px 25px; margin-left: 18%;
padding: 35px 35px 15px 35px;
box-shadow: 0 0 10px 0 rgba(209, 224, 251, 0.79);
.el-input { .el-input {
height: 40px; height: 40px;
input { input {
height: 40px; height: 40px;
} }
} }
.input-icon { .input-icon {
height: 39px; height: 39px;
width: 14px; width: 14px;
margin-left: 0px; margin-left: 0px;
} }
} }
.register-tip { .register-tip {
font-size: 13px; font-size: 13px;
text-align: center; text-align: center;
color: #bfbfbf; color: #bfbfbf;
} }
.register-code { .register-code {
width: 33%; width: 33%;
height: 40px; height: 40px;
float: right; float: right;
img { img {
cursor: pointer; cursor: pointer;
vertical-align: middle; vertical-align: middle;
} }
} }
.el-register-footer { .el-register-footer {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
...@@ -212,8 +230,16 @@ getCode(); ...@@ -212,8 +230,16 @@ getCode();
font-size: 12px; font-size: 12px;
letter-spacing: 1px; letter-spacing: 1px;
} }
.register-code-img { .register-code-img {
height: 40px; height: 40px;
padding-left: 12px; padding-left: 12px;
} }
.link-type {
font-size: 14px;
font-weight: 500;
color: var(--el-color-primary);
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment