Merge branch 'iteration-login' into dev

src/views/setting/components/personInfo.tsx

@@ -39,9 +39,9 @@ export default defineComponent({
     });
     const formRef = ref();
     const teacherForm = reactive({
-      provinceCode: '', // 省份编码
-      cityCode: '', // 城市编码
-      regionCode: '', // 区域编码
+      provinceCode: 0, // 省份编码
+      cityCode: 0, // 城市编码
+      regionCode: 0, // 区域编码
       nickname: userStore.info.nickname,
       phone: userStore.info.phone,
       gender: userStore.info.gender,
@@ -71,6 +71,10 @@ export default defineComponent({
         if (err) {
           return;
         }
+        if (!teacherForm.provinceCode || !teacherForm.cityCode) {
+          message.error('请选择城区');
+          return;
+        }
         await api_teacherUpdate(teacherForm);
         console.log(teacherForm);
         userStore.getInfo();
@@ -129,12 +133,20 @@ export default defineComponent({
                 <NFormItem
                   label="姓名"
                   path="nickname"
-                  rule={{
-                    required: true,
-                    message: '请填写老师姓名',
-                    trigger: 'blur'
-                  }}>
+                  rule={[
+                    {
+                      required: true,
+                      message: '请输入老师姓名',
+                      trigger: 'blur'
+                    },
+                    {
+                      pattern: /^(?:[\u4e00-\u9fa5·]{2,16})$/,
+                      message: '请输入中文姓名,不要包含空格,及特殊符号',
+                      trigger: 'blur'
+                    }
+                  ]}>
                   <NInput
+                    maxlength={14}
                     bordered={!data.disabled}
                     placeholder="请填写老师姓名"
                     v-model:value={teacherForm.nickname}></NInput>
@@ -175,7 +187,9 @@ export default defineComponent({
                 </NFormItem>
               </NGi>
             </NGrid>
-            <NFormItem label="城区" style={{ maxWidth: '30%' }}>
+            <NFormItem
+              label="城区"
+              style={{ maxWidth: '30%' }}>
               <NCascader
                 bordered={!data.disabled}
                 options={formOptions.areaList}
@@ -215,7 +229,12 @@ export default defineComponent({
           </NSpace>
         ) : (
           <NSpace class={styles.btnList} align="center" justify="end">
-            <NButton class={styles.btn} onClick={() => (data.disabled = true)}>
+            <NButton
+              class={styles.btn}
+              onClick={() => {
+                data.disabled = true;
+                formRef.value?.restoreValidation();
+              }}>
               取消
             </NButton>
             <NButton

src/views/setting/index.module.less

@@ -127,17 +127,20 @@
     width: 1172px;
 
     :global {
+      .n-form-item{
+        min-width: 200Px;
+      }
       .n-form-item-label {
         font-size: 15px;
         color: rgba(0, 0, 0, 0.8);
       }
 
       .n-input {
-        height: 50px;
-        border-radius: 8px;
-
+        border-radius: 8Px;
+        
         .n-input__input-el {
-          height: 100%;
+          height: 50Px;
+          font-size: 16Px;
         }
 
         &.n-input--disabled {
@@ -150,7 +153,8 @@
         border-radius: 8px;
 
         .n-base-selection-label {
-          height: 50px;
+          height: 50Px;
+          font-size: 16Px;
         }
       }
 
@@ -168,12 +172,12 @@
   margin-top: 30px;
 
   .btn {
-    width: 144px;
-    height: 45px;
-    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/modal/add-teacher/index.tsx

@@ -164,7 +164,7 @@ export default defineComponent({
             rule={[
               {
                 required: true,
-                message: '手机号码',
+                message: '请输入正确的手机号码',
                 trigger: 'blur'
               },
               {

src/views/setting/modal/forgotPassword.tsx

@@ -136,6 +136,7 @@ export default defineComponent({
               ]}>
               <NInput
                 readonly
+                disabled={true}
                 maxlength={11}
                 v-model:value={formInline.mobile}
                 placeholder="请输入手机号"></NInput>