From 56879640bf4ec4b01178034c16067802e3cec828 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 7 Mar 2023 16:46:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ReturnHead.vue             | 14 ++++++++---
 src/router/index.js                       |  2 +-
 src/views/faceteach/FaceTeach.vue         |  2 +-
 src/views/faceteach/FaceTeachNoCommon.vue | 29 +++++++++++++++++++----
 src/views/faceteach/FaceTeachNoCourse.vue | 17 ++++++++++---
 src/views/homeworkpage/HomeworkPage.vue   |  6 +++++
 6 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/components/ReturnHead.vue b/src/components/ReturnHead.vue
index 2f16173..aad3f43 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-07 15:17:43
+ * @LastEditTime: 2023-03-07 15:57:43
  * @FilePath: /stu_h5/src/components/ReturnHead.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -88,8 +88,16 @@ export default {
   setup(props, ctx) {
     const router = useRouter();
     const returnclick = () => {
-      router.back();
-      // VITE_BOE_STUDY
+      console.log(
+        "window.history",
+        window.history,
+        import.meta.env.VITE_BOE_STUDY
+      );
+      if (window.history.length <= 1) {
+        window.open(import.meta.env.VITE_BOE_STUDY, "_top");
+      } else {
+        router.back();
+      }
     };
     const publishClick = () => {
       if (props.postAdd) {
diff --git a/src/router/index.js b/src/router/index.js
index 292580a..6b2adf1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-08 09:50:10
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-03-07 15:48:30
+ * @LastEditTime: 2023-03-07 16:43:57
  * @FilePath: /stu_h5/src/router/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 03d2708..446ead0 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -162,7 +162,7 @@
             <div class="box"></div>
           </div>
           <div class="detailMain">
-            {{ data.planDto?.description }}
+            {{ data.offcourseDto?.intro }}
           </div>
         </div>
       </div>
diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue
index a243bfa..d7fcc35 100644
--- a/src/views/faceteach/FaceTeachNoCommon.vue
+++ b/src/views/faceteach/FaceTeachNoCommon.vue
@@ -148,13 +148,21 @@
 
 <script setup>
 import ReturnHead from "@/components/ReturnHead.vue";
-import { computed, reactive, toRefs, watch, onUnmounted, onMounted } from "vue";
+import {
+  computed,
+  reactive,
+  toRefs,
+  watch,
+  onUnmounted,
+  onMounted,
+  ref,
+} from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
 import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
-import { ElMessage, messageConfig } from "element-plus";
+import { ElMessage, messageConfig, ElLoading } from "element-plus";
 import dayjs from "dayjs";
 import UploadPostImg from "@/components/img/UploadPostImg.vue";
 import CommentReply from "@/components/CommentReply.vue";
@@ -165,8 +173,21 @@ const returnclick = () => {
 const {
   query: { courseId, type, id: taskId },
 } = useRoute();
-
-const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
+const loading = ref(false); // loading
+const openLoading = () => {
+  loading.value = ElLoading.service({
+    lock: true,
+    text: "Loading",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+};
+openLoading();
+const closeLoading = () => {
+  loading.value.close();
+};
+const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }, () => {
+  closeLoading();
+});
 console.log("获取信息", data);
 
 const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId));
diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue
index dc42259..ce07ea4 100644
--- a/src/views/faceteach/FaceTeachNoCourse.vue
+++ b/src/views/faceteach/FaceTeachNoCourse.vue
@@ -153,13 +153,13 @@
 
 <script setup>
 import ReturnHead from "@/components/ReturnHead.vue";
-import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
+import { computed, reactive, toRefs, watch, onUnmounted, ref } from "vue";
 import FileTypeImg from "@/components/FileTypeImg.vue";
 import { request, useRequest } from "@/api/request";
 import { STU_OFFCOURSE_DETAIL, FACETEACH_SIGNUP } from "@/api/api";
 import { useRoute, useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
-import { ElMessage, messageConfig } from "element-plus";
+import { ElMessage, messageConfig, ElLoading } from "element-plus";
 import dayjs from "dayjs";
 const router = useRouter();
 const returnclick = () => {
@@ -168,7 +168,18 @@ const returnclick = () => {
 const {
   query: { courseId, type, id: taskId },
 } = useRoute();
-
+const loading = ref(false); // loading
+const openLoading = () => {
+  loading.value = ElLoading.service({
+    lock: true,
+    text: "Loading",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+};
+openLoading();
+const closeLoading = () => {
+  loading.value.close();
+};
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
 console.log("获取信息", data);
 
diff --git a/src/views/homeworkpage/HomeworkPage.vue b/src/views/homeworkpage/HomeworkPage.vue
index 6acede8..24a2d40 100644
--- a/src/views/homeworkpage/HomeworkPage.vue
+++ b/src/views/homeworkpage/HomeworkPage.vue
@@ -136,6 +136,12 @@ const { data } =
 
 console.log("data==----->", data);
 //作业倒计时
+// const state = reactive({
+//   hour,
+//   minute,
+//   seconds,
+// });
+// const { hour, minute, seconds } = toRefs(state);
 let hour = ref(0);
 let minute = ref(0);
 let seconds = ref(0);