From 0af152f4b66b66ea02ed05c6ea99a45e8a5bf240 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sun, 10 Nov 2024 11:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts  |  4 +
 .../src/views/system/loginmini/MiniLogin.vue  |  4 +-
 .../system/loginmini/MiniRegister4faren.vue   | 73 +++++++++++--------
 .../loginmini/MiniRegister4shenbaoren.vue     | 47 +++++++-----
 4 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts b/jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts
index 5bccef7..8148279 100644
--- a/jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts
+++ b/jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts
@@ -76,6 +76,7 @@ export default {
     loginButton: '登录',
     registerButton: '注册',
     registerButton4faren: '法人注册',
+    registerButtonexp: '专家注册',
     registerButton4shenbaoren: '申报人注册',
     rememberMe: '记住我',
     forgetPassword: '忘记密码?',
@@ -88,13 +89,16 @@ export default {
     // placeholder
     accountPlaceholder: '请输入账号',
     passwordPlaceholder: '请输入密码',
+    passwordPlaceholderNotReg: '密码格式不对(包含字母(大小写)数字以及特殊字符,至少8位)',
     inputCodePlaceholder: '请输入验证码',
     smsPlaceholder: '请输入验证码',
     mobilePlaceholder: '请输入手机号码',
+    mobilePlaceholderNotReg: '手机号格式不对',
     mobileCorrectPlaceholder: '请输入正确的手机号码',
     policyPlaceholder: '勾选后才能注册',
     diffPwd: '两次输入密码不一致',
     selectorgPlaceholder: '请选择所属单位',
+    selectorgPlaceholder4Kejiju: '请选择科技主管部门',
     realNamePlaceholder: '请输入姓名',
     workNoPlaceholder: '请输入工号',
 
diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
index b55d7b4..6ca7e1e 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
@@ -5,7 +5,7 @@
     <div class="aui-logo" v-if="!getIsMobile">
       <div>
         <h3>
-          <img :src="logoImg" alt="jeecg" />
+          <!--<img :src="logoImg" alt="jeecg" />-->
         </h3>
       </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="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>
diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
index a6484e2..c7cd55d 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
@@ -3,9 +3,9 @@
     <div class="aui-container">
       <div class="aui-form">
         <div class="aui-image">
-          <div class="aui-image-text">
-            <img :src="jeecgAdTextImg" alt="" />
-          </div>
+          <!--          <div class="aui-image-text">
+                      <img :src="jeecgAdTextImg" alt="" />
+                    </div>-->
         </div>
         <div class="aui-formBox">
           <div class="aui-formWell">
@@ -15,18 +15,18 @@
               </div>
               <div class="aui-form-box">
                 <div class="aui-account aui-account-line">
-                    <a-form-item>
-                      <div class="aui-input-line">
-                        <Icon class="aui-icon" icon="ant-design:user-outlined" />
-                        <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入单位名称')" v-model:value="formData.orgName" />
-                      </div>
-                    </a-form-item>
-                    <a-form-item>
-                      <div class="aui-input-line">
-                        <Icon class="aui-icon" icon="ant-design:user-outlined" />
-                        <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入统一社会信用代码')" v-model:value="formData.certificateCode" />
-                      </div>
-                    </a-form-item>
+                  <a-form-item>
+                    <div class="aui-input-line">
+                      <Icon class="aui-icon" icon="ant-design:user-outlined" />
+                      <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入单位名称')" v-model:value="formData.orgName" />
+                    </div>
+                  </a-form-item>
+                  <a-form-item>
+                    <div class="aui-input-line">
+                      <Icon class="aui-icon" icon="ant-design:user-outlined" />
+                      <a-input class="fix-auto-fill" type="text" :placeholder="t('请输入统一社会信用代码')" v-model:value="formData.certificateCode" />
+                    </div>
+                  </a-form-item>
                   <a-form-item>
                     <div class="aui-input-line">
                       <Icon class="aui-icon" icon="ant-design:mobile-outlined" />
@@ -34,14 +34,14 @@
                     </div>
                   </a-form-item>
                   <a-form-item>
-                      <div class="aui-input-line">
-                        <Icon class="aui-icon" icon="ant-design:user-outlined" />
-                        <a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" />
-                      </div>
+                    <div class="aui-input-line">
+                      <Icon class="aui-icon" icon="ant-design:user-outlined" />
+                      <a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" />
+                    </div>
                   </a-form-item>
                   <a-form-item>
                     <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>
                   </a-form-item>
                   <a-form-item>
@@ -224,7 +224,7 @@
       return;
     }
     if (!formData.department) {
-      createMessage.warn(t('sys.login.selectorgPlaceholder'));
+      createMessage.warn(t('sys.login.selectorgPlaceholder4Kejiju'));
       return;
     }
     if (!formData.username) {
@@ -235,10 +235,21 @@
       createMessage.warn(t('sys.login.mobilePlaceholder'));
       return;
     }
+    const phoneRegex = /^1[3-9]\d{9}$/;
+    if (!phoneRegex.test(formData.mobile)) {
+      createMessage.warn(t('sys.login.mobilePlaceholderNotReg'));
+      return;
+    }
     if (!formData.password) {
       createMessage.warn(t('sys.login.passwordPlaceholder'));
       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) {
     //   createMessage.warn(t('sys.login.passwordPlaceholder'));
     //   return;
@@ -345,16 +356,16 @@
   defineExpose({
     initForm,
   });
-  </script>
+</script>
 
 <style lang="less" scoped>
-@import '/@/assets/loginmini/style/home.less';
-@import '/@/assets/loginmini/style/base.less';
-.aui-input-line .aui-icon {
-  position: absolute;
-  z-index: 2;
-  top: 10px;
-  left: 10px;
-  font-size: 20px !important;
-}
+  @import '/@/assets/loginmini/style/home.less';
+  @import '/@/assets/loginmini/style/base.less';
+  .aui-input-line .aui-icon {
+    position: absolute;
+    z-index: 2;
+    top: 10px;
+    left: 10px;
+    font-size: 20px !important;
+  }
 </style>
diff --git a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4shenbaoren.vue b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4shenbaoren.vue
index 5215e31..aa6dba4 100644
--- a/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4shenbaoren.vue
+++ b/jeecgboot-vue3/src/views/system/loginmini/MiniRegister4shenbaoren.vue
@@ -3,13 +3,13 @@
     <div class="aui-container">
       <div class="aui-form">
         <div class="aui-image">
-          <div class="aui-image-text">
-            <img :src="jeecgAdTextImg" alt="" />
-          </div>
+          <!--          <div class="aui-image-text">
+                      <img :src="jeecgAdTextImg" alt="" />
+                    </div>-->
         </div>
         <div class="aui-formBox">
           <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-box activeNav on">{{t('sys.login.registerButton4shenbaoren')}}</div>
               </div>
@@ -42,7 +42,7 @@
                   <!--                  </a-form-item>-->
                   <a-form-item>
                     <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>
                   </a-form-item>
 
@@ -229,21 +229,28 @@
       return;
     }
     if (!formData.department) {
-      createMessage.warn(t('sys.login.selectorgPlaceholder'));
+      createMessage.warn(t('sys.login.selectorgPlaceholder4Kejiju'));
       return;
     }
     if (!formData.mobile) {
       createMessage.warn(t('sys.login.mobilePlaceholder'));
       return;
     }
+    const phoneRegex = /^1[3-9]\d{9}$/;
+    if (!phoneRegex.test(formData.mobile)) {
+      createMessage.warn(t('sys.login.mobilePlaceholderNotReg'));
+      return;
+    }
     if (!formData.password) {
       createMessage.warn(t('sys.login.passwordPlaceholder'));
       return;
     }
-    // if (!formData.workno) {
-    //   createMessage.warn(t('sys.login.passwordPlaceholder'));
-    //   return;
-    // }
+    //包含字母（大小写）、数字以及特殊字符，并且有一定的长度要求，至少 8 位
+    const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@#$%^&+=!])(?=.{8,})$/;
+    if (!passwordRegex.test(formData.password)) {
+      createMessage.warn(t('sys.login.passwordPlaceholderNotReg'));
+      return;
+    }
     if (!formData.confirmPassword) {
       createMessage.warn(t('sys.login.confirmPassword'));
       return;
@@ -338,16 +345,16 @@
   defineExpose({
     initForm,
   });
-  </script>
+</script>
 
 <style lang="less" scoped>
-@import '/@/assets/loginmini/style/home.less';
-@import '/@/assets/loginmini/style/base.less';
-.aui-input-line .aui-icon {
-  position: absolute;
-  z-index: 2;
-  top: 10px;
-  left: 10px;
-  font-size: 20px !important;
-}
+  @import '/@/assets/loginmini/style/home.less';
+  @import '/@/assets/loginmini/style/base.less';
+  .aui-input-line .aui-icon {
+    position: absolute;
+    z-index: 2;
+    top: 10px;
+    left: 10px;
+    font-size: 20px !important;
+  }
 </style>