From 04d6d7838f835a60c5c6b80a053436ba5a0ff64c Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 10 Mar 2023 19:53:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |  2 +-
 src/views/faceteach/FaceTeach.vue         | 12 +++---------
 src/views/faceteach/FaceTeachNoCommon.vue |  9 +--------
 src/views/faceteach/FaceTeachNoCourse.vue |  9 +--------
 src/views/faceteach/FaceTeachSignUp.vue   |  9 +--------
 src/views/liveboradcast/LiveBoradcast.vue | 11 ++++++++++-
 6 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 46e049b..9e902a7 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.4.6------------");
+console.log("版本1.4.7------------");
 const store = useStore();
 const router = useRouter();
 
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 029e404..103a968 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -141,14 +141,7 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img
-              class="teacherAvatar"
-              :src="
-                teacherInfo?.avatar?.includes('upload')
-                  ? teacherInfo?.avatar
-                  : fielPath + teacherInfo?.avatar
-              "
-            />
+            <img class="teacherAvatar" :src="teacherInfo?.avatar" />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
@@ -468,7 +461,7 @@ function isSignClick() {
     data &&
     data.value &&
     data.value.planDto?.beginTime &&
-    data.value.planDto?.afterStart
+    data.value.planDto?.endTime
   ) {
     let newStartTime = changeTime(data.value.planDto?.beginTime);
     let newEndTime = data.value.planDto?.endTime.replaceAll("-", "/");
@@ -497,6 +490,7 @@ function isSignClick() {
       endTime = endTime + data.value.planDto?.afterStart * 60 * 1000;
       console.log("1111333");
     }
+    console.log("nowTime", nowTime, endTime);
     if (nowTime < endTime && nowTime > beginTime) {
       state.isAllowSign = true;
     } else {
diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue
index 917b1c5..c11f4be 100644
--- a/src/views/faceteach/FaceTeachNoCommon.vue
+++ b/src/views/faceteach/FaceTeachNoCommon.vue
@@ -50,14 +50,7 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img
-              class="teacherAvatar"
-              :src="
-                teacherInfo?.avatar?.includes('upload')
-                  ? teacherInfo?.avatar
-                  : fielPath + teacherInfo?.avatar
-              "
-            />
+            <img class="teacherAvatar" :src="teacherInfo?.avatar" />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue
index 74f3404..8a171e8 100644
--- a/src/views/faceteach/FaceTeachNoCourse.vue
+++ b/src/views/faceteach/FaceTeachNoCourse.vue
@@ -55,14 +55,7 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img
-              class="teacherAvatar"
-              :src="
-                teacherInfo?.avatar?.includes('upload')
-                  ? teacherInfo?.avatar
-                  : fielPath + teacherInfo?.avatar
-              "
-            />
+            <img class="teacherAvatar" :src="teacherInfo?.avatar" />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index 4acdca4..3faf292 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -82,14 +82,7 @@
             <div class="box" style="width: 80px; right: 0px"></div>
           </div>
           <div class="teachermain">
-            <img
-              class="teacherAvatar"
-              :src="
-                teacherInfo?.avatar?.includes('upload')
-                  ? teacherInfo?.avatar
-                  : fielPath + teacherInfo?.avatar
-              "
-            />
+            <img class="teacherAvatar" :src="teacherInfo?.avatar" />
             <div style="flex: 1; margin-left: 11px; margin-right: 13px">
               <div class="teacherName">{{ data.planDto?.teacher }}</div>
               <div class="teacherIntro">
diff --git a/src/views/liveboradcast/LiveBoradcast.vue b/src/views/liveboradcast/LiveBoradcast.vue
index 92cc3ff..e96aa30 100644
--- a/src/views/liveboradcast/LiveBoradcast.vue
+++ b/src/views/liveboradcast/LiveBoradcast.vue
@@ -156,7 +156,15 @@
         </div>
       </div>
     </div>
-
+    <!-- <div class="notice">
+      <div class="noticebox">
+        <div class="mani">
+          <div class="joininfo">教师</div>
+          <img class="avaimg" :src="teacherInfo?.avatar" />
+          <div class="avaname">{{ data.userInfoBo?.userName }}</div>
+        </div>
+      </div>
+    </div> -->
     <div class="notice">
       <div class="noticebox">
         <div class="mani">
@@ -290,6 +298,7 @@ function isSignClick() {
       endTime = endTime + data.value.afterSignIn * 60 * 1000;
       console.log("1111333");
     }
+    console.log("nowTime", nowTime, endTime);
     if (nowTime < endTime && nowTime > beginTime) {
       state.isAllowSign = true;
     } else {