feat:合并

src/App.vue

@@ -25,7 +25,7 @@ import { useStore } from "vuex";
 import { boeRequest } from "@/api/request";
 import { GET_USER_INFO } from "@/api/ThirdApi";
 import { getCookie } from "@/api/utils";
-
+console.log("版本1.2.0------------");
 const store = useStore();
 const router = useRouter();
 

src/views/faceteach/FaceTeach.vue

@@ -218,12 +218,7 @@
                     <!-- <img style="width: 19.5px; height: 22px" :src="el.img" />
                   <div style="margin-left: 15px">{{ el.name }}</div> -->
                   </div>
-                  <div
+                  <div>
-                    v-if="
-                      projectStatus !== '3' &&
-                      new Date(projectEndTime).getTime() > new Date().getTime()
-                    "
-                  >
                     <div
                       v-if="
                         new Date(data.planDto.beginTime).getTime() >
@@ -232,20 +227,23 @@
                       class="download"
                     >
                       <img
-                        style="width: 13px; height: 12px"
+                        style="width: 16px; height: 15px"
-                        src="../../assets/image/faceteach/download.png"
+                        src="../../assets/image/download.png"
                       />
-                      <div style="margin-left: 2.5px" @click="downloads(el)">
+                      <div
+                        style="margin-left: 5px; color: #999"
+                        @click="downloads(el)"
+                      >
                         下载
                       </div>
                     </div>
                     <div v-else class="download">
                       <img
-                        style="width: 13px; height: 12px"
+                        style="width: 16px; height: 15px; color: #2478ff"
-                        src="../../assets/image/faceteach/download.png"
+                        src="../../assets/image/download.png"
                       />
                       <div
-                        style="margin-left: 2.5px; color: #999"
+                        style="margin-left: 5px"
                         @click="download(el.name ? el.response.data : el)"
                       >
                         下载
@@ -280,26 +278,21 @@
                           作业
                         </div>
                       </div>
+                      <div
+                        :style="{
+                          background:
+                            new Date(data.planDto?.beginTime).getTime() >
+                            new Date().getTime()
+                              ? '#999'
+                              : '',
+                        }"
+                        class="submit"
+                        @click="toWork"
+                      >
+                        交作业
+                      </div>
                     </div>
                   </div>
-
-                  <div
-                    v-if="
-                      projectStatus !== '3' &&
-                      new Date(projectEndTime).getTime() > new Date().getTime()
-                    "
-                    :style="{
-                      background:
-                        new Date(data.planDto?.beginTime).getTime() >
-                        new Date().getTime()
-                          ? '#999'
-                          : '',
-                    }"
-                    class="submit"
-                    @click="toWork"
-                  >
-                    交作业
-                  </div>
                 </div>
                 <div
                   v-else
@@ -348,10 +341,6 @@
                     </div>
                   </div>
                   <div
-                    v-if="
-                      projectStatus !== '3' &&
-                      new Date(projectEndTime).getTime() > new Date().getTime()
-                    "
                     :style="{
                       background:
                         new Date(data.planDto?.beginTime).getTime() >
@@ -415,6 +404,7 @@ const {
 const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId });
 console.log("datadatadatadatadatadatadata", data);
 console.log("项目状态字段传递", projectStatus, projectEndTime);
+
 const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId));
 
 const state = reactive({
@@ -562,6 +552,7 @@ function toWork() {
     let date2 = new Date().getTime();
     if (date1 > date2) {
       ElMessage.warning("未到开始时间，请耐心等待！");
+      return;
     }
   }
   router.push({
@@ -584,6 +575,7 @@ function toExamItem(obj) {
     let date2 = new Date().getTime();
     if (date1 > date2) {
       ElMessage.warning("未到开始时间，请耐心等待！");
+      return;
     }
   }
   console.log("obj", obj.examinationTestId);

src/views/homeworkpage/UploadWork.vue

@@ -26,9 +26,12 @@
         </div>
         <div class="allimg">
           <img src="../../assets/image/homeworkpage/link.png" />
-          <img src="../../assets/image/homeworkpage/pre.png" />
+          <!-- <img src="../../assets/image/homeworkpage/pre.png" />
-          <img src="../../assets/image/homeworkpage/next.png" />
+          <img src="../../assets/image/homeworkpage/next.png" /> -->
-          <img src="../../assets/image/homeworkpage/delete.png" />
+          <img
+            src="../../assets/image/homeworkpage/delete.png"
+            @click="deleteAll"
+          />
         </div>
       </div>
     </div>
@@ -84,10 +87,16 @@ export default {
         // clearFiles();
       });
     };
+    const deleteAll = () => {
+      console.log("点击");
+      textarea.value = "";
+      fileList.value = [];
+    };
     return {
       ...toRefs(state),
       publishWork,
       textarea,
+      deleteAll,
     };
   },
 };

vue.config.js

@@ -8,6 +8,6 @@
  */
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
-  publicPath: "/student-h5",
+  publicPath: process.env.VITE_BASE,
   transpileDependencies: true
 })