From 3dcb6c5c36123873855148315b706f21beaec07f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 12 Dec 2022 20:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E6=8E=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                    |  2 +-
 src/components/FileTypeImg.vue    |  7 ++--
 src/views/faceteach/FaceTeach.vue | 56 +++++++++++--------------------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index d6854ca..7b93d7e 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -27,7 +27,7 @@ export const TASK_WORK_DETAIL = '/stu/task/work/detail'
 export const VOTE_DETAIL = '/queryVoteSubmitDetailById'
 export const TASK_VOTE_LIST = '/queryVoteSubmitDetailListByTaskId'
 
-export const STU_OFFCOURSE_DETAIL = '/stu/offcourse/detail'
+export const STU_OFFCOURSE_DETAIL = '/stu/offcourse/detail post'
 export const WORK_QUERYWORKDETAILBYID = '/work/queryWorkDetailById'
 export const WORK_HISTROY = '/workSubmit/queryWorkDetailListByStuId'
 export const EXAMINATION_QUERY = examinationId => `/examination/queryExaminationDetailById?examinationId=${examinationId} post`
diff --git a/src/components/FileTypeImg.vue b/src/components/FileTypeImg.vue
index 4c8ab68..15ad1c4 100644
--- a/src/components/FileTypeImg.vue
+++ b/src/components/FileTypeImg.vue
@@ -14,9 +14,12 @@ import zip from '@/assets/image/file/zip.png'
 import book from '@/assets/image/file/book.png'
 import {defineProps, ref} from "vue";
 
-const {modelValue = [],style} = defineProps({
+const {modelValue = [], style} = defineProps({
   modelValue: String,
-  style: Object
+  style: {
+    type: Object,
+    default: {}
+  }
 })
 const filePath = ref(modelValue)
 </script>
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 2f53536..d5e98fc 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -11,10 +11,10 @@
     <!-- 基本信息 -->
     <div class="bascinfo">
       <div style="margin-left: 46px">
-        <div class="title">【其他活动】{{ data.offCourseInfo?.name }}</div>
+        <div class="title">【其他活动】{{ data.planDto?.name }}</div>
         <div class="time" style="margin-top: 26px">
           <img width="15px" height="17px" src="../../assets/image/time.png"/>
-          <div style="margin-left: 8px">{{ data.offCoursePlanInfo?.beginTime }}</div>
+          <div style="margin-left: 8px">{{ data.offcourseDto?.publishTime }}</div>
         </div>
         <div class="time" style="margin-top: 23px">
           <img
@@ -22,11 +22,10 @@
               height="18px"
               src="../../assets/image/position.png"
           />
-          <div style="margin-left: 8px">{{ data.offCoursePlanInfo?.address }}</div>
+          <div style="margin-left: 8px">{{ data.planDto?.address }}</div>
         </div>
       </div>
-<!--      todo #面授课的评估 跳转到哪里？-->
-      <div class="btn" v-if="data.offCoursePlanInfo?.evalFlag && !data.evalFlag">评估</div>
+      <div class="btn" v-if="data.planDto?.evalFlag">评估</div>
     </div>
     <!-- 基本信息 -->
 
@@ -45,7 +44,7 @@
               <div class="box"></div>
             </div>
             <div style="display: flex; align-items: center">
-              <div class="content" v-html="data.offCourseInfo?.intro"></div>
+              <div class="content" v-html="data.planDto?.description"></div>
             </div>
           </div>
         </div>
@@ -53,19 +52,14 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="课程附件" name="first">
               <div
-                  v-for="(el, index) in data.offCoursePlanInfo?.attach.split(',')"
+                  v-for="(el, index) in data.planDto?.attach.split(',')"
                   :key="index"
+                  v-if="data.planDto"
                   class="enclosure"
-                  :style="{
-                  'border-bottom':
-                    index === enclosure.length - 1
-                      ? null
-                      : '1px solid rgba(56, 125, 247, 0.2)',
-                }"
+                  :style="{borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
               >
                 <div class="enclosureL">
-                  <FileTypeImg v-model="data.offCoursePlanInfo.attach.split(',')[index]"
-                               :style="{width:'22px',height:'26px',marginLeft:'10px'}"></FileTypeImg>
+                  <FileTypeImg v-model="data.planDto.attach.split(',')[index]" :style="{width:'22px',height:'26px',marginLeft:'10px'}"></FileTypeImg>
                   <div style="margin-left: 20px">{{ el }}</div>
                 </div>
                 <div class="download">
@@ -80,27 +74,27 @@
             <el-tab-pane label="课程作业" name="second">
               <div class="work">
                 <div>
-                  <div class="question">{{ data.workItem?.name }}</div>
+                  <div class="question">{{ data.workDto?.workName }}</div>
                   <div style="margin-top: 16px; display: flex">
-                    <div class="tag1">必修</div>
+                    <div class="tag1" v-if="data.workDto?.workFlag">必修</div>
                     <div class="tag3" style="margin-left: 11px">作业</div>
                   </div>
                 </div>
-                <div class="submit" @click="toWork(data.workItem)" v-if="!data.workFlag">提交</div>
+                <div class="submit" @click="toWork(data.workDto)" v-if="!data.workDto.workId">提交</div>
               </div>
             </el-tab-pane>
             <el-tab-pane label="课程考试" name="third">
               <div class="work">
                 <div>
                   <div class="question">
-                    {{ data.examItem?.name }}
+                    {{ data.examinationDto?.name }}
                   </div>
                   <div style="margin-top: 16px; display: flex">
-                    <div class="tag1">必修</div>
+                    <div class="tag1" v-if="data.examinationDto?.examinationFlag">必修</div>
                     <div class="tag3" style="margin-left: 11px">考试</div>
                   </div>
                 </div>
-                <div class="submit" @click="toExamItem(data.examItem)" v-if="!data.examFlag">去考试</div>
+                <div class="submit" @click="toExamItem(data.examinationDto)" v-if="!data.examinationDto.examinationTestName">去考试</div>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -116,23 +110,13 @@
           <div class="box"></div>
         </div>
         <!--        todo #面授课接口 讲师缺少img和介绍-->
-        <div
-            v-for="(el, index) in teacher"
-            :key="el.id"
-            class="teacheritem"
-            :style="{
-            'border-bottom':
-              index === teacher.length - 1
-                ? null
-                : '1px solid rgba(56, 125, 247, 0.2)',
-          }"
-        >
-          <img class="peopleimg" :src="el.peopleimg"/>
+        <div class="teacheritem">
+          <img class="peopleimg" :src="data.planDto?.avatar"/>
           <div style="margin-left: 17px; width: 190px">
             <div class="teacherName" style="margin-right: 5px">
-              {{ el.name }}
+              {{ data.planDto?.teacher }}
             </div>
-            <div class="introduce">{{ el.introduce }}</div>
+            <div class="introduce">{{ data.planDto?.bandDesc }}</div>
           </div>
           <div class="follow">+ 关注</div>
         </div>
@@ -151,7 +135,7 @@ import {useRouter} from "vue-router";
 
 const router = useRouter()
 
-const {data} = useRequest(STU_OFFCOURSE_DETAIL, {})
+const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId: 178})
 const state = reactive({
   activeName: "first",
   enclosure: ''