merge wsw into master

fix: bugs

Created-by: yfzmpj
Commit-by: 汪少伟
Merged-by: yfzmpj
Description: fix: bugs

See merge request: hk_openRepo/OpenRepo_Portal!60

src/views/Jyh/PersonalCenter/PersonalBasic.vue

@@ -16,20 +16,12 @@
             </d-form-item>
           </d-col>
           <d-col span="8">
-            <d-form-item
-              field="email"
-              label="邮件"
-              :rules="[{ required: true, message: '请填写邮件', trigger: 'blur' }]"
-            >
+            <d-form-item field="email" label="邮件" :rules="[{ validator: checkEmailValidator, trigger: 'blur' }]">
               <d-input v-model="forms.email" />
             </d-form-item>
           </d-col>
           <d-col span="8">
-            <d-form-item
-              field="mobile"
-              label="电话"
-              :rules="[{ required: true, message: '请填写电话', trigger: 'blur' }]"
-            >
+            <d-form-item field="mobile" label="电话" :rules="[{ validator: checkPhoneValidator, trigger: 'blur' }]">
               <d-input v-model="forms.mobile" />
             </d-form-item>
           </d-col>
@@ -62,6 +54,7 @@ import { getUserInfo } from '@/api/user';
 import { onMounted, reactive, ref, shallowRef } from 'vue';
 import { Message } from 'vue-devui';
 import { useAccountStore } from '@/stores/user';
+import { checkEmailValidator, checkPhoneValidator } from '@/utils/validator';
 
 const loading = ref(false);