Merge branch 'iteration_1.3.3' of http://git.dayaedu.com/lex/h5-colexiu into iteration_1.3.3

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

@@ -54,12 +54,15 @@ export default defineComponent({
             <span class={[styles.viUserName, 'van-hairline--right']}>
               {item?.userName || `游客${item?.teacherId || ''}`}
             </span>
-            <span class={styles.viUserNum}>{item?.countStudent}人已购买</span>
+            <span class={styles.viUserNum}>
+              {item?.countStudent}人已
+              {item?.lessonPrice > 0 ? '购买' : '领取'}
+            </span>
           </div>
           <div class={styles.viPrice}>
             {item?.lessonPrice > 0 && <>￥{item?.lessonPrice}/</>}
-            {item?.lessonPrice <= 0 &&item.auditVersion!==0 &&<>￥{0}/</>}
-            {item?.lessonPrice <= 0 &&item.auditVersion===0 &&<>免费/</>}
+            {item?.lessonPrice <= 0 && item.auditVersion !== 0 && <>￥{0}/</>}
+            {item?.lessonPrice <= 0 && item.auditVersion === 0 && <>免费/</>}
             {item?.lessonCount}课时
           </div>
         </div>

src/teacher/music/upload/index.tsx

@@ -194,6 +194,9 @@ export default defineComponent({
         )
         const names = res.data.musicTagNames.split(',')
         this.tags = res.data.musicTag.split(',')
+        this.tags = this.tags.filter((el: any) => {
+          return el != ''
+        })
 
         for (let i = 0; i < names.length; i++) {
           this.tagsNames[this.tags[i]] = names[i]

src/teacher/video-class/class-content.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
           添加课程
         </Button>
 
-        <Sticky offsetBottom={0} position="bottom">
+        <Sticky offsetBottom={0} position="bottom" zIndex={999999}>
           <div class={['btnGroup', 'btnMore']}>
             <Button
               block

src/teacher/video-class/create.tsx

@@ -94,7 +94,7 @@ export default defineComponent({
     return (
       <div class={styles['video-create']}>
         {createState.active <= 2 ? (
-          <Sticky position="top" offsetTop={0}>
+          <Sticky position="top" offsetTop={0} zIndex={999999}>
             <Grid
               border={false}
               style={{ paddingTop: '15px' }}