lex-xin před 2 měsíci
rodič
revize
dc0b9db5b3

+ 2 - 0
src/student/teacher-dependent/components/vip.module.less

@@ -131,4 +131,6 @@
   background: #fff;
   padding-top: 10px;
   padding-bottom: 30px;
+  background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, #FFFFFF 100%), #FFFDFD;
+  box-shadow: 0px 0px 2px 0px rgba(216,216,216,0.5);
 }

+ 4 - 3
src/teacher/live-class/live-detail.tsx

@@ -225,9 +225,10 @@ export default defineComponent({
             <Tabs color="var(--van-primary)" lineWidth={20} sticky>
               <Tab title="课程列表" titleClass="van-hairline--bottom">
                 <CoursePlanStep
-                  showState={
-                    this.joinRoom == '1' && this.liveStatus.liveStatus !== 2
-                  }
+                  showState
+                  // ={
+                  //   this.joinRoom == '1' && this.liveStatus.liveStatus !== 2
+                  // }
                   courseInfo={this.courseInfo}
                   courseId={Number(this.courseId) || 0}
                 />

+ 1 - 1
src/teacher/statistics/home-statistics-detail/buy-item/index.module.less

@@ -61,7 +61,7 @@
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    padding: 3px 0;
+    padding: 1px 0;
     .iTitle {
       font-weight: 600;
       font-size: 14px;

+ 2 - 2
src/teacher/statistics/practice-statistics-detail/echats/index.tsx

@@ -157,7 +157,7 @@ const lineChartOption = (params: {
         // 固定在顶部
         return [point[0], '10%']
       },
-      backgroundColor: '#FF6079',
+      backgroundColor: params.colors.lineColor || '#FF6079',
       boxShadow: 'none',
       borderWidth: 0,
       borderRadius: 24,
@@ -169,7 +169,7 @@ const lineChartOption = (params: {
       extraCssText: 'z-index: 2;box-shadow: none;',
       axisPointer: {
         lineStyle: {
-          color: '#FF6079'
+          color: params.colors.lineColor || '#FF6079'
         }
       }
     },

+ 30 - 4
src/teacher/statistics/practice-statistics-detail/index.module.less

@@ -174,10 +174,36 @@
   border-collapse: separate;
   border-spacing: 0;
 
+  &.scrollTable {
+    .tdFixedLeft::after {
+      box-shadow: inset 12px 0 8px -12px rgba(0, 0, 0, 0.18);
+    }
+  }
+
   .tdFixedLeft {
     position: sticky;
     z-index: 1;
     left: 0;
+    &::after {
+      pointer-events: none;
+      content: '';
+      width: 12px;
+      display: inline-block;
+      position: absolute;
+      top: 0;
+      bottom: -1px;
+      transition: box-shadow 0.2s var(--n-bezier);
+      right: -12px;
+    }
+  }
+  tbody td {
+    border-bottom: 1px solid #f2f2f2;
+  }
+  thead th {
+    border-left: 1px solid #fff;
+    &:first-child {
+      border-right: none;
+    }
   }
 
   th {
@@ -272,8 +298,9 @@
         line-height: 1;
       }
     }
-    .upArrow, .downArrow {
-      width: 8px;
+    .upArrow,
+    .downArrow {
+      width: 6px;
     }
     .upArrow {
       margin-bottom: 2px;
@@ -376,7 +403,6 @@
         &:first-child {
           margin-left: 5px;
         }
-
       }
     }
 
@@ -433,4 +459,4 @@
       top: 19px;
     }
   }
-}
+}

+ 6 - 22
src/teacher/statistics/practice-statistics-detail/index.tsx

@@ -80,6 +80,7 @@ export default defineComponent({
     const forms = reactive({
       loading: false,
       dataShow: true,
+      isScrollLeft: false,
       subjectId: catchSearch.subjectId || ('' as any), // 选择的声部
       subjectList: [] as any,
       startTimeStatus: false,
@@ -388,7 +389,7 @@ export default defineComponent({
                     <span class={styles.num}>
                       {practiceSummary.totalTimes.hours}
                     </span>
-                    <span class={styles.text}>时</span>
+                    <span class={styles.text}>时</span>
                     <span class={styles.num}>
                       {practiceSummary.totalTimes.minutes}
                     </span>
@@ -471,7 +472,7 @@ export default defineComponent({
 
             <div class={styles.scroll}>
               {forms.dataShow ? (
-                <table class={styles.dataTable} style={{ width: '486px' }}>
+                <table class={[styles.dataTable]} style={{ width: '486px' }}>
                   <colgroup>
                     <col style="width: 88px;" />
                     <col style="width: 105px;" />
@@ -481,23 +482,15 @@ export default defineComponent({
                   </colgroup>
                   <thead>
                     <tr>
-                      <th class={styles.tdFixedLeft}>学员</th>
+                      <th class={[styles.tdFixedLeft]}>学员</th>
                       <th>乐器</th>
                       <th>
                         <div
                           class={styles.filterSection}
                           onClick={() => onSort('totalPracticeTime')}
                         >
-                          练习时长
+                          练习时长
                           <div class={styles.filters}>
-                            {/* <i class={['iconfont iconfont-down', styles.upArrow]} style={{ color: forms.sortField === 'totalPracticeTime' &&
-                                forms.sortType === 'ASC'
-                                  ? 'rgba(223, 128, 16, 1)'
-                                  : 'rgba(0, 0, 0, 0.20)' }}></i>
-                            <i class={['iconfont iconfont-down', styles.downArrow]} style={{ color: forms.sortField === 'totalPracticeTime' &&
-                                forms.sortType === 'DESC'
-                                  ? 'rgba(223, 128, 16, 1)'
-                                  : 'rgba(0, 0, 0, 0.20)' }}></i> */}
                             <img
                               src={
                                 forms.sortField === 'totalPracticeTime' &&
@@ -527,15 +520,6 @@ export default defineComponent({
                         >
                           平均练习时长
                           <div class={styles.filters}>
-                            {/* <i class={['iconfont iconfont-down', styles.upArrow]} style={{ color: forms.sortField === 'averagePracticeTime' &&
-                                forms.sortType === 'ASC'
-                                  ? 'rgba(223, 128, 16, 1)'
-                                  : 'rgba(0, 0, 0, 0.20)' }}></i>
-                            <i class={['iconfont iconfont-down', styles.downArrow]} style={{ color: forms.sortField === 'averagePracticeTime' &&
-                                forms.sortType === 'DESC'
-                                  ? 'rgba(223, 128, 16, 1)'
-                                  : 'rgba(0, 0, 0, 0.20)' }}></i> */}
-
                             <img
                               src={
                                 forms.sortField === 'averagePracticeTime' &&
@@ -563,7 +547,7 @@ export default defineComponent({
                   <tbody>
                     {obj.value.students.map((item: any) => (
                       <tr onClick={() => toDetail(item)}>
-                        <td class={styles.tdFixedLeft}>
+                        <td class={[styles.tdFixedLeft]}>
                           <img class={styles.userImg} src={item.avatar} />
                           <span>{item.studentName}</span>
                         </td>