From 78b77a8b477b8367060b3fbf8bfb0b3a4572d9ff Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sun, 6 Aug 2023 04:49:03 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/sso/SsoModal.vue | 15 ++++++----
 src/views/system/user/sso/sso.data.ts  | 39 ++++++++++----------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/views/system/user/sso/SsoModal.vue b/src/views/system/user/sso/SsoModal.vue
index 87b3445..7fda49f 100644
--- a/src/views/system/user/sso/SsoModal.vue
+++ b/src/views/system/user/sso/SsoModal.vue
@@ -1,7 +1,8 @@
 <template>
   <BasicModal
     v-bind="$attrs"
-    width="720px"
+    width="988px"
+    class="user-modal"
     @ok="handleSubmit"
     @register="registerModal"
   >
@@ -10,13 +11,13 @@
         <BasicForm @register="registerForm"/>
       </ACol>
       <ACol :span="10">
-        <div class="change-avatar">
+        <div class="user-modal-avatar">
           <CropperAvatar
             :uploadApi="commonUpload"
             :value="state.avatar"
             btnText="更换头像"
             :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
-            :width="150"
+            :width="250"
             @change="handleAvatarChange"
           />
         </div>
@@ -164,8 +165,10 @@
   });
 </script>
 <style lang="less" scoped>
-.change-avatar {
-  margin-top: 35px;
-  text-align: center;
+.user-modal {
+  &-avatar {
+    margin-top: 45px;
+    text-align: center;
+  }
 }
 </style>
diff --git a/src/views/system/user/sso/sso.data.ts b/src/views/system/user/sso/sso.data.ts
index 318cbc2..de2be52 100644
--- a/src/views/system/user/sso/sso.data.ts
+++ b/src/views/system/user/sso/sso.data.ts
@@ -87,6 +87,12 @@ export const userFormSchema: FormSchema[] = [
     component: 'Input',
     show: false
   },
+  {
+    field: 'nickName',
+    label: '昵称',
+    component: 'Input',
+    required: true
+  },
   {
     field: 'userName',
     label: '用户名',
@@ -97,10 +103,16 @@ export const userFormSchema: FormSchema[] = [
     }
   },
   {
-    field: 'nickName',
-    label: '用户昵称',
-    component: 'Input',
+    field: 'sex',
+    label: '性别',
+    component: 'Select',
     required: true,
+    componentProps: {
+      options: [
+        { label: '男', value: '0' },
+        { label: '女', value: '1' }
+      ]
+    },
     colProps: {
       span: 12
     }
@@ -109,9 +121,6 @@ export const userFormSchema: FormSchema[] = [
     field: 'password',
     label: '密码',
     component: 'InputPassword',
-    colProps: {
-      span: 12
-    },
     rules: [
       {
         required: true,
@@ -162,30 +171,12 @@ export const userFormSchema: FormSchema[] = [
       }
     ]
   },
-  {
-    field: 'sex',
-    label: '性别',
-    component: 'Select',
-    required: true,
-    componentProps: {
-      options: [
-        { label: '男', value: '0' },
-        { label: '女', value: '1' }
-      ]
-    },
-    colProps: {
-      span: 12
-    }
-  },
   {
     field: 'remarks',
     label: '备注',
     component: 'InputTextArea',
     componentProps: {
       rows: 6
-    },
-    colProps: {
-      span: 24
     }
   }
 ];