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

src/views/new-employee/StudyPage.vue

@@ -400,7 +400,9 @@ export default {
           );
         } else {
           this.$refs.customMessage.show("您已重新报名成功");
-          this.approvalResults = 2;
+          const res = await getWelcomeData();
+          // 1报名失败、2审核中、3审核通过、4审核失败
+          this.approvalResults = res.data.approvalResults;
         }
       });
     },

src/views/new-employee/WelcomePage.vue

@@ -44,7 +44,11 @@
               报名社招新员工项目
             </button>
             <button
-              v-else
+              v-if="
+                approvalResults == '2' ||
+                approvalResults == '3' ||
+                (!allowSelfRegistration && approvalResults == '4')
+              "
               class="btn btn-default btn-lg send center-block start-btn"
               :disabled="enrollLoading"
               @click="handleEnrollClick"