From c561c8263851602a9ab5335041c716c5b4cad88f Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Wed, 17 Dec 2025 21:33:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B7=B3=E8=BD=AC=E7=A4=BE=E6=8B=9B?=
 =?UTF-8?q?=E6=96=B0=E5=91=98=E5=B7=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue        | 20 ++++++++++----------
 src/layout/components/TopNav/Index.vue | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index afc0bdeb..9e290a4a 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -418,20 +418,20 @@ export default {
       window.open(obj[val]);
     },
     async handleCommand(val) {
-      if (val === "five") {
-        // 从后端获取用户信息和报名状态
-        const res = await getWelcomeData();
-        if (res.status === 200 && res.data) {
-          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
-            this.$router.push("/new-employee/study");
-            return;
-          }
-        }
-      }
       if (val === "four") {
         window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
         // this.$emit('showClass',true)
       } else {
+        if (val === "five") {
+          // 从后端获取用户信息和报名状态
+          const res = await getWelcomeData();
+          if (res.status === 200 && res.data) {
+            if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+              this.$router.push("/new-employee/study");
+              return;
+            }
+          }
+        }
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index f92ab4f5..979c3b54 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -422,19 +422,20 @@ export default {
       //   four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
       //   five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
       // };
-      if (val === "five") {
-        // 从后端获取用户信息和报名状态
-        const res = await getWelcomeData();
-        if (res.status === 200 && res.data) {
-          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
-            this.$router.push("/new-employee/study");
-            return;
-          }
-        }
-      }
+
       if (val === "for") {
         this.uClassShow = true;
       } else {
+        if (val === "five") {
+          // 从后端获取用户信息和报名状态
+          const res = await getWelcomeData();
+          if (res.status === 200 && res.data) {
+            if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+              this.$router.push("/new-employee/study");
+              return;
+            }
+          }
+        }
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {