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

src/App.vue

@@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi";
 import { getCookie } from "@/api/utils";
 
 import { USER_INFO } from "@/api/api";
-console.log("版本1.4.7------------");
+console.log("版本1.4.8------------");
 const store = useStore();
 const router = useRouter();
 

src/views/projectdetails/projectDetails.vue

@@ -219,7 +219,7 @@ import dayjs from "dayjs";
 import { useStore } from "vuex";
 import { changeTime } from "@/api/method";
 const {
-  query: { courseId, projectId, type },
+  query: { courseId, projectId, type, infoId, chapterOrStageId, id },
 } = useRoute();
 const router = useRouter();
 const { commit, dispatch, state } = useStore();
@@ -228,8 +228,10 @@ useRequest(PROJECT_PROCESS, { projectId: projectId, type }, (e) => {
   useRequest(
     checkStudentExist,
     {
-      targetId: projectId,
+      targetId: type == 1 ? projectId : infoId,
       type: type,
+      chapterId: chapterOrStageId,
+      courseId: id,
     },
     (res) => {
       console.log("判断任务是否删除", res);

src/views/sign/signTime.vue

@@ -0,0 +1,21 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-03-09 17:56:39
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-03-17 17:41:43
+ * @FilePath: /stu_h5/src/views/sign/signTime.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <el-result icon="success" title="签到异常" sub-title="未在签到时间范围内">
+    <template #extra>
+      <el-button type="primary" @click="toIndex">返回首页</el-button>
+    </template>
+  </el-result>
+</template>
+<script setup>
+function toIndex() {
+  window.location.href =
+    window.location.protocol + import.meta.env.VITE_BOE_HOME;
+}
+</script>