Compare commits

...

2 Commits

4 changed files with 544 additions and 499 deletions

View File

@ -323,13 +323,13 @@
.aui-inputClear {
width: 100%;
// border-bottom: 1px solid #cccccc;
border: 1px solid #f4f5f9;
position: relative;
padding-left: 20px;
background: #f4f5f9;
margin-bottom: 8px;
margin-top: 20px;
border-radius: 8px;
}
.aui-inputClear .icon {
@ -340,7 +340,7 @@
.aui-inputClear input {
width: 100%;
padding: 10px;
padding: 12px;
border: none;
color: #333333;
font-size: 14px;
@ -368,11 +368,11 @@
}
.aui-inputClear:focus {
border-bottom: 1px solid #1b90ff;
border: 1px solid #1b90ff;
}
.aui-inputClear:hover {
border-bottom: 1px solid #1b90ff;
border: 1px solid #1b90ff;
}
.aui-choice {

View File

@ -84,6 +84,7 @@
.scrollbar__wrap {
margin-bottom: 18px !important;
overflow-x: hidden;
padding:0 18px;
}
.scrollbar__view {

View File

@ -202,9 +202,9 @@
.jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu {
color: #606266 !important;
background: #f0f0f0;
// background: #f0f0f0;
padding-bottom: 10px;;
border-radius: 6px;
}
.jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title {
position: relative;
@ -223,7 +223,10 @@
// margin: 10px 20px 0 20px;
transform: scale(1.02);
}
.jeecg-menu-item-active>.jeecg-menu-submenu-title{
background: #f0f0f0;
border-radius: 6px;
}
.ant-drawer-close {
position: absolute;
right: 0;
@ -236,4 +239,16 @@
// min-height: 0;
// padding: 3px;
// }
.jeecg-menu-item-active>.jeecg-menu{
margin-top:10px;
background: #FBFBFD;
border-radius: 6px;
}
.jeecg-menu-item-active .jeecg-menu>li{
width:80%;
margin:5px auto;
padding-left:18px !important;
}
</style>

View File

@ -10,7 +10,7 @@
<div v-else class="aui-phone-logo">
<img :src="logoImg" alt="jeecg" />
</div>
<div >
<div>
<div class="aui-content">
<div class="aui-container">
<div class="aui-form">
@ -27,16 +27,20 @@
</div>
<a-divider />
<div class="aui-form-box" style="height: 180px">
<a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'" @keyup.enter.native="loginHandleClick">
<a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'"
@keyup.enter.native="loginHandleClick">
<div class="aui-account">
<div class="aui-inputClear">
<a-row>
<a-col :span="2">
<span style="margin-top: 10px;display: block;"><img :src="icon1Img" alt="账号" style="width: 20px;" /></span>
<span style="margin-top: 13px;display: block;"><img
:src="icon1Img" alt="账号" style="width: 20px;" /></span>
</a-col>
<a-col :span="20">
<a-form-item>
<a-input class="fix-auto-fill" :placeholder="`请输入`+t('sys.login.userName')" v-model:value="formData.username" />
<a-input class="fix-auto-fill"
:placeholder="`请输入`+t('sys.login.userName')"
v-model:value="formData.username" />
</a-form-item>
</a-col>
</a-row>
@ -44,17 +48,20 @@
<div class="aui-inputClear">
<a-row>
<a-col :span="2">
<span style="margin-top: 10px;display: block;"><img :src="icon2Img" alt="密码" style="width: 20px;" /></span>
<span style="margin-top: 13px;display: block;"><img
:src="icon2Img" alt="密码" style="width: 20px;" /></span>
</a-col>
<a-col :span="20">
<a-form-item>
<a-input class="fix-auto-fill" type="password" :placeholder="`请输入`+t('sys.login.password')" v-model:value="formData.password" />
<a-input class="fix-auto-fill" type="password"
:placeholder="`请输入`+t('sys.login.password')"
v-model:value="formData.password" />
</a-form-item>
</a-col>
</a-row>
</div>
<div >
<huakuai @verifySuccess="checkInputCode"/>
<div>
<huakuai @verifySuccess="checkInputCode" />
</div>
<!-- <div class="aui-inputClear">
<a-row>
@ -79,7 +86,8 @@
</div>
<div class="aui-formButton">
<div class="aui-flex">
<a-button :loading="loginLoading" class="aui-link-login" type="primary" @click="loginHandleClick">
<a-button :loading="loginLoading" class="aui-link-login" type="primary"
@click="loginHandleClick">
{{ t('sys.login.loginButton') }}</a-button>
</div>
</div>
@ -190,8 +198,8 @@
});
}
function checkInputCode(type){
console.log("🚀 ~ checkCode ~ checkCode:",type)
function checkInputCode(type) {
console.log("🚀 ~ checkCode ~ checkCode:", type)
handleChangeCheckCode();
}
@ -268,7 +276,7 @@
}
try {
loginLoading.value = true;
const { userInfo }: any = await userStore.phoneLogin({
const { userInfo } : any = await userStore.phoneLogin({
mobile: phoneFormData.mobile,
captcha: phoneFormData.smscode,
mode: 'none', //
@ -300,8 +308,8 @@
return;
}
//update-begin---author:wangshuai---date:2024-04-18---for:QQYUN-9005IP15---
const result = await getCaptcha({ mobile: phoneFormData.mobile, smsmode: SmsEnum.FORGET_PASSWORD }).catch((res) =>{
if(res.code === ExceptionEnum.PHONE_SMS_FAIL_CODE){
const result = await getCaptcha({ mobile: phoneFormData.mobile, smsmode: SmsEnum.FORGET_PASSWORD }).catch((res) => {
if (res.code === ExceptionEnum.PHONE_SMS_FAIL_CODE) {
openCaptchaModal(true, {});
}
});
@ -395,6 +403,7 @@
:deep(.ant-input:focus) {
box-shadow: none;
}
.aui-get-code {
float: right;
position: relative;
@ -417,11 +426,12 @@
color: #aaa !important;
}
:deep(.jeecg-dark-switch){
position:absolute;
:deep(.jeecg-dark-switch) {
position: absolute;
margin-right: 10px;
}
.aui-link-login{
.aui-link-login {
height: 42px;
padding: 10px 15px;
font-size: 14px;
@ -431,23 +441,28 @@
flex: 1;
color: #fff;
}
.aui-phone-logo{
.aui-phone-logo {
position: absolute;
margin-left: 10px;
width: 40%;
top: 4%;
z-index: 4;
}
.top-3{
.top-3 {
top: 0.45rem;
}
.ant-form-item {
margin-bottom: 0px !important;
}
</style>
<style lang="less">
@prefix-cls: ~'@{namespace}-mini-login';
@dark-bg: #293146;
@prefix-cls: ~'@{namespace}-mini-login';
@dark-bg: #293146;
html[data-theme='dark'] {
html[data-theme='dark'] {
.@{prefix-cls} {
background-color: @dark-bg !important;
background-image: none;
@ -455,9 +470,11 @@ html[data-theme='dark'] {
&::before {
background-image: url(/@/assets/svg/login-bg-dark.svg);
}
.aui-inputClear{
.aui-inputClear {
background-color: #232a3b !important;
}
.ant-input,
.ant-input-password {
background-color: #232a3b !important;
@ -474,30 +491,39 @@ html[data-theme='dark'] {
.app-iconify {
color: #fff !important;
}
.aui-inputClear input,.aui-input-line input,.aui-choice{
.aui-inputClear input,
.aui-input-line input,
.aui-choice {
color: #c9d1d9 !important;
}
.aui-formBox{
.aui-formBox {
background-color: @dark-bg !important;
}
.aui-third-text span{
.aui-third-text span {
background-color: @dark-bg !important;
}
.aui-form-nav .aui-flex-box{
.aui-form-nav .aui-flex-box {
color: #c9d1d9 !important;
}
.aui-formButton .aui-linek-code{
.aui-formButton .aui-linek-code {
background: @dark-bg !important;
color: white !important;
}
.aui-code-line{
.aui-code-line {
border-left: none !important;
}
.ant-checkbox-inner,.aui-success h3{
.ant-checkbox-inner,
.aui-success h3 {
border-color: #c9d1d9;
}
//update-begin---author:wangshuai ---date:20230828 forQQYUN-6363------------
&-sign-in-way {
.anticon {
@ -510,6 +536,7 @@ html[data-theme='dark'] {
}
}
}
//update-end---author:wangshuai ---date:20230828 forQQYUN-6363------------
}
@ -523,14 +550,16 @@ html[data-theme='dark'] {
font-size: 12px !important;
color: @text-color-secondary !important;
}
.aui-third-login a{
.aui-third-login a {
background: transparent;
}
}
/* Chrome/Edge/Safari */
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus {
}
/* Chrome/Edge/Safari */
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus {
/* 重新设置背景色、文字色、边框等 */
background-color: #f5f5f5 !important;
color: #333333 !important;
@ -538,11 +567,11 @@ input:-webkit-autofill:focus {
box-shadow: 0 0 0px 1000px #f5f5f5 inset !important;
/* 如果需要边框高亮,也可以一起重置 */
// border: 1px solid #ccc !important;
}
}
/* Firefox */
input:-moz-autofill {
/* Firefox */
input:-moz-autofill {
background-color: #f5f5f5 !important;
color: #333333 !important;
}
}
</style>