fix

src/layouts/header/index.vue

@@ -34,7 +34,7 @@
             <el-dropdown size="medium" @command="menuChange">
               <div class="user">
                 <el-avatar :size="35" :src="avatar"></el-avatar>
-                <span class="username">{{ account }}</span>
+                <span class="username">{{ customerName || cName || userName }}</span>
               </div>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-if="isIndex" command="index">前往{{ serverToken ? '教学' : '学习' }}</el-dropdown-item>

src/pages/account/login/index.vue

@@ -19,7 +19,8 @@
           <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.account" placeholder="请输入账号/手机号" @keyup.enter.native="submit"></el-input>
+              <el-input v-model.trim="form.account" :placeholder="'请输入账号' + (!form.distinguish ? '/手机号' : '')"
+                @keyup.enter.native="submit"></el-input>
             </el-form-item>
           </div>
           <template v-if="verCodeLogin">
@@ -119,10 +120,12 @@
       <p class="tips">该{{ verCodeLogin ? '手机号已绑定' : '账号存在' }}以下用户信息</p>
       <ul class="users">
         <li :class="{ isEnable: !user.isEnable }" v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
-          <span>{{ user.typeName }}，{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{
-            user.isEnable
-              ? ''
-              : '（已禁用）' }}</span>
+          <span>{{ user.typeName }}，{{ user.schoolName }}{{ user.userName && '，' + user.userName }}{{ user.workNumber
+            &&
+            '，' + user.workNumber }}{{
+              user.isEnable
+                ? ''
+                : '（已禁用）' }}</span>
           <i class="el-icon-right"></i>
         </li>
       </ul>
@@ -245,7 +248,7 @@ export default {
         distinguish: 0,
       },
       rules: {
-        account: [{ required: true, message: "请输入账号/手机号", trigger: "blur" }],
+        account: [{ required: true, message: "请输入账号", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
         code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
       },
@@ -347,7 +350,7 @@ export default {
     handleRule () {
       this.rules.account[0].message = this.verCodeLogin ?
         '请输入手机号/邮箱' :
-        '请输入账号/手机号'
+        this.form.distinguish ? '请输入账号' : '请输入账号/手机号'
     },
     // 切换标签
     typeClick (tab) {

src/pages/account/redirect/index.vue

@@ -157,12 +157,18 @@ export default {
           '/station')
     },
     // 选择用户回调
-    chooseUser (user) {
+    async chooseUser (user) {
       this.curUser = user
-      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}&platform=${Setting.platformId}`).then(({ status, data }) => {
-        this.token = data.token
-        this.setLogin()
-      }).catch(res => { })
+      if (user.isEnable) {
+        const { status, data } = await this.$post(`${this.api.getToken}?id=${user.id}&platform=${Setting.platformId}`)
+        // 未绑定手机号，则弹框去绑定
+        if (status == 30001) {
+          this.phoneVisible = true
+        } else if (status == 200) {
+          this.token = data.token
+          this.setLogin()
+        }
+      }
     },
     // 刷新官网
     reloadIndex () {