skyblued 2 лет назад
Родитель
Сommit
7a9da66803

+ 1 - 1
src/views/mine-orchestra/index.tsx

@@ -157,7 +157,7 @@ export default defineComponent({
               >
                 <Tab name="course" title="我的班级">
                   <div class={styles.content}>
-                    <MyClass list={modelData.orchestra?.classGroupIdList || []} />
+                    <MyClass orchestraName={modelData.orchestra?.name || ''} list={modelData.orchestra?.classGroupIdList || []} />
                   </div>
                 </Tab>
                 <Tab name="photo" title="乐团相册">

+ 5 - 0
src/views/mine-orchestra/my-class/index.module.less

@@ -7,6 +7,7 @@
   background-color: #fff;
   margin: 0 12px 12px 12px;
   .iconImg {
+    flex-shrink: 0;
     width: 44px;
     height: 44px;
     border-radius: 50%;
@@ -31,12 +32,16 @@
     .van-cell {
       padding: 0 12px;
       height: 68px;
+      box-sizing: border-box;
       .van-tag {
         margin-left: 4px;
       }
       .van-cell__label {
         color: #777;
       }
+      .van-cell__title{
+        width: 60vw;
+      }
       .van-cell__value {
         flex: none;
       }

+ 34 - 9
src/views/mine-orchestra/my-class/index.tsx

@@ -4,17 +4,23 @@ import styles from './index.module.less'
 import iconTeacher from '@common/images/icon_teacher.png'
 import iconMessage from '@common/images/icon-muit-message.png'
 import { postMessage } from '@/helpers/native-message'
-import { openDefaultWebView } from '../../../state'
+import { openDefaultWebView, state } from '../../../state'
 
 export default defineComponent({
   name: 'my-orchestra',
   props: {
+    orchestraName: {
+      type: String,
+      default: ''
+    },
     list: {
       type: Object,
       default: () => []
     }
   },
   setup(props) {
+    const { orchestraName } = toRefs(props)
+    console.log('🚀 ~ orchestraName', orchestraName.value)
     const onMessage = async (item: any) => {
       console.log(item)
       postMessage({
@@ -34,7 +40,7 @@ export default defineComponent({
         {Array.isArray(list.value) &&
           list.value.map((item: any) => (
             <div class={styles.itemDiv} onClick={() => openClassDetail(item)}>
-              <Cell center label={item.classGroupId}>
+              <Cell center>
                 {{
                   icon: () => (
                     <Image
@@ -44,10 +50,29 @@ export default defineComponent({
                     />
                   ),
                   title: () => (
-                    <div class={styles.content}>
-                      <div class={['van-ellipsis', styles.teacherName]}>{item.teacherName}</div>
-                      <div class={styles.tag}>{item.classGroupName}</div>
-                    </div>
+                    <>
+                      {state.platformType == 'TEACHER' ? (
+                        <>
+                          <div class={styles.content}>
+                            <div class={['van-ellipsis', styles.teacherName]}>
+                              {item.classGroupName}
+                            </div>
+                          </div>
+                          <div class="van-ellipsis van-cell__label">{orchestraName.value}</div>
+                        </>
+                      ) : (
+                        <>
+                          <div class={styles.content}>
+                            <div class={['van-ellipsis', styles.teacherName]}>
+                              {item.teacherName}
+                            </div>
+                          </div>
+                          <div class="van-cell__label">
+                            <span class={styles.tag}>{item.classGroupName}</span>
+                          </div>
+                        </>
+                      )}
+                    </>
                   ),
                   value: () => (
                     <Image
@@ -63,15 +88,15 @@ export default defineComponent({
               </Cell>
               <Grid border={false} columnNum={3} class={styles.grid}>
                 <GridItem>
-                  <p class={styles.title}>{item.preStudentNum || 0}</p>
+                  <p class={styles.title}>{item.studentNum || 0}</p>
                   <p class={styles.name}>学生人数</p>
                 </GridItem>
                 <GridItem>
-                  <p class={[styles.title]}>{item.courseNum || 0}</p>
+                  <p class={[styles.title]}>{item.totalCourseNum - item.completeCourseNum || 0}</p>
                   <p class={styles.name}>剩余课时</p>
                 </GridItem>
                 <GridItem>
-                  <p class={styles.title}>{item.courseScheduleNum || 0}</p>
+                  <p class={styles.title}>{item.totalCourseNum || 0}</p>
                   <p class={styles.name}>总课时</p>
                 </GridItem>
               </Grid>