From d18143af97f3fe952e2ce552a1c0ae196864bdc6 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 5 Dec 2024 14:50:46 +0800
Subject: [PATCH] fix

---
 src/layouts/header/index.vue         | 6 ++++--
 src/pages/account/login/index.vue    | 6 +++---
 src/pages/account/redirect/index.vue | 3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 29eb6e4..6c0e8b4 100644
--- a/src/layouts/header/index.vue
+++ b/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">{{ customerName || cName || userName }}</span>
+                <span class="username">{{ account }}</span>
               </div>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-if="isIndex" command="index">前往{{ serverToken ? '教学' : '学习' }}</el-dropdown-item>
@@ -89,6 +89,7 @@ export default {
       ip: localStorage.getItem('localIp') ? +localStorage.getItem('localIp') : 0,
       mobileMenuStatus: false,
       timer: null,
+      account: '',
     };
   },
   components: {
@@ -202,7 +203,8 @@ export default {
       userAvatars && this.setAvatar(userAvatars)
       this.setUserId(userId)
       this.setUserName(userName)
-      this.setAccount(res.result.userAccount.account)
+      this.account = res.result.userAccount.account
+      this.setAccount(this.account)
     },
     // 用户名下拉回调
     menuChange (e) {
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 508d1b4..f524a1b 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -19,7 +19,7 @@
           <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="请输入账号/手机号" @keyup.enter.native="submit"></el-input>
             </el-form-item>
           </div>
           <template v-if="verCodeLogin">
@@ -245,7 +245,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 +347,7 @@ export default {
     handleRule () {
       this.rules.account[0].message = this.verCodeLogin ?
         '请输入手机号/邮箱' :
-        '请输入账号'
+        '请输入账号/手机号'
     },
     // 切换标签
     typeClick (tab) {
diff --git a/src/pages/account/redirect/index.vue b/src/pages/account/redirect/index.vue
index f92ef4a..62e6f6c 100644
--- a/src/pages/account/redirect/index.vue
+++ b/src/pages/account/redirect/index.vue
@@ -30,6 +30,9 @@
           <el-input type="password" placeholder="请输入密码" v-model.trim="form.password" autocomplete="new-password"
             @keyup.enter.native="bindSubmit" />
         </el-form-item>
+        <div class="text-right">
+          <el-link :underline="false" type="primary" @click="toLogin">返回账号登录</el-link>
+        </div>
         <el-button class="submit" type="primary" @click="bindSubmit">绑定</el-button>
       </el-form>