Merge branch 'liu-v1.3' into dev

src/business-components/calendar/index.tsx

@@ -127,7 +127,7 @@ export default defineComponent({
       } else {
         date.type = 'disabled'
       }
-      console.log(date)
+      // console.log(date)
       if(this.$route.name == 'liveCreate' && dayjs(date.date).isToday()) {
         date.type = 'disabled'
       }

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

@@ -211,3 +211,54 @@
   text-overflow: ellipsis;
   max-width: 100px;
 }
+
+.teacherIcons {
+  display: flex;
+  align-items: center;
+}
+.teaherPopup {
+  background: transparent;
+  width: 276px;
+  overflow: initial;
+}
+.teacherIconWrap {
+  padding: 50px 22px 22px 22px;
+  background-color: #fff;
+  border-radius: 0 0 10px 10px;
+  margin-top: -25px;
+}
+.teacherIconItem {
+  margin-bottom: 16px;
+  .teacherIconItemTop {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  :global {
+    .van-image {
+      margin-right: 8px;
+      width: 24px;
+      height: 24px;
+    }
+  }
+  .teacherIconTitle {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333;
+  }
+  .teacherIconDes {
+    font-size: 12px;
+    line-height: 16px;
+    font-weight: 400;
+    padding-left: 3px;
+    color: #666;
+  }
+}
+.closeIcon {
+  position: absolute;
+  bottom: -54px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 0.96rem;
+  height: 0.96rem;
+}

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

@@ -1,4 +1,4 @@
-import { Button, Cell, Icon, Image, Rate, Toast } from 'vant'
+import { Button, Cell, Icon, Image, Popup, Rate, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './teacher-header.module.less'
 import { postMessage } from '@/helpers/native-message'
@@ -25,6 +25,11 @@ export default defineComponent({
       default: ''
     }
   },
+  data() {
+    return {
+      iconShow: false
+    }
+  },
   computed: {
     subjectNameList() {
       const userInfo: any = this.userInfo
@@ -82,9 +87,35 @@ export default defineComponent({
           break
       }
       return status
+    },
+
+    openTeacherIcon() {
+      this.iconShow = true
     }
   },
   render() {
+    const iconList = [
+      {
+        icon: 'cert_active.png',
+        title: '演奏Mlog达人',
+        des: '个人风采中上传老师风采视频并通过审核'
+      },
+      {
+        icon: 'video_active.png',
+        title: '教学视频达人',
+        des: '发布您制作的教学视频课程并通过审核'
+      },
+      {
+        icon: 'live_active.png',
+        title: '直播up达人',
+        des: '达到开通直播权限标准并开通直播功能'
+      },
+      {
+        icon: 'music_active.png',
+        title: '乐谱歌单达人',
+        des: '上传您制作的乐谱并通过审核'
+      }
+    ]
     return (
       <>
         <div class={styles.headerContent}>
@@ -138,38 +169,43 @@ export default defineComponent({
                           : getAssetsHomeFile('vip_default.png')
                       }
                     />
-                    <Image
-                      class={styles.iconOther}
-                      src={
-                        this.checkBadge('STYLE')
-                          ? getAssetsHomeFile('cert_active.png')
-                          : getAssetsHomeFile('cert_default.png')
-                      }
-                    />
-                    <Image
-                      class={styles.iconOther}
-                      src={
-                        this.checkBadge('VIDEO')
-                          ? getAssetsHomeFile('video_active.png')
-                          : getAssetsHomeFile('video_default.png')
-                      }
-                    />
-                    <Image
-                      class={styles.iconOther}
-                      src={
-                        this.checkBadge('LIVE')
-                          ? getAssetsHomeFile('live_active.png')
-                          : getAssetsHomeFile('live_default.png')
-                      }
-                    />
-                    <Image
-                      class={styles.iconOther}
-                      src={
-                        this.checkBadge('MUSIC')
-                          ? getAssetsHomeFile('music_active.png')
-                          : getAssetsHomeFile('music_default.png')
-                      }
-                    />
+                    <div
+                      class={styles.teacherIcons}
+                      onClick={this.openTeacherIcon}
+                    >
+                      <Image
+                        class={styles.iconOther}
+                        src={
+                          this.checkBadge('STYLE')
+                            ? getAssetsHomeFile('cert_active.png')
+                            : getAssetsHomeFile('cert_default.png')
+                        }
+                      />
+                      <Image
+                        class={styles.iconOther}
+                        src={
+                          this.checkBadge('VIDEO')
+                            ? getAssetsHomeFile('video_active.png')
+                            : getAssetsHomeFile('video_default.png')
+                        }
+                      />
+                      <Image
+                        class={styles.iconOther}
+                        src={
+                          this.checkBadge('LIVE')
+                            ? getAssetsHomeFile('live_active.png')
+                            : getAssetsHomeFile('live_default.png')
+                        }
+                      />
+                      <Image
+                        class={styles.iconOther}
+                        src={
+                          this.checkBadge('MUSIC')
+                            ? getAssetsHomeFile('music_active.png')
+                            : getAssetsHomeFile('music_default.png')
+                        }
+                      />
+                    </div>
                   </div>
                 </div>
                 <div class={styles.level}>
@@ -248,6 +284,27 @@ export default defineComponent({
             </div>
           </div>
         </div>
+        <Popup class={styles['teaherPopup']} v-model:show={this.iconShow}>
+          <Image src={getAssetsHomeFile('teacher-icon.png')} />
+          <div class={styles.teacherIconWrap}>
+            {iconList.map(n => {
+              return (
+                <div class={styles.teacherIconItem}>
+                  <div class={styles.teacherIconItemTop}>
+                    <Image src={getAssetsHomeFile(n.icon)} />
+                    <div class={styles.teacherIconTitle}>{n.title}</div>
+                  </div>
+                  <div class={styles.teacherIconDes}>{n.des}</div>
+                </div>
+              )
+            })}
+          </div>
+          <Image
+            onClick={() => (this.iconShow = false)}
+            class={styles.closeIcon}
+            src={getAssetsHomeFile('icon-close.png')}
+          />
+        </Popup>
       </>
     )
   }

src/teacher/live-class/create.tsx

@@ -69,7 +69,6 @@ export default defineComponent({
         createState.live.salesStartDate = data.salesStartDate
         createState.live.salesEndDate = data.salesEndDate
         createState.live.mixStudentNum = data.mixStudentNum
-        // createState.live.coursePrice = data.singleCourseMinutes
         createState.live.backgroundPic = data.backgroundPic
       }
     }