Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee

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: "returnEnroll",
+      }).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,47 @@ export default {
 }
 </style>
 
+<style lang="scss">
+.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;
+    color: #606266;
+    font-size: 14px;
+    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;
+    text-align: right;
+    margin-top: 0px;
+    .el-button {
+      padding: 9px 15px;
+      font-size: 12px;
+      border-radius: 3px;
+      width: auto;
+      height: auto;
+    }
+  }
+  .el-message-box__btns button:nth-child(2) {
+    margin-left: 10px;
+  }
+}
+</style>
+