Home Explore Help
Sign In
huangqiyong
/
classroom
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

合并

lex 1 year ago
parent
d16db93c5b 571c700917
commit
c98f29924e
13 changed files with 41 additions and 29 deletions
Split View Show Diff Stats
  1. 0 0
      dist/css/335.29e7186e.css
  2. 1 0
      dist/css/628.0f606cbf.css
  3. 0 0
      dist/css/649.d0595865.css
  4. 1 0
      dist/css/651.e1fff932.css
  5. 4 0
      dist/index.html
  6. 0 0
      dist/js/628.b2ac63ca.js
  7. 0 0
      dist/js/651.6f106b87.js
  8. 0 0
      dist/js/app.5a6db336.js
  9. 11 6
      src/views/curriculum/components/curriculumList/curriculumList_gym.vue
  10. 6 5
      src/views/curriculum/components/curriculumList/curriculumList_gyt.vue
  11. 8 8
      src/views/curriculum/hooks/useStartClass.ts
  12. 5 5
      src/views/homePage/components/curriculum/curriculum_gym.vue
  13. 5 5
      src/views/homePage/components/curriculum/curriculum_gyt.vue

File diff suppressed because it is too large
+ 0 - 0
dist/css/335.29e7186e.css


File diff suppressed because it is too large
+ 1 - 0
dist/css/628.0f606cbf.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/649.d0595865.css


File diff suppressed because it is too large
+ 1 - 0
dist/css/651.e1fff932.css


+ 4 - 0
dist/index.html
View File 

@@ -1,6 +1,10 @@
 
 <!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><link rel="icon" href="/favicon.ico"/><title>乐教通</title><script>if (!!window.ActiveXObject || "ActiveXObject" in window) {
 
             window.location.href = "./ieIncompatible/index.html"
 
+<<<<<<< HEAD
 
          }</script><script defer="defer" src="/js/chunk-vendors.e59c97be.js"></script><script defer="defer" src="/js/app.1df841cc.js"></script><link href="/css/app.51969639.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 
+=======
 
+         }</script><script defer="defer" src="/js/chunk-vendors.e59c97be.js"></script><script defer="defer" src="/js/app.5a6db336.js"></script><link href="/css/app.51969639.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 
+>>>>>>> staging
 
                position: fixed;
 
                left: 50%;
 
                top: 50%;

File diff suppressed because it is too large
+ 0 - 0
dist/js/628.b2ac63ca.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/651.6f106b87.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.5a6db336.js


+ 11 - 6
src/views/curriculum/components/curriculumList/curriculumList_gym.vue
View File 

@@ -4,7 +4,12 @@
 
 * @Date:2024-03-29 15:29:06

 -->

 <template>

-   <div class="curriculumList_gym" v-for="item in props.curriculumData" :key="item.id" @click="handleClickDetail(item.id, item.teachMode)">

+   <div

+      class="curriculumList_gym"

+      v-for="item in props.curriculumData"

+      :key="item.id"

+      @click="handleClickDetail(item.id, item.teachMode, item.coursewareEnable)"

+   >

       <div class="head">

          <div class="timeBox">

             <img class="timeImg" src="@/img/curriculum/sj.png" />

@@ -95,7 +100,7 @@ import { format } from "@/libs/tools"
 
 import { useCurriculumDetail, useSetUpCourseware } from "../../index"

 import { handleStartClass_gym, isONLINE_gym } from "@/views/curriculum/hooks/useStartClass"

 import { classImgType, classNameType } from "@/views/curriculum/type"

-import { ElMessage } from "element-plus"

+import useDialogConfirm from "@/hooks/useDialogConfirm"

 

 const props = defineProps<{

    curriculumData: any[]

@@ -110,10 +115,10 @@ function handleClickDetail(id: string, teachMode: string, coursewareEnable: bool
 
       return

    }

    if (!coursewareEnable) {

-      ElMessage({

-         showClose: true,

-         message: "该资源已失效",

-         type: "error"

+      useDialogConfirm({

+         headImg: require("@/img/curriculum/ts4.png"),

+         text: `该资源已失效`,

+         btnShow: [true]

       })

       return

    }

+ 6 - 5
src/views/curriculum/components/curriculumList/curriculumList_gyt.vue
View File 

@@ -4,7 +4,7 @@
 
 * @Date:2024-03-29 15:29:06

 -->

 <template>

-   <div class="curriculumList_gyt" v-for="item in props.curriculumData" :key="item.id" @click="handleClickDetail(item.id)">

+   <div class="curriculumList_gyt" v-for="item in props.curriculumData" :key="item.id" @click="handleClickDetail(item.id, item.applyStatus)">

       <div class="head">

          <div class="timeBox">

             <img class="timeImg" src="@/img/curriculum/sj.png" />

@@ -50,6 +50,7 @@
 
 </template>

 

 <script setup lang="ts">

+import useDialogConfirm from "@/hooks/useDialogConfirm"

 import { format } from "@/libs/tools"

 import { useCurriculumDetail, useSetUpCourseware } from "@/views/curriculum"

 import { handleStartClass_gyt } from "@/views/curriculum/hooks/useStartClass"

@@ -68,10 +69,10 @@ function handleStartClass(id: string) {
 
 //查看详情

 function handleClickDetail(id: string, applyStatus: boolean) {

    if (!applyStatus) {

-      ElMessage({

-         showClose: true,

-         message: "该资源已失效",

-         type: "error"

+      useDialogConfirm({

+         headImg: require("@/img/curriculum/ts4.png"),

+         text: `该资源已失效`,

+         btnShow: [true]

       })

       return

    }

+ 8 - 8
src/views/curriculum/hooks/useStartClass.ts
View File 

@@ -45,10 +45,10 @@ export function handleStartClass_gym(id: string) {
 
          }

 

          if (!coursewareEnable) {

-            ElMessage({

-               showClose: true,

-               message: "该资源已失效",

-               type: "error"

+            useDialogConfirm({

+               headImg: require("@/img/curriculum/ts4.png"),

+               text: `该资源已失效`,

+               btnShow: [true]

             })

             return

          }

@@ -107,10 +107,10 @@ export function handleStartClass_gyt(id: string) {
 
          }

 

          if (!applyStatus) {

-            ElMessage({

-               showClose: true,

-               message: "该资源已失效",

-               type: "error"

+            useDialogConfirm({

+               headImg: require("@/img/curriculum/ts4.png"),

+               text: `该资源已失效`,

+               btnShow: [true]

             })

             return

          }

+ 5 - 5
src/views/homePage/components/curriculum/curriculum_gym.vue
View File 

@@ -90,11 +90,11 @@
 
 </template>

 

 <script setup lang="ts">

+import useDialogConfirm from "@/hooks/useDialogConfirm"

 import { format } from "@/libs/tools"

 import { useCurriculumDetail, useSetUpCourseware } from "@/views/curriculum"

 import { handleStartClass_gym, isONLINE_gym } from "@/views/curriculum/hooks/useStartClass"

 import { classImgType, classNameType } from "@/views/curriculum/type"

-import { ElMessage } from "element-plus"

 

 const props = defineProps<{

    classData: Record<string, any>

@@ -117,10 +117,10 @@ function handleClickDetail(id: string, coursewareEnable: boolean) {
 
       return

    }

    if (!coursewareEnable) {

-      ElMessage({

-         showClose: true,

-         message: "该资源已失效",

-         type: "error"

+      useDialogConfirm({

+         headImg: require("@/img/curriculum/ts4.png"),

+         text: `该资源已失效`,

+         btnShow: [true]

       })

       return

    }

+ 5 - 5
src/views/homePage/components/curriculum/curriculum_gyt.vue
View File 

@@ -53,10 +53,10 @@
 
 </template>

 

 <script setup lang="ts">

+import useDialogConfirm from "@/hooks/useDialogConfirm"

 import { format } from "@/libs/tools"

 import { useCurriculumDetail, useSetUpCourseware } from "@/views/curriculum"

 import { handleStartClass_gyt } from "@/views/curriculum/hooks/useStartClass"

-import { ElMessage } from "element-plus"

 const emits = defineEmits<{

    (e: "update"): void

 }>()

@@ -71,10 +71,10 @@ function handleStartClass(id: string) {
 
 //查看详情

 function handleClickDetail(id: string, applyStatus: boolean) {

    if (!applyStatus) {

-      ElMessage({

-         showClose: true,

-         message: "该资源已失效",

-         type: "error"

+      useDialogConfirm({

+         headImg: require("@/img/curriculum/ts4.png"),

+         text: `该资源已失效`,

+         btnShow: [true]

       })

       return

    }

Some files were not shown because too many files changed in this diff