From 6b5c6c2ba98a744c30f604e2345f9734fa095a06 Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Tue, 18 Nov 2025 19:55:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=AD=A6=E4=B9=A0=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/new-employee/StudyPage.vue | 44 +++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index 4b585e8d..015a1a0a 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -119,7 +119,7 @@
         <div class="profile card">
           <div
             class="avatar"
-            :style="`background: url(${userInfo.avatar}) no-repeat;`"
+            :style="`background: url(${userInfo.avatar}) no-repeat center/100% 100%;`"
           ></div>
           <div class="name">{{ userInfo.name }}</div>
           <div class="desc">{{ userInfo.departName }}</div>
@@ -405,7 +405,11 @@ export default {
       }
     },
     async returnEnroll() {
-      this.$confirm("请确认是否重新报名").then(async () => {
+      this.$confirm("是否重新报名社招新员工项目", {
+        title: "报名确认",
+        type: "warning",
+        customClass: "confirm",
+      }).then(async () => {
         const res = await enrollRequest();
         if (res.data.sendToOaSuccess != 0) {
           this.$refs.errorMessage.show(
@@ -423,11 +427,11 @@ export default {
     // 社招新员工项目标识：0否，1是
     if (res.data.approvalResults == 1 || !res.data.approvalResults) {
       this.$refs.customMessage.show("未报名或报名失败，请前往报名页面进行报名");
-      this.$router.push("/new-employee/welcome");
+      // this.$router.push("/new-employee/welcome");
     }
     this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
     // 1报名失败、2审核中、3审核通过、4审核失败
-    this.approvalResults = res.data.approvalResults;
+    this.approvalResults = 4 || res.data.approvalResults;
     await this.initIds();
     if (!this.projectId || !this.studentId) {
       this.$message.warning("未获得项目或学员信息，列表可能无法加载");
@@ -841,4 +845,36 @@ export default {
 }
 </style>
 
+<style lang="scss">
+.confirm {
+  width: 420px;
+  height: auto;
+  .el-message-box__header {
+    display: block;
+    position: relative;
+    padding: 15px 15px 10px;
+  }
+  .el-message-box__content {
+    padding: 10px 15px;
+    color: #606266;
+    font-size: 14px;
+    text-align: left;
+    font-weight: 500;
+    margin-top: 0px;
+  }
+  .el-message-box__btns {
+    padding: 5px 15px 0;
+    text-align: right;
+    margin-top: 0px;
+    .el-button {
+      padding: 9px 15px;
+      font-size: 12px;
+      border-radius: 3px;
+      width: auto;
+      height: auto;
+    }
+  }
+}
+</style>
+
 

From d307356570fd1e0943df862433cb813f57a65110 Mon Sep 17 00:00:00 2001
From: zxj <zhang.xijie@iwhalecloud.com>
Date: Tue, 18 Nov 2025 20:08:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=87=8D=E6=96=B0=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/new-employee/StudyPage.vue | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/new-employee/StudyPage.vue b/src/views/new-employee/StudyPage.vue
index 015a1a0a..1b2fa7f2 100644
--- a/src/views/new-employee/StudyPage.vue
+++ b/src/views/new-employee/StudyPage.vue
@@ -405,10 +405,10 @@ export default {
       }
     },
     async returnEnroll() {
-      this.$confirm("是否重新报名社招新员工项目", {
+      this.$confirm("是否重新报名社招新员工项目?", {
         title: "报名确认",
         type: "warning",
-        customClass: "confirm",
+        customClass: "returnEnroll",
       }).then(async () => {
         const res = await enrollRequest();
         if (res.data.sendToOaSuccess != 0) {
@@ -846,13 +846,16 @@ export default {
 </style>
 
 <style lang="scss">
-.confirm {
-  width: 420px;
+.returnEnroll {
+  width: 380px;
   height: auto;
   .el-message-box__header {
     display: block;
     position: relative;
     padding: 15px 15px 10px;
+    .el-message-box__title {
+      font-size: 16px;
+    }
   }
   .el-message-box__content {
     padding: 10px 15px;
@@ -861,6 +864,11 @@ export default {
     text-align: left;
     font-weight: 500;
     margin-top: 0px;
+    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+      Microsoft YaHei, SimSun, sans-serif;
+  }
+  .el-message-box__status {
+    display: block;
   }
   .el-message-box__btns {
     padding: 5px 15px 0;
@@ -874,6 +882,9 @@ export default {
       height: auto;
     }
   }
+  .el-message-box__btns button:nth-child(2) {
+    margin-left: 10px;
+  }
 }
 </style>