Merge remote-tracking branch 'origin/develop' into manage-release

# Conflicts:
#	src/App.vue

.env.prod

@@ -1,10 +1,10 @@
-VITE_BASE=/fe-student-release
+VITE_BASE=/fe-student
-VITE_BASE_API=/manageApi-release
+VITE_BASE_API=/manageApi
 
-VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id=
-VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
-VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id=
+VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id=
 
 VITE_BOE_API_URL=https://u.boe.com

src/App.vue

@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.0.8------------");
+console.log("版本1.0.9------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

src/views/faceteach/FaceTeach.vue

@@ -37,7 +37,7 @@
 			<div style="display: flex">
 				
 				<botton class="btn" style="margin-right: 20px" :style="{
-	background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
+	background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999',
 }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }}
 				</botton>
 				<botton style="background: #999" class="btn" @click="toSurvery" v-if="data.planDto?.evalFlag == 0">
@@ -320,7 +320,7 @@ function toSurvery() {
 		query: {
 			courseId: data.value.planDto.evaluateId,
 			pName: "面授课",
-			infoId: data.value.offcourseDto.offcourseId,
+			infoId: data.value.planDto.offcoursePlanId,
 			chapterOrStageId: 0,
 			sName: data.value.planDto.name,
 			type: 3

src/views/faceteach/FaceTeachSignUp.vue

@@ -171,7 +171,7 @@ let timer = null;
 function onLineSignUp() {
   data.value.isSignUp || request(FACETEACH_SIGNUP, {courseId}).then(() => {
     ElMessage.success("报名成功");
-    router.push({path: 'faceteach', query: {courseId}})
+    router.push({path: '/faceteach', query: {courseId}})
   }).catch(err => {
     console.log(err)
   });

src/views/homework/HomeworkPage.vue

@@ -125,6 +125,12 @@
 						</div>
 						</div>
 
+						<div v-else >
+						<div style="display: flex; justify-content: center">
+							<button disabled class="tijiao" style="background:#999;border-radius: 6px;cursor: not-allowed;">未到开始时间</button>
+						</div>
+						</div>
+
 
 
 						<div class=""></div>

src/views/project/ProjectDetails.vue

@@ -116,7 +116,7 @@
 				<!-- 课程公告及共享文档 -->
 				<div class="detailRT">
 					<el-tabs v-model="activeName" @tab-click="handleClick">
-						<el-tab-pane label="课程公告" name="first">
+						<el-tab-pane label="项目公告" name="first">
 							<div class="notice">
 								{{ data.notice || "暂无公告" }}
 							</div>

src/views/roadmap/PathDetails.vue

@@ -116,9 +116,9 @@
 				<!-- 课程公告及共享文档 -->
 				<div class="detailRT">
 					<el-tabs v-model="activeName" @tab-click="handleClick">
-						<el-tab-pane label="课程公告" name="first">
+						<el-tab-pane label="路径说明" name="first">
 							<div class="notice">
-								{{ data.remark || "暂无公告" }}
+								{{ data.remark || "暂无说明" }}
 							</div>
 						</el-tab-pane>
 						<!--