更新

dist/assets/teacher_cert-legacy.f997e14c.js

@@ -0,0 +1 @@
+;(function(){System.register([],function(exports){'use strict';return{execute:function execute(){var musicCert=exports('m',"./assets/music_cert.c3745c92.png");var teacherCert=exports('t',"./assets/teacher_cert.e88e7df1.png");}};});})();

dist/assets/teacher_cert.5c45c8b4.js

@@ -0,0 +1 @@
+var e="./assets/music_cert.c3745c92.png",s="./assets/teacher_cert.e88e7df1.png";export{e as m,s as t};

dist/index.html

@@ -34,11 +34,11 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index.0f9d1f7a.js"></script>
+  <script type="module" crossorigin src="./assets/index.09584f3a.js"></script>
   <link rel="modulepreload" href="./assets/vendor.2b2105af.js">
   <link rel="modulepreload" href="./assets/index.f0c37c29.js">
-  <link rel="stylesheet" href="./assets/index.b8b002f0.css">
   <link rel="stylesheet" href="./assets/vendor.177057eb.css">
+  <link rel="stylesheet" href="./assets/index.b8b002f0.css">
   <link rel="stylesheet" href="./assets/teacher.c2cf0659.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.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.1f45aa8c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.59512fa2.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -34,11 +34,11 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/teacher.a2c0e17b.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.977ba4fb.js"></script>
   <link rel="modulepreload" href="./assets/vendor.2b2105af.js">
   <link rel="modulepreload" href="./assets/index.f0c37c29.js">
-  <link rel="stylesheet" href="./assets/vendor.177057eb.css">
   <link rel="stylesheet" href="./assets/index.b8b002f0.css">
+  <link rel="stylesheet" href="./assets/vendor.177057eb.css">
   <link rel="stylesheet" href="./assets/teacher.c2cf0659.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 @@
   
   <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.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.dddcc406.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.180381d7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/business-components/calendar/index.tsx

@@ -231,7 +231,7 @@ export default defineComponent({
         <Popup show={this.show} class={styles.calenderPopup}>
           <div class={styles.popup}>
             <div class={styles.title}>
-              <Button
+              {/* <Button
                 type="primary"
                 plain
                 style={{ border: 0 }}
@@ -240,9 +240,9 @@ export default defineComponent({
                 onClick={this.onPrevDay}
               >
                 上一日
-              </Button>
+              </Button> */}
               <span>{this.selectDayTitle}</span>
-              <Button
+              {/* <Button
                 type="primary"
                 plain
                 style={{ border: 0 }}
@@ -251,7 +251,7 @@ export default defineComponent({
                 onClick={this.onNextDay}
               >
                 下一日
-              </Button>
+              </Button> */}
             </div>
 
             <div class={styles.container}>

src/student/teacher-dependent/components/live.tsx

@@ -78,6 +78,7 @@ export default defineComponent({
             {this.list.map((item: any) => (
               <CellGroup
                 class={styles.liveGroup}
+                border={false}
                 onClick={() => this.onDetail(item)}
               >
                 <Cell

src/student/teacher-dependent/teacher-home.module.less

@@ -4,6 +4,10 @@
   position: relative;
   overflow: hidden;
 }
+// .headContainer {
+//   position: relative;
+//   min-height: 270px;
+// }
 .teacherHeader {
   // linear-gradient(
   //   0deg,
@@ -45,9 +49,9 @@
   }
   :global {
     .van-cell__value {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
+      // display: flex;
+      // align-items: center;
+      // justify-content: space-between;
     }
   }
 }
@@ -95,13 +99,30 @@
   }
 }
 
+.cert {
+  margin-left: 5px;
+  height: 24px;
+  // background-color: red;
+  :global {
+    .van-image__img {
+      width: auto !important;
+    }
+  }
+}
+
 .teacher-info {
-  margin-left: 10px;
+  margin-left: 8px;
   .teacher-name {
     font-size: 18px;
     font-weight: 500;
     color: #1a1a1a;
-    padding-bottom: 10px;
+    padding-bottom: 6px;
+    display: flex;
+    justify-content: space-between;
+    .teacherCert {
+      display: flex;
+      align-items: center;
+    }
   }
 }
 

src/student/teacher-dependent/teacher-home.tsx

@@ -4,6 +4,8 @@ import styles from './teacher-home.module.less'
 import { Button, Cell, Icon, Image, Rate, Sticky, Tab, Tabs, Toast } from 'vant'
 
 import iconTeacher from '@common/images/icon_teacher.png'
+import musicCert from '@common/images/music_cert.png'
+import teacherCert from '@common/images/teacher_cert.png'
 import Single from './components/single'
 import Practice from './components/practice'
 import Live from './components/live'
@@ -41,6 +43,22 @@ export default defineComponent({
       // console.log(result)
     } catch {}
   },
+  computed: {
+    subjectNameList() {
+      const userInfo: any = this.userInfo
+      const subjectName = userInfo.subjectName
+      return subjectName ? subjectName.split(',') : []
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      const height = document.querySelector('.headContainer')?.clientHeight || 0
+      height &&
+        ((
+          document.querySelector('.headContainer') as any
+        ).style.height = `${height}px`)
+    })
+  },
   methods: {
     async onStart() {
       // 关注与取消关注
@@ -63,7 +81,12 @@ export default defineComponent({
   render() {
     return (
       <div class={styles['teacher-record']}>
-        <Sticky position="top" offsetTop={0}>
+        {/* <div class={styles.headContainer}> */}
+        <Sticky
+          position="top"
+          offsetTop={0}
+          // style={{ position: 'fixed', left: 0, right: 0, zIndex: 999 }}
+        >
           <ColHeader
             class={styles.teacherHeader}
             background="transparent"
@@ -78,6 +101,7 @@ export default defineComponent({
                     <Cell
                       class={styles['open-teacher-info']}
                       border={false}
+                      center
                       v-slots={{
                         icon: () => (
                           <Image
@@ -90,28 +114,45 @@ export default defineComponent({
                     >
                       <div class={styles['teacher-info']}>
                         <div class={styles['teacher-name']}>
-                          {this.userInfo.username ||
-                            `游客${this.userInfo.userId || ''}`}
+                          <div class={styles.teacherCert}>
+                            <span style={{ display: 'inline-block' }}>
+                              {this.userInfo.username ||
+                                `游客${this.userInfo.userId || ''}`}
+                            </span>
+
+                            {this.userInfo.entryFlag === 1 && (
+                              <Image
+                                class={styles.cert}
+                                src={teacherCert}
+                                // fit="contain"
+                              />
+                            )}
+                            {this.userInfo.musicianFlag === 1 && (
+                              <Image
+                                class={styles.cert}
+                                src={musicCert}
+                                // fit="contain"
+                              />
+                            )}
+                          </div>
+                          <Button
+                            type="primary"
+                            size="mini"
+                            plain={!!this.userInfo.isStar}
+                            style={{ borderRadius: '5px', padding: '5px 10px' }}
+                            onClick={this.onStart}
+                          >
+                            {!this.userInfo.isStar && <Icon name="plus" />}
+
+                            {this.userInfo.isStar ? '已关注' : '关注'}
+                          </Button>
                         </div>
                         <p class={styles.piNameSubject}>
-                          <span class={styles.subject}>
-                            {this.userInfo.subjectName}
-                          </span>
+                          {this.subjectNameList.map((item: any) => (
+                            <span class={styles.subject}>{item}</span>
+                          ))}
                         </p>
                       </div>
-                      <div class={styles['teacher-desc']}>
-                        <Button
-                          type="primary"
-                          size="mini"
-                          plain={!!this.userInfo.isStar}
-                          style={{ borderRadius: '5px', padding: '5px 10px' }}
-                          onClick={this.onStart}
-                        >
-                          {!this.userInfo.isStar && <Icon name="plus" />}
-
-                          {this.userInfo.isStar ? '已关注' : '关注'}
-                        </Button>
-                      </div>
                     </Cell>
                     <div class={styles['teacher-bottom']}>
                       <div class={styles.level}>
@@ -154,6 +195,7 @@ export default defineComponent({
             <Tab title="乐谱" name="music"></Tab>
           </Tabs>
         </Sticky>
+        {/* </div> */}
 
         <div class={styles.container}>
           {this.tabs === 'single' && <Single userInfo={this.userInfo} />}