From 3088c8f1c8f3cb323a5aa29e81ce017f0185c427 Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Tue, 18 Nov 2025 16:12:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=90=8D=E5=90=8E=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=85=A5=E5=AD=A6=E4=B9=A0=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        | 13 ++++++++++++-
 src/layout/components/TopNav/Index.vue | 13 ++++++++++++-
 src/views/new-employee/StudyPage.vue   |  3 +--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 28eac5e7..965d7549 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -298,6 +298,7 @@ import { mapGetters, mapActions } from "vuex";
 import apiMessage from "@/api/system/message.js";
 import popup from "@/components/AlertPopup.vue";
 import yearMedal from "@/components/Popup/China2023.vue";
+import { getWelcomeData } from "@/api/new-employee/newEmployee";
 import apiBoeCourse from "@/api/boe/course.js";
 import { userAvatarText } from "@/utils/tools.js";
 import apiCase from "@/api/modules/cases.js";
@@ -416,7 +417,17 @@ export default {
       };
       window.open(obj[val]);
     },
-    handleCommand(val) {
+    async handleCommand(val) {
+      if (val === "five") {
+        // 从后端获取用户信息和报名状态
+        const res = await getWelcomeData();
+        if (res.status === 200 && res.data) {
+          if (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)
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index 143c3740..9ef6281c 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -337,6 +337,7 @@
 <script>
 import { mapGetters } from "vuex";
 import desk from "@/api/console.js";
+import { getWelcomeData } from "@/api/new-employee/newEmployee";
 import Cookies from "vue-cookies";
 import InterestCollection from "@/components/Portal/interestCollection.vue";
 import GuideBox from "@/components/Portal/guideBox.vue";
@@ -413,7 +414,7 @@ export default {
     closeSignDlg() {
       this.signInShow = false;
     },
-    handleCommand(val) {
+    async handleCommand(val) {
       // let obj = {
       //   one: process.env.VUE_APP_BOE_WEB_URL+'/web/teacherLesson',
       //   two: process.env.VUE_APP_BOE_WEB_URL+'/grow180/login',
@@ -421,6 +422,16 @@ 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 != 1) {
+            this.$router.push("/new-employee/study");
+            return;
+          }
+        }
+      }
       if (val === "for") {
         this.uClassShow = true;
       } else {
diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index 9f50804a..00e4ea9e 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -282,7 +282,7 @@ export default {
         elective: 0,
       },
       // 学习引导弹窗
-      guideDialogVisible: false,
+      guideDialogVisible: true,
       // 转正流程图弹窗
       chartVisible: false,
       approvalList: {
@@ -421,7 +421,6 @@ export default {
       this.$refs.customMessage.show("未报名或报名失败，请前往报名页面进行报名");
       this.$router.push("/new-employee/welcome");
     }
-    this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
     // 1报名失败、2审核中、3审核通过、4审核失败
     this.approvalResults = res.data.approvalResults;
     await this.initIds();