From daa85bad284c486ea0555ba9dcfe9a36db524f6d Mon Sep 17 00:00:00 2001 From: lixg Date: Thu, 9 Mar 2023 11:56:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/api/request.js | 3 +- src/components/img/UploadImg.vue | 35 ++++++++++++++++------- src/views/activities/ActivitiesPage.vue | 11 ++++--- src/views/ballotpage/BallotPage.vue | 9 ++++-- src/views/evaluation/Evaluation.vue | 9 ++++-- src/views/faceteach/FaceTeach.vue | 12 ++++---- src/views/faceteach/FaceTeachSignUp.vue | 13 +++++---- src/views/homeworkpage/HomeworkPage.vue | 22 +++++++++++--- src/views/liveboradcast/LiveBoradcast.vue | 11 ++++--- 10 files changed, 79 insertions(+), 48 deletions(-) diff --git a/src/App.vue b/src/App.vue index 41ac04f..8089103 100644 --- a/src/App.vue +++ b/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("版本2.1.10------------"); +console.log("版本2.1.11------------"); const store = useStore(); const router = useRouter(); diff --git a/src/api/request.js b/src/api/request.js index 5aa410f..1c460fd 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -46,7 +46,6 @@ export function useRequest(_url, params = {}, callback) { const state = reactive({ data: {}, loading: false, - }) watch(params, () => { @@ -58,7 +57,7 @@ export function useRequest(_url, params = {}, callback) { request(_url, params).then(r => { state.data = r.data state.loading = false - callback(r) + callback?.(r) }) } diff --git a/src/components/img/UploadImg.vue b/src/components/img/UploadImg.vue index 16f5a58..c91b65c 100644 --- a/src/components/img/UploadImg.vue +++ b/src/components/img/UploadImg.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-18 14:40:26 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-19 16:37:15 + * @LastEditTime: 2023-03-09 11:39:58 * @FilePath: /stu_h5/src/components/img/UploadImg.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -63,18 +63,31 @@ const closeLoading = () => { function handleChange(e) { openLoading(); console.log("上传", e); - if (e.response && e.response.code === 200) { - e.url = e.response.data; + if ( + e.raw.name.includes(".mp4") || + e.raw.name.includes(".jpeg") || + e.raw.name.includes(".JPEG") + ) { + files.value = []; + emit("update:value", files.value); + ElMessage.error(`暂不支持此格式文件上传`); + closeLoading(); + return; + } else { + if (e.response && e.response.code === 200) { + e.url = e.response.data; + } + + const index = files.value.findIndex((f) => f.uid === e.uid); + if (index === -1) { + files.value.unshift(e); + } else { + files.value[index] = e; + } + emit("update:fileList", files.value); + files.value = []; } - const index = files.value.findIndex((f) => f.uid === e.uid); - if (index === -1) { - files.value.unshift(e); - } else { - files.value[index] = e; - } - emit("update:fileList", files.value); - files.value = []; closeLoading(); } diff --git a/src/views/activities/ActivitiesPage.vue b/src/views/activities/ActivitiesPage.vue index d038c54..e571a6d 100644 --- a/src/views/activities/ActivitiesPage.vue +++ b/src/views/activities/ActivitiesPage.vue @@ -165,7 +165,11 @@ const state = reactive({ isAllowSign: false, closeBtn: true, }); - +onUnmounted(() => { + if (timer) { + clearInterval(timer); + } +}); const { isAllowSign, closeBtn } = toRefs(state); const { data } = useRequest(ACTIVITY, { activityId, type }, (e) => { @@ -240,11 +244,6 @@ function isSignClick() { }, 1000); } isSignClick(); -onUnmounted(() => { - if (timer) { - clearInterval(timer); - } -}); //是否显示头部公告 const isShowClose = () => { diff --git a/src/views/ballotpage/BallotPage.vue b/src/views/ballotpage/BallotPage.vue index dbfe188..79a6042 100644 --- a/src/views/ballotpage/BallotPage.vue +++ b/src/views/ballotpage/BallotPage.vue @@ -190,6 +190,12 @@ const router = useRouter(); const { query: { courseId, chapterOrStageId, infoId, id, btype, type }, } = useRoute(); +onUnmounted(() => { + if (timer) { + clearInterval(timer); + } +}); + const userInfo = computed(() => store.state.userInfo); const { data } = useRequest(VOTE_DETAIL3, { voteId: courseId, type }, (e) => { if (e.code === 6) { @@ -229,9 +235,6 @@ let timer = setInterval(() => { clearInterval(timer); } }, 1000); -onUnmounted(() => { - clearInterval(timer); -}); // 答题时间 const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"); diff --git a/src/views/evaluation/Evaluation.vue b/src/views/evaluation/Evaluation.vue index 9b751f1..8f36d20 100644 --- a/src/views/evaluation/Evaluation.vue +++ b/src/views/evaluation/Evaluation.vue @@ -96,6 +96,11 @@ const { }, } = useRoute(); const router = useRouter(); +onUnmounted(() => { + if (timer) { + clearInterval(timer); + } +}); const { data } = useRequest(EVALUATION_DETAIL, { evaluationId, type }, (e) => { if (e.code === 6) { router.push({ @@ -130,9 +135,7 @@ let timer = setInterval(() => { clearInterval(timer); } }, 1000); -onUnmounted(() => { - clearInterval(timer); -}); + const goOuterChain = () => { console.log("点击去查看"); if (quizTaskId == null) { diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index f933e09..6628975 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -400,7 +400,11 @@ const returnclick = () => { const { query: { courseId, type, id: taskId, projectStatus, projectEndTime }, } = useRoute(); - +onUnmounted(() => { + if (timer) { + clearInterval(timer); + } +}); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); console.log("datadatadatadatadatadatadata", data); // console.log("项目状态字段传递", projectStatus, projectEndTime); @@ -606,12 +610,6 @@ function toExamItem(obj) { // router.push({ path: import.meta.env.VITE_BOE_EXAM_DETAIL_URL+ obj.examinationTestId }); } - -onUnmounted(() => { - if (timer) { - clearInterval(timer); - } -}); diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index a53d047..12e2d43 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -43,7 +43,7 @@ { isSignClick(); }); // 报名 -function onLineSignUp() { +function onLineSignUp(isAgain) { if (!state.isAllowSign) { // console.log("data.signFlag", data.value.signFlag, isAllowSign); ElMessage.warning("未在允许报名时间范围内"); return; } - if (data.value.isSignUp && data.value.isSignUp) { + if (data.value.isSignUp && !isAgain) { return; } request(FACETEACH_SIGNUP, { courseId }); data.value.isSignUp = true; - ElMessage.success("报名成功"); + //重置按钮 + data.value.isSignUpAgain = isAgain; + data.value.isRefused = false; + ElMessage.success(isAgain ? "重新报名成功" : "报名成功"); } function formateArr(strs) { diff --git a/src/views/homeworkpage/HomeworkPage.vue b/src/views/homeworkpage/HomeworkPage.vue index 280462f..f0f2b7a 100644 --- a/src/views/homeworkpage/HomeworkPage.vue +++ b/src/views/homeworkpage/HomeworkPage.vue @@ -83,7 +83,15 @@