guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: 登录修改逻辑，修改弹窗样式

Browse Source
pull/1/head
刘释隆 1 year ago
parent f7d91196e8
commit d28605b0b9
3 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File

54
src/views/login/components/Forget.vue
Unescape View File

@ -96,14 +96,12 @@ function handleSubmit(e) {
if (res.code === "OK") { if (res.code === "OK") {
formSure.loginname = res.data?.loginname; formSure.loginname = res.data?.loginname;
tab.value = 1; tab.value = 1;
}else{ } else {
message.error(res.message); message.error(res.message);
} }
} finally { } finally {
loading.value = false; loading.value = false;
} }
} else {
message.error("请填写完整信息");
} }
}); });
} }
@ -123,13 +121,16 @@ function handleSure(e) {
try { try {
const res = await updateSUser(params); const res = await updateSUser(params);
if (res.code === "OK") message.success("修改成功"); if (res.code === "OK") {
else message.error(res.message); message.success("修改成功");
tab.value = 0;
forget();
} else {
message.error(res.message);
}
} finally { } finally {
loading.value = false; loading.value = false;
} }
} else {
message.error("请填写完整信息");
} }
}); });
} }
@ -257,7 +258,10 @@ function forget() {
</template> </template>
<template #suffix> <template #suffix>
<div <div
:class="{ 'code-count': countTime !== '获取验证码'|| !(formForget.phone.length == 11) }" :class="{
'code-count':
countTime !== '获取验证码' || !(formForget.phone.length == 11),
}"
class="code" class="code"
@click="sendCode" @click="sendCode"
> >
@ -267,17 +271,17 @@ function forget() {
</n-input> </n-input>
</n-form-item> </n-form-item>
<!-- <n-form-item class="form-item"> --> <!-- <n-form-item class="form-item"> -->
<n-button <n-button
:class="{ 'btn-disabled': computedForm() }" :class="{ 'btn-disabled': computedForm() }"
class="btn" class="btn"
type="primary" type="primary"
size="large" size="large"
:loading="loading" :loading="loading"
block block
@click="handleSubmit" @click="handleSubmit"
> >
下一步 下一步
</n-button> </n-button>
<!-- </n-form-item> --> <!-- </n-form-item> -->
</n-form> </n-form>
</div> </div>
@ -296,6 +300,7 @@ function forget() {
type="password" type="password"
show-password-on="click" show-password-on="click"
placeholder="请输入8-16位密码，必须包含英文及数字" placeholder="请输入8-16位密码，必须包含英文及数字"
maxlength="16"
> >
<template #prefix> <template #prefix>
<svg-icon size="20" name="password" /> <svg-icon size="20" name="password" />
@ -309,6 +314,7 @@ function forget() {
type="password" type="password"
show-password-on="click" show-password-on="click"
placeholder="请再次确认输入新密码" placeholder="请再次确认输入新密码"
maxlength="16"
> >
<template #prefix> <template #prefix>
<svg-icon size="20" name="password" /> <svg-icon size="20" name="password" />
@ -403,21 +409,21 @@ function forget() {
} }
.order-last { .order-last {
font-size: .875rem; font-size: 0.875rem;
font-family: PingFang SC, PingFang SC-Regular; font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular; font-weight: Regular;
color: #507afd; color: #507afd;
} }
.code { .code {
font-size: .9375rem; font-size: 0.9375rem;
font-family: PingFang SC, PingFang SC-Regular; font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular; font-weight: Regular;
color: #507afd; color: #507afd;
margin-left: .75rem; margin-left: 0.75rem;
cursor: pointer; cursor: pointer;
&-count { &-count {
font-size: .875rem; font-size: 0.875rem;
color: #999999; color: #999999;
} }
} }
@ -426,7 +432,7 @@ function forget() {
// color: #FF4E4F !important; // color: #FF4E4F !important;
} }
.back { .back {
font-size: .9375rem; font-size: 0.9375rem;
font-family: PingFang SC, PingFang SC-Medium; font-family: PingFang SC, PingFang SC-Medium;
font-weight: Medium; font-weight: Medium;
text-align: center; text-align: center;

28
src/views/login/components/Login.vue
Unescape View File

@ -63,7 +63,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("企业") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -76,7 +78,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("验证码") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -89,7 +93,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("手机号") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -105,7 +111,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("验证码") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -118,7 +126,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("账号") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -131,7 +141,9 @@ const rules = {
if (loginSuccess.value || !value) { if (loginSuccess.value || !value) {
return true; return true;
} }
return new Error(loginRejectMessge.value); if (loginRejectMessge.value.indexOf("密码") > -1) {
return new Error(loginRejectMessge.value);
}
}, },
}, },
], ],
@ -140,6 +152,7 @@ const rules = {
function handleSubmit(e) { function handleSubmit(e) {
e.preventDefault(); e.preventDefault();
console.log(formRef.value,'formRef')
loginSuccess.value = true; loginSuccess.value = true;
formRef.value.validate(async (errors) => { formRef.value.validate(async (errors) => {
if (!errors) { if (!errors) {
@ -174,6 +187,7 @@ function handleSubmit(e) {
loginSuccess.value = false; loginSuccess.value = false;
message.destroyAll(); message.destroyAll();
message.info(msg || "登录失败"); message.info(msg || "登录失败");
formRef.value.validate();
} }
} finally { } finally {
loading.value = false; loading.value = false;
@ -230,6 +244,7 @@ function handleSmsSubmit(e) {
} }
loginSuccess.value = true; loginSuccess.value = true;
// const { code, message: msg } = await userStore.login(params) // const { code, message: msg } = await userStore.login(params)
await userStore.setStorageToken(res.data);
await userStore.getInformation(); await userStore.getInformation();
message.destroyAll(); message.destroyAll();
const toPath = decodeURIComponent((route.query?.redirect || "/") as string); const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
@ -240,6 +255,7 @@ function handleSmsSubmit(e) {
message.destroyAll(); message.destroyAll();
message.info(msg || "登录失败"); message.info(msg || "登录失败");
loginSuccess.value = false; loginSuccess.value = false;
formRefSms.value.validate();
} }
} catch (e) { } catch (e) {
} finally { } finally {

4
src/views/task/modal/CustomFieldModal.vue
Unescape View File

@ -356,7 +356,7 @@ const queryData = (value, type) => {
aria-modal="true" aria-modal="true"
> >
<div class="wrapper"> <div class="wrapper">
<span class="wrapper-title">自定义任务包字段</span> <span class="wrapper-title">自定义任务卡片字段</span>
<div class="wrapper-bar"> <div class="wrapper-bar">
<div class="wrapper-info"> <div class="wrapper-info">
<span :style="{ 'margin-left': '18px' }">字段信息</span> <span :style="{ 'margin-left': '18px' }">字段信息</span>
@ -430,7 +430,7 @@ const queryData = (value, type) => {
</template> </template>
</n-input> </n-input>
<div class="draggable-title">系统默认</div> <div class="draggable-title">系统默认</div>
<div class="draggable-ul"> <div class="draggable-ul" style="border-bottom:none">
<div <div
v-for="item in fixShowList" v-for="item in fixShowList"
:key="item.id" :key="item.id"

Write Preview
Loading…
Cancel
Save