Merge branch 'master' into jenkins

src/router/routes-teacher.ts

@@ -61,7 +61,15 @@ export default [
         meta: {
           title: '考勤规则'
         }
-      }
+      },
+      {
+        path: '/screen-projection',
+        name: 'screen-projection',
+        component: () => import('@/teacher/screen-projection/index'),
+        meta: {
+          title: '教学课件'
+        }
+      },
     ]
   },
   ...rootRouter,

src/student/my-orchestra/index.tsx

@@ -88,6 +88,8 @@ export default defineComponent({
         state.orchestraList = data || []
         if (data && data.length > 0) {
           state.selectOrchestra = data[0]
+
+          console.log(state.selectOrchestra)
           // 判断是否有乐团
           await getList()
         }
@@ -116,21 +118,21 @@ export default defineComponent({
           v-slots={{
             right: () => (
               <>
-                {state.selectOrchestra.status === 'REGISTER' &&
-                  state.selectOrchestra.status === 'LEARNING' && (
-                    <span
-                      onClick={() => {
-                        router.push({
-                          path: '/apply-withdrawal',
-                          query: {
-                            id: state.selectOrchestra.orchestraId
-                          }
-                        })
-                      }}
-                    >
-                      申请退团
-                    </span>
-                  )}
+                {(state.selectOrchestra.status === 'REGISTER' ||
+                  state.selectOrchestra.status === 'LEARNING') && (
+                  <span
+                    onClick={() => {
+                      router.push({
+                        path: '/apply-withdrawal',
+                        query: {
+                          id: state.selectOrchestra.orchestraId
+                        }
+                      })
+                    }}
+                  >
+                    申请退团
+                  </span>
+                )}
                 {state.selectOrchestra.status === 'AUTH' && (
                   <span style={{ color: 'red' }}>申请退团中</span>
                 )}

src/teacher/screen-projection/index.tsx

@@ -0,0 +1,10 @@
+import { defineComponent, ref } from "vue";
+
+export default defineComponent({
+    name: 'screen-projection',
+    setup(props, ctx) {
+        return () => (
+            <div>投屏</div>
+        )
+    },
+})

src/vite-env.d.ts

@@ -1 +1,6 @@
 /// <reference types="vite/client" />
+declare module '*.vue' {
+    import type { DefineComponent } from 'vue'
+    const component: DefineComponent<{}, {}, any>
+    export default component
+  }