master
Gitea 2 weeks ago
parent 0ea060af95
commit 0af152f4b6
  1. 4
      jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts
  2. 4
      jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
  3. 73
      jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
  4. 47
      jeecgboot-vue3/src/views/system/loginmini/MiniRegister4shenbaoren.vue

@ -76,6 +76,7 @@ export default {
loginButton: '登录', loginButton: '登录',
registerButton: '注册', registerButton: '注册',
registerButton4faren: '法人注册', registerButton4faren: '法人注册',
registerButtonexp: '专家注册',
registerButton4shenbaoren: '申报人注册', registerButton4shenbaoren: '申报人注册',
rememberMe: '记住我', rememberMe: '记住我',
forgetPassword: '忘记密码?', forgetPassword: '忘记密码?',
@ -88,13 +89,16 @@ export default {
// placeholder // placeholder
accountPlaceholder: '请输入账号', accountPlaceholder: '请输入账号',
passwordPlaceholder: '请输入密码', passwordPlaceholder: '请输入密码',
passwordPlaceholderNotReg: '密码格式不对(包含字母(大小写)数字以及特殊字符,至少8位)',
inputCodePlaceholder: '请输入验证码', inputCodePlaceholder: '请输入验证码',
smsPlaceholder: '请输入验证码', smsPlaceholder: '请输入验证码',
mobilePlaceholder: '请输入手机号码', mobilePlaceholder: '请输入手机号码',
mobilePlaceholderNotReg: '手机号格式不对',
mobileCorrectPlaceholder: '请输入正确的手机号码', mobileCorrectPlaceholder: '请输入正确的手机号码',
policyPlaceholder: '勾选后才能注册', policyPlaceholder: '勾选后才能注册',
diffPwd: '两次输入密码不一致', diffPwd: '两次输入密码不一致',
selectorgPlaceholder: '请选择所属单位', selectorgPlaceholder: '请选择所属单位',
selectorgPlaceholder4Kejiju: '请选择科技主管部门',
realNamePlaceholder: '请输入姓名', realNamePlaceholder: '请输入姓名',
workNoPlaceholder: '请输入工号', workNoPlaceholder: '请输入工号',

@ -5,7 +5,7 @@
<div class="aui-logo" v-if="!getIsMobile"> <div class="aui-logo" v-if="!getIsMobile">
<div> <div>
<h3> <h3>
<img :src="logoImg" alt="jeecg" /> <!--<img :src="logoImg" alt="jeecg" />-->
</h3> </h3>
</div> </div>
</div> </div>
@ -99,7 +99,7 @@
<a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton') }}</a> <a class="aui-linek-code aui-flex-box" @click="registerHandleClick">{{ t('sys.login.registerButton') }}</a>
--> -->
<a class="aui-linek-code aui-flex-box" @click="registerRef4farenHandleClick">{{ t('sys.login.registerButton4faren') }}</a> <a class="aui-linek-code aui-flex-box" @click="registerRef4farenHandleClick">{{ t('sys.login.registerButton4faren') }}</a>
<a class="aui-linek-code aui-flex-box" @click="registerRef4shenbaorenHandleClick">{{ t('sys.login.registerButton4shenbaoren') }}</a> <!--<a class="aui-linek-code aui-flex-box" @click="registerRef4shenbaorenHandleClick">{{ t('sys.login.registerButton4shenbaoren') }}</a>-->
</div> </div>
</div> </div>
</div> </div>

@ -3,9 +3,9 @@
<div class="aui-container"> <div class="aui-container">
<div class="aui-form"> <div class="aui-form">
<div class="aui-image"> <div class="aui-image">
<div class="aui-image-text"> <!-- <div class="aui-image-text">
<img :src="jeecgAdTextImg" alt="" /> <img :src="jeecgAdTextImg" alt="" />
</div> </div>-->
</div> </div>
<div class="aui-formBox"> <div class="aui-formBox">
<div class="aui-formWell"> <div class="aui-formWell">
@ -15,18 +15,18 @@
</div> </div>
<div class="aui-form-box"> <div class="aui-form-box">
<div class="aui-account aui-account-line"> <div class="aui-account aui-account-line">
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<Icon class="aui-icon" icon="ant-design:user-outlined" /> <Icon class="aui-icon" icon="ant-design:user-outlined" />
<a-input class="fix-auto-fill" type="text" :placeholder="t('请输入单位名称')" v-model:value="formData.orgName" /> <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入单位名称')" v-model:value="formData.orgName" />
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<Icon class="aui-icon" icon="ant-design:user-outlined" /> <Icon class="aui-icon" icon="ant-design:user-outlined" />
<a-input class="fix-auto-fill" type="text" :placeholder="t('请输入统一社会信用代码')" v-model:value="formData.certificateCode" /> <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入统一社会信用代码')" v-model:value="formData.certificateCode" />
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<Icon class="aui-icon" icon="ant-design:mobile-outlined" /> <Icon class="aui-icon" icon="ant-design:mobile-outlined" />
@ -34,14 +34,14 @@
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<Icon class="aui-icon" icon="ant-design:user-outlined" /> <Icon class="aui-icon" icon="ant-design:user-outlined" />
<a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" /> <a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" />
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<JSelectDept :placeholder="t('sys.login.selectorgPlaceholder')" v-model:value="formData.department" :multiple="false" /> <JSelectDept :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
@ -224,7 +224,7 @@
return; return;
} }
if (!formData.department) { if (!formData.department) {
createMessage.warn(t('sys.login.selectorgPlaceholder')); createMessage.warn(t('sys.login.selectorgPlaceholder4Kejiju'));
return; return;
} }
if (!formData.username) { if (!formData.username) {
@ -235,10 +235,21 @@
createMessage.warn(t('sys.login.mobilePlaceholder')); createMessage.warn(t('sys.login.mobilePlaceholder'));
return; return;
} }
const phoneRegex = /^1[3-9]\d{9}$/;
if (!phoneRegex.test(formData.mobile)) {
createMessage.warn(t('sys.login.mobilePlaceholderNotReg'));
return;
}
if (!formData.password) { if (!formData.password) {
createMessage.warn(t('sys.login.passwordPlaceholder')); createMessage.warn(t('sys.login.passwordPlaceholder'));
return; return;
} }
// 8
const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@#$%^&+=!])(?=.{8,})$/;
if (!passwordRegex.test(formData.password)) {
createMessage.warn(t('sys.login.passwordPlaceholderNotReg'));
return;
}
// if (!formData.workno) { // if (!formData.workno) {
// createMessage.warn(t('sys.login.passwordPlaceholder')); // createMessage.warn(t('sys.login.passwordPlaceholder'));
// return; // return;
@ -345,16 +356,16 @@
defineExpose({ defineExpose({
initForm, initForm,
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '/@/assets/loginmini/style/home.less'; @import '/@/assets/loginmini/style/home.less';
@import '/@/assets/loginmini/style/base.less'; @import '/@/assets/loginmini/style/base.less';
.aui-input-line .aui-icon { .aui-input-line .aui-icon {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
top: 10px; top: 10px;
left: 10px; left: 10px;
font-size: 20px !important; font-size: 20px !important;
} }
</style> </style>

@ -3,13 +3,13 @@
<div class="aui-container"> <div class="aui-container">
<div class="aui-form"> <div class="aui-form">
<div class="aui-image"> <div class="aui-image">
<div class="aui-image-text"> <!-- <div class="aui-image-text">
<img :src="jeecgAdTextImg" alt="" /> <img :src="jeecgAdTextImg" alt="" />
</div> </div>-->
</div> </div>
<div class="aui-formBox"> <div class="aui-formBox">
<div class="aui-formWell"> <div class="aui-formWell">
<a-form ref="formRef" :model="formData"> <a-form ref="formRef" :model="formData" :rules="rules">
<div class="aui-flex aui-form-nav aui-clear-left" style="padding-bottom: 21px"> <div class="aui-flex aui-form-nav aui-clear-left" style="padding-bottom: 21px">
<div class="aui-flex-box activeNav on">{{t('sys.login.registerButton4shenbaoren')}}</div> <div class="aui-flex-box activeNav on">{{t('sys.login.registerButton4shenbaoren')}}</div>
</div> </div>
@ -42,7 +42,7 @@
<!-- </a-form-item>--> <!-- </a-form-item>-->
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<JSelectDept :placeholder="t('sys.login.selectorgPlaceholder')" v-model:value="formData.department" :multiple="false" /> <JSelectDept :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
</div> </div>
</a-form-item> </a-form-item>
@ -229,21 +229,28 @@
return; return;
} }
if (!formData.department) { if (!formData.department) {
createMessage.warn(t('sys.login.selectorgPlaceholder')); createMessage.warn(t('sys.login.selectorgPlaceholder4Kejiju'));
return; return;
} }
if (!formData.mobile) { if (!formData.mobile) {
createMessage.warn(t('sys.login.mobilePlaceholder')); createMessage.warn(t('sys.login.mobilePlaceholder'));
return; return;
} }
const phoneRegex = /^1[3-9]\d{9}$/;
if (!phoneRegex.test(formData.mobile)) {
createMessage.warn(t('sys.login.mobilePlaceholderNotReg'));
return;
}
if (!formData.password) { if (!formData.password) {
createMessage.warn(t('sys.login.passwordPlaceholder')); createMessage.warn(t('sys.login.passwordPlaceholder'));
return; return;
} }
// if (!formData.workno) { // 8
// createMessage.warn(t('sys.login.passwordPlaceholder')); const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@#$%^&+=!])(?=.{8,})$/;
// return; if (!passwordRegex.test(formData.password)) {
// } createMessage.warn(t('sys.login.passwordPlaceholderNotReg'));
return;
}
if (!formData.confirmPassword) { if (!formData.confirmPassword) {
createMessage.warn(t('sys.login.confirmPassword')); createMessage.warn(t('sys.login.confirmPassword'));
return; return;
@ -338,16 +345,16 @@
defineExpose({ defineExpose({
initForm, initForm,
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '/@/assets/loginmini/style/home.less'; @import '/@/assets/loginmini/style/home.less';
@import '/@/assets/loginmini/style/base.less'; @import '/@/assets/loginmini/style/base.less';
.aui-input-line .aui-icon { .aui-input-line .aui-icon {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
top: 10px; top: 10px;
left: 10px; left: 10px;
font-size: 20px !important; font-size: 20px !important;
} }
</style> </style>

Loading…
Cancel
Save