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

src/views/new-employee/StudyPage.vue

@@ -6,7 +6,7 @@
     <!-- 顶部横幅与标题 -->
     <div class="banner">
       <div class="banner-inner">
-        <div class="title">社招新员工培训及考试</div>
+        <div class="title">{{ projectName }}</div>
         <!-- 筛选条 -->
         <div class="filters">
           <div class="filter-group">
@@ -273,6 +273,7 @@ export default {
       total: 0,
       loading: false,
       projectId: "",
+      projectName: "",
       studentId: "",
       // 列表数据（课程/考试混合）
       items: [],
@@ -312,6 +313,7 @@ export default {
       const res = await getSzxygProjectInfo();
       this.bpmApprovalRequired = res.data.bpmApprovalRequired;
       this.projectId = res.data.id || "";
+      this.projectName = res.data.name || "";
     },
     async loadList() {
       if (!this.studentId || !this.projectId) return;
@@ -470,7 +472,7 @@ export default {
 }
 .sidebar {
   width: 360px;
-  margin-top: -70px;
+  margin-top: -80px;
 }
 
 .card {

src/views/new-employee/WelcomePage.vue

@@ -38,7 +38,7 @@
                 allowSelfRegistration
               "
               class="btn btn-default btn-lg send center-block start-btn"
-              :disabled="enrollLoading"
+              :disabled="enrollLoading || !isPublish"
               @click="handleEnrollClick"
             >
               报名社招新员工项目
@@ -50,12 +50,13 @@
                 (!allowSelfRegistration && approvalResults == '4')
               "
               class="btn btn-default btn-lg send center-block start-btn"
-              :disabled="enrollLoading"
+              :disabled="enrollLoading || !isPublish"
               @click="handleEnrollClick"
             >
               开启学习之旅
             </button>
             <p
+              v-if="isPublish"
               style="
                 color: #ffe551;
                 font-size: 14px;
@@ -65,6 +66,17 @@
             >
               温馨提示：仅社招新员工可以报名，校招新员工和其他员工请不要点击
             </p>
+            <p
+              v-else
+              style="
+                color: #ffe551;
+                font-size: 14px;
+                font-family: '黑体';
+                margin-top: 20px;
+              "
+            >
+              社招新员工项目待发布，请等候
+            </p>
           </div>
         </div>
       </div>
@@ -124,6 +136,7 @@ export default {
         const szxygProjectInfo = await getSzxygProjectInfo();
         this.allowSelfRegistration =
           szxygProjectInfo.data.allowSelfRegistration;
+        this.isPublish = szxygProjectInfo.data.status == 3;
         if (res.status === 200 && res.data) {
           if (typeof res.data === "string") {
             this.approvalResults = null;

src/views/portal/course/Index.vue

@@ -1265,14 +1265,24 @@ export default {
       });
     },
     //课程列表详情
-    toCourseDetail(item) {
+    async toCourseDetail(item) {
       let $this = this;
       let courseId = item.id;
       if (!courseId) {
         courseId = item.courseId;
       }
       if (item.szxygProjectFlag == 1) {
-        this.$router.push("/new-employee/study");
+        // 从后端获取用户信息和报名状态
+        const res = await getWelcomeData();
+        if (res.status === 200 && res.data) {
+          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+            this.$router.push("/new-employee/study");
+            return;
+          } else {
+            this.$router.push("/new-employee/welcome");
+            return;
+          }
+        }
         return;
       }
       if (item.source == 1) {