From feb217e1d12da241bd586fe112c0ca288c0a8277 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 8 Mar 2023 18:07:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/components/ReturnHead.vue | 14 +++++++------- src/views/faceteach/FaceTeach.vue | 2 +- src/views/faceteach/FaceTeachNoCommon.vue | 2 +- src/views/faceteach/FaceTeachNoCourse.vue | 2 +- src/views/faceteach/FaceTeachSignUp.vue | 2 +- src/views/pathmap/PathDetails.vue | 3 ++- src/views/projectdetails/projectDetails.vue | 1 + 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/App.vue b/src/App.vue index 689798e..c1cc9d7 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.8------------"); +console.log("版本2.1.9------------"); const store = useStore(); const router = useRouter(); diff --git a/src/components/ReturnHead.vue b/src/components/ReturnHead.vue index 4c0138e..96c5ebc 100644 --- a/src/components/ReturnHead.vue +++ b/src/components/ReturnHead.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-16 17:26:39 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-03-08 17:27:40 + * @LastEditTime: 2023-03-08 18:01:49 * @FilePath: /stu_h5/src/components/ReturnHead.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -84,16 +84,16 @@ export default { type: Number, default: null, }, + gohome: { + type: Boolean, + default: false, + }, }, setup(props, ctx) { const router = useRouter(); const returnclick = () => { - console.log( - "window.history", - window.history, - import.meta.env.VITE_BOE_STUDY - ); - if (window.history.length <= 1) { + console.log("props.gohome", props.gohome, import.meta.env.VITE_BOE_STUDY); + if (props.gohome) { window.open(import.meta.env.VITE_BOE_STUDY, "_top"); } else { router.back(-1); diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 446ead0..f933e09 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -1,6 +1,6 @@