Merge branch 'master' into jenkins

src/components/o-video/index.tsx

@@ -44,6 +44,7 @@ export default defineComponent({
       default: () => {}
     }
   },
+  emits:['exitfullscreen'],
   data() {
     return {
       player: null as any,
@@ -130,6 +131,7 @@ export default defineComponent({
         console.log('exitfullscreen')
         const i = document.getElementById('fullscreen-back')
         i && i.remove()
+        this.$emit('exitfullscreen')
       })
     },
     // 操作功能

src/views/mine-orchestra/my-class/index.module.less

@@ -6,6 +6,13 @@
   overflow: hidden;
   background-color: #fff;
   margin: 0 12px 12px 12px;
+  .userContainer {
+    :global {
+      .van-cell__label {
+        margin-top: 0;
+      }
+    }
+  }
   .userContainer::after {
     left: 0;
     right: 0;

src/views/mine-orchestra/orchestra-deeds/index.tsx

@@ -99,6 +99,7 @@ export default defineComponent({
     onMounted(() => {
       getList()
     })
+    const swipeRef = ref()
     return () => (
       <div
         class={[styles.orchestraStory, !state.listState.dataShow && 'emptyRootContainer']}
@@ -128,7 +129,7 @@ export default defineComponent({
                   </div>
                   <p class={[styles.content, 'van-multi-ellipsis--l2']}>{item.content}</p>
 
-                  <Swipe class={styles.storySwipe}>
+                  <Swipe ref={swipeRef} class={styles.storySwipe}>
                     {item.attachments &&
                       item.attachments.map((child: any) => (
                         <SwipeItem>
@@ -153,6 +154,10 @@ export default defineComponent({
                               class={styles.swipeImg}
                               ref={(el: any) => (videoRef.value[index] = el)}
                               onPlay={() => onPlay(index)}
+                              onExitfullscreen={() => {
+                                console.log('重新resize', swipeRef.value)
+                                swipeRef.value?.resize()
+                              }}
                             />
                           )}
                         </SwipeItem>

src/views/unit-test/unit-create/index.tsx

@@ -66,7 +66,7 @@ export default defineComponent({
     })
     const getOrchestraList = async () => {
       try {
-        const res = await request.post('/api-school/orchestra/page', {
+        const res = await request.post('/api-teacher/orchestra/page', {
           data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {