更新

dist/assets/index.2b427b4e.css

@@ -0,0 +1 @@
+._userDetail_137n9_1 ._banner_137n9_1{width:100%;height:5.65333rem;overflow:hidden;vertical-align:middle}._userDetail_137n9_1 ._userInfo_137n9_7{overflow:hidden}._userDetail_137n9_1 ._userInfo_137n9_7 ._avatar_137n9_10{width:.64rem;height:.64rem;border-radius:50%;overflow:hidden}._userDetail_137n9_1 ._userInfo_137n9_7 ._name_137n9_16{padding-left:.21333rem;font-size:.42667rem;font-weight:500;color:#333;line-height:.58667rem;display:flex;align-items:center}._userDetail_137n9_1 ._userInfo_137n9_7 ._buyNum_137n9_25{color:#ff802c;font-size:.37333rem;display:flex;align-items:center}._userDetail_137n9_1 ._userInfo_137n9_7 ._buyNum_137n9_25:before{content:" ";display:inline-block;width:.02667rem;height:.32rem;margin:0 .21333rem;background:#d3d3d3}._userDetail_137n9_1 ._userInfo_137n9_7 ._buyNumInfo_137n9_39{font-size:.32rem;color:#6a6a6a;display:flex;align-items:center}._userDetail_137n9_1 ._userInfo_137n9_7 ._buyNumInfo_137n9_39 ._iconBuy_137n9_45{margin-right:.13333rem}._userDetail_137n9_1 ._userInfo_137n9_7 ._info_137n9_48{font-size:.42667rem;font-weight:600;color:var(--van-primary);line-height:.45333rem}._userDetail_137n9_1 ._userInfo_137n9_7 ._userTitle_137n9_54{font-size:.48rem;color:#1a1a1a;font-weight:500;display:block!important}._userDetail_137n9_1 ._userInfo_137n9_7 .van-cell{padding:.37333rem}._userDetail_137n9_1 ._userInfo_137n9_7 .van-cell__title{flex-basis:28%}._userDetail_137n9_1 ._userInfo_137n9_7 .van-cell__title,._userDetail_137n9_1 ._userInfo_137n9_7 .van-cell__value{display:flex;align-items:center}._userDetail_137n9_1 ._userInfo_137n9_7 .van-cell__value{justify-content:flex-end}

dist/assets/index.7d4b26b2.css

@@ -1 +0,0 @@
-._userDetail_yz302_1 ._banner_yz302_1{width:100%;height:5.6rem;overflow:hidden;vertical-align:middle}._userDetail_yz302_1 ._userInfo_yz302_7{overflow:hidden}._userDetail_yz302_1 ._userInfo_yz302_7 ._avatar_yz302_10{width:.64rem;height:.64rem;border-radius:50%;overflow:hidden}._userDetail_yz302_1 ._userInfo_yz302_7 ._name_yz302_16{padding-left:.21333rem;font-size:.42667rem;font-weight:500;color:#333;line-height:.58667rem;display:flex;align-items:center}._userDetail_yz302_1 ._userInfo_yz302_7 ._buyNum_yz302_25{color:#ff802c;font-size:.37333rem;display:flex;align-items:center}._userDetail_yz302_1 ._userInfo_yz302_7 ._buyNum_yz302_25:before{content:" ";display:inline-block;width:.02667rem;height:.32rem;margin:0 .21333rem;background:#d3d3d3}._userDetail_yz302_1 ._userInfo_yz302_7 ._buyNumInfo_yz302_39{font-size:.32rem;color:#6a6a6a;display:flex;align-items:center}._userDetail_yz302_1 ._userInfo_yz302_7 ._buyNumInfo_yz302_39 ._iconBuy_yz302_45{margin-right:.13333rem}._userDetail_yz302_1 ._userInfo_yz302_7 ._info_yz302_48{font-size:.42667rem;font-weight:600;color:var(--van-primary);line-height:.45333rem}._userDetail_yz302_1 ._userInfo_yz302_7 ._userTitle_yz302_54{font-size:.48rem;color:#1a1a1a;font-weight:500;display:block!important}._userDetail_yz302_1 ._userInfo_yz302_7 .van-cell{padding:.37333rem}._userDetail_yz302_1 ._userInfo_yz302_7 .van-cell__title{flex-basis:28%}._userDetail_yz302_1 ._userInfo_yz302_7 .van-cell__title,._userDetail_yz302_1 ._userInfo_yz302_7 .van-cell__value{display:flex;align-items:center}._userDetail_yz302_1 ._userInfo_yz302_7 .van-cell__value{justify-content:flex-end}

dist/index.html

@@ -35,12 +35,12 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/index.9b20c33a.js"></script>
+    <script type="module" crossorigin src="./assets/index.ddcddf4b.js"></script>
     <link rel="modulepreload" href="./assets/vendor.fb1fb7d7.js">
     <link rel="modulepreload" href="./assets/index.0d346694.js">
-    <link rel="stylesheet" href="./assets/index.5242455e.css">
     <link rel="stylesheet" href="./assets/vendor.42d1964e.css">
-    <link rel="stylesheet" href="./assets/index.5062a520.css">
+    <link rel="stylesheet" href="./assets/index.5242455e.css">
+    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -50,6 +50,6 @@
     <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.230ab621.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.50207dec.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.04da75ad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/teacher.html

@@ -35,12 +35,12 @@
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
     <script src="./flexible.js" charset="UTF-8"></script>
-    <script type="module" crossorigin src="./assets/teacher.63c56bf0.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.41b700b5.js"></script>
     <link rel="modulepreload" href="./assets/vendor.fb1fb7d7.js">
     <link rel="modulepreload" href="./assets/index.0d346694.js">
-    <link rel="stylesheet" href="./assets/vendor.42d1964e.css">
     <link rel="stylesheet" href="./assets/index.5242455e.css">
-    <link rel="stylesheet" href="./assets/index.5062a520.css">
+    <link rel="stylesheet" href="./assets/vendor.42d1964e.css">
+    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -49,6 +49,6 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.230ab621.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.cafdfbf2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.7b61122d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/business-components/user-detail/index.module.less

@@ -1,7 +1,7 @@
 .userDetail {
   .banner {
     width: 100%;
-    height: 210px;
+    height: 212px;
     overflow: hidden;
     vertical-align: middle;
   }

src/router/routes-teacher.ts

@@ -187,7 +187,7 @@ export default [
         name: 'cashProtocol',
         component: () => import('@/teacher/cash-protocol/index'),
         meta: {
-          title: '提现协议'
+          title: '结算协议'
         }
       }
     ]

src/student/live-class/live-detail.tsx

@@ -3,7 +3,7 @@ import SectionDetail from '@/business-components/section-detail'
 import UserDetail from '@/business-components/user-detail'
 import request from '@/helpers/request'
 import dayjs from 'dayjs'
-import { Icon, Sticky, Button, Dialog } from 'vant'
+import { Icon, Sticky, Button, Dialog, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './live-detail.module.less'
 import iconTips from '@common/images/icon_tips.png'
@@ -97,6 +97,39 @@ export default defineComponent({
     } catch {}
   },
   methods: {
+    async onJoinRoom() {
+      try {
+        const res = await request.get(
+          '/api-student/courseGroup/queryLiveCourseInfo',
+          {
+            params: {
+              groupId: this.groupId
+            }
+          }
+        )
+        const result = res.data || {}
+        const coursePlanList = result.planList || []
+        let tempObj: any = {}
+        coursePlanList.forEach((item: any) => {
+          if (item.courseId === Number(this.courseId)) {
+            tempObj = item
+          }
+        })
+        if (tempObj && tempObj.liveState === 1) {
+          postMessage({
+            api: 'joinLiveRoom',
+            content: {
+              roomId: this.liveStatus.roomUid,
+              teacherId: this.live.teacherId
+            }
+          })
+        } else {
+          setTimeout(() => {
+            Toast('课程尚未开始，请耐心等候')
+          }, 100)
+        }
+      } catch {}
+    },
     async onBuy() {
       try {
         const res = await request.post(
@@ -222,20 +255,7 @@ export default defineComponent({
         {this.joinRoom == '1' && this.courseInfo.length > 0 && (
           <Sticky offsetBottom={0} position="bottom">
             <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
-              <Button
-                block
-                round
-                type="primary"
-                onClick={() => {
-                  postMessage({
-                    api: 'joinLiveRoom',
-                    content: {
-                      roomId: this.liveStatus.roomUid,
-                      teacherId: this.live.teacherId
-                    }
-                  })
-                }}
-              >
+              <Button block round type="primary" onClick={this.onJoinRoom}>
                 进入直播间
               </Button>
             </div>

src/student/video-class/video-class-detail.tsx

@@ -50,7 +50,8 @@ export default defineComponent({
         rows: 20
       },
       freeRate: 0, // 试看百分比
-      trySee: false // 是否试看
+      trySee: false, // 是否试看
+      videoHeight: '212px'
     }
   },
   computed: {
@@ -64,6 +65,9 @@ export default defineComponent({
     }
   },
   async mounted() {
+    // 处理视频显示
+    const width = document.body.clientWidth || document.body.offsetWidth
+    this.videoHeight = (width / 16) * 9 + 'px'
     this.navHeight = sessionStorage.getItem('navHeight') || 0
     try {
       //
@@ -185,6 +189,7 @@ export default defineComponent({
                   trySee={this.trySee}
                   src={this.srcUrl}
                   poster={this.posterUrl}
+                  height={this.videoHeight}
                 />
               )
           }}

src/teacher/live-class/live-detail.tsx

@@ -114,6 +114,39 @@ export default defineComponent({
     }
   },
   methods: {
+    async onJoinRoom() {
+      try {
+        const res = await request.get(
+          '/api-teacher/courseGroup/queryLiveCourseInfo',
+          {
+            params: {
+              groupId: this.groupId
+            }
+          }
+        )
+        const result = res.data || {}
+        const coursePlanList = result.planList || []
+        let tempObj: any = {}
+        coursePlanList.forEach((item: any) => {
+          if (item.courseId === Number(this.courseId)) {
+            tempObj = item
+          }
+        })
+        if (tempObj && tempObj.liveState === 1) {
+          postMessage({
+            api: 'joinLiveRoom',
+            content: {
+              roomId: this.liveStatus.roomUid,
+              teacherId: this.live.teacherId
+            }
+          })
+        } else {
+          setTimeout(() => {
+            Toast('课程尚未开始，请耐心等候')
+          }, 100)
+        }
+      } catch {}
+    },
     async cancelCourseGroup() {
       try {
         const res = await request.get(
@@ -193,20 +226,7 @@ export default defineComponent({
         {this.joinRoom == '1' && this.courseInfo.length > 0 && (
           <Sticky offsetBottom={0} position="bottom">
             <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
-              <Button
-                block
-                round
-                type="primary"
-                onClick={() => {
-                  postMessage({
-                    api: 'joinLiveRoom',
-                    content: {
-                      roomId: this.liveStatus.roomUid,
-                      teacherId: this.live.teacherId
-                    }
-                  })
-                }}
-              >
+              <Button block round type="primary" onClick={this.onJoinRoom}>
                 进入直播间
               </Button>
             </div>