From 2f03fff7e9aad5e63255414571447b7a78465a8c Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 10 Mar 2023 14:31:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=9B=B4=E6=92=AD=E6=95=99=E5=B8=88?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 ++ .env.prod | 2 ++ .env.release | 3 +++ src/views/liveBroadcast/LiveBroadcast.vue | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 0899c85..3541d61 100644 --- a/.env +++ b/.env @@ -15,5 +15,7 @@ VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/pc/exam/test?id= VITE_BOE_PATH_DETAIL_URL=//u-pre.boe.com/pc/forward?to=/fe-student VITE_BOE_API_URL=https://u-pre.boe.com +#用户头像 +VITE_AVATAR_PATH=/upload/ VITE_TASK_WHITE_TYPE=-22- \ No newline at end of file diff --git a/.env.prod b/.env.prod index 6b5d969..05d656a 100644 --- a/.env.prod +++ b/.env.prod @@ -11,5 +11,7 @@ VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc/exam/test?id= VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc/forward?to=/fe-student VITE_BOE_API_URL=https://u.boe.com +#用户头像 +VITE_AVATAR_PATH=/upload/ VITE_TASK_WHITE_TYPE==-22- diff --git a/.env.release b/.env.release index 072c5f2..d61b437 100644 --- a/.env.release +++ b/.env.release @@ -9,4 +9,7 @@ VITE_BOE_TEST_OUT_DETAIL_URL=//u.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/pc-release/exam/test?id= VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc-release/forward?to=/fe-student-release +#用户头像 +VITE_AVATAR_PATH=/upload/ + VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 05797f4..67779f7 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -212,7 +212,7 @@ const returnclick = () => { const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId,type}); console.log('直播信息', data) const teacherInfo = useUserInfo( - computed(() => data.value?.userInfoBo?.userId) + computed(() => data.value?.liveTeacherId) ); const state = reactive({ @@ -303,6 +303,7 @@ function isSignClick() { } watch(data, () => { + console.log(teacherInfo) isSignClick(); }) From 8518d34749300422fa3c0cc4639739e6f816ac6c Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 10 Mar 2023 16:55:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/liveBroadcast/LiveBroadcast.vue | 16 ++++++++-------- src/views/survey/SurveyDetail.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 67779f7..0753c4d 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -63,7 +63,7 @@ {{ data.signFlag ? "已签到" : "签到" }} {{ data.isSurvery ? "已评估" : "评估" @@ -80,7 +80,7 @@
{{ data.isSurvery ? "已评估" : "评估" @@ -109,7 +109,7 @@ --> {{ data.isSurvery ? "已评估" : "评估" @@ -202,7 +202,7 @@ import {ElMessage} from "element-plus"; import {useTaskPage} from "@/api/useCommon"; const { - query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime}, + query: {courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime, infoId}, } = useRoute(); const router = useRouter(); const returnclick = () => { @@ -326,18 +326,18 @@ const commitClick = () => { console.log({ courseId: data.value.assessmentId, - taskIds: taskId, + infoId: liveId, chapterOrStageId: 0, pName: "直播", sName: data.value.liveName, type: 4 }) - + console.log(data.value) router.push({ path: "/surveydetail", query: { courseId: data.value.assessmentId, - infoId: data.value.liveId, + infoId: liveId, chapterOrStageId: 0, pName: "直播", sName: data.value.liveName, diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 583325e..4c52b4f 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -348,7 +348,7 @@ const returnclick = () => { clearInterval(timers) router.back(); }; -const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() +const {nextPage,prevPage,hasPrev, hasNext} = type==3 || type==4 ? '' : useTaskPage() const fielPath = ref(import.meta.env.VITE_FILE_PATH); const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); console.log(data) From 5df37f3fd563b03cb789f653fe4bf640eccc2d64 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 10 Mar 2023 16:58:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 0db5af6..f41741f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,7 +38,7 @@ import {useRoute} from "vue-router/dist/vue-router"; import {USER_INFO} from "@/api/api"; import {IsPhone} from "@/api/utils"; -console.log("版本1.4.5------------"); +console.log("版本1.4.6------------"); const store = useStore(); const { path } = useRoute(); onMounted(() => {