From db5395dcc415165b1957af6a3af141daf0a57912 Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 5 Mar 2023 19:42:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=9E=E5=88=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 13 +++++++++++-- .env.prod | 5 ++++- .env.release | 9 ++++++--- src/views/nottask/NotPath.vue | 4 ++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.env b/.env index ab9ccc9..42ea51e 100644 --- a/.env +++ b/.env @@ -4,12 +4,17 @@ VITE_OUTPUT_DIR=./dist VITE_BASE_LOGIN_URL=//u-pre.boe.com/m/loginuser?returnUrl= VITE_PROXY_URL=http://43.143.139.204/manageApi - +# 在线 VITE_BOE_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= +# 不用 案例 VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= +# 测评 不用 VITE_BOE_TEST_DETAIL_URL=//u-pre.boe.com/web/quizsummary?detailId= +# 测评 不用 VITE_BOE_TEST_OUT_DETAIL_URL=//u-pre.boe.com/api/b1/tale/do-quiz?quizKid= +# 考试 VITE_BOE_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= +# 不用 VITE_BOE_PATH_DETAIL_URL=//u-pre.boe.com/pc/forward?to=/student-h5 VITE_BOE_API_URL=https://u-pre.boe.com @@ -20,4 +25,8 @@ VITE_BOE_BASE_URL=//u-pre.boe.com #评论上传图片 VITE_IMG=/manageApi VITE_BASE_FILE_PATH=/fe-student-h5/upload -VITE_FILE_PATH=/upload/ \ No newline at end of file +VITE_FILE_PATH=/upload/ + + +#h5的基本url +VITE_BOE_HOME=//u-pre.boe.com/mobile/pages/index/index \ No newline at end of file diff --git a/.env.prod b/.env.prod index a577d89..3534595 100644 --- a/.env.prod +++ b/.env.prod @@ -15,4 +15,7 @@ VITE_BOE_API_URL=https://u.boe.com VITE_TASK_WHITE_TYPE=-22- VITE_BOE_BASE_URL=//u.boe.com -VITE_IMG=/manageApi \ No newline at end of file +VITE_IMG=/manageApi + +#h5的基本url +VITE_BOE_HOME=//u.boe.com/mobile/pages/index/index \ No newline at end of file diff --git a/.env.release b/.env.release index bafc02c..26fcca8 100644 --- a/.env.release +++ b/.env.release @@ -2,14 +2,17 @@ VITE_BASE=/student-h5-release VITE_BASE_API=/manageApi-release VITE_BASE_LOGIN_URL=//u.boe.com/web?returnUrl= -VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/pc-release/mobile/pages/study/courseStudy?id= +VITE_BOE_ONLINE_CLASS_URL=//u.boe.com/mobile-release/pages/study/courseStudy?id= VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc-release/case/detail?id= VITE_BOE_TEST_DETAIL_URL=//u.boe.com/web/quizsummary?detailId= 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/mobile/pages/exam/exam?id= +VITE_BOE_EXAM_DETAIL_URL=//u.boe.com/mobile-release/pages/exam/exam?id= VITE_BOE_PATH_DETAIL_URL=//u.boe.com/pc-release/forward?to=/student-h5-release VITE_BOE_API_URL=https://u.boe.com VITE_BOE_BASE_URL=//u.boe.com -VITE_IMG=/manageApi-release \ No newline at end of file +VITE_IMG=/manageApi-release + +#h5的基本url +VITE_BOE_HOME=//u.boe.com/mobile-release/pages/index/index \ No newline at end of file diff --git a/src/views/nottask/NotPath.vue b/src/views/nottask/NotPath.vue index 99b8465..21b4316 100644 --- a/src/views/nottask/NotPath.vue +++ b/src/views/nottask/NotPath.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-03-01 20:41:06 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-03-01 21:32:29 + * @LastEditTime: 2023-03-05 19:39:54 * @FilePath: /stu_h5/src/views/nottask/NotTask.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -19,6 +19,6 @@ From 30093f0fb891122b2e4b99bfc8740d84ef0af842 Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 5 Mar 2023 21:04:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=9B=BE=E7=89=87=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/discuss/DiscussDetail.vue | 15 ++++++- src/views/discuss/DiscussPage.vue | 24 ++++++++++ src/views/faceteach/FaceTeachNoCommon.vue | 16 ++++++- src/views/faceteach/FaceTeachNoCourse.vue | 12 +++++ src/views/faceteach/FaceTeachSignUp.vue | 55 ++++++++++++++++++++++- 5 files changed, 119 insertions(+), 3 deletions(-) diff --git a/src/views/discuss/DiscussDetail.vue b/src/views/discuss/DiscussDetail.vue index b60ae4b..cbfd95d 100644 --- a/src/views/discuss/DiscussDetail.vue +++ b/src/views/discuss/DiscussDetail.vue @@ -314,7 +314,7 @@ diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 9c5f943..423300b 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -189,6 +189,17 @@ function getPostList(discussId) { }) .then((e) => { console.log("我是当前讨论下的帖子", e); + if (e.data.records) { + let arr = e.data.records; + for (let i = 0; i < arr.length; i++) { + let obj = arr[i].content; + let regex = new RegExp(" { + console.log("state.postList", state.postList); + // if (data.value.offcourseDto && data.value.offcourseDto.outline) { + // let obj = data.value.offcourseDto.outline; + // let regex = new RegExp(" diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue index 274a35e..a243bfa 100644 --- a/src/views/faceteach/FaceTeachNoCommon.vue +++ b/src/views/faceteach/FaceTeachNoCommon.vue @@ -73,6 +73,7 @@
import ReturnHead from "@/components/ReturnHead.vue"; -import { computed, reactive, toRefs, watch, onUnmounted } from "vue"; +import { computed, reactive, toRefs, watch, onUnmounted, onMounted } from "vue"; import FileTypeImg from "@/components/FileTypeImg.vue"; import { request, useRequest } from "@/api/request"; import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api"; @@ -209,6 +210,19 @@ function formateArr(strs) { console.log("112233", arrs); return arrs; } + +watch(data, () => { + console.log("data.offcourseDto", data.value.offcourseDto); + if (data.value.offcourseDto && data.value.offcourseDto.outline) { + let obj = data.value.offcourseDto.outline; + let regex = new RegExp(" diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue index 43cede5..dc42259 100644 --- a/src/views/faceteach/FaceTeachNoCourse.vue +++ b/src/views/faceteach/FaceTeachNoCourse.vue @@ -213,6 +213,18 @@ function formateArr(strs) { console.log("112233", arrs); return arrs; } +watch(data, () => { + console.log("data.offcourseDto", data.value.offcourseDto); + if (data.value.offcourseDto && data.value.offcourseDto.outline) { + let obj = data.value.offcourseDto.outline; + let regex = new RegExp(" diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 5251298..7f9cf97 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -88,6 +88,7 @@
import ReturnHead from "@/components/ReturnHead.vue"; -import { computed, reactive, toRefs, watch, onUnmounted } from "vue"; +import { computed, reactive, toRefs, watch, onUnmounted, onMounted } from "vue"; import FileTypeImg from "@/components/FileTypeImg.vue"; import { request, useRequest } from "@/api/request"; import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api"; @@ -223,6 +224,58 @@ function formateArr(strs) { console.log("112233", arrs); return arrs; } +watch(data, () => { + console.log("data.offcourseDto", data.value.offcourseDto); + if (data.value.offcourseDto && data.value.offcourseDto.outline) { + let obj = data.value.offcourseDto.outline; + let regex = new RegExp(" { +// console.log("data.offcourseDto?.outline", data.value); +// // console.log("document", document.getElementById("face_img_id")); +// let imgs = document.getElementById("face_img_id").getElementsByTagName("img"); +// console.log("imgs", imgs, imgs.length); +// let timer = setInterval(() => { +// if (imgs && imgs.length !== 0) { +// clearInterval(timer); +// for (let i = 0; i < imgs.length; i++) { +// console.log("11111", imgs[i], i); +// // console.log( +// // "document.body.clientWidth", +// // document.body.clientWidth, +// // imgs[i].width +// // ); +// // if (document.body.clientWidth <= imgs[i].width) { +// // imgs[i].style.width = "100%"; +// // } +// getImgInfo(imgs[i].src, i, imgs); +// } +// } +// }, 1000); +// }); +function getImgInfo(url, i, imgs) { + console.log("url_i", url, i); + let image = new Image(); + let w, h; + image.src = url; + console.log("dj", image.width); + image.onload = function () { + w = image.width; + console.log("image.width", image.width); + h = image.height; + console.log("document.body.clientWidth", document.body.clientWidth); + if (document.body.clientWidth <= w) { + imgs[i].style.width = "100%"; + } + image.onload = null; + }; +} From 21d0871dc9b377f9d3c2fa6e78a8da995d45b528 Mon Sep 17 00:00:00 2001 From: lixg Date: Sun, 5 Mar 2023 21:44:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= 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 295dc2b..ac87df5 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("版本1.3.7------------"); +console.log("版本1.3.8------------"); const store = useStore(); const router = useRouter();