From 133b35b51e54f86f36371ccab8798c715536afb1 Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Tue, 18 Nov 2025 19:20:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=93=E5=8C=BA-=E7=A4=BE=E6=8B=9B?=
 =?UTF-8?q?=E6=96=B0=E5=91=98=E5=B7=A5=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NewEmployeeGuideDialog.vue | 12 ++----------
 src/components/PortalHeader.vue           |  2 +-
 src/layout/components/TopNav/Index.vue    |  2 +-
 src/views/new-employee/StudyPage.vue      |  5 +++--
 src/views/new-employee/WelcomePage.vue    |  2 ++
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/components/NewEmployeeGuideDialog.vue b/src/components/NewEmployeeGuideDialog.vue
index 9f71ab2a..f87250c9 100644
--- a/src/components/NewEmployeeGuideDialog.vue
+++ b/src/components/NewEmployeeGuideDialog.vue
@@ -18,18 +18,10 @@
           class="footer-btn"
           type="primary"
           :loading="processing"
-          @click="handleConfirmClick"
-          v-if="showBtn"
-        >
-          立即学习
-        </el-button>
-        <el-button
-          v-if="showBtn"
-          class="footer-btn"
-          type="text"
           @click="handleCancelClick"
+          v-if="showBtn"
         >
-          取消
+          关闭
         </el-button>
       </div>
     </div>
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 965d7549..afc0bdeb 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -422,7 +422,7 @@ export default {
         // 从后端获取用户信息和报名状态
         const res = await getWelcomeData();
         if (res.status === 200 && res.data) {
-          if (res.data?.approvalResults != 1) {
+          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
             this.$router.push("/new-employee/study");
             return;
           }
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index 9ef6281c..f92ab4f5 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -426,7 +426,7 @@ export default {
         // 从后端获取用户信息和报名状态
         const res = await getWelcomeData();
         if (res.status === 200 && res.data) {
-          if (res.data?.approvalResults != 1) {
+          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
             this.$router.push("/new-employee/study");
             return;
           }
diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index c2f8dea1..4b585e8d 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -218,7 +218,7 @@
     <NewEmployeeGuideDialog
       :visible.sync="guideDialogVisible"
       @close="guideDialogVisible = false"
-      :showBtn="false"
+      :showBtn="true"
     />
     <!-- 转正流程图弹窗 -->
     <el-dialog
@@ -421,10 +421,11 @@ export default {
   async mounted() {
     const res = await getWelcomeData();
     // 社招新员工项目标识：0否，1是
-    if (res.data.approvalResults == 1) {
+    if (res.data.approvalResults == 1 || !res.data.approvalResults) {
       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();
diff --git a/src/views/new-employee/WelcomePage.vue b/src/views/new-employee/WelcomePage.vue
index f2d4e6c4..dfda9086 100644
--- a/src/views/new-employee/WelcomePage.vue
+++ b/src/views/new-employee/WelcomePage.vue
@@ -132,6 +132,8 @@ export default {
             this.$refs.customMessage.show(
               "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
             );
+          } else {
+            this.$router.push("/new-employee/study?fromWelcome=1");
           }
         } catch (error) {
           console.error("报名请求失败:", error);