From 90f1fdee9b17109f9d8fa2dbbded61b9cd721488 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 10 Mar 2023 17:03:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=8A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 |  2 +-
 src/components/ReturnHead.vue               |  8 ++++++--
 src/views/discuss/DiscussUpload.vue         |  3 +++
 src/views/faceteach/FaceTeach.vue           | 12 ++++++++++--
 src/views/faceteach/FaceTeachNoCommon.vue   | 10 +++++++++-
 src/views/faceteach/FaceTeachNoCourse.vue   | 10 +++++++++-
 src/views/faceteach/FaceTeachSignUp.vue     | 10 +++++++++-
 src/views/liveboradcast/LiveBoradcast.vue   |  4 +++-
 src/views/pathmap/PathmapPage.vue           | 11 ++++++-----
 src/views/projectdetails/projectDetails.vue | 12 +++++++-----
 vite.config.js                              |  2 +-
 11 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e05685e..46e049b 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.0------------");
+console.log("版本1.4.6------------");
 const store = useStore();
 const router = useRouter();
 
diff --git a/src/components/ReturnHead.vue b/src/components/ReturnHead.vue
index ef0d900..1479f79 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-09 18:35:30
+ * @LastEditTime: 2023-03-10 15:20:30
  * @FilePath: /stu_h5/src/components/ReturnHead.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -99,7 +99,11 @@ export default {
           "_top"
         );
       } else {
-        router.back(-1);
+        if (window.history.length <= 1) {
+          window.open(import.meta.env.VITE_BOE_STUDY, "_top");
+        } else {
+          router.back(-1);
+        }
       }
     };
     const publishClick = () => {
diff --git a/src/views/discuss/DiscussUpload.vue b/src/views/discuss/DiscussUpload.vue
index c82d7fc..f675866 100644
--- a/src/views/discuss/DiscussUpload.vue
+++ b/src/views/discuss/DiscussUpload.vue
@@ -168,6 +168,9 @@ onBeforeUnmount(() => {
 // 发表帖子发布操作
 const postAdd = () => {
   console.log("用户信息", userInfo.value);
+  if (titleName.value == "") {
+    return ElMessage.warning("评论标题为空");
+  }
   let obj = {
     collectionNum: 0,
     commentNum: 0,
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index de099fb..029e404 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -141,7 +141,14 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img class="teacherAvatar" :src="teacherInfo.avatar" />
+            <img
+              class="teacherAvatar"
+              :src="
+                teacherInfo?.avatar?.includes('upload')
+                  ? teacherInfo?.avatar
+                  : fielPath + teacherInfo?.avatar
+              "
+            />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
@@ -384,7 +391,7 @@
 <script setup>
 import TitleHead from "@/components/TitleHead.vue";
 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 {
@@ -398,6 +405,7 @@ import { useUserInfo } from "@/api/utils";
 import { ElMessage, messageConfig } from "element-plus";
 import dayjs from "dayjs";
 import { changeTime } from "@/api/method";
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const router = useRouter();
 const returnclick = () => {
   router.back();
diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue
index 5908678..917b1c5 100644
--- a/src/views/faceteach/FaceTeachNoCommon.vue
+++ b/src/views/faceteach/FaceTeachNoCommon.vue
@@ -50,7 +50,14 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img class="teacherAvatar" :src="teacherInfo.avatar" />
+            <img
+              class="teacherAvatar"
+              :src="
+                teacherInfo?.avatar?.includes('upload')
+                  ? teacherInfo?.avatar
+                  : fielPath + teacherInfo?.avatar
+              "
+            />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
@@ -165,6 +172,7 @@ import { ElMessage, messageConfig, ElLoading } from "element-plus";
 import dayjs from "dayjs";
 import UploadPostImg from "@/components/img/UploadPostImg.vue";
 import CommentReply from "@/components/CommentReply.vue";
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const router = useRouter();
 const returnclick = () => {
   router.back();
diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue
index c4966fc..74f3404 100644
--- a/src/views/faceteach/FaceTeachNoCourse.vue
+++ b/src/views/faceteach/FaceTeachNoCourse.vue
@@ -55,7 +55,14 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img class="teacherAvatar" :src="teacherInfo.avatar" />
+            <img
+              class="teacherAvatar"
+              :src="
+                teacherInfo?.avatar?.includes('upload')
+                  ? teacherInfo?.avatar
+                  : fielPath + teacherInfo?.avatar
+              "
+            />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
@@ -161,6 +168,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useUserInfo } from "@/api/utils";
 import { ElMessage, messageConfig, ElLoading } from "element-plus";
 import dayjs from "dayjs";
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const router = useRouter();
 const returnclick = () => {
   router.back();
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index c147b33..4acdca4 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -82,7 +82,14 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img class="teacherAvatar" :src="teacherInfo.avatar" />
+            <img
+              class="teacherAvatar"
+              :src="
+                teacherInfo?.avatar?.includes('upload')
+                  ? teacherInfo?.avatar
+                  : fielPath + teacherInfo?.avatar
+              "
+            />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
@@ -201,6 +208,7 @@ import { ElMessage, messageConfig, ElLoading } from "element-plus";
 import CommentReply from "@/components/CommentReply.vue";
 import dayjs from "dayjs";
 import { changeTime } from "@/api/method";
+const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const router = useRouter();
 const returnclick = () => {
   router.back();
diff --git a/src/views/liveboradcast/LiveBoradcast.vue b/src/views/liveboradcast/LiveBoradcast.vue
index c878f9d..92cc3ff 100644
--- a/src/views/liveboradcast/LiveBoradcast.vue
+++ b/src/views/liveboradcast/LiveBoradcast.vue
@@ -216,6 +216,7 @@ const {
     sName,
     projectStatus,
     projectEndTime,
+    targetId,
   },
 } = useRoute();
 const router = useRouter();
@@ -335,13 +336,14 @@ const commitClick = () => {
     pName: "直播",
     sName: data.value.liveName,
     type: 4,
+    targetId: targetId,
   });
 
   router.push({
     path: "/investigatpage",
     query: {
       courseId: data.value.assessmentId,
-      infoId: data.value.liveId,
+      infoId: liveId,
       chapterOrStageId: 0,
       pName: "直播",
       sName: data.value.liveName,
diff --git a/src/views/pathmap/PathmapPage.vue b/src/views/pathmap/PathmapPage.vue
index f1962ea..ab7bf0f 100644
--- a/src/views/pathmap/PathmapPage.vue
+++ b/src/views/pathmap/PathmapPage.vue
@@ -182,6 +182,7 @@ import store from "@/store";
 import { ROUTER, TASK_TYPES } from "@/api/CONST";
 import ReturnHead from "@/components/ReturnHead.vue";
 import { useStore } from "vuex";
+import { changeTime } from "@/api/method";
 const {
   query: { routerId, routerName, chapterId, isStudy },
 } = useRoute();
@@ -278,7 +279,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
   console.log("judgeTaskIsEnd", type, endTimes, status);
   let isEnd = false;
   let nowTime = new Date().getTime();
-  let endTime = new Date().getTime(endTimes);
+  let endTime = new Date().getTime(changeTime(endTimes));
   switch (type) {
     case 1:
       status == -1
@@ -344,7 +345,7 @@ function toFinish(d) {
       ElMessage.warning("该任务无法学习，请联系管理员进行替换！");
       return;
     }
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前面授课已结束");
@@ -357,7 +358,7 @@ function toFinish(d) {
   }
 
   if (d.type == 4) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前作业已结束");
@@ -398,7 +399,7 @@ function toFinish(d) {
   }
   // 直播结束时间
   if (d.type == 6) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前直播已结束");
@@ -407,7 +408,7 @@ function toFinish(d) {
   }
   // 其他活动 结束时间
   if (d.type == 9) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前活动已结束");
diff --git a/src/views/projectdetails/projectDetails.vue b/src/views/projectdetails/projectDetails.vue
index b222cc8..be1c598 100644
--- a/src/views/projectdetails/projectDetails.vue
+++ b/src/views/projectdetails/projectDetails.vue
@@ -221,6 +221,7 @@ import ReturnHead from "@/components/ReturnHead.vue";
 import { PROJECT, TASK_TYPES } from "@/api/CONST";
 import dayjs from "dayjs";
 import { useStore } from "vuex";
+import { changeTime } from "@/api/method";
 const {
   query: { courseId, projectId, type },
 } = useRoute();
@@ -371,7 +372,8 @@ function judgeTaskIsEnd(type, endTimes, status) {
   console.log("judgeTaskIsEnd", type, endTimes, status);
   let isEnd = false;
   let nowTime = new Date().getTime();
-  let endTime = new Date().getTime(endTimes);
+  let endTime = new Date().getTime(changeTime(endTimes));
+  console.log("endTime---------", endTime);
   switch (type) {
     case 1:
       status == -1
@@ -424,7 +426,7 @@ function toFinish(d, sName, chapterOrStageId) {
     return;
   }
   if (d.type == 2) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前面授课已结束");
@@ -434,7 +436,7 @@ function toFinish(d, sName, chapterOrStageId) {
   }
   // 作业过期判断
   if (d.type == 4) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前作业已结束");
@@ -443,7 +445,7 @@ function toFinish(d, sName, chapterOrStageId) {
   }
   // 直播结束时间
   if (d.type == 6) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前直播已结束");
@@ -492,7 +494,7 @@ function toFinish(d, sName, chapterOrStageId) {
   }
   // 其他活动 结束时间
   if (d.type == 9) {
-    let date1 = new Date(d.endTime).getTime();
+    let date1 = new Date(changeTime(d.endTime)).getTime();
     let date2 = new Date().getTime();
     if (date1 < date2) {
       ElMessage.warning("当前活动已结束");
diff --git a/vite.config.js b/vite.config.js
index ddfeefc..377b14d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-01-13 11:42:48
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-03-10 04:08:35
+ * @LastEditTime: 2023-03-10 11:42:51
  * @FilePath: /stu_h5/vite.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */