Merge branch 'master' of http://git.dayaedu.com/lex/h5-colexiu

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.e9086865.js"></script>
+    <script type="module" crossorigin src="./assets/index.b61ead06.js"></script>
     <link rel="modulepreload" href="./assets/vendor.f57b7239.js">
     <link rel="modulepreload" href="./assets/index.4403075c.js">
-    <link rel="stylesheet" href="./assets/index.8a670858.css">
     <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
-    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+    <link rel="stylesheet" href="./assets/index.8a670858.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.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,7 +49,7 @@
     
     <!-- <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.6aa1fdef.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.3240f68a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.89735233.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.92dc85c4.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.7165c2e2.js"></script>
+    <script type="module" crossorigin src="./assets/teacher.afc3d185.js"></script>
     <link rel="modulepreload" href="./assets/vendor.f57b7239.js">
     <link rel="modulepreload" href="./assets/index.4403075c.js">
-    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
     <link rel="stylesheet" href="./assets/index.8a670858.css">
-    <link rel="stylesheet" href="./assets/teacher.a6c9550a.css">
+    <link rel="stylesheet" href="./assets/vendor.0f0cf986.css">
+    <link rel="stylesheet" href="./assets/index.5062a520.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>
 
@@ -48,7 +48,7 @@
     <div id="app"></div>
     
     <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.6aa1fdef.js"></script>
-    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.85d1070d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.89735233.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.eb698623.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/student/practice-class/index.tsx

@@ -267,7 +267,7 @@ export default defineComponent({
         )}
 
         <ActionSheet
-          show={this.show}
+          v-model:show={this.show}
           actions={actions}
           cancelText="取消"
           onSelect={this.onSheetSelect}

src/student/teacher-dependent/model/teacher-header.module.less

@@ -124,6 +124,13 @@
   }
 }
 
+.subjectList {
+  overflow: auto;
+  width: 255px;
+  display: flex;
+  flex-wrap: nowrap;
+}
+
 .piNameSubject {
   display: flex;
   align-items: center;
@@ -137,6 +144,7 @@
     color: #ff8c00;
     line-height: 16px;
     padding: 0px 4px;
+    white-space: nowrap;
     &:first-child {
       margin-left: 0;
     }

src/student/teacher-dependent/model/teacher-header.tsx

@@ -146,9 +146,11 @@ export default defineComponent({
                 src={getAssetsHomeFile('icon_subject.png')}
                 fit="contain"
               />
-              {this.subjectNameList.map((item: any) => (
-                <span class={styles.subject}>{item}</span>
-              ))}
+              <div class={styles.subjectList}>
+                {this.subjectNameList.map((item: any) => (
+                  <span class={styles.subject}>{item}</span>
+                ))}
+              </div>
             </p>
             <div class={styles['teacher-bottom']}>
               <div class={styles['teacher-data']}>

src/teacher/piano-room/account-recharge-timer/index.tsx

@@ -14,15 +14,20 @@ export const getAssetsHomeFile = (fileName: string) => {
 export default defineComponent({
   name: 'accountRechargeTimer',
   data() {
-    const query = this.$route.query
     return {
-      remainTime: query.remainTime || 0,
       list: [],
-      selectItem: {} as any
+      selectItem: {} as any,
+      remain: {
+        frozenTime: 0,
+        remainTime: 0,
+        studentCount: 0
+      }
     }
   },
   async mounted() {
     try {
+      await this._init()
+
       const res = await request.post('/api-teacher/pianoRoomSettings/list', {
         data: {}
       })
@@ -31,11 +36,22 @@ export default defineComponent({
         const item: any = this.list[0]
         this.selectItem = item
       }
-
-      console.log(this.selectItem)
     } catch {}
   },
   methods: {
+    async _init() {
+      try {
+        const res = await request.get(
+          '/api-teacher/courseSchedule/selectRemainTime'
+        )
+        const { frozenTime, remainTime, studentCount } = res.data || {}
+        this.remain = {
+          frozenTime: frozenTime || 0,
+          remainTime: remainTime || 0,
+          studentCount: studentCount || 0
+        }
+      } catch {}
+    },
     async onSubmit() {
       const selectItem = this.selectItem
       orderStatus.orderObject.orderType = 'PINAO_ROOM'
@@ -73,7 +89,7 @@ export default defineComponent({
         <div class={styles.lastMin}>
           <img src={getAssetsHomeFile('icon_music_account.png')} />
           <p>
-            琴房剩余时长<span>{this.remainTime}</span>分钟
+            琴房剩余时长<span>{this.remain.remainTime}</span>分钟
           </p>
         </div>
 
@@ -118,8 +134,8 @@ export default defineComponent({
           </p>
           <p>
             3、课程消耗时长按排课人数计算，无论实际到课人数是否为排课人数，都会按照排课人数扣费；
-            4、课程结束后费用立即结算；
           </p>
+          <p>4、课程结束后费用立即结算；</p>
           <p>5、琴房时长不足时，您将无法排课，请确保琴房剩 余时长充足；</p>
           <p>6、琴房时长一经购买不予退费。</p>
         </div>

src/teacher/piano-room/index.tsx

@@ -25,6 +25,8 @@ import ColPopup from '@/components/col-popup'
 import StudentInfo from './model/student-info'
 import StudentConfirm from './model/student-info/student-confirm'
 import { useEventListener, useWindowScroll } from '@vueuse/core'
+import { state } from '@/state'
+import { callbackify } from 'util'
 
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
@@ -71,7 +73,8 @@ export default defineComponent({
       studentStatus: false,
       studentConfirm: false,
       studentChangeObject: {} as any,
-      background: 'transparent'
+      background: 'transparent',
+      setLoading: false
     }
   },
   async mounted() {
@@ -118,12 +121,15 @@ export default defineComponent({
     },
     async getList() {
       try {
+        if (this.setLoading) return
+        this.setLoading = true
         const res = await request.post(
           '/api-teacher/courseSchedule/selectCourseList',
           {
             data: this.params
           }
         )
+        this.setLoading = false
         this.loading = false
         const result = res.data || {}
         // 处理重复请求数据
@@ -198,6 +204,18 @@ export default defineComponent({
           this.onSearch()
         }, 1000)
       } catch {}
+    },
+    onTeacherAuth(callBack: any) {
+      // 是否老师认证
+      // 老师入驻状态 0、未申请 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过,可用值:UNPAALY,DOING,PASS,UNPASS
+      const data = state.user.data
+      if (data.entryStatus === 'PASS') {
+        callBack && callBack()
+      } else if (data.entryStatus === 'DOING') {
+        Toast('认证审核中，请稍后再试')
+      } else {
+        this.$router.push('/teacherCert')
+      }
     }
   },
   render() {
@@ -240,11 +258,10 @@ export default defineComponent({
                 size="small"
                 class={styles.chargeTimer}
                 onClick={() => {
-                  this.$router.push({
-                    path: '/accountRechargeTimer',
-                    query: {
-                      remainTime: this.remain.remainTime
-                    }
+                  this.onTeacherAuth(() => {
+                    this.$router.push({
+                      path: '/accountRechargeTimer'
+                    })
                   })
                 }}
               >
@@ -268,7 +285,9 @@ export default defineComponent({
                 round
                 block
                 onClick={() => {
-                  this.shareStatus = true
+                  this.onTeacherAuth(() => {
+                    this.shareStatus = true
+                  })
                 }}
               >
                 <img src={getAssetsHomeFile('icon_invite_student.png')} />
@@ -279,7 +298,9 @@ export default defineComponent({
                 round
                 block
                 onClick={() => {
-                  this.$router.push('/classArrangement')
+                  this.onTeacherAuth(() => {
+                    this.$router.push('/classArrangement')
+                  })
                 }}
               >
                 <img src={getAssetsHomeFile('icon_class_plan.png')} />
@@ -334,6 +355,7 @@ export default defineComponent({
             {this.list.map((item: any) => (
               <Course
                 item={item}
+                operation={item.status === 'NOT_START' ? true : false}
                 onCourseDelete={this.onCourseDelete}
                 onStudentAdjust={(item: any) => {
                   console.log(item)
@@ -419,8 +441,9 @@ export default defineComponent({
           <StudentConfirm
             courseInfo={this.timeUpdateInfo}
             studentObject={this.studentChangeObject}
-            onSubmit={(item: any) => {
-              this.onStudentChange(item)
+            onSubmit={async (item: any) => {
+              await this.onStudentChange(item)
+              await this._init()
             }}
           />
         </Popup>

src/teacher/piano-room/model/share/index.module.less

@@ -2,8 +2,9 @@
   width: 305px;
   // height: 304px;
   padding: 14px;
-  background: url('../../images/share_bg.png') center no-repeat;
-  background-size: 100%;
+  background: url('../../images/share_bg.png') center no-repeat #2dc7aa;
+  background-size: cover;
+  overflow: hidden;
 
   .img {
     width: 54px;

src/teacher/piano-room/model/share/index.tsx

@@ -7,6 +7,7 @@ import { toPng } from 'html-to-image'
 
 import iconTeacher from '@/common/images/icon_teacher.png'
 import logo from '../../images/logo.png'
+import { state } from '@/state'
 
 export default defineComponent({
   name: 'share',
@@ -77,19 +78,25 @@ export default defineComponent({
               border={false}
               style={{ padding: 0 }}
               v-slots={{
-                icon: () => <img src={iconTeacher} class={styles.img} />,
+                icon: () => (
+                  <img
+                    src={state.user.data.heardUrl || iconTeacher}
+                    class={styles.img}
+                    crossorigin="anonymous"
+                  />
+                ),
                 title: () => (
                   <div>
-                    <p class={styles.name}>分享</p>
+                    <p class={styles.name}>{state.user.data.username}</p>
                     <p class={styles.titleTips}>酷乐秀入驻老师</p>
                   </div>
                 )
               }}
             />
             <p class={[styles.txt, styles.teacherName]}>
-              <span>李老师</span>邀请您加入酷乐秀
+              <span>{state.user.data.username}</span>邀请您加入酷乐秀
             </p>
-            <p class={styles.txt}>来与我一起踏入音</p>
+            <p class={styles.txt}>来与我一起踏入音乐殿堂吧！</p>
           </div>
 
           <div class={[styles.section, styles.download]}>