Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

src/renderer/src/views/login/components/Register.vue

@@ -19,23 +19,23 @@
       ref="ruleFormRef"
     >
       <el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1">
-        <el-input  v-model="ruleForm.name" />
+        <el-input  v-model="ruleForm.name"  placeholder="请输入姓名" />
       </el-form-item>
       <el-form-item label="身份证号"  prop="idNumber" v-if="type==1 && activeIndex==1">
-        <el-input v-model="ruleForm.idNumber" />
+        <el-input v-model="ruleForm.idNumber"  placeholder="请输入身份证号码" />
       </el-form-item>
       <el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
-        <el-input v-model="ruleForm.phoneNumber" />
+        <el-input v-model="ruleForm.phoneNumber"  placeholder="请输入手机号" />
       </el-form-item>
       <el-form-item label="验证码" prop="Code" v-if="activeIndex==1">
-        <el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" />
+        <el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" placeholder="请输入验证码"  />
-        <el-button type="primary" style="margin-left:10px" @click="sendcaptchaImg">发送验证码</el-button>
+        <el-button type="primary" style="margin-left:10px"  @click="sendcaptchaImg">发送验证码</el-button>
       </el-form-item>
       <el-form-item label="设置密码" prop="password" v-if="activeIndex==1">
-        <el-input v-model="ruleForm.password" type="password" />
+        <el-input v-model="ruleForm.password" type="password" placeholder="6-30位，至少包含数字和字母,允许特殊符号" />
       </el-form-item>
       <el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1">
-        <el-input v-model="ruleForm.confirmPassword" type="password" />
+        <el-input v-model="ruleForm.confirmPassword" type="password"  placeholder="请确认密码" />
       </el-form-item>
       <el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
         <el-cascader
@@ -54,7 +54,7 @@
                 :data="gradeTree"
                  multiple
                 :render-after-expand="false"
-                style="width: 100%"
+                style="width: 100%;-webkit-app-region: no-drag;"
               />
       </el-form-item>
       <el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
@@ -235,6 +235,20 @@ const OpenModel = v =>{
 }
 // 关闭弹窗
 const handleClose = () => {
+  var restValue={
+              name: '',
+              idNumber:'',
+              phoneNumber: '',
+              Code:'',
+              password:'',
+              confirmPassword:'',
+              class:[],
+              discipline:[],
+              school:[],
+            }
+    Object.assign(ruleForm, restValue);
+    schoolSubject.value=[]
+    gradeTree.value=[]
   if (ruleFormRef.value) ruleFormRef.value.resetFields()
    removeToken();
   activeIndex.value=1
@@ -337,6 +351,8 @@ const submitForm = async (formEl) => {
               discipline:[],
               school:[],
             }
+            schoolSubject.value=[]
+            gradeTree.value=[]
             Object.assign(ruleForm, restValue);
             activeIndex.value=1
             dialogVisible.value=false

src/renderer/src/views/login/index.vue

@@ -33,7 +33,7 @@
         </el-form-item>
         <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
            <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
-           <!-- | -->
+           |
            <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
         </div>
       </el-form>