From 63022ee720d121bdb2d5d58581b8760dcffe320e Mon Sep 17 00:00:00 2001
From: GuanBo <732166156@qq.com>
Date: Sat, 13 Nov 2021 06:25:41 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A0=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/account/settings/BaseSetting.vue    | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/aidex-ui/src/views/account/settings/BaseSetting.vue b/aidex-ui/src/views/account/settings/BaseSetting.vue
index e2bbf52..e7c9569 100644
--- a/aidex-ui/src/views/account/settings/BaseSetting.vue
+++ b/aidex-ui/src/views/account/settings/BaseSetting.vue
@@ -2,33 +2,35 @@
   <div class="account-settings-info-view">
     <a-row :gutter="16">
       <a-col :md="20" :lg="12" :offset="2">
-        <a-form
+       <a-form-model
           layout="vertical"
           :rules="rules"
           :model="user"
-          ref="form"
+          ref="user"
         >
-          <a-form-item
+          <a-form-model-item
             label="昵称"
             ref="nickName"
-            prop="nickName"
             :required="true"
+            prop="nickName"
           >
             <a-input v-model="user.nickName" placeholder="给自己起个名字" />
-          </a-form-item>
-          <a-form-item
+          </a-form-model-item>
+          <a-form-model-item
             label="手机"
             :required="true"
+            prop="phonenumber"
           >
             <a-input v-model="user.phonenumber" placeholder="xxxxxx"/>
-          </a-form-item>
-          <a-form-item
+          </a-form-model-item>
+          <a-form-model-item
             label="电子邮件"
             :required="true"
+            prop="email"
           >
             <a-input v-model="user.email" placeholder="exp@admin.com"/>
-          </a-form-item>
-          <a-form-item
+          </a-form-model-item>
+          <a-form-model-item
             label="性别"
             :required="false"
           >
@@ -36,11 +38,11 @@
               <a-radio :value="sexValue.men">男</a-radio>
               <a-radio :value="sexValue.women">女</a-radio>
             </a-radio-group>
-          </a-form-item>
-          <a-form-item>
+          </a-form-model-item>
+          <a-form-model-item>
             <a-button type="primary" @click="submit">保存</a-button>
-          </a-form-item>
-        </a-form>
+          </a-form-model-item>
+        </a-form-model>
 
       </a-col>
       <a-col :md="20" :lg="6" :offset="2">
@@ -95,7 +97,23 @@ export default {
       rules: {
         nickName: [
           { required: true, message: '请输入昵称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度应为1-5', trigger: 'blur' }
+          { min: 3, max: 5, message: '长度应为3-5', trigger: 'blur' }
+        ],
+        email: [
+          {
+            required: true,
+            type: 'email',
+            message: '请正确填写邮箱地址',
+            trigger: ['blur', 'change']
+          }
+        ],
+        phonenumber: [
+          {
+            required: true,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请正确填写手机号',
+            trigger: 'blur'
+          }
         ]
       }
     }
@@ -124,7 +142,9 @@ export default {
       this.option.img = url
     },
     submit () {
-      updateUserProfile(this.user).then(response => {
+      this.$refs.user.validate(valid => {
+        if (valid) {
+          updateUserProfile(this.user).then(response => {
         this.$notification.open({
           message: '提示',
           description:
@@ -133,6 +153,10 @@ export default {
           duration: 3
         })
       })
+        } else {
+          return false
+        }
+      })
     }
   }
 }
-- 
Gitee