fix

src/layouts/home/index.vue

@@ -140,7 +140,7 @@ export default {
       const res = await this.$post(this.api.checkUserNameOrWorkNumber)
       // 如果没有真实姓名，则弹框提示填写
       if (!res.hasName) {
-        this.realNameForm.workNumber = res.workNumber
+        this.realNameForm.workNumber = res.workNumber || ''
         this.realNameVisible = true
       }
     },

src/pages/account/login/index.vue

@@ -15,18 +15,13 @@
             @click="typeClick(item)">{{ item.label }}</li>
         </ul>
         <el-form :model="form" :rules="rules" ref="form" style="margin-top: 20px">
-          <!-- 学号工号 -->
-          <div v-show="!form.distinguish && !verCodeLogin" class="items">
-            <el-form-item class="flex-1" prop="workNumber">
+          <!-- 账号 -->
+          <div v-show="!verCodeLogin" class="items">
+            <el-form-item class="flex-1" prop="account">
               <label class="label account"></label>
-              <el-input v-model.trim="form.workNumber" placeholder="请输入学号/工号" @keyup.enter.native="submit"></el-input>
+              <el-input v-model.trim="form.account" placeholder="请输入账号" @keyup.enter.native="submit"></el-input>
             </el-form-item>
           </div>
-          <!-- 手机号邮箱登录 -->
-          <el-form-item v-show="form.distinguish === 1" prop="account">
-            <label class="label account"></label>
-            <el-input v-model.trim="form.account" placeholder="请输入账号" @keyup.enter.native="submit"></el-input>
-          </el-form-item>
           <template v-if="verCodeLogin">
             <el-form-item prop="account" ref="phoneItem">
               <label class="label account"></label>
@@ -237,7 +232,6 @@ export default {
       mailReg: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
       verificationIMG: '',
       form: {
-        workNumber: '',
         account: '', // 手机号验证码模式用这个字段
         password: '',
         code: '', // 验证码
@@ -246,8 +240,7 @@ export default {
         distinguish: 0,
       },
       rules: {
-        workNumber: [{ required: true, message: "请输入学号/工号", trigger: "blur" }],
-        account: [{ required: false, message: "请输入账号", trigger: "blur" }],
+        account: [{ required: true, message: "请输入账号", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
         code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
       },
@@ -339,15 +332,9 @@ export default {
     },
     // 重置验证规则
     handleRule () {
-      const type = this.form.distinguish
-      const rules = this.rules
-      rules.workNumber[0].required = !type && !this.verCodeLogin
-      rules.account[0].required = (!type && this.verCodeLogin) || type
-      this.rules.account[0].message = type ?
-        '请输入账号' :
-        this.verCodeLogin ?
-          '请输入手机号/邮箱' :
-          '请输入学号/工号'
+      this.rules.account[0].message = this.verCodeLogin ?
+        '请输入手机号/邮箱' :
+        '请输入账号'
     },
     // 切换标签
     typeClick (tab) {

src/pages/setting/person/info.vue

@@ -75,6 +75,12 @@
                 <el-input size="small" readonly placeholder="请输入学校" v-model="form.schoolName" clearable></el-input>
               </li>
             </div>
+            <div class="line info">
+              <li style="width: 334px;margin-right: 90px">
+                <label>学号：</label>
+                <el-input class="m-r-10" size="small" v-model="form.workNumber" clearable></el-input>
+              </li>
+            </div>
           </ul>
         </div>
         <div class="flex j-between a-center" style="width: 862px">
@@ -154,8 +160,8 @@
           <ul class="list">
             <div class="line info imp">
               <li style="width: 334px;margin-right: 90px">
-                <label>学号：</label>
-                <el-input class="m-r-10" size="small" v-model="form.workNumber" clearable disabled></el-input>
+                <label>账号：</label>
+                <el-input class="m-r-10" size="small" v-model="form.account" clearable disabled></el-input>
               </li>
               <li>
                 <label>手机号：</label>
@@ -195,8 +201,8 @@
         <el-form-item label="验证码">
           <div class="flex">
             <el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendEmailCode"
-              :disabled="emailDisabled">{{ emailBtnText }}</el-button>
+            <el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{
+              emailBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -215,8 +221,8 @@
         <el-form-item label="验证码">
           <div class="flex">
             <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode"
-              :disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
+            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{
+              phoneBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>