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 ba8382c..05d656a 100644 --- a/.env.prod +++ b/.env.prod @@ -1,7 +1,7 @@ VITE_BASE=/fe-student VITE_BASE_API=/manageApi VITE_BASE_LOGIN_URL=//u.boe.com/web/ - +VITE_FILE_PATH=/upload/boe/file/ VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc/case/detail?id= @@ -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/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index b17b6d6..9a49da2 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -375,7 +375,8 @@ const handleClick = (tab, event) => { const fielPath = ref(import.meta.env.VITE_FILE_PATH); const download = (url) => { console.log('下载url',fielPath.value+url) - window.open(fielPath.value+url); + //window.open(fielPath.value+url); + window.open(url); }; const downloads = (url) => { ElMessage.warning("未在有效时间范围内，请耐心等待！"); diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 05797f4..796ee55 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 ? "已评估" : "评估" @@ -177,9 +177,9 @@
- {{ data.userInfoBo?.userName }} + {{ teacherInfo?.realName}}
-
{{ data.userInfoBo?.bandDesc }}
+
{{ teacherInfo?.bandDesc }}
@@ -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 = () => { @@ -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(); }) @@ -325,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..2042d7a 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -1,15 +1,15 @@