Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css
This commit is contained in:
commit
70b638bb97
@ -14,7 +14,7 @@
|
|||||||
auto-complete="on"
|
auto-complete="on"
|
||||||
label-position="left"
|
label-position="left"
|
||||||
>
|
>
|
||||||
<div class="title-container">
|
<div class="title-container" style="margin-bottom: 40px;">
|
||||||
<div class="title">账号登录</div>
|
<div class="title">账号登录</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -66,7 +66,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|
||||||
<el-form-item
|
<!-- <el-form-item
|
||||||
prop="code"
|
prop="code"
|
||||||
class="login-code"
|
class="login-code"
|
||||||
>
|
>
|
||||||
@ -88,7 +88,7 @@
|
|||||||
<img :src="codeUrl" class="mr-[10px]">
|
<img :src="codeUrl" class="mr-[10px]">
|
||||||
<svg-icon icon-class="refresh" />
|
<svg-icon icon-class="refresh" />
|
||||||
</span>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<div>
|
<div>
|
||||||
<el-checkbox
|
<el-checkbox
|
||||||
v-model="remember"
|
v-model="remember"
|
||||||
@ -232,8 +232,8 @@ function handleLogin() {
|
|||||||
username: state.loginData.username,
|
username: state.loginData.username,
|
||||||
password: state.loginData.password,
|
password: state.loginData.password,
|
||||||
// rememberMe: state.loginData.rememberMe,
|
// rememberMe: state.loginData.rememberMe,
|
||||||
code: state.loginData.code,
|
// code: state.loginData.code,
|
||||||
uuid: state.loginData.uuid
|
// uuid: state.loginData.uuid
|
||||||
};
|
};
|
||||||
if (user.password !== state.cookiePass) {
|
if (user.password !== state.cookiePass) {
|
||||||
user.password = encrypt(user.password);
|
user.password = encrypt(user.password);
|
||||||
@ -251,7 +251,7 @@ function handleLogin() {
|
|||||||
state.loading = false;
|
state.loading = false;
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
getCode();
|
// getCode();
|
||||||
state.loading = false;
|
state.loading = false;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -293,21 +293,21 @@ function getCookie() {
|
|||||||
state.loginData = {
|
state.loginData = {
|
||||||
username: username === undefined ? state.loginData.username : username,
|
username: username === undefined ? state.loginData.username : username,
|
||||||
password: decrypt(password),
|
password: decrypt(password),
|
||||||
code: '',
|
// code: '',
|
||||||
uuid: ''
|
// uuid: ''
|
||||||
};
|
};
|
||||||
remember.value = rememberMe === undefined ? false : Boolean(rememberMe)
|
remember.value = rememberMe === undefined ? false : Boolean(rememberMe)
|
||||||
}
|
}
|
||||||
function getCode() {
|
function getCode() {
|
||||||
getCaptcha().then((result:any) => {
|
getCaptcha().then((result:any) => {
|
||||||
codeUrl.value = result.data.img
|
// codeUrl.value = result.data.img
|
||||||
state.loginData.uuid = result.data.uuid;
|
// state.loginData.uuid = result.data.uuid;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getCookie();
|
getCookie();
|
||||||
getCode();
|
// getCode();
|
||||||
window.onresize = () => {
|
window.onresize = () => {
|
||||||
if (state.clientHeight > document.documentElement.clientHeight) {
|
if (state.clientHeight > document.documentElement.clientHeight) {
|
||||||
state.showCopyright = false;
|
state.showCopyright = false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user