fix

src/views/setting/components/personInfo.tsx

@@ -116,10 +116,12 @@ export default defineComponent({
           <div class={styles.headerInfo}>
             <p class={styles.headerTitle}>
               {userStore.info.nickname}
-              <NImage
-                previewDisabled
-                class={styles.sexIcon}
-                src={userStore.info.gender ? maleIcon : femaleIcon}></NImage>
+              {userStore.info.gender !== null && (
+                <NImage
+                  previewDisabled
+                  class={styles.sexIcon}
+                  src={userStore.info.gender ? maleIcon : femaleIcon}></NImage>
+              )}
             </p>
             <p class={styles.headerSubTitle}>
               {userStore.info.schoolInfos?.[0]?.name} | 音乐老师
@@ -175,7 +177,17 @@ export default defineComponent({
                 </NFormItem>
               </NGi>
               <NGi>
-                <NFormItem label="性别" path="sex">
+                <NFormItem
+                  label="性别"
+                  path="gender"
+                  rule={[
+                    {
+                      required: true,
+                      type: 'number',
+                      message: '请选择性别',
+                      trigger: 'blur'
+                    }
+                  ]}>
                   <NSelect
                     bordered={!data.disabled}
                     class={styles.select}
@@ -186,30 +198,42 @@ export default defineComponent({
                   />
                 </NFormItem>
               </NGi>
+              <NGi>
+                <NFormItem
+                  label="城区"
+                  path="provinceCode"
+                  rule={{
+                    required: true,
+                    type: 'number',
+                    message: '请选择城区',
+                    trigger: 'change'
+                  }}>
+                  <NCascader
+                    bordered={!data.disabled}
+                    options={formOptions.areaList}
+                    labelField="name"
+                    valueField="code"
+                    childrenField="areas"
+                    checkStrategy="child"
+                    expandTrigger="hover"
+                    defaultValue={
+                      userStore.info.regionCode ||
+                      userStore.info.cityCode ||
+                      userStore.info.provinceCode
+                    }
+                    onUpdate:value={(
+                      val: any,
+                      option: any,
+                      pathValues: any
+                    ) => {
+                      teacherForm.provinceCode = pathValues[0]?.code;
+                      teacherForm.cityCode = pathValues[1]?.code;
+                      teacherForm.regionCode = pathValues[2]?.code;
+                    }}
+                  />
+                </NFormItem>
+              </NGi>
             </NGrid>
-            <NFormItem
-              label="城区"
-              style={{ maxWidth: '30%' }}>
-              <NCascader
-                bordered={!data.disabled}
-                options={formOptions.areaList}
-                labelField="name"
-                valueField="code"
-                childrenField="areas"
-                checkStrategy="child"
-                expandTrigger="hover"
-                defaultValue={
-                  userStore.info.regionCode ||
-                  userStore.info.cityCode ||
-                  userStore.info.provinceCode
-                }
-                onUpdate:value={(val: any, option: any, pathValues: any) => {
-                  teacherForm.provinceCode = pathValues[0]?.code;
-                  teacherForm.cityCode = pathValues[1]?.code;
-                  teacherForm.regionCode = pathValues[2]?.code;
-                }}
-              />
-            </NFormItem>
           </NForm>
         </div>
         {data.disabled ? (

src/views/setting/components/schoolInfo/index.tsx

@@ -120,6 +120,7 @@ export default defineComponent({
 
               {row.status === 'ACTIVATION' ? (
                 <NButton
+                  disabled={row.jobType === 'ADMIN'}
                   type="primary"
                   quaternary
                   size="small"

src/views/setting/index.module.less

@@ -118,6 +118,7 @@
         font-weight: 400;
         color: #707a92;
         line-height: 20px;
+        text-align: center;
       }
     }
   }
@@ -150,15 +151,20 @@
         }
       }
 
-      .n-input__input-el {
-        height: 55px;
-        line-height: 55px;
-        border-radius: 8px;
-      }
+      .n-base-selection {
+        height: 50Px;
+        border-radius: 8Px;
 
-      .n-base-selection .n-base-selection-label {
-        height: 55px;
-      }
+        .n-base-selection-label {
+            height: 50Px;
+            font-size: 16Px;
+        }
+    }
+
+    .n-base-selection.n-base-selection--disabled .n-base-selection-label {
+        background-color: #F5F6FA;
+        color: rgba(149, 149, 152, 1);
+    }
     }
   }
 }