skyblued 2 anos atrás
pai
commit
99e61afd73

+ 25 - 1
src/router/routes-common.ts

@@ -1,7 +1,11 @@
 const paymentType = (window as any).paymentType
+import { RouteRecordRaw } from 'vue-router'
+import Accompany from '@/views/accompany/index'
+import AccompanycCategory from '@/views/accompany/category'
+import AccompanycMusicList from '@/views/accompany/music-list'
 
 // 需要登录的路由
-export const router = [
+export const router: RouteRecordRaw[] = [
   {
     path: '/lessonCourseware',
     name: 'lessonCourseware',
@@ -27,6 +31,26 @@ export const router = [
     }
   },
   {
+    path: '/accompany',
+    name: 'accompany',
+    component: Accompany,
+    meta: {
+      title: '云教练'
+    },
+    children: [
+      {
+        path: '',
+        name: 'category',
+        component: AccompanycCategory
+      },
+      {
+        path: 'musicList',
+        name: 'music-list',
+        component: AccompanycMusicList
+      },
+    ]
+  },
+  {
     path: '/information-detail',
     name: 'information-detail',
     component: () => import('@/views/information/information-detail'),

+ 15 - 0
src/views/accompany/category.tsx

@@ -0,0 +1,15 @@
+import { defineComponent } from "vue";
+import { getImage } from "./images";
+import styles from './index.module.less'
+
+export default defineComponent({
+    name: 'accompany-category',
+    setup(props, ctx) {
+        console.log(getImage('b1.svg'))
+        return () => (
+            <div class={styles.accompany}>
+                列表
+            </div>
+        )
+    },
+})

+ 26 - 0
src/views/accompany/images/b1.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="89px" height="41px" viewBox="0 0 89 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>矩形</title>
+    <defs>
+        <rect id="path-1" x="0" y="68" width="75" height="27" rx="13.5"></rect>
+        <filter x="-17.3%" y="-29.6%" width="134.7%" height="196.3%" filterUnits="objectBoundingBox" id="filter-2">
+            <feOffset dx="0" dy="5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="3.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0.554129082   0 0 0 0 0.471074695   0 0 0 0 1  0 0 0 0.71484375 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetOuter2"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.792156863   0 0 0 0 0.670588235   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowOffsetOuter2" result="shadowMatrixOuter2"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="shadowMatrixOuter2"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="云教练" transform="translate(-25.000000, -188.000000)">
+            <g id="矩形" transform="translate(32.000000, 122.000000)">
+                <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
+            </g>
+        </g>
+    </g>
+</svg>

+ 28 - 0
src/views/accompany/images/b2.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="89px" height="41px" viewBox="0 0 89 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>矩形</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="75" height="27" rx="13.5"></rect>
+        <filter x="-17.3%" y="-29.6%" width="134.7%" height="196.3%" filterUnits="objectBoundingBox" id="filter-2">
+            <feOffset dx="0" dy="5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="3.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 1   0 0 0 0 0.428612672   0 0 0 0 0.167130335  0 0 0 1 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetOuter2"></feOffset>
+            <feColorMatrix values="0 0 0 0 1   0 0 0 0 0.780392157   0 0 0 0 0.670588235  0 0 0 1 0" type="matrix" in="shadowOffsetOuter2" result="shadowMatrixOuter2"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="shadowMatrixOuter2"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="云教练" transform="translate(-25.000000, -345.000000)">
+            <g id="编组-10" transform="translate(32.000000, 279.000000)">
+                <g id="矩形" transform="translate(0.000000, 68.000000)">
+                    <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                    <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

+ 28 - 0
src/views/accompany/images/b3.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="89px" height="41px" viewBox="0 0 89 41" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>矩形</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="75" height="27" rx="13.5"></rect>
+        <filter x="-17.3%" y="-29.6%" width="134.7%" height="196.3%" filterUnits="objectBoundingBox" id="filter-2">
+            <feOffset dx="0" dy="5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="3.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0.176456962   0 0 0 0 0.52204819   0 0 0 0 0.943500906  0 0 0 0.790045892 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetOuter2"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.647058824   0 0 0 0 0.803921569   0 0 0 0 1  0 0 0 1 0" type="matrix" in="shadowOffsetOuter2" result="shadowMatrixOuter2"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="shadowMatrixOuter2"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="云教练" transform="translate(-25.000000, -501.000000)">
+            <g id="编组-8" transform="translate(32.000000, 435.000000)">
+                <g id="矩形" transform="translate(0.000000, 68.000000)">
+                    <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                    <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

+ 4 - 0
src/views/accompany/images/index.ts

@@ -0,0 +1,4 @@
+export const getImage = (name: string) => {
+    console.log(import('../images'))
+    return 
+}

BIN
src/views/accompany/images/l1.png


BIN
src/views/accompany/images/l2.png


BIN
src/views/accompany/images/l3.png


+ 0 - 0
src/views/accompany/index.module.less


+ 15 - 0
src/views/accompany/index.tsx

@@ -0,0 +1,15 @@
+import { defineComponent } from "vue";
+import { RouterView } from "vue-router";
+import styles from './index.module.less'
+
+export default defineComponent({
+    name: 'accompany',
+    setup(props, ctx) {
+        return () => (
+            <div class={styles.accompany}>
+                云教练
+                <RouterView />
+            </div>
+        )
+    },
+})

+ 13 - 0
src/views/accompany/music-list.tsx

@@ -0,0 +1,13 @@
+import { defineComponent } from "vue";
+import styles from './index.module.less'
+
+export default defineComponent({
+    name: 'accompany-music-list',
+    setup(props, ctx) {
+        return () => (
+            <div class={styles.accompany}>
+                曲谱
+            </div>
+        )
+    },
+})

+ 1 - 1
src/views/coursewarePlay/index.tsx

@@ -96,7 +96,7 @@ export default defineComponent({
         debug: false,
         ratio: '16:9',
         clickToPlay: true,
-        controls: ['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions']
+        controls: ['play-large',  'play', 'progress', 'current-time','duration', 'mute', 'volume',  'restart']
       })
       data.players.forEach((p: Plyr) => {
         // console.log(p)

+ 16 - 8
src/views/lessonCourseware/index.tsx

@@ -15,12 +15,21 @@ export default defineComponent({
       list: [] as any
     })
     const getList = async () => {
-      try {
-        const res: any = await request.post(state.platformApi + '/courseSchedule/myCourseware')
-        if (Array.isArray(res?.data)) {
-          data.list = res.data
-        }
-      } catch (error) {}
+      if (route.query.code === 'select') {
+        try {
+          const res: any = await request.post(state.platformApi + `/courseSchedule/getCourseware/${route.query.courseScheduleId}`)
+          if (Array.isArray(res?.data)) {
+            data.list = res.data
+          }
+        } catch (error) {}
+      } else {
+        try {
+          const res: any = await request.post(state.platformApi + '/courseSchedule/myCourseware')
+          if (Array.isArray(res?.data)) {
+            data.list = res.data
+          }
+        } catch (error) {}
+      }
     }
     onMounted(() => {
       getList()
@@ -31,7 +40,7 @@ export default defineComponent({
           path: '/courseList',
           query: {
             ...route.query,
-            id: item.id,
+            id: item.id
           }
         })
         return
@@ -44,7 +53,6 @@ export default defineComponent({
       })
     }
 
-    
     return () => (
       <div style={{ paddingTop: '14px' }}>
         <Grid gutter={14} columnNum={3} class={styles.grid}>