Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/login/components/editPassword.vue

@@ -76,7 +76,7 @@ const phoneRef = ref()
 // const regex = /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,16}$/
 // 请输入8-16位数由数字、大小写字母组成的密码
 
-const regex = /^[A-Za-z0-9]{8,}$/
+const regex = /^.{8,}$/
 const validPassword = computed(() => {
   return regex.test(query.password) || '请输入至少8位数的密码'
 })

src/views/login/components/editPasswordEnt.vue

@@ -100,7 +100,7 @@ const loading = ref(false)
 const passwordType = ref(false)
 
 // 密码效验
-const regex = /^[A-Za-z0-9]{8,}$/
+const regex = /^.{8,}$/
 const validPassword = computed(() => {
   return regex.test(query.password) || '请输入至少8位数的密码'
 })

src/views/login/components/passwordPage.vue

@@ -2,7 +2,7 @@
   <v-form ref="passwordForm" @submit.prevent>
     <v-text-field
       v-model="loginData.phone"
-      counter="11"
+      :counter="isCounter ? 30 : 11"
       :disabled="props.phoneDisabled"
       :placeholder="placeholder ? placeholder : '请输入手机号码'"
       color="primary" 
@@ -52,7 +52,7 @@ import { checkEmail } from '@/utils/validate'
 import { useI18n } from '@/hooks/web/useI18n'
 const { t } = useI18n()
 
-const props = defineProps({ phoneDisabled: Boolean, placeholder: String, validEmail: Boolean })
+const props = defineProps({ phoneDisabled: Boolean, placeholder: String, validEmail: Boolean, isCounter: Boolean })
 const passwordType = ref(false)
 const emits = defineEmits(['handleEnter'])
 
@@ -94,7 +94,7 @@ if (props.validEmail) {
 // }
 
 // 密码效验
-const regex = /^[A-Za-z0-9]{8,}$/
+const regex = /^.{8,}$/
 const validPassword = computed(() => {
   return regex.test(loginData.password) || '请输入至少8位数的密码'
 })

src/views/login/index.vue

@@ -18,7 +18,7 @@
             <v-tabs v-model="tab1" align-tabs="center" color="primary" class="mb-10">
               <v-tab :value="1">企业邮箱登录</v-tab>
             </v-tabs>
-            <passwordFrom ref="entPassRef" placeholder="请输入企业邮箱" :validEmail="true" @handleEnter="handleLogin"></passwordFrom>
+            <passwordFrom ref="entPassRef" placeholder="请输入企业邮箱" :isCounter="true" :validEmail="true" @handleEnter="handleLogin"></passwordFrom>
           </div>
           <!-- 个人登录 -->
           <div v-show="!isEnterpriseLogin" class="login-tab">

src/views/recruit/entRegister/inReview.vue

@@ -5,10 +5,8 @@
       <v-btn v-if="query?.noLogin" class="my-2" color="primary" variant="text" size="large" @click="router.push('/login')">{{ `<< 回到登录页` }}</v-btn>
       <v-btn v-else class="my-2" color="primary" variant="text" size="large" @click="router.push('/recruitHome')">{{ `<< 回到首页` }}</v-btn>
     </div>
-    <v-card class="pa-5" :class="isMobile? 'mobileBox' : 'default-width'" :elevation="isMobile? '0' : '3'">
-
-      <div style="margin: 80px auto;" :style="{width: isMobile ? '' : '600px'}">
-
+    <v-card :class="isMobile? 'mobileBox' : 'default-width'" :elevation="isMobile? '0' : '3'">
+      <div style="margin: 70px auto;" :style="{width: isMobile ? '' : '600px'}">
         <!-- 提交企业注册以后跳转显示页面 -->
         <div v-if="!applyInfo || !(Object.keys(applyInfo).length)" class="d-flex flex-column align-center">
           <svg-icon name="submit" size="300"></svg-icon>
@@ -69,7 +67,7 @@
           <span>审核通过</span>
         </div>
         <div class="text-center">
-          <v-btn v-if="!isMobile" class="mt-16 mr-12 buttons" color="primary" to="/recruitHome">{{ $t('common.toHome') }}</v-btn>
+          <v-btn v-if="!isMobile" class="mt-16 buttons" color="primary" to="/recruitHome">{{ $t('common.toHome') }}</v-btn>
           <v-btn v-if="applyInfo.status === '2'" class="mt-16 buttons" color="primary" @click="handleConfirm">{{ $t('common.resubmit') }}</v-btn>
         </div>
       </div>

src/views/recruit/entRegister/register.vue

@@ -440,7 +440,7 @@ const passwordObj = {
       return '请输入账户登录密码'
     },
     value => {
-      if (/^[A-Za-z0-9]{8,}$/.test(value)) return true
+      if (/^.{8,}$/.test(value)) return true
       return '请输入至少8位数的密码'
     }
   ],

src/views/recruit/enterprise/staffChangePassword/index.vue

@@ -63,7 +63,7 @@ const formItems = ref({
           return '请输入新密码'
         },
         value => {
-          if (/^[A-Za-z0-9]{8,}$/.test(value)) return true
+          if (/^.{8,}$/.test(value)) return true
           return '请输入至少8位数的密码'
         }
       ]
@@ -83,7 +83,7 @@ const formItems = ref({
           return '请再次输入新密码'
         },
         value => {
-          if (/^[A-Za-z0-9]{8,}$/.test(value)) return true
+          if (/^.{8,}$/.test(value)) return true
           return '请输入至少8位数的密码'
         }
       ]