fix

src/views/setting/components/personInfo.tsx

@@ -185,7 +185,9 @@ export default defineComponent({
                 checkStrategy="child"
                 expandTrigger="hover"
                 defaultValue={
-                  userStore.info.regionCode || userStore.info.cityCode
+                  userStore.info.regionCode ||
+                  userStore.info.cityCode ||
+                  userStore.info.provinceCode
                 }
                 onUpdate:value={(val: any, option: any, pathValues: any) => {
                   teacherForm.provinceCode = pathValues[0]?.code;

src/views/setting/components/schoolInfo/index.module.less

@@ -41,12 +41,12 @@
 .formWrap {
     :global {
         .n-input {
-            min-width: 284px;
-            height: 50px;
+            width: 284Px;
             border-radius: 8Px;
 
             .n-input__input-el {
-                height: 100%;
+                height: 50Px;
+                font-size: 16Px;
             }
 
             &.n-input--disabled {
@@ -56,13 +56,13 @@
         }
 
         .n-base-selection {
-            height: 50px;
-            min-width: 284px;
+            height: 50Px;
+            width: 284Px;
             border-radius: 8Px;
 
             .n-base-selection-label {
-                height: 100%;
-
+                height: 50Px;
+                font-size: 16Px;
             }
         }
 
@@ -101,34 +101,6 @@
             font-weight: bold;
             font-size: 15Px;
         }
-
-        .n-input {
-            height: 50px;
-            border-radius: 8Px;
-
-            .n-input__input-el {
-                height: 100%;
-            }
-
-            &.n-input--disabled {
-                background-color: #F5F6FA;
-                color: rgba(149, 149, 152, 1);
-            }
-        }
-
-        .n-base-selection {
-            border-radius: 8Px;
-
-            .n-base-selection-label {
-                height: 50px;
-
-            }
-        }
-
-        .n-base-selection.n-base-selection--disabled .n-base-selection-label {
-            background-color: #F5F6FA;
-            color: rgba(149, 149, 152, 1);
-        }
     }
 
     .errorBtn {
@@ -239,10 +211,11 @@
     width: 100%;
 
     .btn {
-        width: 144px;
-        border-radius: 8px;
-        font-size: 18px;
+        width: 144Px;
+        height: 45Px;
+        border-radius: 8Px;
+        font-size: 18Px;
         font-weight: 600 !important;
-        margin-right: 24px;
+        margin-right: 24Px;
     }
 }

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

@@ -95,10 +95,10 @@ export default defineComponent({
             return (
               <div>
                 {row.status === 'ACTIVATION' ? (
-                  <NButton text>{row.statusName}</NButton>
+                  <NButton text>启用</NButton>
                 ) : (
                   <NButton class={styles.errorBtn} text>
-                    {row.statusName}
+                    停用
                   </NButton>
                 )}
               </div>
@@ -236,100 +236,99 @@ export default defineComponent({
     };
     return () => (
       <div class={styles.schoolInfo}>
-        <NSpace wrapItem={false} align="center">
-          <div class={styles.logo}>
-            <NImage
-              previewDisabled={false}
-              width={100}
-              height={100}
-              src={forms.logo}
-            />
-            <div
-              style={{ display: data.disabled ? 'none' : '' }}
-              class={styles.changeHead}>
-              修改头像
-              {data.schoolLoading && (
-                <UploadFile
-                  class={[styles.uploadFile]}
-                  cropper
-                  onUpdate:fileList={val => {
-                    forms.logo = val;
-                  }}
-                />
-              )}
-            </div>
-          </div>
-          <NForm
-            ref={formRef}
-            class={styles.formWrap}
-            model={forms}
-            style={{ paddingTop: '30px', paddingLeft: '80px' }}
-            disabled={data.disabled}>
-            <NSpace size={100}>
-              <NFormItem
-                label="学校名称"
-                path="name"
-                showRequireMark={false}
-                rule={[
-                  { required: true, message: '请填写学校名称', trigger: 'blur' }
-                ]}>
-                <NInput
-                  bordered={!data.disabled}
-                  maxlength={20}
-                  v-model:value={forms.name}
-                />
-              </NFormItem>
-              <NFormItem label="城区">
-                <NCascader
-                  placeholder="请选择城区"
-                  bordered={!data.disabled}
-                  options={formOptions.areaList}
-                  labelField="name"
-                  valueField="code"
-                  childrenField="areas"
-                  checkStrategy="child"
-                  expandTrigger="hover"
-                  defaultValue={
-                    user.info.schoolInfos?.[0]?.regionCode ||
-                    user.info.schoolInfos?.[0]?.cityCode
-                  }
-                  onUpdate:value={(val: any, option: any, pathValues: any) => {
-                    forms.provinceCode = pathValues[0]?.code;
-                    forms.cityCode = pathValues[1]?.code;
-                    forms.regionCode = pathValues[2]?.code;
-                  }}
-                />
-              </NFormItem>
-              <NFormItem>
-                {data.disabled ? (
-                  <NSpace class={styles.btnList} align="center" justify="end">
-                    <NButton
-                      class={styles.btn}
-                      color="#f24433"
-                      onClick={() => (data.disabled = false)}>
-                      修改信息
-                    </NButton>
-                  </NSpace>
-                ) : (
-                  <NSpace class={styles.btnList} align="center" justify="end">
-                    <NButton
-                      class={styles.btn}
-                      onClick={() => (data.disabled = true)}>
-                      取消
-                    </NButton>
-                    <NButton
-                      class={styles.btn}
-                      loading={!data.schoolLoading}
-                      type="primary"
-                      onClick={() => changeSchoolInfo()}>
-                      完成
-                    </NButton>
-                  </NSpace>
+        <NForm
+          ref={formRef}
+          class={styles.formWrap}
+          model={forms}
+          style={{ padding: '30px 0'}}
+          disabled={data.disabled}>
+          <NSpace size={[30, 20]}>
+            <div class={styles.logo}>
+              <NImage
+                previewDisabled={false}
+                width={100}
+                height={100}
+                src={forms.logo}
+              />
+              <div
+                style={{ display: data.disabled ? 'none' : '' }}
+                class={styles.changeHead}>
+                修改头像
+                {data.schoolLoading && (
+                  <UploadFile
+                    class={[styles.uploadFile]}
+                    cropper
+                    onUpdate:fileList={val => {
+                      forms.logo = val;
+                    }}
+                  />
                 )}
-              </NFormItem>
-            </NSpace>
-          </NForm>
-        </NSpace>
+              </div>
+            </div>
+            <NFormItem
+              label="学校名称"
+              path="name"
+              showRequireMark={false}
+              rule={[
+                { required: true, message: '请填写学校名称', trigger: 'blur' }
+              ]}>
+              <NInput
+                bordered={!data.disabled}
+                maxlength={20}
+                v-model:value={forms.name}
+              />
+            </NFormItem>
+            <NFormItem label="城区">
+              <NCascader
+                placeholder="请选择城区"
+                bordered={!data.disabled}
+                options={formOptions.areaList}
+                labelField="name"
+                valueField="code"
+                childrenField="areas"
+                checkStrategy="child"
+                expandTrigger="hover"
+                defaultValue={
+                  user.info.schoolInfos?.[0]?.regionCode ||
+                  user.info.schoolInfos?.[0]?.cityCode ||
+                  user.info.schoolInfos?.[0]?.provinceCode
+                }
+                onUpdate:value={(val: any, option: any, pathValues: any) => {
+                  forms.provinceCode = pathValues[0]?.code;
+                  forms.cityCode = pathValues[1]?.code;
+                  forms.regionCode = pathValues[2]?.code;
+                }}
+              />
+            </NFormItem>
+            <NFormItem>
+              {data.disabled ? (
+                <NSpace class={styles.btnList} align="center" justify="end">
+                  <NButton
+                    class={styles.btn}
+                    color="#f24433"
+                    onClick={() => (data.disabled = false)}>
+                    修改信息
+                  </NButton>
+                </NSpace>
+              ) : (
+                <NSpace class={styles.btnList} align="center" justify="end">
+                  <NButton
+                    class={styles.btn}
+                    onClick={() => (data.disabled = true)}>
+                    取消
+                  </NButton>
+                  <NButton
+                    class={styles.btn}
+                    loading={!data.schoolLoading}
+                    type="primary"
+                    onClick={() => changeSchoolInfo()}>
+                    完成
+                  </NButton>
+                </NSpace>
+              )}
+            </NFormItem>
+          </NSpace>
+        </NForm>
 
         <NSpace style={{ padding: '32px 0' }}>
           <NButton