From 4dc723e653be5876dd8921921e62e0530c6b25d2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 7 Mar 2022 14:19:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=AE=98=E7=BD=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue      | 19 +++++++++++++++----
 src/pages/account/login/index.vue |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 0ae288c..8b8569b 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -18,16 +18,16 @@
                     <el-divider direction="vertical"></el-divider>
                     <a class="logout" @click="logout">退出</a>
                 </template>
-                <router-link v-else class="login" to="/login" target="_blank">
+                <div v-else class="login" @click="toLogin">
                     <img src="@/assets/img/user.png" alt="">
                     <span>登录</span>
-                </router-link>
+                </div>
             </div>
         </div>
     </div>
 </template>
 <script>
-import { mapState, mapActions } from "vuex";
+import { mapState, mapMutations, mapActions } from "vuex";
 import Setting from "@/setting";
 import util from "@/libs/util";
 import navbar from "../navbar";
@@ -53,6 +53,9 @@ export default {
         }
     },
     methods: {
+        ...mapMutations("user", [
+            'SET_CUSTOMERNAME'
+        ]),
         ...mapActions("user", [
             "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
         ]),
@@ -66,9 +69,14 @@ export default {
         },
         getUserInfo() {
             this.$get(this.api.queryUserInfoDetails).then(res => {
-                let {userAvatars, userName} = res.result.hrUserInfo;
+                const {userAvatars, userName} = res.result.hrUserInfo || {}
                 userAvatars && this.setAvatar(userAvatars);
                 this.setUserName(userName);
+                if (!userName && !this.customerName) {
+                    this.$get(this.api.isClient).then(res => {
+                        res.customerName && this.SET_CUSTOMERNAME(res.customerName)
+                    }).catch(res => {})
+                }
             }).catch(err => {})
         },
         toPersonal() {
@@ -83,6 +91,9 @@ export default {
             this.$refs.nav.jump({
                 index: this.isIndex ? '/index/list' : '/station/list'
             })
+        },
+        toLogin() {
+            window.open(this.$router.resolve('/login').href)
         }
     }
 };
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index b4bc38b..00678a2 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -155,6 +155,7 @@ export default {
         setLogin() {
             util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
             util.successMsg('登录成功')
+            window.opener && window.opener.location.reload() // 刷新官网
             const redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/station"
             this.$router.replace(redirect)
         },